ARTEMIS-3559 Update netty version to 4.1.70.Final

artemis-distribution/pom.xml

@@ -246,10 +246,64 @@
          <artifactId>artemis-quorum-ri</artifactId>
          <version>${project.version}</version>
       </dependency>
-      <dependency>
-         <groupId>io.netty</groupId>
-         <artifactId>netty-all</artifactId>
-      </dependency>
+       <dependency>
+           <groupId>io.netty</groupId>
+           <artifactId>netty-buffer</artifactId>
+       </dependency>
+       <dependency>
+           <groupId>io.netty</groupId>
+           <artifactId>netty-transport</artifactId>
+       </dependency>
+       <dependency>
+           <groupId>io.netty</groupId>
+           <artifactId>netty-handler</artifactId>
+       </dependency>
+       <dependency>
+           <groupId>io.netty</groupId>
+           <artifactId>netty-handler-proxy</artifactId>
+       </dependency>
+       <dependency>
+           <groupId>io.netty</groupId>
+           <artifactId>netty-codec</artifactId>
+       </dependency>
+       <dependency>
+           <groupId>io.netty</groupId>
+           <artifactId>netty-codec-http</artifactId>
+       </dependency>
+       <dependency>
+           <groupId>io.netty</groupId>
+           <artifactId>netty-codec-mqtt</artifactId>
+       </dependency>
+       <dependency>
+           <groupId>io.netty</groupId>
+           <artifactId>netty-codec-socks</artifactId>
+       </dependency>
+       <dependency>
+           <groupId>io.netty</groupId>
+           <artifactId>netty-common</artifactId>
+       </dependency>
+       <dependency>
+           <groupId>io.netty</groupId>
+           <artifactId>netty-resolver</artifactId>
+       </dependency>
+       <dependency>
+           <groupId>io.netty</groupId>
+           <artifactId>netty-transport-classes-epoll</artifactId>
+       </dependency>
+       <dependency>
+           <groupId>io.netty</groupId>
+           <artifactId>netty-transport-native-epoll</artifactId>
+           <classifier>${netty-transport-native-epoll-classifier}</classifier>
+       </dependency>
+       <dependency>
+           <groupId>io.netty</groupId>
+           <artifactId>netty-transport-classes-kqueue</artifactId>
+       </dependency>
+       <dependency>
+           <groupId>io.netty</groupId>
+           <artifactId>netty-transport-native-kqueue</artifactId>
+           <classifier>${netty-transport-native-kqueue-classifier}</classifier>
+       </dependency>
        <dependency>
           <groupId>jakarta.json</groupId>
           <artifactId>jakarta.json-api</artifactId>

artemis-distribution/src/main/assembly/dep.xml

@@ -76,7 +76,20 @@
             <include>org.jctools:jctools-core</include>
             <include>org.apache.commons:commons-dbcp2</include>
             <include>org.apache.commons:commons-pool2</include>
-            <include>io.netty:netty-all</include>
+            <include>io.netty:netty-buffer</include>
+            <include>io.netty:netty-transport</include>
+            <include>io.netty:netty-handler</include>
+            <include>io.netty:netty-handler-proxy</include>
+            <include>io.netty:netty-codec</include>
+            <include>io.netty:netty-codec-http</include>
+            <include>io.netty:netty-codec-mqtt</include>
+            <include>io.netty:netty-codec-socks</include>
+            <include>io.netty:netty-common</include>
+            <include>io.netty:netty-resolver</include>
+            <include>io.netty:netty-transport-classes-epoll</include>
+            <include>io.netty:netty-transport-native-epoll</include>
+            <include>io.netty:netty-transport-classes-kqueue</include>
+            <include>io.netty:netty-transport-native-kqueue</include>
             <include>org.apache.qpid:proton-j</include>
             <include>org.apache.activemq:activemq-client</include>
             <include>org.apache.activemq:activemq-openwire-legacy</include>

artemis-features/src/main/resources/features.xml

@@ -38,10 +38,11 @@
 		<bundle>mvn:io.netty/netty-codec-http/${netty.version}</bundle>
 		<bundle>mvn:io.netty/netty-handler/${netty.version}</bundle>
 		<bundle>mvn:io.netty/netty-handler-proxy/${netty.version}</bundle>
+		<bundle>mvn:io.netty/netty-transport-classes-epoll/${netty.version}</bundle>
 		<bundle>mvn:io.netty/netty-transport-native-epoll/${netty.version}</bundle>
+		<bundle>mvn:io.netty/netty-transport-classes-kqueue/${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-codec-http/${netty.version}</bundle>
 	</feature>
 
 	<feature name="artemis-common" version="${pom.version}" description="ActiveMQ Artemis Common libraries">

artemis-protocols/artemis-mqtt-protocol/pom.xml

@@ -52,12 +52,6 @@
          <groupId>org.apache.activemq</groupId>
          <artifactId>artemis-server</artifactId>
          <version>${project.version}</version>
-         <exclusions>
-            <exclusion>
-               <groupId>io.netty</groupId>
-               <artifactId>netty-all</artifactId>
-            </exclusion>
-         </exclusions>
       </dependency>
       <dependency>
          <groupId>org.apache.activemq</groupId>
@@ -93,7 +87,6 @@
       <dependency>
          <groupId>io.netty</groupId>
          <artifactId>netty-codec-mqtt</artifactId>
-         <version>${netty.version}</version>
       </dependency>
       <dependency>
          <groupId>org.osgi</groupId>

examples/features/standard/cdi/pom.xml

@@ -52,11 +52,6 @@
          <artifactId>artemis-commons</artifactId>
          <version>${project.version}</version>
       </dependency>
-      <dependency>
-         <groupId>io.netty</groupId>
-         <artifactId>netty-all</artifactId>
-         <version>${netty.version}</version>
-      </dependency>
       <dependency>
          <groupId>jakarta.jms</groupId>
          <artifactId>jakarta.jms-api</artifactId>

examples/features/standard/interceptor-amqp/pom.xml

@@ -46,11 +46,6 @@ under the License.
          <groupId>org.apache.qpid</groupId>
          <artifactId>qpid-jms-client</artifactId>
       </dependency>
-
-      <dependency>
-         <groupId>io.netty</groupId>
-         <artifactId>netty-all</artifactId>
-      </dependency>
    </dependencies>
 
    <build>

examples/features/standard/interceptor-mqtt/pom.xml

@@ -46,11 +46,6 @@ under the License.
          <groupId>org.fusesource.mqtt-client</groupId>
          <artifactId>mqtt-client</artifactId>
       </dependency>
-
-      <dependency>
-         <groupId>io.netty</groupId>
-         <artifactId>netty-all</artifactId>
-      </dependency>
    </dependencies>
 
    <build>

examples/features/standard/rest/dup-send/pom.xml

@@ -54,10 +54,6 @@ under the License.
          <artifactId>artemis-jms-server</artifactId>
          <version>${project.version}</version>
       </dependency>
-      <dependency>
-         <groupId>io.netty</groupId>
-         <artifactId>netty-all</artifactId>
-      </dependency>
       <dependency>
          <groupId>jakarta.jms</groupId>
          <artifactId>jakarta.jms-api</artifactId>

examples/features/standard/rest/javascript-chat/pom.xml

@@ -54,10 +54,6 @@ under the License.
          <artifactId>artemis-jms-server</artifactId>
          <version>${project.version}</version>
       </dependency>
-      <dependency>
-         <groupId>io.netty</groupId>
-         <artifactId>netty-all</artifactId>
-      </dependency>
       <dependency>
          <groupId>jakarta.jms</groupId>
          <artifactId>jakarta.jms-api</artifactId>

examples/features/standard/rest/jms-to-rest/pom.xml

@@ -54,10 +54,6 @@ under the License.
          <artifactId>artemis-jms-server</artifactId>
          <version>${project.version}</version>
       </dependency>
-      <dependency>
-         <groupId>io.netty</groupId>
-         <artifactId>netty-all</artifactId>
-      </dependency>
       <dependency>
          <groupId>jakarta.jms</groupId>
          <artifactId>jakarta.jms-api</artifactId>

examples/features/standard/rest/push/pom.xml

@@ -54,10 +54,6 @@ under the License.
          <artifactId>artemis-jms-server</artifactId>
          <version>${project.version}</version>
       </dependency>
-      <dependency>
-         <groupId>io.netty</groupId>
-         <artifactId>netty-all</artifactId>
-      </dependency>
       <dependency>
          <groupId>jakarta.jms</groupId>
          <artifactId>jakarta.jms-api</artifactId>

examples/features/sub-modules/artemis-jakarta-ra-rar/pom.xml

@@ -112,10 +112,6 @@ under the License.
             </exclusion>
          </exclusions>
       </dependency>
-      <dependency>
-         <groupId>io.netty</groupId>
-         <artifactId>netty-all</artifactId>
-      </dependency>
    </dependencies>
 
    <build>

examples/features/sub-modules/artemis-ra-rar/pom.xml

@@ -112,10 +112,6 @@ under the License.
             </exclusion>
          </exclusions>
       </dependency>
-      <dependency>
-         <groupId>io.netty</groupId>
-         <artifactId>netty-all</artifactId>
-      </dependency>
    </dependencies>
 
    <build>

examples/protocols/stomp/stomp-embedded-interceptor/pom.xml

@@ -56,10 +56,6 @@ under the License.
          <artifactId>artemis-hornetq-protocol</artifactId>
          <version>${project.version}</version>
       </dependency>
-      <dependency>
-         <groupId>io.netty</groupId>
-         <artifactId>netty-all</artifactId>
-      </dependency>
    </dependencies>
 
    <build>

pom.xml

@@ -108,12 +108,12 @@
       <checkstyle.version>8.43</checkstyle.version>
       <mockito.version>3.12.4</mockito.version>
       <jctools.version>2.1.2</jctools.version>
-      <netty.version>4.1.68.Final</netty.version>
+      <netty.version>4.1.70.Final</netty.version>
       <curator.version>5.2.0</curator.version>
       <zookeeper.version>3.6.3</zookeeper.version>
 
       <!-- this is basically for tests -->
-      <netty-tcnative-version>2.0.42.Final</netty-tcnative-version>
+      <netty-tcnative-version>2.0.44.Final</netty-tcnative-version>
       <proton.version>0.33.10</proton.version>
       <resteasy.version>3.15.0.Final</resteasy.version>
       <slf4j.version>1.7.21</slf4j.version>
@@ -562,12 +562,6 @@
             <version>${jctools.version}</version>
             <!-- License: Apache 2.0 -->
          </dependency>
-         <dependency>
-            <groupId>io.netty</groupId>
-            <artifactId>netty-all</artifactId>
-            <version>${netty.version}</version>
-            <!-- License: Apache 2.0 -->
-         </dependency>
          <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-buffer</artifactId>
@@ -598,6 +592,18 @@
             <version>${netty.version}</version>
             <!-- License: Apache 2.0 -->
          </dependency>
+         <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec-http</artifactId>
+            <version>${netty.version}</version>
+            <!-- License: Apache 2.0 -->
+         </dependency>
+         <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-codec-mqtt</artifactId>
+            <version>${netty.version}</version>
+            <!-- License: Apache 2.0 -->
+         </dependency>
          <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-codec-socks</artifactId>
@@ -610,6 +616,18 @@
             <version>${netty.version}</version>
             <!-- License: Apache 2.0 -->
          </dependency>
+         <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-resolver</artifactId>
+            <version>${netty.version}</version>
+            <!-- License: Apache 2.0 -->
+         </dependency>
+         <dependency>
+            <groupId>io.netty</groupId>
+            <artifactId>netty-transport-classes-epoll</artifactId>
+            <version>${netty.version}</version>
+            <!-- License: Apache 2.0 -->
+         </dependency>
          <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-transport-native-epoll</artifactId>
@@ -619,15 +637,15 @@
          </dependency>
          <dependency>
             <groupId>io.netty</groupId>
-            <artifactId>netty-transport-native-kqueue</artifactId>
+            <artifactId>netty-transport-classes-kqueue</artifactId>
             <version>${netty.version}</version>
-            <classifier>${netty-transport-native-kqueue-classifier}</classifier>
             <!-- License: Apache 2.0 -->
          </dependency>
          <dependency>
             <groupId>io.netty</groupId>
-            <artifactId>netty-codec-http</artifactId>
+            <artifactId>netty-transport-native-kqueue</artifactId>
             <version>${netty.version}</version>
+            <classifier>${netty-transport-native-kqueue-classifier}</classifier>
             <!-- License: Apache 2.0 -->
          </dependency>
          <dependency>