This is an automated email from the ASF dual-hosted git repository. alien11689 pushed a commit to branch ARIES-2175-move-org.osgi-to-osgi-artifacts in repository https://gitbox.apache.org/repos/asf/aries.git
commit 7fa84de592b2d3a20e367d589df2bf54b36b8c61 Author: Dominik Przybysz <[email protected]> AuthorDate: Mon Mar 24 20:20:47 2025 +0100 ARIES-2175: Update org.osgi.* artifacts to osgi.* in samples --- samples/blog/blog-itests/pom.xml | 4 ++-- samples/blueprint/helloworld/helloworld-itests/pom.xml | 4 ++-- samples/twitter/twitter-bundle/pom.xml | 2 +- samples/twitter/twitter-itests/pom.xml | 4 ++-- .../test/java/org/apache/aries/sample/twitter/itest/TwitterTest.java | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/samples/blog/blog-itests/pom.xml b/samples/blog/blog-itests/pom.xml index 4dfb8c5bd..5e2701fdc 100644 --- a/samples/blog/blog-itests/pom.xml +++ b/samples/blog/blog-itests/pom.xml @@ -60,7 +60,7 @@ </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> + <artifactId>osgi.cmpn</artifactId> <scope>provided</scope> </dependency> @@ -440,7 +440,7 @@ <version>${tinybundles.version}</version> <exclusions> <exclusion> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> <groupId>org.osgi</groupId> </exclusion> </exclusions> diff --git a/samples/blueprint/helloworld/helloworld-itests/pom.xml b/samples/blueprint/helloworld/helloworld-itests/pom.xml index f8b52268b..0ab68c3ac 100644 --- a/samples/blueprint/helloworld/helloworld-itests/pom.xml +++ b/samples/blueprint/helloworld/helloworld-itests/pom.xml @@ -53,13 +53,13 @@ <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> + <artifactId>osgi.cmpn</artifactId> <scope>provided</scope> </dependency> diff --git a/samples/twitter/twitter-bundle/pom.xml b/samples/twitter/twitter-bundle/pom.xml index b2d40e4b8..722b6d543 100644 --- a/samples/twitter/twitter-bundle/pom.xml +++ b/samples/twitter/twitter-bundle/pom.xml @@ -45,7 +45,7 @@ </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> <scope>provided</scope> </dependency> </dependencies> diff --git a/samples/twitter/twitter-itests/pom.xml b/samples/twitter/twitter-itests/pom.xml index e2b17360e..384195c79 100644 --- a/samples/twitter/twitter-itests/pom.xml +++ b/samples/twitter/twitter-itests/pom.xml @@ -80,7 +80,7 @@ </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> + <artifactId>osgi.cmpn</artifactId> <scope>test</scope> </dependency> <dependency> @@ -228,7 +228,7 @@ <version>${pax-tinybundles.version}</version> <exclusions> <exclusion> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> <groupId>org.osgi</groupId> </exclusion> </exclusions> 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 6e88c9a1b..5753cc073 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 @@ -178,7 +178,7 @@ public class TwitterTest { public Option[] configuration() { return CoreOptions.options( baseOptions(), - mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(), + mavenBundle("org.osgi", "osgi.cmpn").versionAsInProject(), mavenBundle("org.apache.aries.application", "org.apache.aries.application.api").versionAsInProject(), mavenBundle("org.apache.aries.application", "org.apache.aries.application.utils").versionAsInProject(), mavenBundle("org.apache.aries.application", "org.apache.aries.application.management").versionAsInProject(),
