From 51b2dc4001aa3d9a11f32341138befbd7bd09255 Mon Sep 17 00:00:00 2001 From: Dmitriy Tverdiakov Date: Thu, 28 Nov 2024 12:24:11 +0000 Subject: [PATCH] Update dependencies --- .../neo4j-java-driver/reflection-config.json | 18 ++ .../internal/svm/NettySubstitutions.java | 155 ------------------ .../neo4j-java-driver/reflection-config.json | 18 ++ pom.xml | 18 +- 4 files changed, 45 insertions(+), 164 deletions(-) diff --git a/bundle/src/main/resources/META-INF/native-image/org.neo4j.driver/neo4j-java-driver/reflection-config.json b/bundle/src/main/resources/META-INF/native-image/org.neo4j.driver/neo4j-java-driver/reflection-config.json index 68572f10fb..abc48072ad 100644 --- a/bundle/src/main/resources/META-INF/native-image/org.neo4j.driver/neo4j-java-driver/reflection-config.json +++ b/bundle/src/main/resources/META-INF/native-image/org.neo4j.driver/neo4j-java-driver/reflection-config.json @@ -54,5 +54,23 @@ "fields": [ {"name": "consumerIndex", "allowUnsafeAccess": true} ] + }, + { + "name" : "org.neo4j.driver.internal.shaded.io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField", + "fields": [ + {"name": "producerIndex", "allowUnsafeAccess": true} + ] + }, + { + "name" : "org.neo4j.driver.internal.shaded.io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField", + "fields": [ + {"name": "producerLimit", "allowUnsafeAccess": true} + ] + }, + { + "name" : "org.neo4j.driver.internal.shaded.io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueConsumerIndexField", + "fields": [ + {"name": "consumerIndex", "allowUnsafeAccess": true} + ] } ] diff --git a/driver/src/main/java/org/neo4j/driver/internal/svm/NettySubstitutions.java b/driver/src/main/java/org/neo4j/driver/internal/svm/NettySubstitutions.java index 21b82f8347..6afa528457 100644 --- a/driver/src/main/java/org/neo4j/driver/internal/svm/NettySubstitutions.java +++ b/driver/src/main/java/org/neo4j/driver/internal/svm/NettySubstitutions.java @@ -31,25 +31,12 @@ import io.netty.channel.DefaultChannelPromise; import io.netty.handler.ssl.ApplicationProtocolConfig; import io.netty.handler.ssl.ApplicationProtocolConfig.SelectorFailureBehavior; -import io.netty.handler.ssl.CipherSuiteFilter; -import io.netty.handler.ssl.ClientAuth; import io.netty.handler.ssl.JdkAlpnApplicationProtocolNegotiator; import io.netty.handler.ssl.JdkApplicationProtocolNegotiator; -import io.netty.handler.ssl.SslContext; -import io.netty.handler.ssl.SslContextOption; -import io.netty.handler.ssl.SslProvider; import io.netty.util.concurrent.GlobalEventExecutor; import io.netty.util.internal.logging.InternalLoggerFactory; import io.netty.util.internal.logging.JdkLoggerFactory; -import java.security.PrivateKey; -import java.security.Provider; -import java.security.SecureRandom; -import java.security.cert.X509Certificate; -import java.util.Map; -import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLEngine; -import javax.net.ssl.SSLException; -import javax.net.ssl.TrustManagerFactory; /** * This substitution avoid having loggers added to the build @@ -65,55 +52,6 @@ private static InternalLoggerFactory newDefaultFactory(String name) { // SSL // This whole section is mostly about removing static analysis references to openssl/tcnative - -@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, - X509Certificate[] keyCertChain, - PrivateKey key, - String keyPassword, - KeyManagerFactory keyManagerFactory, - Iterable ciphers, - CipherSuiteFilter cipherFilter, - ApplicationProtocolConfig apn, - long sessionCacheSize, - long sessionTimeout, - ClientAuth clientAuth, - String[] protocols, - boolean startTls, - SecureRandom secureRandom, - String keyStore) - throws SSLException {} -} - -@TargetClass(className = "io.netty.handler.ssl.JdkSslClientContext") -final class Target_io_netty_handler_ssl_JdkSslClientContext { - - @Alias - Target_io_netty_handler_ssl_JdkSslClientContext( - Provider sslContextProvider, - X509Certificate[] trustCertCollection, - TrustManagerFactory trustManagerFactory, - X509Certificate[] keyCertChain, - PrivateKey key, - String keyPassword, - KeyManagerFactory keyManagerFactory, - Iterable ciphers, - CipherSuiteFilter cipherFilter, - ApplicationProtocolConfig apn, - String[] protocols, - long sessionCacheSize, - long sessionTimeout, - SecureRandom secureRandom, - String keyStoreType) - throws SSLException {} -} - @TargetClass(className = "io.netty.handler.ssl.SslHandler$SslEngineType") final class Target_io_netty_handler_ssl_SslHandler$SslEngineType { @@ -196,99 +134,6 @@ final class Target_io_netty_handler_ssl_JdkAlpnSslEngine { final boolean isServer) {} } -@TargetClass(className = "io.netty.handler.ssl.SslContext") -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, - SecureRandom secureRandom, - String keyStoreType, - Map.Entry, Object>... ctxOptions) - throws SSLException { - - if (enableOcsp) { - throw new IllegalArgumentException("OCSP is not supported with this SslProvider: " + provider); - } - 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, - secureRandom, - keyStoreType); - } - - @Substitute - static SslContext newClientContextInternal( - SslProvider provider, - Provider sslContextProvider, - X509Certificate[] trustCert, - TrustManagerFactory trustManagerFactory, - X509Certificate[] keyCertChain, - PrivateKey key, - String keyPassword, - KeyManagerFactory keyManagerFactory, - Iterable ciphers, - CipherSuiteFilter cipherFilter, - ApplicationProtocolConfig apn, - String[] protocols, - long sessionCacheSize, - long sessionTimeout, - 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); - } - return (SslContext) (Object) new Target_io_netty_handler_ssl_JdkSslClientContext( - sslContextProvider, - trustCert, - trustManagerFactory, - keyCertChain, - key, - keyPassword, - keyManagerFactory, - ciphers, - cipherFilter, - apn, - protocols, - sessionCacheSize, - sessionTimeout, - secureRandom, - keyStoreType); - } -} - @TargetClass(className = "io.netty.handler.ssl.JdkDefaultApplicationProtocolNegotiator") final class Target_io_netty_handler_ssl_JdkDefaultApplicationProtocolNegotiator { diff --git a/driver/src/main/resources/META-INF/native-image/org.neo4j.driver/neo4j-java-driver/reflection-config.json b/driver/src/main/resources/META-INF/native-image/org.neo4j.driver/neo4j-java-driver/reflection-config.json index d91092ea00..61c1815fad 100644 --- a/driver/src/main/resources/META-INF/native-image/org.neo4j.driver/neo4j-java-driver/reflection-config.json +++ b/driver/src/main/resources/META-INF/native-image/org.neo4j.driver/neo4j-java-driver/reflection-config.json @@ -54,5 +54,23 @@ "fields": [ {"name": "consumerIndex", "allowUnsafeAccess": true} ] + }, + { + "name" : "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField", + "fields": [ + {"name": "producerIndex", "allowUnsafeAccess": true} + ] + }, + { + "name" : "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField", + "fields": [ + {"name": "producerLimit", "allowUnsafeAccess": true} + ] + }, + { + "name" : "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueConsumerIndexField", + "fields": [ + {"name": "consumerIndex", "allowUnsafeAccess": true} + ] } ] diff --git a/pom.xml b/pom.xml index 2835f61c5f..794ff0f534 100644 --- a/pom.xml +++ b/pom.xml @@ -34,11 +34,11 @@ - 4.1.111.Final + 4.1.115.Final - 2023.0.7 + 2023.0.11 2.2.21 1.7.36 2.0.0.0 @@ -46,14 +46,14 @@ 5.9.3 1.0.5 1.2.0 - 1.78.1 + 1.79 1.2.13 - 2.17.1 - 1.18.32 - 21.3.10 - 1.13.1 - 1.19.8 - 4.4.34 + 2.18.2 + 1.18.36 + 21.3.12 + 1.13.8 + 1.20.4 + 4.4.39