Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies #1594

Merged
merged 1 commit into from
Nov 29, 2024
Merged

Update dependencies #1594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions ...resources/META-INF/native-image/org.neo4j.driver/neo4j-java-driver/reflection-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
]
}
]
155 changes: 0 additions & 155 deletions driver/src/main/java/org/neo4j/driver/internal/svm/NettySubstitutions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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<String> 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<String> 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 {

Expand Down Expand Up @@ -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<String> ciphers,
CipherSuiteFilter cipherFilter,
ApplicationProtocolConfig apn,
long sessionCacheSize,
long sessionTimeout,
ClientAuth clientAuth,
String[] protocols,
boolean startTls,
boolean enableOcsp,
SecureRandom secureRandom,
String keyStoreType,
Map.Entry<SslContextOption<?>, 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<String> ciphers,
CipherSuiteFilter cipherFilter,
ApplicationProtocolConfig apn,
String[] protocols,
long sessionCacheSize,
long sessionTimeout,
boolean enableOcsp,
SecureRandom secureRandom,
String keyStoreType,
Map.Entry<SslContextOption<?>, 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 {

Expand Down
18 changes: 18 additions & 0 deletions ...resources/META-INF/native-image/org.neo4j.driver/neo4j-java-driver/reflection-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
]
}
]
18 changes: 9 additions & 9 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,26 +34,26 @@
<!-- Please note that when updating this dependency -->
<!-- (i.e. due to a security vulnerability or bug) that the -->
<!-- corresponding server dependency also needs updating.-->
<netty-bom.version>4.1.111.Final</netty-bom.version>
<netty-bom.version>4.1.115.Final</netty-bom.version>
<!-- Please note that when updating this dependency -->
<!-- (i.e. due to a security vulnerability or bug) that the -->
<!-- corresponding server dependency also needs updating.-->
<reactor-bom.version>2023.0.7</reactor-bom.version>
<reactor-bom.version>2023.0.11</reactor-bom.version>
<rxjava.version>2.2.21</rxjava.version>
<slf4j-api.version>1.7.36</slf4j-api.version>
<hamcrest-junit.version>2.0.0.0</hamcrest-junit.version>
<mockito-core.version>4.11.0</mockito-core.version>
<junit.version>5.9.3</junit.version>
<testng-engine.version>1.0.5</testng-engine.version>
<jarchivelib.version>1.2.0</jarchivelib.version>
<bouncycastle-jdk18on.version>1.78.1</bouncycastle-jdk18on.version>
<bouncycastle-jdk18on.version>1.79</bouncycastle-jdk18on.version>
<logback-classic.version>1.2.13</logback-classic.version>
<jackson.version>2.17.1</jackson.version>
<lombok.version>1.18.32</lombok.version>
<svm.version>21.3.10</svm.version>
<micrometer.version>1.13.1</micrometer.version>
<testcontainers.version>1.19.8</testcontainers.version>
<build-resources.version>4.4.34</build-resources.version>
<jackson.version>2.18.2</jackson.version>
<lombok.version>1.18.36</lombok.version>
<svm.version>21.3.12</svm.version>
<micrometer.version>1.13.8</micrometer.version>
<testcontainers.version>1.20.4</testcontainers.version>
<build-resources.version>4.4.39</build-resources.version>
<!-- To be overwritten by child projects -->
<moduleName/>
</properties>
Expand Down