You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2020/02/26 17:02:39 UTC
[activemq] branch activemq-5.15.x updated: [AMQ-7410] Align
dependencies with Apache Karaf
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-5.15.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-5.15.x by this push:
new 612b098 [AMQ-7410] Align dependencies with Apache Karaf
612b098 is described below
commit 612b0985dc15ceb61d204d67c34ffc7132e845d3
Author: jbonofre <jb...@apache.org>
AuthorDate: Tue Feb 18 15:17:10 2020 +0100
[AMQ-7410] Align dependencies with Apache Karaf
(cherry picked from commit d878d877d528c0031615213102ee4175990627a9)
---
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 fa1138d..a7c01a2 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 560fc11..55b3bb4 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 9a9de73..580cae1 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 48fe0d0..372428f 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 745fcd5..01ac66e 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 548eb7e..2104195 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 724ac9b..5536c3a 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 3992b3f..b7d1180 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 9160947..089d251 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 0a16dc2..457387c 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 041009d..2789add 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 f829676..470a49c 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 2b3c132..0435f1b 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>