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 02f0d30d99ad487db9076232afd89c58ba0f0b45
Author: Dominik Przybysz <alien11...@gmail.com>
AuthorDate: Mon Mar 24 21:38:35 2025 +0100
ARIES-2175: Update org.osgi.* artifacts to osgi.* in subsystem
---
subsystem/subsystem-api/pom.xml | 18 +++----
subsystem/subsystem-core/pom.xml | 12 ++---
subsystem/subsystem-gogo-command/pom.xml | 12 ++---
subsystem/subsystem-itests/pom.xml | 58 ++++++++++++++++++++--
.../aries/subsystem/itests/SubsystemTest.java | 2 +-
subsystem/subsystem-obr/pom.xml | 12 ++---
6 files changed, 83 insertions(+), 31 deletions(-)
diff --git a/subsystem/subsystem-api/pom.xml b/subsystem/subsystem-api/pom.xml
index 37b4e1910..445598da4 100644
--- a/subsystem/subsystem-api/pom.xml
+++ b/subsystem/subsystem-api/pom.xml
@@ -55,9 +55,9 @@
</aries.osgi.import>
<org.apache.aries.util.version>1.1.1</org.apache.aries.util.version>
- <org.osgi.annotation.version>6.0.0</org.osgi.annotation.version>
- <org.osgi.core.version>6.0.0</org.osgi.core.version>
- <org.osgi.enterprise.version>5.0.0</org.osgi.enterprise.version>
+ <osgi.annotation.version>6.0.0</osgi.annotation.version>
+ <osgi.core.version>6.0.0</osgi.core.version>
+ <osgi.enterprise.version>5.0.0</osgi.enterprise.version>
</properties>
<dependencies>
@@ -68,19 +68,19 @@
</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.annotation</artifactId>
- <version>${org.osgi.annotation.version}</version>
+ <artifactId>osgi.annotation</artifactId>
+ <version>${osgi.annotation.version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.enterprise</artifactId>
- <version>${org.osgi.enterprise.version}</version>
+ <artifactId>osgi.enterprise</artifactId>
+ <version>${osgi.enterprise.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/subsystem/subsystem-core/pom.xml b/subsystem/subsystem-core/pom.xml
index d7f6cb780..827c6acdd 100644
--- a/subsystem/subsystem-core/pom.xml
+++ b/subsystem/subsystem-core/pom.xml
@@ -71,8 +71,8 @@
<org.apache.aries.util.version>1.1.1</org.apache.aries.util.version>
<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.osgi.core.version>6.0.0</org.osgi.core.version>
- <org.osgi.enterprise.version>5.0.0</org.osgi.enterprise.version>
+ <osgi.core.version>6.0.0</osgi.core.version>
+ <osgi.enterprise.version>5.0.0</osgi.enterprise.version>
<org.eclipse.equinox.coordinator.version>1.1.0.v20120522-1841</org.eclipse.equinox.coordinator.version>
<org.eclipse.equinox.region.version>1.2.101.v20150831-1342</org.eclipse.equinox.region.version>
<easymock.version>5.5.0</easymock.version>
@@ -102,14 +102,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>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.enterprise</artifactId>
- <version>${org.osgi.enterprise.version}</version>
+ <artifactId>osgi.enterprise</artifactId>
+ <version>${osgi.enterprise.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
diff --git a/subsystem/subsystem-gogo-command/pom.xml
b/subsystem/subsystem-gogo-command/pom.xml
index 1ee7d865a..7e220dcf0 100644
--- a/subsystem/subsystem-gogo-command/pom.xml
+++ b/subsystem/subsystem-gogo-command/pom.xml
@@ -51,21 +51,21 @@
</aries.osgi.private.pkg>
<lastReleaseVersion>1.0.0</lastReleaseVersion>
- <org.osgi.core.version>6.0.0</org.osgi.core.version>
- <org.osgi.enterprise.version>5.0.0</org.osgi.enterprise.version>
+ <osgi.core.version>6.0.0</osgi.core.version>
+ <osgi.enterprise.version>5.0.0</osgi.enterprise.version>
</properties>
<dependencies>
<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.enterprise</artifactId>
- <version>${org.osgi.enterprise.version}</version>
+ <artifactId>osgi.enterprise</artifactId>
+ <version>${osgi.enterprise.version}</version>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/subsystem/subsystem-itests/pom.xml
b/subsystem/subsystem-itests/pom.xml
index 38300b749..cab7bb3aa 100644
--- a/subsystem/subsystem-itests/pom.xml
+++ b/subsystem/subsystem-itests/pom.xml
@@ -64,7 +64,7 @@
<org.osgi.service.obr.version>1.0.2</org.osgi.service.obr.version>
<osgi.cmpn.version>7.0.0</osgi.cmpn.version>
<osgi.core.version>8.0.0</osgi.core.version>
- <osgi.enterprise.version>7.0.0</osgi.enterprise.version>
+ <osgi.enterprise.version>5.0.0</osgi.enterprise.version>
<pax-exam.version>4.13.5</pax-exam.version>
<!-- Newer tiny bundles have problem in some tests where classes are
added with explicit classloader -->
<pax-tinybundles.version>2.0.0</pax-tinybundles.version>
@@ -106,6 +106,10 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -118,6 +122,10 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -129,6 +137,10 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -141,6 +153,10 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -165,6 +181,10 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -177,6 +197,10 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -189,6 +213,10 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -213,9 +241,13 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -229,6 +261,10 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -237,6 +273,10 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -249,14 +289,22 @@
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
+ </exclusion>
<exclusion>
<groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
+ <artifactId>osgi.core</artifactId>
</exclusion>
<exclusion>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.osgi</groupId>
+ <artifactId>osgi.cmpn</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -333,8 +381,12 @@
<version>${pax-tinybundles.version}</version>
<exclusions>
<exclusion>
+ <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.osgi</groupId>
+ <artifactId>osgi.core</artifactId>
</exclusion>
</exclusions>
</dependency>
diff --git
a/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java
b/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java
index dd2459cab..5536b664d 100644
---
a/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java
+++
b/subsystem/subsystem-itests/src/test/java/org/apache/aries/subsystem/itests/SubsystemTest.java
@@ -148,7 +148,7 @@ public abstract class SubsystemTest extends
AbstractIntegrationTest {
mavenBundle("org.eclipse.equinox",
"org.eclipse.equinox.coordinator").version("1.1.0.v20120522-1841"),
mavenBundle("org.eclipse.equinox",
"org.eclipse.equinox.event").versionAsInProject(),
mavenBundle("org.eclipse.equinox",
"org.eclipse.equinox.region").version("1.1.0.v20120522-1841"),
- mavenBundle("org.osgi",
"org.osgi.enterprise").versionAsInProject(),
+ mavenBundle("org.osgi",
"osgi.enterprise").versionAsInProject(),
mavenBundle("org.easymock",
"easymock").versionAsInProject(),
mavenBundle("org.ops4j.pax.tinybundles",
"tinybundles").versionAsInProject(),
mavenBundle("biz.aQute.bnd",
"bndlib").versionAsInProject(),
diff --git a/subsystem/subsystem-obr/pom.xml b/subsystem/subsystem-obr/pom.xml
index 64b5ea4d6..597f3b7a1 100644
--- a/subsystem/subsystem-obr/pom.xml
+++ b/subsystem/subsystem-obr/pom.xml
@@ -55,8 +55,8 @@
<org.apache.aries.application.utils.version>1.0.0</org.apache.aries.application.utils.version>
<org.apache.felix.bundlerepository.version>2.0.10</org.apache.felix.bundlerepository.version>
- <org.osgi.core.version>6.0.0</org.osgi.core.version>
- <org.osgi.enterprise.version>5.0.0</org.osgi.enterprise.version>
+ <osgi.core.version>6.0.0</osgi.core.version>
+ <osgi.enterprise.version>5.0.0</osgi.enterprise.version>
</properties>
<dependencies>
@@ -77,13 +77,13 @@
</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>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.enterprise</artifactId>
- <version>${org.osgi.enterprise.version}</version>
+ <artifactId>osgi.enterprise</artifactId>
+ <version>${osgi.enterprise.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
