diff --git a/README.md b/README.md index 2debaa8573..3bb2f915fb 100644 --- a/README.md +++ b/README.md @@ -84,9 +84,7 @@ Before contributing to this project, please take a few minutes to read our [Cont ### Java Version -For the 1.5+ Driver Series, the source code _must_ compile on Java 8. - -For the previous versions, the compilation requires Java 7. +For the 4.4.x Driver Series, the source code _must_ compile on Java 8. ### Building 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 8e4e535d32..21b82f8347 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 @@ -43,6 +43,7 @@ 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; @@ -85,6 +86,7 @@ final class Target_io_netty_handler_ssl_JdkSslServerContext { ClientAuth clientAuth, String[] protocols, boolean startTls, + SecureRandom secureRandom, String keyStore) throws SSLException {} } @@ -107,6 +109,7 @@ final class Target_io_netty_handler_ssl_JdkSslClientContext { String[] protocols, long sessionCacheSize, long sessionTimeout, + SecureRandom secureRandom, String keyStoreType) throws SSLException {} } @@ -215,6 +218,7 @@ static SslContext newServerContextInternal( String[] protocols, boolean startTls, boolean enableOcsp, + SecureRandom secureRandom, String keyStoreType, Map.Entry, Object>... ctxOptions) throws SSLException { @@ -238,6 +242,7 @@ static SslContext newServerContextInternal( clientAuth, protocols, startTls, + secureRandom, keyStoreType); } @@ -258,6 +263,7 @@ static SslContext newClientContextInternal( long sessionCacheSize, long sessionTimeout, boolean enableOcsp, + SecureRandom secureRandom, String keyStoreType, Map.Entry, Object>... options) throws SSLException { @@ -278,6 +284,7 @@ static SslContext newClientContextInternal( protocols, sessionCacheSize, sessionTimeout, + secureRandom, keyStoreType); } } diff --git a/pom.xml b/pom.xml index 52697233f6..485826d8b9 100644 --- a/pom.xml +++ b/pom.xml @@ -34,11 +34,11 @@ - 4.1.109.Final + 4.1.110.Final - 2023.0.5 + 2023.0.6 2.2.21 1.7.36 2.0.0.0 @@ -48,12 +48,12 @@ 1.2.0 1.78.1 1.2.13 - 2.17.0 + 2.17.1 1.18.32 21.3.10 - 1.12.5 - 1.19.7 - 4.4.32 + 1.13.0 + 1.19.8 + 4.4.34 diff --git a/testkit-backend/LICENSES.txt b/testkit-backend/LICENSES.txt index 87c1178ba9..ef04ce5961 100644 --- a/testkit-backend/LICENSES.txt +++ b/testkit-backend/LICENSES.txt @@ -4,7 +4,6 @@ libraries. For an overview of the licenses see the NOTICE.txt file. ------------------------------------------------------------------------------ Apache Software License, Version 2.0 - Byte Buddy (without dependencies) Jackson-annotations Jackson-core jackson-databind diff --git a/testkit-backend/NOTICE.txt b/testkit-backend/NOTICE.txt index 6fb64aaf6a..affa7c0181 100644 --- a/testkit-backend/NOTICE.txt +++ b/testkit-backend/NOTICE.txt @@ -19,7 +19,6 @@ Third-party licenses -------------------- Apache Software License, Version 2.0 - Byte Buddy (without dependencies) Jackson-annotations Jackson-core jackson-databind