Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[AMQ-7410] Align dependencies with Apache Karaf

This commit is contained in:
jbonofre 2020-02-18 15:17:10 +01:00
parent 82c3e70a2a
commit d878d877d5
13 changed files with 37 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activemq-broker/pom.xml
View File

@ -53,7 +53,7 @@
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId> <artifactId>osgi.core</artifactId>
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

5
activemq-cf/pom.xml
View File

@ -36,12 +36,11 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId> <artifactId>osgi.core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId> <artifactId>osgi.cmpn</artifactId>
<version>5.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.activemq</groupId> <groupId>org.apache.activemq</groupId>

2
activemq-kahadb-store/pom.xml
View File

@ -56,7 +56,7 @@
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId> <artifactId>osgi.core</artifactId>
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

2
activemq-karaf-itest/pom.xml
View File

@ -91,7 +91,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId> <artifactId>osgi.core</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>

18
activemq-karaf/pom.xml
View File

@ -42,12 +42,18 @@
<dependency> <dependency>
<groupId>org.ops4j.pax.logging</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-api</artifactId> <artifactId>pax-logging-api</artifactId>
<version>1.8.3</version> <version>1.11.4</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.ops4j.pax.logging</groupId> <groupId>org.ops4j.pax.logging</groupId>
<artifactId>pax-logging-service</artifactId> <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>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
@ -62,17 +68,17 @@
<dependency> <dependency>
<groupId>org.apache.aries.blueprint</groupId> <groupId>org.apache.aries.blueprint</groupId>
<artifactId>org.apache.aries.blueprint.core</artifactId> <artifactId>org.apache.aries.blueprint.core</artifactId>
<version>1.7.1</version> <version>1.10.2</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.framework</artifactId> <artifactId>org.apache.felix.framework</artifactId>
<version>5.0.1</version> <version>5.6.12</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.felix</groupId> <groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.bundlerepository</artifactId> <artifactId>org.apache.felix.bundlerepository</artifactId>
<version>2.0.4</version> <version>2.0.10</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.karaf.shell</groupId> <groupId>org.apache.karaf.shell</groupId>
@ -81,7 +87,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId> <artifactId>osgi.core</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

5
activemq-leveldb-store/pom.xml
View File

@ -147,13 +147,12 @@
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId> <artifactId>osgi.core</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId> <artifactId>osgi.cmpn</artifactId>
<version>${org.osgi.core-version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

2
activemq-mqtt/pom.xml
View File

@ -66,7 +66,7 @@
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId> <artifactId>osgi.core</artifactId>
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

5
activemq-osgi/pom.xml
View File

@ -190,14 +190,13 @@
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId> <artifactId>osgi.core</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId> <artifactId>osgi.cmpn</artifactId>
<version>${org.osgi.core-version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

5
activemq-spring/pom.xml
View File

@ -113,14 +113,13 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId> <artifactId>osgi.core</artifactId>
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId> <artifactId>osgi.cmpn</artifactId>
<version>${org.osgi.core-version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

2
activemq-unit-tests/pom.xml
View File

@ -97,7 +97,7 @@
<!-- =============================== --> <!-- =============================== -->
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId> <artifactId>osgi.core</artifactId>
<scope>provided</scope> <scope>provided</scope>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>

5
activemq-web-console/pom.xml
View File

@ -333,14 +333,13 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId> <artifactId>osgi.core</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId> <artifactId>osgi.cmpn</artifactId>
<version>${org.osgi.core-version}</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>

5
assembly/pom.xml
View File

@ -110,12 +110,11 @@
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId> <artifactId>osgi.core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId> <artifactId>osgi.cmpn</artifactId>
<version>${org.osgi.core-version}</version>
</dependency> </dependency>

11
pom.xml
View File

@ -101,7 +101,7 @@
<mqtt-client-version>1.15</mqtt-client-version> <mqtt-client-version>1.15</mqtt-client-version>
<openjpa-version>1.2.0</openjpa-version> <openjpa-version>1.2.0</openjpa-version>
<org-apache-derby-version>10.14.2.0</org-apache-derby-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> <p2psockets-version>1.1.2</p2psockets-version>
<linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version> <linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version>
<zookeeper-version>3.4.14</zookeeper-version> <zookeeper-version>3.4.14</zookeeper-version>
@ -602,8 +602,13 @@
<dependency> <dependency>
<groupId>org.osgi</groupId> <groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId> <artifactId>osgi.core</artifactId>
<version>${org.osgi.core-version}</version> <version>${osgi-version}</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>osgi.cmpn</artifactId>
<version>${osgi-version}</version>
</dependency> </dependency>
<dependency> <dependency>