This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch use-the-newest-parent-pom-in-samepls in repository https://gitbox.apache.org/repos/asf/aries.git
commit 84760bbb5a793584de857760bc6eb34415feebd5 Author: Dominik Przybysz <[email protected]> AuthorDate: Tue Mar 18 19:46:04 2025 +0100 [MAINTENANCE] Use the newest parent pom in samples --- samples/ariestrader/modules/ariestrader-entities/pom.xml | 4 ++-- samples/blueprint/helloworld/helloworld-itests/pom.xml | 4 ++-- samples/pom.xml | 2 +- samples/twitter/twitter-itests/pom.xml | 13 ++----------- .../twitter-itests/src/test/java/org/apache/aries/itest | 1 - .../org/apache/aries/sample/twitter/itest/TwitterTest.java | 4 +--- 6 files changed, 8 insertions(+), 20 deletions(-) diff --git a/samples/ariestrader/modules/ariestrader-entities/pom.xml b/samples/ariestrader/modules/ariestrader-entities/pom.xml index 2bee09b35..21ab13a11 100644 --- a/samples/ariestrader/modules/ariestrader-entities/pom.xml +++ b/samples/ariestrader/modules/ariestrader-entities/pom.xml @@ -88,7 +88,7 @@ <execution> <phase>compile</phase> <configuration> - <tasks> + <target> <path id="enhance.path.ref"> <fileset dir="${project.build.outputDirectory}"> <include name="*Bean*/*.class"/> @@ -103,7 +103,7 @@ <path refid="maven.compile.classpath"/> </classpath> </java> - </tasks> + </target> </configuration> <goals> <goal>run</goal> diff --git a/samples/blueprint/helloworld/helloworld-itests/pom.xml b/samples/blueprint/helloworld/helloworld-itests/pom.xml index ea1e1608b..78306b125 100644 --- a/samples/blueprint/helloworld/helloworld-itests/pom.xml +++ b/samples/blueprint/helloworld/helloworld-itests/pom.xml @@ -35,7 +35,7 @@ <asm.version>5.0.3</asm.version> <cm.version>3.2.0-v20070116</cm.version> <org.apache.aries.proxy.version>1.0.0</org.apache.aries.proxy.version> - <org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version> + <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version> <pax-exam.version>4.13.5</pax-exam.version> <pax-logging.version>1.7.2</pax-logging.version> <pax-url.version>2.6.16</pax-url.version> @@ -44,7 +44,7 @@ <dependencies> <dependency> - <groupId>org.eclipse</groupId> + <groupId>org.eclipse.platform</groupId> <artifactId>org.eclipse.osgi</artifactId> <version>${org.eclipse.osgi.version}</version> <scope>provided</scope> diff --git a/samples/pom.xml b/samples/pom.xml index 62210817c..616904f8f 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> diff --git a/samples/twitter/twitter-itests/pom.xml b/samples/twitter/twitter-itests/pom.xml index 7b91f83b6..bbf13d24c 100644 --- a/samples/twitter/twitter-itests/pom.xml +++ b/samples/twitter/twitter-itests/pom.xml @@ -40,7 +40,7 @@ <org.apache.aries.proxy.version>1.1.0</org.apache.aries.proxy.version> <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version> <org.apache.felix.bundlerepository.version>1.6.6</org.apache.felix.bundlerepository.version> - <org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version> + <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version> <pax-exam.version>4.13.5</pax-exam.version> <pax-tinybundles.version>2.1.1</pax-tinybundles.version> <pax-url.version>2.6.16</pax-url.version> @@ -48,7 +48,7 @@ <dependencies> <dependency> - <groupId>org.eclipse</groupId> + <groupId>org.eclipse.platform</groupId> <artifactId>org.eclipse.osgi</artifactId> <version>${org.eclipse.osgi.version}</version> </dependency> @@ -88,15 +88,6 @@ <artifactId>org.apache.aries.application.utils</artifactId> <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>javax.inject</groupId> <artifactId>javax.inject</artifactId> diff --git a/samples/twitter/twitter-itests/src/test/java/org/apache/aries/itest b/samples/twitter/twitter-itests/src/test/java/org/apache/aries/itest deleted file mode 120000 index 5e145ea8a..000000000 --- a/samples/twitter/twitter-itests/src/test/java/org/apache/aries/itest +++ /dev/null @@ -1 +0,0 @@ -../../../../../../../../../testsupport/testsupport-unit/src/main/java/org/apache/aries/itest \ No newline at end of file diff --git a/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java b/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java index 95d94ee83..6e88c9a1b 100644 --- a/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java +++ b/samples/twitter/twitter-itests/src/test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java @@ -48,7 +48,6 @@ import org.apache.aries.application.management.AriesApplication; import org.apache.aries.application.management.AriesApplicationContext; import org.apache.aries.application.management.AriesApplicationManager; import org.apache.aries.application.utils.AppConstants; -import org.apache.aries.itest.AbstractIntegrationTest; import org.apache.felix.bundlerepository.Repository; import org.apache.felix.bundlerepository.RepositoryAdmin; import org.junit.Test; @@ -60,8 +59,7 @@ import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.options.MavenArtifactUrlReference; @RunWith(PaxExam.class) -public class TwitterTest extends AbstractIntegrationTest -{ +public class TwitterTest { public static final String CORE_BUNDLE_BY_VALUE = "core.bundle.by.value"; public static final String CORE_BUNDLE_BY_REFERENCE = "core.bundle.by.reference"; public static final String TRANSITIVE_BUNDLE_BY_VALUE = "transitive.bundle.by.value";
