diff --git a/activemq-amqp/pom.xml b/activemq-amqp/pom.xml index dad1dbf86a..3fc60cbe6f 100644 --- a/activemq-amqp/pom.xml +++ b/activemq-amqp/pom.xml @@ -140,31 +140,31 @@ io.netty netty-buffer - ${netty-all-version} + ${netty-version} test io.netty netty-common - ${netty-all-version} + ${netty-version} test io.netty netty-handler - ${netty-all-version} + ${netty-version} test io.netty netty-codec-http - ${netty-all-version} + ${netty-version} test io.netty netty-transport - ${netty-all-version} + ${netty-version} test diff --git a/activemq-karaf-itest/pom.xml b/activemq-karaf-itest/pom.xml index bbee871906..6a39ec82d5 100644 --- a/activemq-karaf-itest/pom.xml +++ b/activemq-karaf-itest/pom.xml @@ -111,13 +111,6 @@ ${qpid-jms-version} test - - io.netty - netty-all - ${netty-all-version} - test - - org.apache.camel.karaf apache-camel diff --git a/activemq-karaf/src/main/resources/features.xml b/activemq-karaf/src/main/resources/features.xml index 38e5c27e0e..e882ffdc9c 100644 --- a/activemq-karaf/src/main/resources/features.xml +++ b/activemq-karaf/src/main/resources/features.xml @@ -70,17 +70,17 @@ - mvn:io.netty/netty-common/${qpid-jms-netty-version} - mvn:io.netty/netty-transport/${qpid-jms-netty-version} - mvn:io.netty/netty-transport-native-epoll/${qpid-jms-netty-version} - mvn:io.netty/netty-transport-native-kqueue/${qpid-jms-netty-version} - mvn:io.netty/netty-transport-native-unix-common/${qpid-jms-netty-version} - mvn:io.netty/netty-buffer/${qpid-jms-netty-version} - mvn:io.netty/netty-codec/${qpid-jms-netty-version} - mvn:io.netty/netty-codec-http/${qpid-jms-netty-version} - mvn:io.netty/netty-handler/${netty-all-version} - mvn:io.netty/netty-resolver/${netty-all-version} - mvn:org.apache.qpid/proton-j/${qpid-jms-proton-version} + mvn:io.netty/netty-common/${netty-version} + mvn:io.netty/netty-transport/${netty-version} + mvn:io.netty/netty-transport-native-epoll/${netty-version} + mvn:io.netty/netty-transport-native-kqueue/${netty-version} + mvn:io.netty/netty-transport-native-unix-common/${netty-version} + mvn:io.netty/netty-buffer/${netty-version} + mvn:io.netty/netty-codec/${netty-version} + mvn:io.netty/netty-codec-http/${netty-version} + mvn:io.netty/netty-handler/${netty-version} + mvn:io.netty/netty-resolver/${netty-version} + mvn:org.apache.qpid/proton-j/${qpid-proton-version} mvn:org.apache.qpid/qpid-jms-client/${qpid-jms-version} diff --git a/pom.xml b/pom.xml index 2c6f469207..ab65ecb12a 100644 --- a/pom.xml +++ b/pom.xml @@ -91,11 +91,9 @@ 6.0.0 1.4.0 3.4.14 - 0.33.8 - 0.58.0 - 4.1.63.Final - 0.33.8 - 4.1.63.Final + 0.33.10 + 1.6.0 + 4.1.75.Final 1.3 1.18.0 1.8.0