update SECURITY.md and bazel artifact versions to reflect netty update

grpc · Dec 29, 2021 · 9638034 · 9638034
1 parent 2613ed1
commit 9638034
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 14 deletions.
diff --git a/SECURITY.md b/SECURITY.md
@@ -409,7 +409,8 @@ 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-1.43.x      | 4.1.63.Final          | 2.0.38.Final
+1.44.x             | 4.1.72.Final          | 2.0.46.Final
 
 _(grpc-netty-shaded avoids issues with keeping these versions in sync.)_
 

diff --git 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/unix.sh b/buildscripts/kokoro/unix.sh
@@ -24,6 +24,9 @@ fi
 cd $(dirname $0)/../..
 
 # TODO(zpencer): always make sure we are using Oracle jdk8
+if [[ -f /usr/libexec/java_home ]]; then
+    JAVA_HOME=$(/usr/libexec/java_home -v"1.8.0")
+fi
 
 # ARCH is x86_64 unless otherwise specified.
 ARCH="${ARCH:-x86_64}"

diff --git a/netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java b/netty/src/test/java/io/grpc/netty/ProtocolNegotiatorsTest.java
@@ -415,7 +415,9 @@ public void from_tls_clientAuthRequire_noClientCert() throws Exception {
         .trustManager(caCert)
         .build();
     Status status = expectFailedHandshake(channelCreds, serverCreds);
-    assertThat(status.getDescription()).isEqualTo("ssl exception");
+    if (!"ssl exception".equals(status.getDescription())) {
+      assertThat(status.getDescription()).startsWith("io exception");
+    }
   }
 
   @Test

diff --git 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.72.Final",
+    "io.netty:netty-codec-http2:4.1.72.Final",
+    "io.netty:netty-codec-http:4.1.72.Final",
+    "io.netty:netty-codec-socks:4.1.72.Final",
+    "io.netty:netty-codec:4.1.72.Final",
+    "io.netty:netty-common:4.1.72.Final",
+    "io.netty:netty-handler-proxy:4.1.72.Final",
+    "io.netty:netty-handler:4.1.72.Final",
+    "io.netty:netty-resolver:4.1.72.Final",
+    "io.netty:netty-tcnative-boringssl-static:2.0.46.Final",
+    "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.72.Final",
+    "io.netty:netty-transport:4.1.72.Final",
     "io.opencensus:opencensus-api:0.24.0",
     "io.opencensus:opencensus-contrib-grpc-metrics:0.24.0",
     "io.perfmark:perfmark-api:0.23.0",