activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [activemq] branch master updated: [AMQ-7410] Align dependencies with Apache Karaf
Date Wed, 26 Feb 2020 17:00:41 GMT
This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
     new d878d87  [AMQ-7410] Align dependencies with Apache Karaf
     new d2592e2  Merge pull request #461 from jbonofre/AMQ-7410
d878d87 is described below

commit d878d877d528c0031615213102ee4175990627a9
Author: jbonofre <jbonofre@apache.org>
AuthorDate: Tue Feb 18 15:17:10 2020 +0100

    [AMQ-7410] Align dependencies with Apache Karaf
---
 activemq-broker/pom.xml        |  2 +-
 activemq-cf/pom.xml            |  5 ++---
 activemq-kahadb-store/pom.xml  |  2 +-
 activemq-karaf-itest/pom.xml   |  2 +-
 activemq-karaf/pom.xml         | 18 ++++++++++++------
 activemq-leveldb-store/pom.xml |  5 ++---
 activemq-mqtt/pom.xml          |  2 +-
 activemq-osgi/pom.xml          |  5 ++---
 activemq-spring/pom.xml        |  5 ++---
 activemq-unit-tests/pom.xml    |  2 +-
 activemq-web-console/pom.xml   |  5 ++---
 assembly/pom.xml               |  5 ++---
 pom.xml                        | 11 ++++++++---
 13 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/activemq-broker/pom.xml b/activemq-broker/pom.xml
index 0c9b0ba..7945cfb 100644
--- a/activemq-broker/pom.xml
+++ b/activemq-broker/pom.xml
@@ -53,7 +53,7 @@
 
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
diff --git a/activemq-cf/pom.xml b/activemq-cf/pom.xml
index e54631a..de47804 100644
--- a/activemq-cf/pom.xml
+++ b/activemq-cf/pom.xml
@@ -36,12 +36,11 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.core</artifactId>
+			<artifactId>osgi.core</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.osgi</groupId>
-			<artifactId>org.osgi.compendium</artifactId>
-			<version>5.0.0</version>
+			<artifactId>osgi.cmpn</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.activemq</groupId>
diff --git a/activemq-kahadb-store/pom.xml b/activemq-kahadb-store/pom.xml
index af1a3e5..0f69f16 100644
--- a/activemq-kahadb-store/pom.xml
+++ b/activemq-kahadb-store/pom.xml
@@ -56,7 +56,7 @@
 
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml
index 5d52c7d..b45a43f 100644
--- a/activemq-karaf-itest/pom.xml
+++ b/activemq-karaf-itest/pom.xml
@@ -91,7 +91,7 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml
index 60d64ee..3b01812 100644
--- a/activemq-karaf/pom.xml
+++ b/activemq-karaf/pom.xml
@@ -42,12 +42,18 @@
     <dependency>
       <groupId>org.ops4j.pax.logging</groupId>
       <artifactId>pax-logging-api</artifactId>
-      <version>1.8.3</version>
+      <version>1.11.4</version>
     </dependency>
     <dependency>
       <groupId>org.ops4j.pax.logging</groupId>
       <artifactId>pax-logging-service</artifactId>
-      <version>1.8.3</version>
+      <version>1.11.4</version>
+      <exclusions>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>apache-log4j-extras</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -62,17 +68,17 @@
      <dependency>
       <groupId>org.apache.aries.blueprint</groupId>
       <artifactId>org.apache.aries.blueprint.core</artifactId>
-      <version>1.7.1</version>
+      <version>1.10.2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.framework</artifactId>
-      <version>5.0.1</version>
+      <version>5.6.12</version>
     </dependency>
     <dependency>
       <groupId>org.apache.felix</groupId>
       <artifactId>org.apache.felix.bundlerepository</artifactId>
-      <version>2.0.4</version>
+      <version>2.0.10</version>
     </dependency>
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>
@@ -81,7 +87,7 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
diff --git a/activemq-leveldb-store/pom.xml b/activemq-leveldb-store/pom.xml
index 37f4040..111b6a2 100644
--- a/activemq-leveldb-store/pom.xml
+++ b/activemq-leveldb-store/pom.xml
@@ -147,13 +147,12 @@
 
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${org.osgi.core-version}</version>
+      <artifactId>osgi.cmpn</artifactId>
       <scope>provided</scope>
     </dependency>
 
diff --git a/activemq-mqtt/pom.xml b/activemq-mqtt/pom.xml
index 5f8a74a..0b2e7b5 100644
--- a/activemq-mqtt/pom.xml
+++ b/activemq-mqtt/pom.xml
@@ -66,7 +66,7 @@
 
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index f0158b6..2f655c9 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -190,14 +190,13 @@
 
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${org.osgi.core-version}</version>
+      <artifactId>osgi.cmpn</artifactId>
        <scope>provided</scope>
     </dependency>
 
diff --git a/activemq-spring/pom.xml b/activemq-spring/pom.xml
index f37c469..6c8ab6d 100644
--- a/activemq-spring/pom.xml
+++ b/activemq-spring/pom.xml
@@ -113,14 +113,13 @@
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${org.osgi.core-version}</version>
+      <artifactId>osgi.cmpn</artifactId>
       <scope>provided</scope>
     </dependency>
 
diff --git a/activemq-unit-tests/pom.xml b/activemq-unit-tests/pom.xml
index 9c71c33..ab619fb 100644
--- a/activemq-unit-tests/pom.xml
+++ b/activemq-unit-tests/pom.xml
@@ -97,7 +97,7 @@
     <!-- =============================== -->
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
diff --git a/activemq-web-console/pom.xml b/activemq-web-console/pom.xml
index 0102781..df429dd 100644
--- a/activemq-web-console/pom.xml
+++ b/activemq-web-console/pom.xml
@@ -333,14 +333,13 @@
 	</dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
       <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${org.osgi.core-version}</version>
+      <artifactId>osgi.cmpn</artifactId>
       <scope>provided</scope>
     </dependency>
 
diff --git a/assembly/pom.xml b/assembly/pom.xml
index 9604a6c..3a68b37 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -110,12 +110,11 @@
 
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.core</artifactId>
+      <artifactId>osgi.core</artifactId>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
-      <artifactId>org.osgi.compendium</artifactId>
-      <version>${org.osgi.core-version}</version>
+      <artifactId>osgi.cmpn</artifactId>
     </dependency>
 
 
diff --git a/pom.xml b/pom.xml
index bfd8dd1..86d40c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -101,7 +101,7 @@
     <mqtt-client-version>1.15</mqtt-client-version>
     <openjpa-version>1.2.0</openjpa-version>
     <org-apache-derby-version>10.14.2.0</org-apache-derby-version>
-    <org.osgi.core-version>4.3.1</org.osgi.core-version>
+    <osgi-version>6.0.0</osgi-version>
     <p2psockets-version>1.1.2</p2psockets-version>
     <linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version>
     <zookeeper-version>3.4.14</zookeeper-version>
@@ -602,8 +602,13 @@
 
       <dependency>
         <groupId>org.osgi</groupId>
-        <artifactId>org.osgi.core</artifactId>
-        <version>${org.osgi.core-version}</version>
+        <artifactId>osgi.core</artifactId>
+        <version>${osgi-version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>osgi.cmpn</artifactId>
+        <version>${osgi-version}</version>
       </dependency>
 
       <dependency>


Mime
View raw message