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 1019990a470d6c87eac22712a720bd982ca69630 Author: Dominik Przybysz <[email protected]> AuthorDate: Mon Mar 24 21:03:58 2025 +0100 ARIES-2175: Update org.osgi.* artifacts to osgi.* in blueprint --- blueprint/blueprint-api/pom.xml | 5 ++++- blueprint/blueprint-authz/pom.xml | 8 ++++++-- blueprint/blueprint-bundle/pom.xml | 4 +++- blueprint/blueprint-cm/pom.xml | 10 ++++++---- blueprint/blueprint-core/pom.xml | 8 ++++++-- blueprint/blueprint-parser/pom.xml | 4 +++- blueprint/blueprint-spring-camel/pom.xml | 4 +++- blueprint/blueprint-spring-extender/pom.xml | 12 ++++++------ blueprint/blueprint-spring/pom.xml | 8 ++++++-- blueprint/blueprint-web-osgi/pom.xml | 4 +++- blueprint/examples/blueprint-sample/pom.xml | 4 +++- blueprint/itests/pom.xml | 4 +++- 12 files changed, 52 insertions(+), 23 deletions(-) diff --git a/blueprint/blueprint-api/pom.xml b/blueprint/blueprint-api/pom.xml index 5a55cb49d..92eef325c 100644 --- a/blueprint/blueprint-api/pom.xml +++ b/blueprint/blueprint-api/pom.xml @@ -56,12 +56,15 @@ </aries.osgi.import.pkg> <aries.osgi.private.pkg/> <lastReleaseVersion>1.0.0</lastReleaseVersion> + + <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> </dependencies> diff --git a/blueprint/blueprint-authz/pom.xml b/blueprint/blueprint-authz/pom.xml index 608d6dedb..69f61614a 100644 --- a/blueprint/blueprint-authz/pom.xml +++ b/blueprint/blueprint-authz/pom.xml @@ -47,6 +47,8 @@ <blueprint.api.version>1.0.0</blueprint.api.version> <blueprint.parser.version>1.0.0</blueprint.parser.version> <javax.annotation-api.version>1.3.2</javax.annotation-api.version> + <osgi.cmpn.version>4.3.1</osgi.cmpn.version> + <osgi.core.version>4.3.1</osgi.core.version> <slf4j.version>2.0.17</slf4j.version> </properties> @@ -69,7 +71,8 @@ <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> @@ -97,7 +100,8 @@ </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/blueprint/blueprint-bundle/pom.xml b/blueprint/blueprint-bundle/pom.xml index 896deed61..355bbdeae 100644 --- a/blueprint/blueprint-bundle/pom.xml +++ b/blueprint/blueprint-bundle/pom.xml @@ -117,6 +117,7 @@ <org.apache.aries.proxy.impl.version>1.0.6</org.apache.aries.proxy.impl.version> <org.apache.aries.quiesce.api.version>1.0.0</org.apache.aries.quiesce.api.version> <org.apache.aries.versioning.plugin.version>0.3.1</org.apache.aries.versioning.plugin.version> + <osgi.cmpn.version>4.3.1</osgi.cmpn.version> <slf4j.version>2.0.17</slf4j.version> </properties> @@ -177,7 +178,8 @@ </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/blueprint/blueprint-cm/pom.xml b/blueprint/blueprint-cm/pom.xml index 0b3b72530..4b5f77c72 100644 --- a/blueprint/blueprint-cm/pom.xml +++ b/blueprint/blueprint-cm/pom.xml @@ -62,7 +62,8 @@ <blueprint.parser.version>1.6.0</blueprint.parser.version> <maven-release-plugin.version>3.1.1</maven-release-plugin.version> <org.apache.aries.blueprint.core.version>1.10.0</org.apache.aries.blueprint.core.version> - <org.osgi.compendium.version>5.0.0</org.osgi.compendium.version> + <osgi.cmpn.version>5.0.0</osgi.cmpn.version> + <osgi.core.version>4.3.1</osgi.core.version> <slf4j.version>2.0.17</slf4j.version> </properties> @@ -109,14 +110,15 @@ </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> <scope>provided</scope> - <version>${org.osgi.compendium.version}</version> + <version>${osgi.cmpn.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> diff --git a/blueprint/blueprint-core/pom.xml b/blueprint/blueprint-core/pom.xml index aa8420aa5..f8cda696a 100644 --- a/blueprint/blueprint-core/pom.xml +++ b/blueprint/blueprint-core/pom.xml @@ -103,6 +103,8 @@ <maven-release-plugin.version>3.1.1</maven-release-plugin.version> <org.apache.aries.versioning.plugin.version>0.3.1</org.apache.aries.versioning.plugin.version> <org.apache.felix.utils.version>1.11.8</org.apache.felix.utils.version> + <osgi.cmpn.version>4.3.1</osgi.cmpn.version> + <osgi.core.version>4.3.1</osgi.core.version> <proxy.api.version>1.1.1</proxy.api.version> <proxy.impl.version>1.1.9</proxy.impl.version> <quiesce.api.version>1.0.0</quiesce.api.version> @@ -154,12 +156,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/blueprint/blueprint-parser/pom.xml b/blueprint/blueprint-parser/pom.xml index b4bcdd7b2..a579a89ad 100644 --- a/blueprint/blueprint-parser/pom.xml +++ b/blueprint/blueprint-parser/pom.xml @@ -48,6 +48,7 @@ <lastReleaseVersion>1.4.0</lastReleaseVersion> <blueprint.api.version>1.0.0</blueprint.api.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <profiles> @@ -77,7 +78,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> </dependencies> diff --git a/blueprint/blueprint-spring-camel/pom.xml b/blueprint/blueprint-spring-camel/pom.xml index 79f208017..3fd5d6e00 100644 --- a/blueprint/blueprint-spring-camel/pom.xml +++ b/blueprint/blueprint-spring-camel/pom.xml @@ -52,6 +52,7 @@ <blueprint.core.version>1.6.2</blueprint.core.version> <blueprint.parser.version>1.4.0</blueprint.parser.version> <camel.version>2.19.0</camel.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <profiles> @@ -85,7 +86,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> </dependencies> diff --git a/blueprint/blueprint-spring-extender/pom.xml b/blueprint/blueprint-spring-extender/pom.xml index cee3f5bfe..35684782b 100644 --- a/blueprint/blueprint-spring-extender/pom.xml +++ b/blueprint/blueprint-spring-extender/pom.xml @@ -67,8 +67,8 @@ <blueprint.parser.version>1.4.0</blueprint.parser.version> <junit.version>4.13.2</junit.version> <org.apache.felix.utils.version>1.11.8</org.apache.felix.utils.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> <slf4j.version>2.0.17</slf4j.version> <spring.version>5.3.39</spring.version> </properties> @@ -110,15 +110,15 @@ </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>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> + <artifactId>osgi.cmpn</artifactId> <scope>provided</scope> - <version>${org.osgi.compendium.version}</version> + <version>${osgi.cmpn.version}</version> </dependency> <dependency> <groupId>org.slf4j</groupId> diff --git a/blueprint/blueprint-spring/pom.xml b/blueprint/blueprint-spring/pom.xml index a6a217e9e..0df4a762b 100644 --- a/blueprint/blueprint-spring/pom.xml +++ b/blueprint/blueprint-spring/pom.xml @@ -66,6 +66,8 @@ <blueprint.core.version>1.9.0</blueprint.core.version> <blueprint.parser.version>1.5.0</blueprint.parser.version> <org.apache.felix.utils.version>1.11.8</org.apache.felix.utils.version> + <osgi.cmpn.version>4.3.1</osgi.cmpn.version> + <osgi.core.version>4.3.1</osgi.core.version> <slf4j.version>2.0.17</slf4j.version> <spring.version>5.3.39</spring.version> </properties> @@ -107,12 +109,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/blueprint/blueprint-web-osgi/pom.xml b/blueprint/blueprint-web-osgi/pom.xml index 9e0feed7b..cab541575 100644 --- a/blueprint/blueprint-web-osgi/pom.xml +++ b/blueprint/blueprint-web-osgi/pom.xml @@ -57,6 +57,7 @@ <blueprint.core.version>1.3.0</blueprint.core.version> <geronimo-servlet_2.5_spec.version>1.2</geronimo-servlet_2.5_spec.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <profiles> @@ -91,7 +92,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> </dependencies> diff --git a/blueprint/examples/blueprint-sample/pom.xml b/blueprint/examples/blueprint-sample/pom.xml index 3a3399648..45addc46b 100644 --- a/blueprint/examples/blueprint-sample/pom.xml +++ b/blueprint/examples/blueprint-sample/pom.xml @@ -58,6 +58,7 @@ <aries.osgi.private.pkg/> <blueprint.api.version>1.0.0</blueprint.api.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <profiles> @@ -72,7 +73,8 @@ <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/blueprint/itests/pom.xml b/blueprint/itests/pom.xml index 579f10b28..682d84ec2 100644 --- a/blueprint/itests/pom.xml +++ b/blueprint/itests/pom.xml @@ -49,6 +49,7 @@ <properties> <blueprint.api.version>1.0.0</blueprint.api.version> <blueprint.core.version>1.0.0</blueprint.core.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <profiles> @@ -64,7 +65,8 @@ <dependencies> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> + <artifactId>osgi.core</artifactId> + <version>${osgi.core.version}</version> </dependency> <dependency> <groupId>org.apache.aries.blueprint</groupId>
