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 1cf6fda9e7f7493ea41f31294be7b4568f9abab7 Author: Dominik Przybysz <[email protected]> AuthorDate: Mon Mar 24 21:17:42 2025 +0100 ARIES-2175: Update org.osgi.* artifacts to osgi.* in application --- application/application-api/pom.xml | 4 +++- application/application-bundle/pom.xml | 8 ++++++-- application/application-converters/pom.xml | 4 +++- application/application-default-local-platform/pom.xml | 4 +++- application/application-deployment-management/pom.xml | 4 +++- application/application-install/pom.xml | 8 ++++++-- application/application-itests/pom.xml | 2 +- .../application/runtime/itests/BasicAppManagerTest.java | 4 ++-- .../application/runtime/itests/BasicNoOpResolverTest.java | 4 ++-- .../runtime/itests/IsolatedCfgAdminRuntimeTest.java | 4 ++-- .../application/runtime/itests/IsolatedRuntimeTest.java | 4 ++-- .../aries/application/runtime/itests/MinimumImportsTest.java | 4 ++-- .../aries/application/runtime/itests/OBRAppManagerTest.java | 4 ++-- .../application/runtime/itests/OBRResolverAdvancedTest.java | 4 ++-- .../aries/application/runtime/itests/OBRResolverTest.java | 4 ++-- .../aries/application/runtime/itests/UpdateAppTest.java | 4 ++-- application/application-management/pom.xml | 8 ++++++-- application/application-modeller-common-test/pom.xml | 12 ++++++------ application/application-modeller/pom.xml | 8 ++++++-- application/application-noop-resolver/pom.xml | 4 +++- application/application-obr-resolver/pom.xml | 4 +++- application/application-resolve-transform-cm-itests/pom.xml | 8 ++++++-- .../transform/cm/itest/ConfigurationPostResolverTest.java | 4 ++-- application/application-resolve-transform-cm/pom.xml | 4 +++- application/application-runtime-framework-management/pom.xml | 8 ++++++-- application/application-runtime-framework/pom.xml | 8 ++++++-- application/application-runtime-isolated/pom.xml | 8 ++++++-- application/application-runtime-repository/pom.xml | 8 ++++++-- application/application-runtime/pom.xml | 8 ++++++-- application/application-utils/pom.xml | 4 +++- 30 files changed, 111 insertions(+), 55 deletions(-) diff --git a/application/application-api/pom.xml b/application/application-api/pom.xml index fa8328db1..6a04c81f3 100644 --- a/application/application-api/pom.xml +++ b/application/application-api/pom.xml @@ -57,12 +57,14 @@ <lastReleaseVersion>1.0.0</lastReleaseVersion> <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <dependencies> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> + <version>${osgi.core.version}</version> <scope>provided</scope> </dependency> <dependency> diff --git a/application/application-bundle/pom.xml b/application/application-bundle/pom.xml index fbfc496a9..2380ed1c9 100644 --- a/application/application-bundle/pom.xml +++ b/application/application-bundle/pom.xml @@ -73,6 +73,8 @@ <org.apache.aries.application.management.version>1.0.0</org.apache.aries.application.management.version> <org.apache.aries.application.runtime.version>1.0.0</org.apache.aries.application.runtime.version> <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + <osgi.cmpn.version>4.3.1</osgi.cmpn.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <dependencies> @@ -98,12 +100,14 @@ </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> + <version>${osgi.core.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> + <artifactId>osgi.cmpn</artifactId> + <version>${osgi.cmpn.version}</version> <scope>provided</scope> </dependency> <dependency> diff --git a/application/application-converters/pom.xml b/application/application-converters/pom.xml index 8490fda67..bfd5ab2da 100644 --- a/application/application-converters/pom.xml +++ b/application/application-converters/pom.xml @@ -58,6 +58,7 @@ <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> <org.apache.aries.web.urlhandler.version>1.0.0</org.apache.aries.web.urlhandler.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <dependencies> @@ -89,7 +90,8 @@ <!--External dependencies. Versions may be specified in parent --> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> + <version>${osgi.core.version}</version> <scope>provided</scope> </dependency> <dependency> diff --git a/application/application-default-local-platform/pom.xml b/application/application-default-local-platform/pom.xml index ca2edda32..28b9a5ea4 100644 --- a/application/application-default-local-platform/pom.xml +++ b/application/application-default-local-platform/pom.xml @@ -56,12 +56,14 @@ <lastReleaseVersion>1.0.0</lastReleaseVersion> <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <dependencies> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> + <version>${osgi.core.version}</version> <scope>provided</scope> </dependency> <dependency> diff --git a/application/application-deployment-management/pom.xml b/application/application-deployment-management/pom.xml index c9674ff1a..f02e9b492 100644 --- a/application/application-deployment-management/pom.xml +++ b/application/application-deployment-management/pom.xml @@ -56,6 +56,7 @@ <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <dependencies> @@ -66,7 +67,8 @@ --> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> + <version>${osgi.core.version}</version> <scope>provided</scope> </dependency> <dependency> diff --git a/application/application-install/pom.xml b/application/application-install/pom.xml index 4027a86d9..6019860d0 100644 --- a/application/application-install/pom.xml +++ b/application/application-install/pom.xml @@ -50,6 +50,8 @@ <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> <org.apache.felix.fileinstall.version>3.7.4</org.apache.felix.fileinstall.version> + <osgi.cmpn.version>4.3.1</osgi.cmpn.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> @@ -87,12 +89,14 @@ </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> + <version>${osgi.core.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> + <artifactId>osgi.cmpn</artifactId> + <version>${osgi.cmpn.version}</version> <scope>provided</scope> </dependency> <dependency> diff --git a/application/application-itests/pom.xml b/application/application-itests/pom.xml index 7db147aa9..8587ed6b2 100644 --- a/application/application-itests/pom.xml +++ b/application/application-itests/pom.xml @@ -77,7 +77,7 @@ <!-- framework --> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> + <artifactId>osgi.cmpn</artifactId> <scope>test</scope> </dependency> <dependency> diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java index 0e2db743d..609ff6b23 100644 --- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java +++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicAppManagerTest.java @@ -147,8 +147,8 @@ public class BasicAppManagerTest extends AbstractIntegrationTest { return options( // framework / core bundles - mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(), - mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(), + mavenBundle("org.osgi", "osgi.core").versionAsInProject(), + mavenBundle("org.osgi", "osgi.cmpn").versionAsInProject(), // Logging addPaxLoggingBundles(), diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java index aec09e68e..8f88754a1 100644 --- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java +++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/BasicNoOpResolverTest.java @@ -123,8 +123,8 @@ public class BasicNoOpResolverTest extends AbstractIntegrationTest { return options( // framework / core bundles - mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(), - mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(), + mavenBundle("org.osgi", "osgi.core").versionAsInProject(), + mavenBundle("org.osgi", "osgi.cmpn").versionAsInProject(), // Logging addPaxLoggingBundles(), diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java index 859fd1a1e..421ebb30a 100644 --- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java +++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedCfgAdminRuntimeTest.java @@ -366,8 +366,8 @@ public class IsolatedCfgAdminRuntimeTest extends AbstractIntegrationTest { return options( // framework / core bundles - mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(), - mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(), + mavenBundle("org.osgi", "osgi.core").versionAsInProject(), + mavenBundle("org.osgi", "osgi.cmpn").versionAsInProject(), // Logging addPaxLoggingBundles(), diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java index 3183fc0e7..e629a90a6 100644 --- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java +++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/IsolatedRuntimeTest.java @@ -314,8 +314,8 @@ public class IsolatedRuntimeTest extends AbstractIntegrationTest { return options( // framework / core bundles - mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(), - mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(), + mavenBundle("org.osgi", "osgi.core").versionAsInProject(), + mavenBundle("org.osgi", "osgi.cmpn").versionAsInProject(), // Logging addPaxLoggingBundles(), diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java index 4f0c0852c..3f47283c6 100644 --- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java +++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/MinimumImportsTest.java @@ -173,8 +173,8 @@ public class MinimumImportsTest extends AbstractIntegrationTest { return options( // framework / core bundles - mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(), - mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(), + mavenBundle("org.osgi", "osgi.core").versionAsInProject(), + mavenBundle("org.osgi", "osgi.cmpn").versionAsInProject(), // Logging addPaxLoggingBundles(), diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java index 9167c458e..6d1f8ad14 100644 --- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java +++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRAppManagerTest.java @@ -154,8 +154,8 @@ public class OBRAppManagerTest extends AbstractIntegrationTest { return options( // framework / core bundles - mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(), - mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(), + mavenBundle("org.osgi", "osgi.core").versionAsInProject(), + mavenBundle("org.osgi", "osgi.cmpn").versionAsInProject(), // Logging diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java index ece04a0b2..96980d6d3 100644 --- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java +++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverAdvancedTest.java @@ -531,8 +531,8 @@ public class OBRResolverAdvancedTest extends AbstractIntegrationTest { return options( // framework / core bundles - mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(), - mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(), + mavenBundle("org.osgi", "osgi.core").versionAsInProject(), + mavenBundle("org.osgi", "osgi.cmpn").versionAsInProject(), // Logging addPaxLoggingBundles(), diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java index 8bec78337..edb276804 100644 --- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java +++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/OBRResolverTest.java @@ -317,8 +317,8 @@ public class OBRResolverTest extends AbstractIntegrationTest { return options( // framework / core bundles - mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(), - mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(), + mavenBundle("org.osgi", "osgi.core").versionAsInProject(), + mavenBundle("org.osgi", "osgi.cmpn").versionAsInProject(), // Logging addPaxLoggingBundles(), diff --git a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java index 88ef0bc34..5b09626d5 100644 --- a/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java +++ b/application/application-itests/src/test/java/org/apache/aries/application/runtime/itests/UpdateAppTest.java @@ -255,8 +255,8 @@ public class UpdateAppTest extends AbstractIntegrationTest { return options( // framework / core bundles - mavenBundle("org.osgi", "org.osgi.core").versionAsInProject(), - mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(), + mavenBundle("org.osgi", "osgi.core").versionAsInProject(), + mavenBundle("org.osgi", "osgi.cmpn").versionAsInProject(), // Logging addPaxLoggingBundles(), diff --git a/application/application-management/pom.xml b/application/application-management/pom.xml index 3577cecc7..c617a29ed 100644 --- a/application/application-management/pom.xml +++ b/application/application-management/pom.xml @@ -62,6 +62,8 @@ <org.apache.aries.application.deployment.management.version>1.0.0</org.apache.aries.application.deployment.management.version> <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> + <osgi.cmpn.version>4.3.1</osgi.cmpn.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <dependencies> @@ -88,12 +90,14 @@ </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> + <version>${osgi.core.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> + <artifactId>osgi.cmpn</artifactId> + <version>${osgi.cmpn.version}</version> <scope>provided</scope> </dependency> <dependency> diff --git a/application/application-modeller-common-test/pom.xml b/application/application-modeller-common-test/pom.xml index 7ad74c351..88425f3c3 100644 --- a/application/application-modeller-common-test/pom.xml +++ b/application/application-modeller-common-test/pom.xml @@ -47,8 +47,8 @@ <application-modeller-standalone.version>1.0.0</application-modeller-standalone.version> <org.apache.aries.blueprint.core.version>1.0.0</org.apache.aries.blueprint.core.version> <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> - <org.osgi.compendium.version>5.0.0</org.osgi.compendium.version> - <org.osgi.core.version>6.0.0</org.osgi.core.version> + <osgi.cmpn.version>5.0.0</osgi.cmpn.version> + <osgi.core.version>6.0.0</osgi.core.version> </properties> <dependencies> @@ -64,14 +64,14 @@ </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <version>${org.osgi.core.version}</version> + <artifactId>osgi.core</artifactId> + <version>${osgi.core.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <version>${org.osgi.compendium.version}</version> + <artifactId>osgi.cmpn</artifactId> + <version>${osgi.cmpn.version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/application/application-modeller/pom.xml b/application/application-modeller/pom.xml index e4fafaf3f..e533c5cb0 100644 --- a/application/application-modeller/pom.xml +++ b/application/application-modeller/pom.xml @@ -63,6 +63,8 @@ <org.apache.aries.jndi.api.version>1.0.0</org.apache.aries.jndi.api.version> <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version> + <osgi.cmpn.version>4.3.1</osgi.cmpn.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <dependencies> @@ -104,12 +106,14 @@ <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> + <version>${osgi.core.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> + <artifactId>osgi.cmpn</artifactId> + <version>${osgi.cmpn.version}</version> <scope>provided</scope> </dependency> <dependency> diff --git a/application/application-noop-resolver/pom.xml b/application/application-noop-resolver/pom.xml index ad441f5a3..0821e57f9 100644 --- a/application/application-noop-resolver/pom.xml +++ b/application/application-noop-resolver/pom.xml @@ -56,12 +56,14 @@ <lastReleaseVersion>1.0.0</lastReleaseVersion> <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <dependencies> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> + <version>${osgi.core.version}</version> <scope>provided</scope> </dependency> <dependency> diff --git a/application/application-obr-resolver/pom.xml b/application/application-obr-resolver/pom.xml index 30fdfe363..64848c2ca 100644 --- a/application/application-obr-resolver/pom.xml +++ b/application/application-obr-resolver/pom.xml @@ -65,12 +65,14 @@ <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> <org.apache.felix.bundlerepository.version>1.6.6</org.apache.felix.bundlerepository.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <dependencies> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> + <version>${osgi.core.version}</version> <scope>provided</scope> </dependency> <dependency> diff --git a/application/application-resolve-transform-cm-itests/pom.xml b/application/application-resolve-transform-cm-itests/pom.xml index c49f97254..d616b10cb 100644 --- a/application/application-resolve-transform-cm-itests/pom.xml +++ b/application/application-resolve-transform-cm-itests/pom.xml @@ -59,6 +59,8 @@ <!-- <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version>--> <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version> <org.eclipse.osgi.version>3.8.0.v20120529-1548</org.eclipse.osgi.version> + <osgi.cmpn.version>4.3.1</osgi.cmpn.version> + <osgi.core.version>4.3.1</osgi.core.version> <pax-exam.version>4.13.5</pax-exam.version> <pax-swissbox.version>1.8.3</pax-swissbox.version> <pax-url.version>2.6.16</pax-url.version> @@ -85,12 +87,14 @@ <!-- framework and test bundles--> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> + <version>${osgi.core.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> + <artifactId>osgi.cmpn</artifactId> + <version>${osgi.cmpn.version}</version> <scope>test</scope> </dependency> <dependency> diff --git a/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java b/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java index 348ba9017..e9bd51f5f 100644 --- a/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java +++ b/application/application-resolve-transform-cm-itests/src/test/java/org/apache/aries/application/resolve/transform/cm/itest/ConfigurationPostResolverTest.java @@ -143,13 +143,13 @@ public class ConfigurationPostResolverTest extends AbstractIntegrationTest { public Option[] configuration() throws Exception { return options( baseOptions(), - mavenBundle("org.osgi", "org.osgi.compendium").versionAsInProject(), + mavenBundle("org.osgi", "osgi.cmpn").versionAsInProject(), // mavenBundle("org.apache.aries.testsupport", "org.apache.aries.testsupport.unit").versionAsInProject(), mavenBundle("org.apache.aries.blueprint", "org.apache.aries.blueprint").versionAsInProject(), mavenBundle("org.ow2.asm", "asm-all").versionAsInProject(), mavenBundle("org.apache.aries.proxy", "org.apache.aries.proxy").versionAsInProject(), mavenBundle("org.apache.aries", "org.apache.aries.util").versionAsInProject(), - 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.resolve.transform.cm").versionAsInProject() ); diff --git a/application/application-resolve-transform-cm/pom.xml b/application/application-resolve-transform-cm/pom.xml index 796271929..35bff5f1a 100644 --- a/application/application-resolve-transform-cm/pom.xml +++ b/application/application-resolve-transform-cm/pom.xml @@ -55,12 +55,14 @@ <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <dependencies> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> + <version>${osgi.core.version}</version> <scope>provided</scope> </dependency> <dependency> diff --git a/application/application-runtime-framework-management/pom.xml b/application/application-runtime-framework-management/pom.xml index 7cb8b338c..b035e5a94 100644 --- a/application/application-runtime-framework-management/pom.xml +++ b/application/application-runtime-framework-management/pom.xml @@ -60,6 +60,8 @@ <org.apache.aries.application.runtime.framework.version>1.0.0</org.apache.aries.application.runtime.framework.version> <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> + <osgi.cmpn.version>4.3.1</osgi.cmpn.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <dependencies> @@ -91,12 +93,14 @@ </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> + <version>${osgi.core.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> + <artifactId>osgi.cmpn</artifactId> + <version>${osgi.cmpn.version}</version> <scope>provided</scope> </dependency> <dependency> diff --git a/application/application-runtime-framework/pom.xml b/application/application-runtime-framework/pom.xml index 446e97a14..81d801259 100644 --- a/application/application-runtime-framework/pom.xml +++ b/application/application-runtime-framework/pom.xml @@ -62,6 +62,8 @@ <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> <osgi.version>3.5.0.v20090520</osgi.version> + <osgi.cmpn.version>4.3.1</osgi.cmpn.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <dependencies> @@ -88,12 +90,14 @@ </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> + <version>${osgi.core.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> + <artifactId>osgi.cmpn</artifactId> + <version>${osgi.cmpn.version}</version> <scope>provided</scope> </dependency> <dependency> diff --git a/application/application-runtime-isolated/pom.xml b/application/application-runtime-isolated/pom.xml index 7eef7f89b..bf99dbb04 100644 --- a/application/application-runtime-isolated/pom.xml +++ b/application/application-runtime-isolated/pom.xml @@ -61,6 +61,8 @@ <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> <osgi.version>3.5.0.v20090520</osgi.version> + <osgi.cmpn.version>4.3.1</osgi.cmpn.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <dependencies> @@ -87,12 +89,14 @@ </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> + <version>${osgi.core.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> + <artifactId>osgi.cmpn</artifactId> + <version>${osgi.cmpn.version}</version> <scope>provided</scope> </dependency> <dependency> diff --git a/application/application-runtime-repository/pom.xml b/application/application-runtime-repository/pom.xml index 8d7aa1bed..d9a0c5770 100644 --- a/application/application-runtime-repository/pom.xml +++ b/application/application-runtime-repository/pom.xml @@ -58,6 +58,8 @@ <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> + <osgi.cmpn.version>4.3.1</osgi.cmpn.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <dependencies> @@ -84,12 +86,14 @@ </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> + <version>${osgi.core.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> + <artifactId>osgi.cmpn</artifactId> + <version>${osgi.cmpn.version}</version> <scope>provided</scope> </dependency> <dependency> diff --git a/application/application-runtime/pom.xml b/application/application-runtime/pom.xml index 11c9376ae..301ce3607 100644 --- a/application/application-runtime/pom.xml +++ b/application/application-runtime/pom.xml @@ -54,6 +54,8 @@ <org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version> <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> + <osgi.cmpn.version>4.3.1</osgi.cmpn.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <dependencies> @@ -75,12 +77,14 @@ </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> + <version>${osgi.core.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> + <artifactId>osgi.cmpn</artifactId> + <version>${osgi.cmpn.version}</version> <scope>provided</scope> </dependency> <dependency> diff --git a/application/application-utils/pom.xml b/application/application-utils/pom.xml index dd6505a4a..7617f21bd 100644 --- a/application/application-utils/pom.xml +++ b/application/application-utils/pom.xml @@ -68,6 +68,7 @@ <org.apache.aries.application.api.version>1.0.0</org.apache.aries.application.api.version> <org.apache.aries.testsupport.unit.version>1.0.0</org.apache.aries.testsupport.unit.version> <org.apache.aries.util.version>1.0.0</org.apache.aries.util.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <dependencies> @@ -99,7 +100,8 @@ </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> + <version>${osgi.core.version}</version> <scope>provided</scope> </dependency> <dependency>
