From 88c2895d9db7933504752917bf3f5c8a2abe0ddb Mon Sep 17 00:00:00 2001 From: Clement Escoffier Date: Wed, 12 Jun 2024 12:08:03 +0200 Subject: [PATCH] Update to Vert.x 4.5.8 and Netty 4.1.110 - bump Mutiny Bindings to 3.13.0 - bump Quarkus HTTP to 5.3.0 - update Netty SSL released substitutions --- bom/application/pom.xml | 8 ++--- .../config/GrpcServerConfiguration.java | 3 +- .../runtime/graal/NettySubstitutions.java | 29 ++++++++++--------- .../resteasy-reactive/pom.xml | 2 +- 4 files changed, 22 insertions(+), 20 deletions(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index c937f51950862..249674d35346f 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -34,7 +34,7 @@ 1.32.0 1.32.0-alpha 1.21.0-alpha - 5.2.2.Final + 5.3.0 1.12.5 2.1.12 0.22.0 @@ -61,7 +61,7 @@ 2.1.2 1.0.13 3.0.1 - 3.12.0 + 3.13.0 4.21.0 2.6.0 2.1.3 @@ -113,7 +113,7 @@ 2.4.2.Final 2.1.4.SP1 3.6.1.Final - 4.5.7 + 4.5.8 4.5.14 4.4.16 4.1.5 @@ -134,7 +134,7 @@ 15.0.4.Final 5.0.4.Final 3.1.5 - 4.1.108.Final + 4.1.110.Final 1.16.0 1.0.4 3.6.0.Final diff --git a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/GrpcServerConfiguration.java b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/GrpcServerConfiguration.java index 9afacf7542319..471df3983534d 100644 --- a/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/GrpcServerConfiguration.java +++ b/extensions/grpc/runtime/src/main/java/io/quarkus/grpc/runtime/config/GrpcServerConfiguration.java @@ -58,7 +58,8 @@ public class GrpcServerConfiguration { /** * The max inbound message size in bytes. */ - public @ConfigItem OptionalInt maxInboundMessageSize; + @ConfigItem + public OptionalInt maxInboundMessageSize; /** * The max inbound metadata size in bytes diff --git a/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java b/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java index 392f64a240d93..be76939ecf7ac 100644 --- a/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java +++ b/extensions/netty/runtime/src/main/java/io/quarkus/netty/runtime/graal/NettySubstitutions.java @@ -14,6 +14,7 @@ import java.security.NoSuchAlgorithmException; import java.security.PrivateKey; import java.security.Provider; +import java.security.SecureRandom; import java.security.cert.X509Certificate; import java.security.spec.InvalidKeySpecException; import java.util.Collections; @@ -164,7 +165,6 @@ public static boolean isCipherSuiteAvailable(String cipherSuite) { @TargetClass(className = "io.netty.handler.ssl.JdkSslServerContext") final class Target_io_netty_handler_ssl_JdkSslServerContext { - @Alias Target_io_netty_handler_ssl_JdkSslServerContext(Provider provider, X509Certificate[] trustCertCollection, TrustManagerFactory trustManagerFactory, @@ -172,8 +172,7 @@ final class Target_io_netty_handler_ssl_JdkSslServerContext { KeyManagerFactory keyManagerFactory, Iterable ciphers, CipherSuiteFilter cipherFilter, ApplicationProtocolConfig apn, long sessionCacheSize, long sessionTimeout, ClientAuth clientAuth, String[] protocols, boolean startTls, - String keyStore) - throws SSLException { + SecureRandom secureRandom, String keyStore) throws SSLException { } } @@ -185,9 +184,8 @@ final class Target_io_netty_handler_ssl_JdkSslClientContext { TrustManagerFactory trustManagerFactory, X509Certificate[] keyCertChain, PrivateKey key, String keyPassword, KeyManagerFactory keyManagerFactory, Iterable ciphers, CipherSuiteFilter cipherFilter, ApplicationProtocolConfig apn, String[] protocols, - long sessionCacheSize, long sessionTimeout, String keyStoreType) - throws SSLException { - + long sessionCacheSize, long sessionTimeout, SecureRandom secureRandom, + String keyStoreType) throws SSLException { } } @@ -229,10 +227,12 @@ final class Target_io_netty_handler_ssl_SslContext { @Substitute static SslContext newServerContextInternal(SslProvider provider, Provider sslContextProvider, X509Certificate[] trustCertCollection, TrustManagerFactory trustManagerFactory, - X509Certificate[] keyCertChain, - PrivateKey key, String keyPassword, KeyManagerFactory keyManagerFactory, Iterable ciphers, - CipherSuiteFilter cipherFilter, ApplicationProtocolConfig apn, long sessionCacheSize, long sessionTimeout, - ClientAuth clientAuth, String[] protocols, boolean startTls, boolean enableOcsp, String keyStoreType, + X509Certificate[] keyCertChain, PrivateKey key, String keyPassword, + KeyManagerFactory keyManagerFactory, Iterable ciphers, + CipherSuiteFilter cipherFilter, ApplicationProtocolConfig apn, + long sessionCacheSize, long sessionTimeout, ClientAuth clientAuth, + String[] protocols, boolean startTls, boolean enableOcsp, + SecureRandom secureRandom, String keyStoreType, Map.Entry, Object>... ctxOptions) throws SSLException { if (enableOcsp) { throw new IllegalArgumentException("OCSP is not supported with this SslProvider: " + provider); @@ -240,7 +240,7 @@ static SslContext newServerContextInternal(SslProvider provider, Provider sslCon return (SslContext) (Object) new Target_io_netty_handler_ssl_JdkSslServerContext(sslContextProvider, trustCertCollection, trustManagerFactory, keyCertChain, key, keyPassword, keyManagerFactory, ciphers, cipherFilter, apn, sessionCacheSize, sessionTimeout, - clientAuth, protocols, startTls, keyStoreType); + clientAuth, protocols, startTls, secureRandom, keyStoreType); } @Substitute @@ -249,7 +249,7 @@ static SslContext newClientContextInternal(SslProvider provider, Provider sslCon TrustManagerFactory trustManagerFactory, X509Certificate[] keyCertChain, PrivateKey key, String keyPassword, KeyManagerFactory keyManagerFactory, Iterable ciphers, CipherSuiteFilter cipherFilter, ApplicationProtocolConfig apn, String[] protocols, long sessionCacheSize, long sessionTimeout, - boolean enableOcsp, + boolean enableOcsp, SecureRandom secureRandom, String keyStoreType, Map.Entry, Object>... options) throws SSLException { if (enableOcsp) { throw new IllegalArgumentException("OCSP is not supported with this SslProvider: " + provider); @@ -257,7 +257,7 @@ static SslContext newClientContextInternal(SslProvider provider, Provider sslCon return (SslContext) (Object) new Target_io_netty_handler_ssl_JdkSslClientContext(sslContextProvider, trustCert, trustManagerFactory, keyCertChain, key, keyPassword, keyManagerFactory, ciphers, cipherFilter, apn, protocols, sessionCacheSize, - sessionTimeout, keyStoreType); + sessionTimeout, secureRandom, keyStoreType); } } @@ -540,7 +540,8 @@ protected EmbeddedChannel newContentDecompressor(ChannelHandlerContext ctx, Char return null; } else { ZlibWrapper wrapper = this.strict ? ZlibWrapper.ZLIB : ZlibWrapper.ZLIB_OR_NONE; - return new EmbeddedChannel(ctx.channel().id(), ctx.channel().metadata().hasDisconnect(), ctx.channel().config(), + return new EmbeddedChannel(ctx.channel().id(), ctx.channel().metadata().hasDisconnect(), + ctx.channel().config(), new ChannelHandler[] { ZlibCodecFactory.newZlibDecoder(wrapper) }); } } else { diff --git a/independent-projects/resteasy-reactive/pom.xml b/independent-projects/resteasy-reactive/pom.xml index fb400b34eb6fc..d2d56a09697c8 100644 --- a/independent-projects/resteasy-reactive/pom.xml +++ b/independent-projects/resteasy-reactive/pom.xml @@ -58,7 +58,7 @@ 2.6.0 2.3.0 - 4.5.7 + 4.5.8 5.4.0 1.0.0.Final 2.17.1