Skip to content

Commit 9f1b230

Browse files
injectivesinjectives
authored
Update dependencies (#1594)
1 parent 045ce93 commit 9f1b230

File tree

4 files changed

+45
-164
lines changed

4 files changed

+45
-164
lines changed

‎bundle/src/main/resources/META-INF/native-image/org.neo4j.driver/neo4j-java-driver/reflection-config.json

+18
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,23 @@
5454
"fields": [
5555
{"name": "consumerIndex", "allowUnsafeAccess": true}
5656
]
57+
},
58+
{
59+
"name" : "org.neo4j.driver.internal.shaded.io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField",
60+
"fields": [
61+
{"name": "producerIndex", "allowUnsafeAccess": true}
62+
]
63+
},
64+
{
65+
"name" : "org.neo4j.driver.internal.shaded.io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField",
66+
"fields": [
67+
{"name": "producerLimit", "allowUnsafeAccess": true}
68+
]
69+
},
70+
{
71+
"name" : "org.neo4j.driver.internal.shaded.io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueConsumerIndexField",
72+
"fields": [
73+
{"name": "consumerIndex", "allowUnsafeAccess": true}
74+
]
5775
}
5876
]

‎driver/src/main/java/org/neo4j/driver/internal/svm/NettySubstitutions.java

-155
Original file line numberDiff line numberDiff line change
@@ -31,25 +31,12 @@
3131
import io.netty.channel.DefaultChannelPromise;
3232
import io.netty.handler.ssl.ApplicationProtocolConfig;
3333
import io.netty.handler.ssl.ApplicationProtocolConfig.SelectorFailureBehavior;
34-
import io.netty.handler.ssl.CipherSuiteFilter;
35-
import io.netty.handler.ssl.ClientAuth;
3634
import io.netty.handler.ssl.JdkAlpnApplicationProtocolNegotiator;
3735
import io.netty.handler.ssl.JdkApplicationProtocolNegotiator;
38-
import io.netty.handler.ssl.SslContext;
39-
import io.netty.handler.ssl.SslContextOption;
40-
import io.netty.handler.ssl.SslProvider;
4136
import io.netty.util.concurrent.GlobalEventExecutor;
4237
import io.netty.util.internal.logging.InternalLoggerFactory;
4338
import io.netty.util.internal.logging.JdkLoggerFactory;
44-
import java.security.PrivateKey;
45-
import java.security.Provider;
46-
import java.security.SecureRandom;
47-
import java.security.cert.X509Certificate;
48-
import java.util.Map;
49-
import javax.net.ssl.KeyManagerFactory;
5039
import javax.net.ssl.SSLEngine;
51-
import javax.net.ssl.SSLException;
52-
import javax.net.ssl.TrustManagerFactory;
5340

5441
/**
5542
* This substitution avoid having loggers added to the build
@@ -65,55 +52,6 @@ private static InternalLoggerFactory newDefaultFactory(String name) {
6552

6653
// SSL
6754
// This whole section is mostly about removing static analysis references to openssl/tcnative
68-
69-
@TargetClass(className = "io.netty.handler.ssl.JdkSslServerContext")
70-
final class Target_io_netty_handler_ssl_JdkSslServerContext {
71-
72-
@Alias
73-
Target_io_netty_handler_ssl_JdkSslServerContext(
74-
Provider provider,
75-
X509Certificate[] trustCertCollection,
76-
TrustManagerFactory trustManagerFactory,
77-
X509Certificate[] keyCertChain,
78-
PrivateKey key,
79-
String keyPassword,
80-
KeyManagerFactory keyManagerFactory,
81-
Iterable<String> ciphers,
82-
CipherSuiteFilter cipherFilter,
83-
ApplicationProtocolConfig apn,
84-
long sessionCacheSize,
85-
long sessionTimeout,
86-
ClientAuth clientAuth,
87-
String[] protocols,
88-
boolean startTls,
89-
SecureRandom secureRandom,
90-
String keyStore)
91-
throws SSLException {}
92-
}
93-
94-
@TargetClass(className = "io.netty.handler.ssl.JdkSslClientContext")
95-
final class Target_io_netty_handler_ssl_JdkSslClientContext {
96-
97-
@Alias
98-
Target_io_netty_handler_ssl_JdkSslClientContext(
99-
Provider sslContextProvider,
100-
X509Certificate[] trustCertCollection,
101-
TrustManagerFactory trustManagerFactory,
102-
X509Certificate[] keyCertChain,
103-
PrivateKey key,
104-
String keyPassword,
105-
KeyManagerFactory keyManagerFactory,
106-
Iterable<String> ciphers,
107-
CipherSuiteFilter cipherFilter,
108-
ApplicationProtocolConfig apn,
109-
String[] protocols,
110-
long sessionCacheSize,
111-
long sessionTimeout,
112-
SecureRandom secureRandom,
113-
String keyStoreType)
114-
throws SSLException {}
115-
}
116-
11755
@TargetClass(className = "io.netty.handler.ssl.SslHandler$SslEngineType")
11856
final class Target_io_netty_handler_ssl_SslHandler$SslEngineType {
11957

@@ -196,99 +134,6 @@ final class Target_io_netty_handler_ssl_JdkAlpnSslEngine {
196134
final boolean isServer) {}
197135
}
198136

199-
@TargetClass(className = "io.netty.handler.ssl.SslContext")
200-
final class Target_io_netty_handler_ssl_SslContext {
201-
202-
@Substitute
203-
static SslContext newServerContextInternal(
204-
SslProvider provider,
205-
Provider sslContextProvider,
206-
X509Certificate[] trustCertCollection,
207-
TrustManagerFactory trustManagerFactory,
208-
X509Certificate[] keyCertChain,
209-
PrivateKey key,
210-
String keyPassword,
211-
KeyManagerFactory keyManagerFactory,
212-
Iterable<String> ciphers,
213-
CipherSuiteFilter cipherFilter,
214-
ApplicationProtocolConfig apn,
215-
long sessionCacheSize,
216-
long sessionTimeout,
217-
ClientAuth clientAuth,
218-
String[] protocols,
219-
boolean startTls,
220-
boolean enableOcsp,
221-
SecureRandom secureRandom,
222-
String keyStoreType,
223-
Map.Entry<SslContextOption<?>, Object>... ctxOptions)
224-
throws SSLException {
225-
226-
if (enableOcsp) {
227-
throw new IllegalArgumentException("OCSP is not supported with this SslProvider: " + provider);
228-
}
229-
return (SslContext) (Object) new Target_io_netty_handler_ssl_JdkSslServerContext(
230-
sslContextProvider,
231-
trustCertCollection,
232-
trustManagerFactory,
233-
keyCertChain,
234-
key,
235-
keyPassword,
236-
keyManagerFactory,
237-
ciphers,
238-
cipherFilter,
239-
apn,
240-
sessionCacheSize,
241-
sessionTimeout,
242-
clientAuth,
243-
protocols,
244-
startTls,
245-
secureRandom,
246-
keyStoreType);
247-
}
248-
249-
@Substitute
250-
static SslContext newClientContextInternal(
251-
SslProvider provider,
252-
Provider sslContextProvider,
253-
X509Certificate[] trustCert,
254-
TrustManagerFactory trustManagerFactory,
255-
X509Certificate[] keyCertChain,
256-
PrivateKey key,
257-
String keyPassword,
258-
KeyManagerFactory keyManagerFactory,
259-
Iterable<String> ciphers,
260-
CipherSuiteFilter cipherFilter,
261-
ApplicationProtocolConfig apn,
262-
String[] protocols,
263-
long sessionCacheSize,
264-
long sessionTimeout,
265-
boolean enableOcsp,
266-
SecureRandom secureRandom,
267-
String keyStoreType,
268-
Map.Entry<SslContextOption<?>, Object>... options)
269-
throws SSLException {
270-
if (enableOcsp) {
271-
throw new IllegalArgumentException("OCSP is not supported with this SslProvider: " + provider);
272-
}
273-
return (SslContext) (Object) new Target_io_netty_handler_ssl_JdkSslClientContext(
274-
sslContextProvider,
275-
trustCert,
276-
trustManagerFactory,
277-
keyCertChain,
278-
key,
279-
keyPassword,
280-
keyManagerFactory,
281-
ciphers,
282-
cipherFilter,
283-
apn,
284-
protocols,
285-
sessionCacheSize,
286-
sessionTimeout,
287-
secureRandom,
288-
keyStoreType);
289-
}
290-
}
291-
292137
@TargetClass(className = "io.netty.handler.ssl.JdkDefaultApplicationProtocolNegotiator")
293138
final class Target_io_netty_handler_ssl_JdkDefaultApplicationProtocolNegotiator {
294139

‎driver/src/main/resources/META-INF/native-image/org.neo4j.driver/neo4j-java-driver/reflection-config.json

+18
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,23 @@
5454
"fields": [
5555
{"name": "consumerIndex", "allowUnsafeAccess": true}
5656
]
57+
},
58+
{
59+
"name" : "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerIndexField",
60+
"fields": [
61+
{"name": "producerIndex", "allowUnsafeAccess": true}
62+
]
63+
},
64+
{
65+
"name" : "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueProducerLimitField",
66+
"fields": [
67+
{"name": "producerLimit", "allowUnsafeAccess": true}
68+
]
69+
},
70+
{
71+
"name" : "io.netty.util.internal.shaded.org.jctools.queues.unpadded.MpscUnpaddedArrayQueueConsumerIndexField",
72+
"fields": [
73+
{"name": "consumerIndex", "allowUnsafeAccess": true}
74+
]
5775
}
5876
]

‎pom.xml

+9-9
Original file line numberDiff line numberDiff line change
@@ -34,26 +34,26 @@
3434
<!-- Please note that when updating this dependency -->
3535
<!-- (i.e. due to a security vulnerability or bug) that the -->
3636
<!-- corresponding server dependency also needs updating.-->
37-
<netty-bom.version>4.1.111.Final</netty-bom.version>
37+
<netty-bom.version>4.1.115.Final</netty-bom.version>
3838
<!-- Please note that when updating this dependency -->
3939
<!-- (i.e. due to a security vulnerability or bug) that the -->
4040
<!-- corresponding server dependency also needs updating.-->
41-
<reactor-bom.version>2023.0.7</reactor-bom.version>
41+
<reactor-bom.version>2023.0.11</reactor-bom.version>
4242
<rxjava.version>2.2.21</rxjava.version>
4343
<slf4j-api.version>1.7.36</slf4j-api.version>
4444
<hamcrest-junit.version>2.0.0.0</hamcrest-junit.version>
4545
<mockito-core.version>4.11.0</mockito-core.version>
4646
<junit.version>5.9.3</junit.version>
4747
<testng-engine.version>1.0.5</testng-engine.version>
4848
<jarchivelib.version>1.2.0</jarchivelib.version>
49-
<bouncycastle-jdk18on.version>1.78.1</bouncycastle-jdk18on.version>
49+
<bouncycastle-jdk18on.version>1.79</bouncycastle-jdk18on.version>
5050
<logback-classic.version>1.2.13</logback-classic.version>
51-
<jackson.version>2.17.1</jackson.version>
52-
<lombok.version>1.18.32</lombok.version>
53-
<svm.version>21.3.10</svm.version>
54-
<micrometer.version>1.13.1</micrometer.version>
55-
<testcontainers.version>1.19.8</testcontainers.version>
56-
<build-resources.version>4.4.34</build-resources.version>
51+
<jackson.version>2.18.2</jackson.version>
52+
<lombok.version>1.18.36</lombok.version>
53+
<svm.version>21.3.12</svm.version>
54+
<micrometer.version>1.13.8</micrometer.version>
55+
<testcontainers.version>1.20.4</testcontainers.version>
56+
<build-resources.version>4.4.39</build-resources.version>
5757
<!-- To be overwritten by child projects -->
5858
<moduleName/>
5959
</properties>

0 commit comments

Comments
 (0)