Skip to content

Commit

Permalink
Update dependencies (#1553)
Browse files Browse the repository at this point in the history
  • Loading branch information
injectives authored May 30, 2024
1 parent b4dc7f2 commit abd2252
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -85,6 +86,7 @@ final class Target_io_netty_handler_ssl_JdkSslServerContext {
ClientAuth clientAuth,
String[] protocols,
boolean startTls,
SecureRandom secureRandom,
String keyStore)
throws SSLException {}
}
Expand All @@ -107,6 +109,7 @@ final class Target_io_netty_handler_ssl_JdkSslClientContext {
String[] protocols,
long sessionCacheSize,
long sessionTimeout,
SecureRandom secureRandom,
String keyStoreType)
throws SSLException {}
}
Expand Down Expand Up @@ -215,6 +218,7 @@ static SslContext newServerContextInternal(
String[] protocols,
boolean startTls,
boolean enableOcsp,
SecureRandom secureRandom,
String keyStoreType,
Map.Entry<SslContextOption<?>, Object>... ctxOptions)
throws SSLException {
Expand All @@ -238,6 +242,7 @@ static SslContext newServerContextInternal(
clientAuth,
protocols,
startTls,
secureRandom,
keyStoreType);
}

Expand All @@ -258,6 +263,7 @@ static SslContext newClientContextInternal(
long sessionCacheSize,
long sessionTimeout,
boolean enableOcsp,
SecureRandom secureRandom,
String keyStoreType,
Map.Entry<SslContextOption<?>, Object>... options)
throws SSLException {
Expand All @@ -278,6 +284,7 @@ static SslContext newClientContextInternal(
protocols,
sessionCacheSize,
sessionTimeout,
secureRandom,
keyStoreType);
}
}
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
<!-- 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.109.Final</netty-bom.version>
<netty-bom.version>4.1.110.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.5</reactor-bom.version>
<reactor-bom.version>2023.0.6</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>
Expand All @@ -48,12 +48,12 @@
<jarchivelib.version>1.2.0</jarchivelib.version>
<bouncycastle-jdk18on.version>1.78.1</bouncycastle-jdk18on.version>
<logback-classic.version>1.2.13</logback-classic.version>
<jackson.version>2.17.0</jackson.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.12.5</micrometer.version>
<testcontainers.version>1.19.7</testcontainers.version>
<build-resources.version>4.4.32</build-resources.version>
<micrometer.version>1.13.0</micrometer.version>
<testcontainers.version>1.19.8</testcontainers.version>
<build-resources.version>4.4.34</build-resources.version>
<!-- To be overwritten by child projects -->
<moduleName/>
</properties>
Expand Down
1 change: 0 additions & 1 deletion testkit-backend/LICENSES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion testkit-backend/NOTICE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ Third-party licenses
--------------------

Apache Software License, Version 2.0
Byte Buddy (without dependencies)
Jackson-annotations
Jackson-core
jackson-databind
Expand Down

0 comments on commit abd2252

Please sign in to comment.