Merge pull request #11978 from spyrkob/WFLY-10995

[WFLY-10995] Upgrade Netty from 4.1.25.Final to 4.1.29.Final.
wildfly · Jan 9, 2019 · b095d3a · b095d3a
2 parents 99bfad8 + 9dd86dd
commit b095d3a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/clustering/infinispan/extension/pom.xml b/clustering/infinispan/extension/pom.xml
@@ -90,6 +90,11 @@
             <groupId>net.jcip</groupId>
             <artifactId>jcip-annotations</artifactId>
         </dependency>
+        <dependency>
+            <!-- This is only required for the InfinispanExtension to initialize Netty's InternalLoggerFactory -->
+            <groupId>io.netty</groupId>
+            <artifactId>netty-all</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.reactivex.rxjava2</groupId>
             <artifactId>rxjava</artifactId>

diff --git a/...nsion/src/main/java/org/jboss/as/clustering/infinispan/subsystem/InfinispanExtension.java b/...nsion/src/main/java/org/jboss/as/clustering/infinispan/subsystem/InfinispanExtension.java
@@ -23,6 +23,8 @@
 
 import java.util.EnumSet;
 
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import io.netty.util.internal.logging.JdkLoggerFactory;
 import org.jboss.as.clustering.controller.ContextualSubsystemRegistration;
 import org.jboss.as.clustering.controller.descriptions.SubsystemResourceDescriptionResolver;
 import org.jboss.as.controller.Extension;
@@ -46,6 +48,8 @@ public class InfinispanExtension implements Extension {
 
     @Override
     public void initialize(ExtensionContext context) {
+        // Initialize the Netty logger factory
+        InternalLoggerFactory.setDefaultFactory(JdkLoggerFactory.INSTANCE);
         SubsystemRegistration registration = context.registerSubsystem(SUBSYSTEM_NAME, InfinispanModel.CURRENT.getVersion());
 
         new InfinispanSubsystemResourceDefinition().register(new ContextualSubsystemRegistration(registration, context));

diff --git a/...n/resources/modules/system/layers/base/org/jboss/as/clustering/infinispan/main/module.xml b/...n/resources/modules/system/layers/base/org/jboss/as/clustering/infinispan/main/module.xml
@@ -38,6 +38,8 @@
     <dependencies>
         <module name="javax.api"/>
         <module name="javax.transaction.api"/>
+        <!-- The io.netty module is only require to initialize Netty's InternalLoggingFactory -->
+        <module name="io.netty"/>
         <module name="io.reactivex.rxjava2.rxjava"/>
         <module name="net.jcip"/>
         <module name="org.infinispan" services="import"/>

diff --git a/...g-activemq/src/main/java/org/wildfly/extension/messaging/activemq/MessagingExtension.java b/...g-activemq/src/main/java/org/wildfly/extension/messaging/activemq/MessagingExtension.java
@@ -56,6 +56,8 @@
 import static org.wildfly.extension.messaging.activemq.CommonAttributes.SHARED_STORE_SLAVE;
 import static org.wildfly.extension.messaging.activemq.CommonAttributes.SLAVE;
 
+import io.netty.util.internal.logging.InternalLoggerFactory;
+import io.netty.util.internal.logging.JdkLoggerFactory;
 import org.jboss.as.controller.Extension;
 import org.jboss.as.controller.ExtensionContext;
 import org.jboss.as.controller.ModelVersion;
@@ -206,6 +208,8 @@ public static ResourceDescriptionResolver getResourceDescriptionResolver(final b
 
     @Override
     public void initialize(ExtensionContext context) {
+        // Initialize the Netty logger factory
+        InternalLoggerFactory.setDefaultFactory(JdkLoggerFactory.INSTANCE);
         final SubsystemRegistration subsystemRegistration = context.registerSubsystem(SUBSYSTEM_NAME, CURRENT_MODEL_VERSION);
         subsystemRegistration.registerXMLElementWriter(CURRENT_PARSER);
 

diff --git a/pom.xml b/pom.xml
@@ -238,7 +238,7 @@
         <version.httpunit>1.7.2</version.httpunit>
         <version.io.agroal>1.3</version.io.agroal>
         <version.io.jaegertracing>0.30.6</version.io.jaegertracing>
-        <version.io.netty>4.1.25.Final</version.io.netty>
+        <version.io.netty>4.1.29.Final</version.io.netty>
         <version.io.opentracing>0.31.0</version.io.opentracing>
         <version.io.opentracing.concurrent>0.1.0</version.io.opentracing.concurrent>
         <version.io.opentracing.jaxrs2>0.1.7</version.io.opentracing.jaxrs2>