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 13e62e158ca78668eb88d225e5bb5d09a744fe2e Author: Dominik Przybysz <alien11...@gmail.com> AuthorDate: Mon Mar 24 20:44:28 2025 +0100 ARIES-2175: Update org.osgi.* artifacts to osgi.* in proxy --- proxy/proxy-api/pom.xml | 4 +++- proxy/proxy-impl/pom.xml | 8 ++++++-- proxy/proxy-itests/pom.xml | 4 +++- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/proxy/proxy-api/pom.xml b/proxy/proxy-api/pom.xml index 12aa404ea..9fff22d74 100644 --- a/proxy/proxy-api/pom.xml +++ b/proxy/proxy-api/pom.xml @@ -55,12 +55,14 @@ <!-- Skip version check for release 1.1.0 as the plugin does not handle the case of removing a dpendency correctly --> <aries.skip.version.check>true</aries.skip.version.check> + <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/proxy/proxy-impl/pom.xml b/proxy/proxy-impl/pom.xml index f25d9adf7..be007ebcc 100644 --- a/proxy/proxy-impl/pom.xml +++ b/proxy/proxy-impl/pom.xml @@ -71,6 +71,8 @@ <javax.transaction-api.version>1.3</javax.transaction-api.version> <mockito-core.version>4.11.0</mockito-core.version> <org.apache.aries.proxy.api.version>1.1.1</org.apache.aries.proxy.api.version> + <osgi.cmpn.version>4.3.1</osgi.cmpn.version> + <osgi.core.version>4.3.1</osgi.core.version> </properties> <dependencies> @@ -100,12 +102,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> diff --git a/proxy/proxy-itests/pom.xml b/proxy/proxy-itests/pom.xml index c140fcf9b..ea883bb23 100644 --- a/proxy/proxy-itests/pom.xml +++ b/proxy/proxy-itests/pom.xml @@ -52,6 +52,7 @@ <org.apache.aries.proxy.version>1.1.15-SNAPSHOT</org.apache.aries.proxy.version> <org.apache.aries.testsupport.unit.version>2.0.0-SNAPSHOT</org.apache.aries.testsupport.unit.version> <org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version> + <osgi.cmpn.version>4.3.1</osgi.cmpn.version> <pax-exam.version>4.13.5</pax-exam.version> <pax-logging.version>2.2.8</pax-logging.version> <pax-tinybundles.version>2.1.1</pax-tinybundles.version> @@ -68,7 +69,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>