This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch restore-sample-blog in repository https://gitbox.apache.org/repos/asf/aries.git
commit d33791765c8e7b50f60573a76e29bd49249ea540 Author: Dominik Przybysz <[email protected]> AuthorDate: Sun Feb 23 12:51:30 2025 +0100 [MAINTENANCE] Restore sample blog - not working some tests --- samples/blog/blog-comment-ejb/pom.xml | 4 +-- samples/blog/blog-itests/pom.xml | 33 ++++++++++++++++------ .../src/test/java/org/apache/aries/itest | 1 + .../blog/itests/AbstractBlogIntegrationTest.java | 3 +- samples/blog/blog-persistence-jpa/pom.xml | 4 +-- samples/blog/pom.xml | 1 + samples/pom.xml | 4 +-- 7 files changed, 34 insertions(+), 16 deletions(-) diff --git a/samples/blog/blog-comment-ejb/pom.xml b/samples/blog/blog-comment-ejb/pom.xml index 539cf51e3..e16652143 100644 --- a/samples/blog/blog-comment-ejb/pom.xml +++ b/samples/blog/blog-comment-ejb/pom.xml @@ -51,7 +51,7 @@ <execution> <phase>compile</phase> <configuration> - <tasks> + <target> <path id="enhance.path.ref"> <fileset dir="${project.build.outputDirectory}"> <include name="CommentImpl.class"/> @@ -66,7 +66,7 @@ <path refid="maven.compile.classpath"/> </classpath> </java> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/samples/blog/blog-itests/pom.xml b/samples/blog/blog-itests/pom.xml index e6d3f8bd1..f75ac8fde 100644 --- a/samples/blog/blog-itests/pom.xml +++ b/samples/blog/blog-itests/pom.xml @@ -33,18 +33,22 @@ <properties> <asm.version>4.0</asm.version> <cm.version>3.2.0-v20070116</cm.version> + <commons-dbcp.version>1.4</commons-dbcp.version> <depends-maven-plugin.version>1.2</depends-maven-plugin.version> - <exam.version>3.4.0</exam.version> + <exam.version>4.13.5</exam.version> + <java.source.version>8</java.source.version> + <javax.inject.version>1</javax.inject.version> <logback.version>0.9.29</logback.version> - <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version> +<!-- <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>--> <org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version> + <org.apache.aries.proxy.version>1.1.0</org.apache.aries.proxy.version> + <org.apache.felix.bundlerepository.version>1.6.6</org.apache.felix.bundlerepository.version> <pax-web-extender-war.version>3.0.0</pax-web-extender-war.version> <pax-web-jetty-bundle.version>3.1.0</pax-web-jetty-bundle.version> <services.version>3.1.200-v20070605</services.version> - <slf4j-api.version>1.7.7</slf4j-api.version> <swissbox.version>1.7.0</swissbox.version> <tinybundles.version>2.0.0</tinybundles.version> - <url.version>1.6.0</url.version> + <url.version>2.6.16</url.version> <xbean.version>3.16</xbean.version> </properties> @@ -78,11 +82,17 @@ <scope>test</scope> </dependency> +<!-- TODO ARIES-2165 Use testsupport dependency when application runs on newer eclipse --> +<!-- <dependency>--> +<!-- <groupId>org.apache.aries.testsupport</groupId>--> +<!-- <artifactId>org.apache.aries.testsupport.unit</artifactId>--> +<!-- <version>${org.apache.aries.testsupport.unit.version}</version>--> +<!-- <scope>test</scope>--> +<!-- </dependency>--> <dependency> - <groupId>org.apache.aries.testsupport</groupId> - <artifactId>org.apache.aries.testsupport.unit</artifactId> - <version>${org.apache.aries.testsupport.unit.version}</version> - <scope>test</scope> + <groupId>javax.inject</groupId> + <artifactId>javax.inject</artifactId> + <version>${javax.inject.version}</version> </dependency> <dependency> @@ -381,7 +391,6 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>${slf4j-api.version}</version> </dependency> <dependency> <groupId>org.ops4j.pax.exam</groupId> @@ -441,6 +450,12 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>${commons-dbcp.version}</version> + </dependency> </dependencies> <build> diff --git a/samples/blog/blog-itests/src/test/java/org/apache/aries/itest b/samples/blog/blog-itests/src/test/java/org/apache/aries/itest new file mode 120000 index 000000000..5e145ea8a --- /dev/null +++ b/samples/blog/blog-itests/src/test/java/org/apache/aries/itest @@ -0,0 +1 @@ +../../../../../../../../../testsupport/testsupport-unit/src/main/java/org/apache/aries/itest \ No newline at end of file diff --git a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java index 6fc4530d3..1eb2cbc60 100644 --- a/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java +++ b/samples/blog/blog-itests/src/test/java/org/apache/aries/samples/blog/itests/AbstractBlogIntegrationTest.java @@ -159,7 +159,7 @@ public abstract class AbstractBlogIntegrationTest extends org.apache.aries.itest junitBundles(), mavenBundle("org.ops4j.pax.logging", "pax-logging-api", "1.7.2"), mavenBundle("org.ops4j.pax.logging", "pax-logging-service", "1.7.2"), - mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(), +// mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(), // this is how you set the default log level when using pax // logging (logProfile) systemProperty("org.ops4j.pax.logging.DefaultServiceLog.level").value("INFO"), @@ -199,6 +199,7 @@ public abstract class AbstractBlogIntegrationTest extends org.apache.aries.itest mavenBundle("commons-lang", "commons-lang").versionAsInProject(), mavenBundle("commons-collections", "commons-collections").versionAsInProject(), mavenBundle("commons-pool", "commons-pool").versionAsInProject(), + mavenBundle("commons-dbcp", "commons-dbcp").versionAsInProject(), mavenBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.serp").versionAsInProject(), mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.api").versionAsInProject(), mavenBundle("org.apache.aries.quiesce", "org.apache.aries.quiesce.manager").versionAsInProject(), diff --git a/samples/blog/blog-persistence-jpa/pom.xml b/samples/blog/blog-persistence-jpa/pom.xml index 8fe194499..6cb158160 100644 --- a/samples/blog/blog-persistence-jpa/pom.xml +++ b/samples/blog/blog-persistence-jpa/pom.xml @@ -51,7 +51,7 @@ <execution> <phase>compile</phase> <configuration> - <tasks> + <target> <path id="enhance.path.ref"> <fileset dir="${project.build.outputDirectory}"> <include name="AuthorImpl.class"/> @@ -67,7 +67,7 @@ <path refid="maven.compile.classpath"/> </classpath> </java> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/samples/blog/pom.xml b/samples/blog/pom.xml index 0f88460d6..94c9a17b0 100644 --- a/samples/blog/pom.xml +++ b/samples/blog/pom.xml @@ -30,6 +30,7 @@ <packaging>pom</packaging> <properties> + <java.source.version>1.6</java.source.version> <org.eclipse.osgi.version>3.7.0.v20110613</org.eclipse.osgi.version> </properties> diff --git a/samples/pom.xml b/samples/pom.xml index aa322d24b..e75d232f1 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.aries</groupId> <artifactId>parent</artifactId> - <version>2.0.0</version> + <version>2.1.2-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> @@ -687,7 +687,7 @@ <modules> <module>ariestrader</module> -<!-- <module>blog</module>--> + <module>blog</module> <module>blueprint</module> <!-- <module>twitter</module>--> </modules>
