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 b3c1f0e7624123a41e9216acbc3edc635d4a9cf5
Author: Dominik Przybysz <alien11...@gmail.com>
AuthorDate: Mon Mar 24 20:19:20 2025 +0100
ARIES-2175: Update org.osgi.* artifacts to osgi.* in transaction
---
transaction/transaction-blueprint/pom.xml | 19 ++++++-------------
transaction/transaction-itests/pom.xml | 6 +++---
transaction/transaction-jdbc/pom.xml | 19 +++++++------------
transaction/transaction-jms/pom.xml | 15 +++------------
transaction/transaction-manager/pom.xml | 8 ++++++--
5 files changed, 25 insertions(+), 42 deletions(-)
diff --git a/transaction/transaction-blueprint/pom.xml
b/transaction/transaction-blueprint/pom.xml
index 5bd8a80f8..e910cbf7b 100644
--- a/transaction/transaction-blueprint/pom.xml
+++ b/transaction/transaction-blueprint/pom.xml
@@ -55,28 +55,21 @@
<javax.transaction-api.version>1.2</javax.transaction-api.version>
<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
<org.apache.aries.blueprint.core.version>1.0.0</org.apache.aries.blueprint.core.version>
- <org.apache.aries.util.version>1.1.3</org.apache.aries.util.version>
+ <osgi.cmpn.version>4.3.1</osgi.cmpn.version>
+ <osgi.core.version>4.3.1</osgi.core.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <version>${org.apache.aries.util.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<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>
<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/transaction/transaction-itests/pom.xml
b/transaction/transaction-itests/pom.xml
index 370becb77..15cc352e9 100644
--- a/transaction/transaction-itests/pom.xml
+++ b/transaction/transaction-itests/pom.xml
@@ -63,7 +63,7 @@
<org.apache.felix.coordinator.version>1.0.2</org.apache.felix.coordinator.version>
<org.apache.servicemix.bundles.javax-inject.version>1_3</org.apache.servicemix.bundles.javax-inject.version>
<org.eclipse.osgi.version>3.23.0</org.eclipse.osgi.version>
- <org.osgi.core.version>6.0.0</org.osgi.core.version>
+ <osgi.core.version>6.0.0</osgi.core.version>
<pax-swissbox.version>1.8.3</pax-swissbox.version>
<pax-exam.version>4.13.5</pax-exam.version>
<pax-tinybundles.version>2.1.1</pax-tinybundles.version>
@@ -79,8 +79,8 @@
</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.apache.aries.proxy</groupId>
diff --git a/transaction/transaction-jdbc/pom.xml
b/transaction/transaction-jdbc/pom.xml
index 8595d8f0e..9cfd43219 100644
--- a/transaction/transaction-jdbc/pom.xml
+++ b/transaction/transaction-jdbc/pom.xml
@@ -77,18 +77,10 @@
<org.apache.aries.util.version>1.1.3</org.apache.aries.util.version>
<tranql-connector.version>1.8</tranql-connector.version>
<xbean-blueprint.version>4.26</xbean-blueprint.version>
+ <osgi.core.version>4.3.1</osgi.core.version>
+ <osgi.cmpn.version>4.3.1</osgi.cmpn.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <version>${org.apache.aries.util.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
<groupId>org.apache.aries.transaction</groupId>
@@ -98,15 +90,18 @@
<dependency>
<groupId>org.apache.aries</groupId>
<artifactId>org.apache.aries.util</artifactId>
+ <version>${org.apache.aries.util.version}</version>
</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/transaction/transaction-jms/pom.xml
b/transaction/transaction-jms/pom.xml
index 8e1c7d0fb..7aff6757e 100644
--- a/transaction/transaction-jms/pom.xml
+++ b/transaction/transaction-jms/pom.xml
@@ -69,24 +69,15 @@
<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
<maven-xbean-plugin.version>4.26</maven-xbean-plugin.version>
<org.apache.aries.blueprint.core.version>1.0.0</org.apache.aries.blueprint.core.version>
- <org.apache.aries.util.version>1.1.3</org.apache.aries.util.version>
+ <osgi.core.version>4.3.1</osgi.core.version>
<xbean-blueprint.version>4.26</xbean-blueprint.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.aries</groupId>
- <artifactId>org.apache.aries.util</artifactId>
- <version>${org.apache.aries.util.version}</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<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/transaction/transaction-manager/pom.xml
b/transaction/transaction-manager/pom.xml
index a7612bc4b..77525e130 100644
--- a/transaction/transaction-manager/pom.xml
+++ b/transaction/transaction-manager/pom.xml
@@ -76,18 +76,22 @@
<junit.version>4.13.2</junit.version>
<maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
<maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
+ <osgi.cmpn.version>4.3.1</osgi.cmpn.version>
+ <osgi.core.version>4.3.1</osgi.core.version>
<spring.version>5.3.39</spring.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>
<groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
+ <artifactId>osgi.cmpn</artifactId>
+ <version>${osgi.cmpn.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
