AMQ-8575: update to Qpid JMS 1.6.0

NikitaShupletsov · Apr 7, 2022 · 3d4bf1f · 3d4bf1f
1 parent 6b7ed38
commit 3d4bf1f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 28 deletions.
diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml
@@ -140,31 +140,31 @@
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-buffer</artifactId>
-      <version>${netty-all-version}</version>
+      <version>${netty-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-common</artifactId>
-      <version>${netty-all-version}</version>
+      <version>${netty-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-handler</artifactId>
-      <version>${netty-all-version}</version>
+      <version>${netty-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-codec-http</artifactId>
-      <version>${netty-all-version}</version>
+      <version>${netty-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.netty</groupId>
       <artifactId>netty-transport</artifactId>
-      <version>${netty-all-version}</version>
+      <version>${netty-version}</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml
@@ -111,13 +111,6 @@
       <version>${qpid-jms-version}</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>io.netty</groupId>
-      <artifactId>netty-all</artifactId>
-      <version>${netty-all-version}</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>org.apache.camel.karaf</groupId>
       <artifactId>apache-camel</artifactId>

diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml
@@ -70,17 +70,17 @@
     </feature>
 
     <feature name="activemq-amqp-client" version="${pom.version}" description="ActiveMQ AMQP protocol client libraries">
-      <bundle>mvn:io.netty/netty-common/${qpid-jms-netty-version}</bundle>
-      <bundle>mvn:io.netty/netty-transport/${qpid-jms-netty-version}</bundle>
-      <bundle>mvn:io.netty/netty-transport-native-epoll/${qpid-jms-netty-version}</bundle>
-      <bundle>mvn:io.netty/netty-transport-native-kqueue/${qpid-jms-netty-version}</bundle>
-      <bundle>mvn:io.netty/netty-transport-native-unix-common/${qpid-jms-netty-version}</bundle>
-      <bundle>mvn:io.netty/netty-buffer/${qpid-jms-netty-version}</bundle>
-      <bundle>mvn:io.netty/netty-codec/${qpid-jms-netty-version}</bundle>
-      <bundle>mvn:io.netty/netty-codec-http/${qpid-jms-netty-version}</bundle>
-      <bundle>mvn:io.netty/netty-handler/${netty-all-version}</bundle>
-      <bundle>mvn:io.netty/netty-resolver/${netty-all-version}</bundle>
-      <bundle>mvn:org.apache.qpid/proton-j/${qpid-jms-proton-version}</bundle>
+      <bundle>mvn:io.netty/netty-common/${netty-version}</bundle>
+      <bundle>mvn:io.netty/netty-transport/${netty-version}</bundle>
+      <bundle>mvn:io.netty/netty-transport-native-epoll/${netty-version}</bundle>
+      <bundle>mvn:io.netty/netty-transport-native-kqueue/${netty-version}</bundle>
+      <bundle>mvn:io.netty/netty-transport-native-unix-common/${netty-version}</bundle>
+      <bundle>mvn:io.netty/netty-buffer/${netty-version}</bundle>
+      <bundle>mvn:io.netty/netty-codec/${netty-version}</bundle>
+      <bundle>mvn:io.netty/netty-codec-http/${netty-version}</bundle>
+      <bundle>mvn:io.netty/netty-handler/${netty-version}</bundle>
+      <bundle>mvn:io.netty/netty-resolver/${netty-version}</bundle>
+      <bundle>mvn:org.apache.qpid/proton-j/${qpid-proton-version}</bundle>
       <bundle>mvn:org.apache.qpid/qpid-jms-client/${qpid-jms-version}</bundle>
     </feature>
 

diff --git a/pom.xml b/pom.xml
@@ -91,11 +91,9 @@
     <osgi-version>6.0.0</osgi-version>
     <linkedin-zookeeper-version>1.4.0</linkedin-zookeeper-version>
     <zookeeper-version>3.4.14</zookeeper-version>
-    <qpid-proton-version>0.33.8</qpid-proton-version>
-    <qpid-jms-version>0.58.0</qpid-jms-version>
-    <qpid-jms-netty-version>4.1.63.Final</qpid-jms-netty-version>
-    <qpid-jms-proton-version>0.33.8</qpid-jms-proton-version>
-    <netty-all-version>4.1.63.Final</netty-all-version>
+    <qpid-proton-version>0.33.10</qpid-proton-version>
+    <qpid-jms-version>1.6.0</qpid-jms-version>
+    <netty-version>4.1.75.Final</netty-version>
     <regexp-version>1.3</regexp-version>
     <rome-version>1.18.0</rome-version>
     <shiro-version>1.8.0</shiro-version>