Skip to content

Commit

Permalink
[DPP-586] Upgrade to netty 4.1.67.Final and netty-tcnative-boringssl-…
Browse files Browse the repository at this point in the history
…static 2.0.40.Final (#10956)

1. Upgrading netty to 4.1.67.Final. 
    Netty release notes: https://netty.io/news/2021/08/16/4-1-67-Final.html
2. Upgrading netty-tcnative-boringssl-static to corresponding version as listed here:
    https://github.com/netty/netty/blob/netty-4.1.67.Final/pom.xml#L511: 
   `<tcnative.version>2.0.40.Final</tcnative.version>`

NOTE: As of this upgrade TLS 1.1 and 1.0 are getting disabled by default  (see https://netty.io/news/2021/05/19/4-1-65-Final.html)


CHANGELOG_BEGIN
Daml on SQL, Integration Kit, Sandbox: Drop support for TLS 1.0 and 1.1 in Ledger API.
CHANGELOG_END
  • Loading branch information
pbatko-da authored Sep 23, 2021
1 parent 871d03b commit 8de162b
Show file tree
Hide file tree
Showing 4 changed files with 892 additions and 886 deletions.
12 changes: 10 additions & 2 deletions bazel-java-deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,15 @@ version_specific = {
],
}

netty_version = "4.1.58.Final"
netty_version = "4.1.67.Final"

# ** Upgrading tcnative in sync with main netty version **
# Look for "tcnative.version" in top-level pom.xml.
# For example for netty version netty-4.1.68.Final look here https://github.com/netty/netty/blob/netty-4.1.68.Final/pom.xml#L511:
# ```
# <tcnative.version>2.0.42.Final</tcnative.version>
# ```
netty_tcnative_version = "2.0.40.Final"
grpc_version = "1.35.0"
akka_version = "2.6.13"

Expand Down Expand Up @@ -129,7 +137,7 @@ def install_java_deps():
"io.netty:netty-handler:{}".format(netty_version),
"io.netty:netty-handler-proxy:{}".format(netty_version),
"io.netty:netty-resolver:{}".format(netty_version),
"io.netty:netty-tcnative-boringssl-static:2.0.36.Final",
"io.netty:netty-tcnative-boringssl-static:{}".format(netty_tcnative_version),
# protobuf
"com.google.protobuf:protobuf-java:3.17.1",
#scalapb
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,6 @@ class TlsConfigurationTest extends AnyWordSpec with Matchers with BeforeAndAfter
"is default" in {
getServerEnabledProtocols(None) shouldBe Seq(
"SSLv2Hello",
"TLSv1",
"TLSv1.1",
"TLSv1.2",
"TLSv1.3",
)
Expand Down
Loading

0 comments on commit 8de162b

Please sign in to comment.