Move to main HTTP/3 version (#11849)

yawkat · web-flow · commit f7b96d682541 · 2025-06-11T11:08:12.000-04:00
Updates the Netty libraries for HTTP/3
diff --git a/core-bom/build.gradle.kts b/core-bom/build.gradle.kts
@@ -13,6 +13,8 @@ micronautBom {
     suppressions {
         // io_uring was graduated to the main netty repo, so we don't track the incubator version anymore.
         acceptedVersionRegressions.add("netty-iouring")
+        acceptedVersionRegressions.add("netty-http3")
+        acceptedLibraryRegressions.add("netty-incubator-codec-http3")
     }
     propertyName = "core"
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -80,7 +80,6 @@ managed-kotlin = "1.9.25"
 managed-kotlin-coroutines = "1.8.1"
 managed-methvin-directory-watcher = "0.19.0"
 managed-netty = "4.2.2.Final"
-managed-netty-http3 = "0.0.29.Final"
 managed-netty-tcnative = "2.0.72.Final"
 managed-reactive-streams = "1.0.4"
 # This should be kept aligned with https://github.com/micronaut-projects/micronaut-reactor/blob/master/gradle.properties from the BOM
@@ -153,8 +152,10 @@ managed-methvin-directoryWatcher = { module = "io.methvin:directory-watcher", ve
 managed-netty-buffer = { module = "io.netty:netty-buffer", version.ref = "managed-netty" }
 managed-netty-codec-http = { module = "io.netty:netty-codec-http", version.ref = "managed-netty" }
 managed-netty-codec-http2 = { module = "io.netty:netty-codec-http2", version.ref = "managed-netty" }
+managed-netty-codec-http3 = { module = "io.netty:netty-codec-http3", version.ref = "managed-netty" }
+managed-netty-codec-classes-quic = { module = "io.netty:netty-codec-classes-quic", version.ref = "managed-netty" }
+managed-netty-codec-native-quic = { module = "io.netty:netty-codec-native-quic", version.ref = "managed-netty" }
 managed-netty-common = { module = "io.netty:netty-common", version.ref = "managed-netty" }
-managed-netty-incubator-codec-http3 = { module = "io.netty.incubator:netty-incubator-codec-http3", version.ref = "managed-netty-http3" }
 managed-netty-handler = { module = "io.netty:netty-handler", version.ref = "managed-netty" }
 managed-netty-handler-proxy = { module = "io.netty:netty-handler-proxy", version.ref = "managed-netty" }
 managed-netty-transport-native-epoll = { module = "io.netty:netty-transport-native-epoll", version.ref = "managed-netty" }
diff --git a/http-client/build.gradle.kts b/http-client/build.gradle.kts
@@ -19,8 +19,8 @@ dependencies {
     api(projects.micronautHttpNetty)
     api(libs.managed.netty.handler.proxy)
 
-    compileOnly(libs.managed.netty.incubator.codec.http3)
-    testImplementation(libs.managed.netty.incubator.codec.http3)
+    compileOnly(projects.micronautHttpNettyHttp3)
+    testImplementation(projects.micronautHttpNettyHttp3)
 
     testAnnotationProcessor(platform(libs.test.boms.micronaut.validation))
     testAnnotationProcessor(libs.micronaut.validation.processor) {
diff --git a/http-client/src/main/java/io/micronaut/http/client/netty/ConnectionManager.java b/http-client/src/main/java/io/micronaut/http/client/netty/ConnectionManager.java
@@ -49,6 +49,15 @@
 import io.netty.channel.EventLoopGroup;
 import io.netty.channel.MultiThreadIoEventLoopGroup;
 import io.netty.channel.nio.NioIoHandler;
+import io.netty.handler.codec.http3.Http3;
+import io.netty.handler.codec.http3.Http3ClientConnectionHandler;
+import io.netty.handler.codec.http3.Http3FrameToHttpObjectCodec;
+import io.netty.handler.codec.http3.Http3HeadersFrame;
+import io.netty.handler.codec.http3.Http3RequestStreamInitializer;
+import io.netty.handler.codec.http3.Http3SettingsFrame;
+import io.netty.handler.codec.quic.QuicChannel;
+import io.netty.handler.codec.quic.QuicSslContext;
+import io.netty.handler.codec.quic.QuicStreamChannel;
 import io.netty.handler.codec.DecoderException;
 import io.netty.handler.codec.http.DefaultFullHttpRequest;
 import io.netty.handler.codec.http.HttpClientCodec;
@@ -87,15 +96,6 @@
 import io.netty.handler.timeout.IdleStateHandler;
 import io.netty.handler.timeout.ReadTimeoutException;
 import io.netty.handler.timeout.ReadTimeoutHandler;
-import io.netty.incubator.codec.http3.Http3;
-import io.netty.incubator.codec.http3.Http3ClientConnectionHandler;
-import io.netty.incubator.codec.http3.Http3FrameToHttpObjectCodec;
-import io.netty.incubator.codec.http3.Http3HeadersFrame;
-import io.netty.incubator.codec.http3.Http3RequestStreamInitializer;
-import io.netty.incubator.codec.http3.Http3SettingsFrame;
-import io.netty.incubator.codec.quic.QuicChannel;
-import io.netty.incubator.codec.quic.QuicSslContext;
-import io.netty.incubator.codec.quic.QuicStreamChannel;
 import io.netty.resolver.AddressResolver;
 import io.netty.resolver.AddressResolverGroup;
 import io.netty.resolver.DefaultAddressResolverGroup;
diff --git a/http-client/src/main/java/io/micronaut/http/client/netty/ssl/ClientSslBuilder.java b/http-client/src/main/java/io/micronaut/http/client/netty/ssl/ClientSslBuilder.java
@@ -19,8 +19,8 @@
 import io.micronaut.core.annotation.NonNull;
 import io.micronaut.http.client.HttpVersionSelection;
 import io.micronaut.http.ssl.SslConfiguration;
+import io.netty.handler.codec.quic.QuicSslContext;
 import io.netty.handler.ssl.SslContext;
-import io.netty.incubator.codec.quic.QuicSslContext;
 
 /**
  * Interface used by the netty HTTP client to construct the SSL context.
diff --git a/http-client/src/main/java/io/micronaut/http/client/netty/ssl/NettyClientSslBuilder.java b/http-client/src/main/java/io/micronaut/http/client/netty/ssl/NettyClientSslBuilder.java
@@ -27,6 +27,9 @@
 import io.micronaut.http.ssl.SslBuilder;
 import io.micronaut.http.ssl.SslConfiguration;
 import io.micronaut.http.ssl.SslConfigurationException;
+import io.netty.handler.codec.http3.Http3;
+import io.netty.handler.codec.quic.QuicSslContext;
+import io.netty.handler.codec.quic.QuicSslContextBuilder;
 import io.netty.handler.codec.http2.Http2SecurityUtil;
 import io.netty.handler.ssl.ApplicationProtocolConfig;
 import io.netty.handler.ssl.ClientAuth;
@@ -35,9 +38,6 @@
 import io.netty.handler.ssl.SslProvider;
 import io.netty.handler.ssl.SupportedCipherSuiteFilter;
 import io.netty.handler.ssl.util.InsecureTrustManagerFactory;
-import io.netty.incubator.codec.http3.Http3;
-import io.netty.incubator.codec.quic.QuicSslContext;
-import io.netty.incubator.codec.quic.QuicSslContextBuilder;
 import jakarta.inject.Singleton;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/http-netty-http3/build.gradle.kts b/http-netty-http3/build.gradle.kts
@@ -0,0 +1,22 @@
+plugins {
+    id("io.micronaut.build.internal.convention-library")
+}
+
+dependencies {
+    api(libs.managed.netty.codec.http3) {
+        exclude(group = "io.netty", module = "netty-codec-native-quic")
+    }
+    api(libs.managed.netty.codec.classes.quic)
+    runtimeOnly(variantOf(libs.managed.netty.codec.native.quic) { classifier("linux-x86_64") })
+    runtimeOnly(variantOf(libs.managed.netty.codec.native.quic) { classifier("linux-aarch_64") })
+    runtimeOnly(variantOf(libs.managed.netty.codec.native.quic) { classifier("osx-x86_64") })
+    runtimeOnly(variantOf(libs.managed.netty.codec.native.quic) { classifier("osx-aarch_64") })
+    runtimeOnly(variantOf(libs.managed.netty.codec.native.quic) { classifier("windows-x86_64") })
+}
+
+micronautBuild {
+    binaryCompatibility {
+        // remove after 4.9.0
+        enabled = false
+    }
+}
diff --git a/http-server-netty/build.gradle.kts b/http-server-netty/build.gradle.kts
@@ -33,7 +33,7 @@ dependencies {
     compileOnly(projects.micronautWebsocket)
     compileOnly(libs.managed.kotlin.stdlib)
     compileOnly(libs.managed.netty.transport.native.unix.common)
-    compileOnly(libs.managed.netty.incubator.codec.http3)
+    compileOnly(projects.micronautHttpNettyHttp3)
     compileOnly(libs.brotli4j)
 
     testImplementation(libs.jmh.core)
@@ -60,7 +60,7 @@ dependencies {
     testImplementation(projects.micronautInjectJavaTest)
     testImplementation(projects.micronautHttpClient)
     testImplementation(libs.spotbugs)
-    testImplementation(libs.managed.netty.incubator.codec.http3)
+    testImplementation(projects.micronautHttpNettyHttp3)
     testImplementation(libs.bcpkix)
     testImplementation(projects.micronautJacksonDatabind)
 // Add Micronaut Jackson XML after v4 Migration
diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/HttpPipelineBuilder.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/HttpPipelineBuilder.java
@@ -40,6 +40,13 @@
 import io.netty.channel.ChannelOutboundHandler;
 import io.netty.channel.ChannelPipeline;
 import io.netty.channel.SimpleChannelInboundHandler;
+import io.netty.handler.codec.http3.Http3;
+import io.netty.handler.codec.http3.Http3FrameToHttpObjectCodec;
+import io.netty.handler.codec.http3.Http3ServerConnectionHandler;
+import io.netty.handler.codec.quic.QuicChannel;
+import io.netty.handler.codec.quic.QuicSslContext;
+import io.netty.handler.codec.quic.QuicSslEngine;
+import io.netty.handler.codec.quic.QuicStreamChannel;
 import io.netty.handler.codec.http.FullHttpRequest;
 import io.netty.handler.codec.http.HttpMessage;
 import io.netty.handler.codec.http.HttpObjectAggregator;
@@ -66,13 +73,6 @@
 import io.netty.handler.ssl.SslHandler;
 import io.netty.handler.ssl.SslHandshakeCompletionEvent;
 import io.netty.handler.timeout.IdleStateHandler;
-import io.netty.incubator.codec.http3.Http3;
-import io.netty.incubator.codec.http3.Http3FrameToHttpObjectCodec;
-import io.netty.incubator.codec.http3.Http3ServerConnectionHandler;
-import io.netty.incubator.codec.quic.QuicChannel;
-import io.netty.incubator.codec.quic.QuicSslContext;
-import io.netty.incubator.codec.quic.QuicSslEngine;
-import io.netty.incubator.codec.quic.QuicStreamChannel;
 import io.netty.util.AsciiString;
 import io.netty.util.AttributeKey;
 import io.netty.util.ReferenceCountUtil;
@@ -214,7 +214,7 @@ HttpPipelineBuilder pipelineBuilder() {
      */
     private static final class QuicFactory {
         /**
-         * Create a QUIC SSL engine provider ({@link io.netty.incubator.codec.quic.QuicCodecBuilder#sslEngineProvider(Function)}).
+         * Create a QUIC SSL engine provider ({@link io.netty.handler.codec.quic.QuicCodecBuilder#sslEngineProvider(Function)}).
          *
          * @return The engine provider
          */
diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/QuicTokenHandlerImpl.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/QuicTokenHandlerImpl.java
@@ -18,7 +18,7 @@
 import io.micronaut.core.annotation.Internal;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.ByteBufAllocator;
-import io.netty.incubator.codec.quic.QuicTokenHandler;
+import io.netty.handler.codec.quic.QuicTokenHandler;
 import io.netty.util.concurrent.FastThreadLocal;
 
 import javax.crypto.KeyGenerator;
diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/handler/accesslog/element/ConnectionMetadataImpl.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/handler/accesslog/element/ConnectionMetadataImpl.java
@@ -21,7 +21,7 @@
 import io.netty.channel.socket.SocketChannel;
 import io.netty.channel.unix.DomainSocketAddress;
 import io.netty.channel.unix.DomainSocketChannel;
-import io.netty.incubator.codec.quic.QuicChannel;
+import io.netty.handler.codec.quic.QuicChannel;
 
 import java.net.SocketAddress;
 import java.util.Optional;
diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/ssl/AbstractServerSslBuilder.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/ssl/AbstractServerSslBuilder.java
@@ -25,16 +25,16 @@
 import io.micronaut.http.ssl.SslBuilder;
 import io.micronaut.http.ssl.SslConfiguration;
 import io.micronaut.http.ssl.SslConfigurationException;
+import io.netty.handler.codec.http3.Http3;
+import io.netty.handler.codec.quic.QuicSslContext;
+import io.netty.handler.codec.quic.QuicSslContextBuilder;
 import io.netty.handler.codec.http2.Http2SecurityUtil;
 import io.netty.handler.ssl.ApplicationProtocolConfig;
 import io.netty.handler.ssl.ApplicationProtocolNames;
 import io.netty.handler.ssl.ClientAuth;
 import io.netty.handler.ssl.SslContext;
 import io.netty.handler.ssl.SslContextBuilder;
 import io.netty.handler.ssl.SupportedCipherSuiteFilter;
-import io.netty.incubator.codec.http3.Http3;
-import io.netty.incubator.codec.quic.QuicSslContext;
-import io.netty.incubator.codec.quic.QuicSslContextBuilder;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLException;
diff --git a/http-server-netty/src/main/java/io/micronaut/http/server/netty/ssl/ServerSslBuilder.java b/http-server-netty/src/main/java/io/micronaut/http/server/netty/ssl/ServerSslBuilder.java
@@ -17,8 +17,8 @@
 
 import io.micronaut.core.annotation.Experimental;
 import io.micronaut.http.ssl.ServerSslConfiguration;
+import io.netty.handler.codec.quic.QuicSslContext;
 import io.netty.handler.ssl.SslContext;
-import io.netty.incubator.codec.quic.QuicSslContext;
 
 import java.util.Optional;
 
diff --git a/settings.gradle b/settings.gradle
@@ -37,6 +37,7 @@ include "http-client"
 include "http-client-jdk"
 include "http-client-tck"
 include "http-netty"
+include "http-netty-http3"
 include "http-server"
 include "http-server-tck"
 include "http-server-netty"
diff --git a/src/main/docs/guide/httpClient/clientHttp3.adoc b/src/main/docs/guide/httpClient/clientHttp3.adoc
@@ -13,4 +13,4 @@ micronaut:
 
 Additionally, the netty HTTP/3 codec needs to be present on the classpath:
 
-dependency:netty-incubator-codec-http3[groupId="io.netty.incubator",artifactId="netty-incubator-codec-http3"]
+dependency:micronaut-http-netty-http3[]
diff --git a/src/main/docs/guide/httpServer/http3Server.adoc b/src/main/docs/guide/httpServer/http3Server.adoc
@@ -20,4 +20,4 @@ NOTE: that defining this listener will disable the implicit TCP listeners. You c
 
 Additionally, the netty HTTP/3 codec needs to be present on the classpath:
 
-dependency:netty-incubator-codec-http3[groupId="io.netty.incubator",artifactId="netty-incubator-codec-http3"]
+dependency:micronaut-http-netty-http3[]
diff --git a/src/main/docs/guide/httpServer/serverConfiguration.adoc b/src/main/docs/guide/httpServer/serverConfiguration.adoc
@@ -59,10 +59,10 @@ micronaut:
 
 On Linux, Netty also offers an io_uring-based transport in incubator status. On x86_64:
 
-dependency:netty-incubator-transport-native-io_uring[groupId="io.netty.incubator",scope="runtimeOnly",classifier="linux-x86_64"]
+dependency:netty-transport-native-io_uring[groupId="io.netty",scope="runtimeOnly",classifier="linux-x86_64"]
 
 On ARM64:
 
-dependency:netty-incubator-transport-native-io_uring[groupId="io.netty.incubator",scope="runtimeOnly",classifier="linux-aarch_64"]
+dependency:netty-transport-native-io_uring[groupId="io.netty",scope="runtimeOnly",classifier="linux-aarch_64"]
 
 NOTE: Netty enables simplistic sampling resource leak detection which reports there is a leak or not, at the cost of small overhead. You can enable it by setting property `netty.resource-leak-detector-level` to one of: `DISABLED` (default), `SIMPLE`, `PARANOID` or `ADVANCED`.
diff --git a/test-suite/build.gradle.kts b/test-suite/build.gradle.kts
@@ -90,7 +90,7 @@ dependencies {
             }
         }
     }
-    testImplementation(libs.managed.netty.incubator.codec.http3)
+    testImplementation(projects.micronautHttpNettyHttp3)
     testImplementation(libs.logbook.netty)
     testImplementation(libs.logback.classic)
     testImplementation(libs.bcpkix)

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,8 @@ micronautBom {`
`13`	`13`	`suppressions {`
`14`	`14`	`// io_uring was graduated to the main netty repo, so we don't track the incubator version anymore.`
`15`	`15`	`acceptedVersionRegressions.add("netty-iouring")`
	`16`	`+ acceptedVersionRegressions.add("netty-http3")`
	`17`	`+ acceptedLibraryRegressions.add("netty-incubator-codec-http3")`
`16`	`18`	`}`
`17`	`19`	`propertyName = "core"`
`18`	`20`	`}`