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 44274404b3dd18ec5a47c5533e673716faf68113
Author: Dominik Przybysz <alien11...@gmail.com>
AuthorDate: Mon Mar 24 21:08:36 2025 +0100
ARIES-2175: Update org.osgi.* artifacts to osgi.* in jmx
---
jmx/jmx-blueprint-bundle/pom.xml | 9 +++++++--
jmx/jmx-blueprint-core/pom.xml | 8 ++++++--
jmx/jmx-bundle/pom.xml | 8 ++++++--
jmx/jmx-core-whiteboard/pom.xml | 8 ++++++--
jmx/jmx-core/pom.xml | 8 ++++++--
jmx/jmx-itests/pom.xml | 6 ++++--
.../test/java/org/apache/aries/jmx/AbstractIntegrationTest.java | 2 +-
jmx/jmx-mbeanserver-platform/pom.xml | 7 +++++--
jmx/jmx-whiteboard/pom.xml | 8 ++++++--
9 files changed, 47 insertions(+), 17 deletions(-)
diff --git a/jmx/jmx-blueprint-bundle/pom.xml b/jmx/jmx-blueprint-bundle/pom.xml
index a316322e4..bf268b585 100644
--- a/jmx/jmx-blueprint-bundle/pom.xml
+++ b/jmx/jmx-blueprint-bundle/pom.xml
@@ -62,6 +62,9 @@
javax.management.MBeanServer
</aries.osgi.import.service>
<lastReleaseVersion>1.1.1</lastReleaseVersion>
+
+ <osgi.cmpn.version>4.3.1</osgi.cmpn.version>
+ <osgi.core.version>4.3.1</osgi.core.version>
</properties>
<dependencies>
@@ -77,12 +80,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>
</dependencies>
diff --git a/jmx/jmx-blueprint-core/pom.xml b/jmx/jmx-blueprint-core/pom.xml
index fd1918509..bb4c1c4f7 100644
--- a/jmx/jmx-blueprint-core/pom.xml
+++ b/jmx/jmx-blueprint-core/pom.xml
@@ -56,6 +56,8 @@
<jmock.version>2.13.1</jmock.version>
<org.apache.aries.jmx.blueprint.api.version>1.2.0</org.apache.aries.jmx.blueprint.api.version>
<org.apache.aries.util.version>1.1.1</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>
@@ -71,12 +73,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/jmx/jmx-bundle/pom.xml b/jmx/jmx-bundle/pom.xml
index 5be7f0719..8a53ae5a8 100644
--- a/jmx/jmx-bundle/pom.xml
+++ b/jmx/jmx-bundle/pom.xml
@@ -81,6 +81,8 @@
<lastReleaseVersion>1.1.1</lastReleaseVersion>
<org.apache.aries.jmx.core.version>1.1.9-SNAPSHOT</org.apache.aries.jmx.core.version>
+ <osgi.cmpn.version>4.3.1</osgi.cmpn.version>
+ <osgi.core.version>4.3.1</osgi.core.version>
</properties>
<dependencies>
@@ -96,12 +98,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>
</dependencies>
diff --git a/jmx/jmx-core-whiteboard/pom.xml b/jmx/jmx-core-whiteboard/pom.xml
index c1e09b740..4333bd2b5 100644
--- a/jmx/jmx-core-whiteboard/pom.xml
+++ b/jmx/jmx-core-whiteboard/pom.xml
@@ -72,6 +72,8 @@
<org.apache.aries.jmx.api.version>1.1.5</org.apache.aries.jmx.api.version>
<org.apache.aries.jmx.core.version>1.1.8</org.apache.aries.jmx.core.version>
<org.apache.aries.util.version>1.1.1</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>
@@ -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/jmx/jmx-core/pom.xml b/jmx/jmx-core/pom.xml
index 21194390b..7e4ff6db8 100644
--- a/jmx/jmx-core/pom.xml
+++ b/jmx/jmx-core/pom.xml
@@ -81,6 +81,8 @@
<mockito-core.version>4.11.0</mockito-core.version>
<org.apache.aries.jmx.api.version>1.1.5</org.apache.aries.jmx.api.version>
<org.apache.aries.util.version>1.1.1</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>
@@ -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/jmx/jmx-itests/pom.xml b/jmx/jmx-itests/pom.xml
index 067e08b11..cfee0d0e1 100644
--- a/jmx/jmx-itests/pom.xml
+++ b/jmx/jmx-itests/pom.xml
@@ -52,6 +52,7 @@
<org.apache.aries.util.version>1.0.0</org.apache.aries.util.version>
<org.apache.felix.configadmin.version>1.9.26</org.apache.felix.configadmin.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-tinybundles.version>2.1.1</pax-tinybundles.version>
<pax-url.version>2.6.16</pax-url.version>
@@ -105,7 +106,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>
@@ -214,7 +216,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/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
index f6f3f3e89..7ad6ae41d 100644
---
a/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
+++
b/jmx/jmx-itests/src/test/java/org/apache/aries/jmx/AbstractIntegrationTest.java
@@ -68,7 +68,7 @@ public abstract class AbstractIntegrationTest extends
org.apache.aries.itest.Abs
protected Option jmxRuntime() {
return composite(
baseOptions(),
- mavenBundle("org.osgi",
"org.osgi.compendium").versionAsInProject(),
+ mavenBundle("org.osgi",
"osgi.cmpn").versionAsInProject(),
mavenBundle("org.apache.aries",
"org.apache.aries.util").versionAsInProject(),
mavenBundle("org.apache.felix",
"org.apache.felix.configadmin").versionAsInProject(),
mavenBundle("org.apache.aries.jmx",
"org.apache.aries.jmx").versionAsInProject(),
diff --git a/jmx/jmx-mbeanserver-platform/pom.xml
b/jmx/jmx-mbeanserver-platform/pom.xml
index 116ece68c..d007bdd11 100644
--- a/jmx/jmx-mbeanserver-platform/pom.xml
+++ b/jmx/jmx-mbeanserver-platform/pom.xml
@@ -51,13 +51,16 @@
<aries.osgi.private.pkg>
org.apache.aries.jmx.mbean_server.platform.impl
</aries.osgi.private.pkg>
- <lastReleaseVersion>0.1.0-SNAPSHOT</lastReleaseVersion>
+ <lastReleaseVersion>0.0.1</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/jmx/jmx-whiteboard/pom.xml b/jmx/jmx-whiteboard/pom.xml
index 10fa72bf8..d96db98b5 100644
--- a/jmx/jmx-whiteboard/pom.xml
+++ b/jmx/jmx-whiteboard/pom.xml
@@ -85,6 +85,8 @@
<mockito-core.version>4.11.0</mockito-core.version>
<org.apache.aries.jmx.core.version>1.1.8</org.apache.aries.jmx.core.version>
<org.eclipse.osgi.version>3.23.0</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-tinybundles.version>2.1.1</pax-tinybundles.version>
<pax-url.version>2.6.16</pax-url.version>
@@ -152,12 +154,14 @@
<!-- OSGi Libraries -->
<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>
