diff --git a/SECURITY.md b/SECURITY.md index df9061eab8f..f1130dbe85e 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -409,7 +409,7 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver 1.29.x-1.31.x | 4.1.48.Final | 2.0.30.Final 1.32.x-1.34.x | 4.1.51.Final | 2.0.31.Final 1.35.x-1.41.x | 4.1.52.Final | 2.0.34.Final -1.42.x- | 4.1.63.Final | 2.0.38.Final +1.42.x- | 4.1.69.Final | 2.0.44.Final _(grpc-netty-shaded avoids issues with keeping these versions in sync.)_ diff --git a/build.gradle b/build.gradle index f68125fa5d7..07df31f2761 100644 --- a/build.gradle +++ b/build.gradle @@ -54,7 +54,7 @@ subprojects { protocPluginBaseName = 'protoc-gen-grpc-java' javaPluginPath = "$rootDir/compiler/build/exe/java_plugin/$protocPluginBaseName$exeSuffix" - nettyVersion = '4.1.63.Final' + nettyVersion = '4.1.69.Final' guavaVersion = '30.1.1-android' googleauthVersion = '0.22.2' protobufVersion = '3.19.2' @@ -176,7 +176,7 @@ subprojects { // SECURITY.md (multiple occurrences) // examples/example-tls/build.gradle // examples/example-tls/pom.xml - netty_tcnative: 'io.netty:netty-tcnative-boringssl-static:2.0.38.Final', + netty_tcnative: 'io.netty:netty-tcnative-boringssl-static:2.0.44.Final', conscrypt: 'org.conscrypt:conscrypt-openjdk-uber:2.5.1', re2j: 'com.google.re2j:re2j:1.5', diff --git a/buildscripts/kokoro/linux_artifacts.cfg b/buildscripts/kokoro/linux_artifacts.cfg index 0938e4bff2e..330b09eb025 100644 --- a/buildscripts/kokoro/linux_artifacts.cfg +++ b/buildscripts/kokoro/linux_artifacts.cfg @@ -6,6 +6,7 @@ timeout_mins: 60 action { define_artifacts { + regex: "github/grpc-java/**/build/reports/**" regex: "github/grpc-java/mvn-artifacts/**" regex: "github/grpc-java/artifacts/**" } diff --git a/buildscripts/kokoro/macos.cfg b/buildscripts/kokoro/macos.cfg index 310e1130416..a6bf290d1ec 100644 --- a/buildscripts/kokoro/macos.cfg +++ b/buildscripts/kokoro/macos.cfg @@ -15,6 +15,7 @@ env_vars { # We always build mvn artifacts. action { define_artifacts { + regex: "github/grpc-java/**/build/reports/**" regex: "github/grpc-java/mvn-artifacts/**" } } diff --git a/buildscripts/kokoro/windows.cfg b/buildscripts/kokoro/windows.cfg index 6b2703f99c9..cf0850332b1 100644 --- a/buildscripts/kokoro/windows.cfg +++ b/buildscripts/kokoro/windows.cfg @@ -7,6 +7,7 @@ timeout_mins: 45 # We always build mvn artifacts. action { define_artifacts { + regex: "github/grpc-java/**/build/reports/**" regex: "**/build/test-results/**/*.xml" regex: "github/grpc-java/mvn-artifacts/**" } diff --git a/examples/example-tls/pom.xml b/examples/example-tls/pom.xml index 193e05fd812..0cea2fd8445 100644 --- a/examples/example-tls/pom.xml +++ b/examples/example-tls/pom.xml @@ -14,7 +14,7 @@ UTF-8 1.44.0-SNAPSHOT 3.19.2 - 2.0.34.Final + 2.0.44.Final 1.7 1.7 diff --git a/netty/build.gradle b/netty/build.gradle index 00726940cde..12406cf9655 100644 --- a/netty/build.gradle +++ b/netty/build.gradle @@ -54,6 +54,7 @@ project.sourceSets { test { // Allow testing Jetty ALPN in TlsTest jvmArgs "-javaagent:" + configurations.alpnagent.asPath + systemProperty "io.netty.handler.ssl.openssl.useTasks", "false" } jmh { diff --git a/netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java b/netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java index d333d1cc8c6..7a9ebd7fb71 100644 --- a/netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java +++ b/netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java @@ -415,6 +415,12 @@ public void from_tls_clientAuthRequire_noClientCert() throws Exception { .trustManager(caCert) .build(); Status status = expectFailedHandshake(channelCreds, serverCreds); + if (status.getCause() != null) { + status.getCause().printStackTrace(); + } else { + Logger logger = Logger.getLogger(ProtocolNegotiators.class.getName()); + logger.severe("status has no exception attached"); + } assertThat(status.getDescription()).isEqualTo("ssl exception"); } diff --git a/repositories.bzl b/repositories.bzl index e5e5ccb0a55..678a739729b 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -25,18 +25,18 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "com.google.truth:truth:1.0.1", "com.squareup.okhttp:okhttp:2.7.4", "com.squareup.okio:okio:1.17.5", - "io.netty:netty-buffer:4.1.63.Final", - "io.netty:netty-codec-http2:4.1.63.Final", - "io.netty:netty-codec-http:4.1.63.Final", - "io.netty:netty-codec-socks:4.1.63.Final", - "io.netty:netty-codec:4.1.63.Final", - "io.netty:netty-common:4.1.63.Final", - "io.netty:netty-handler-proxy:4.1.63.Final", - "io.netty:netty-handler:4.1.63.Final", - "io.netty:netty-resolver:4.1.63.Final", - "io.netty:netty-tcnative-boringssl-static:2.0.38.Final", - "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.63.Final", - "io.netty:netty-transport:4.1.63.Final", + "io.netty:netty-buffer:4.1.69.Final", + "io.netty:netty-codec-http2:4.1.69.Final", + "io.netty:netty-codec-http:4.1.69.Final", + "io.netty:netty-codec-socks:4.1.69.Final", + "io.netty:netty-codec:4.1.69.Final", + "io.netty:netty-common:4.1.69.Final", + "io.netty:netty-handler-proxy:4.1.69.Final", + "io.netty:netty-handler:4.1.69.Final", + "io.netty:netty-resolver:4.1.69.Final", + "io.netty:netty-tcnative-boringssl-static:2.0.44.Final", + "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.69.Final", + "io.netty:netty-transport:4.1.69.Final", "io.opencensus:opencensus-api:0.24.0", "io.opencensus:opencensus-contrib-grpc-metrics:0.24.0", "io.perfmark:perfmark-api:0.23.0",