flasn4nt
/
grpc-java
mirror of https://github.com/grpc/grpc-java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Netty upgrade to 4.1.110 in grpc-java (#11273)" 

This reverts commit f9b072cfe2.

Changes from the release process got mixed in with the commit.
This commit is contained in:
Eric Anderson 2024-08-02 14:46:14 -07:00
parent 15456f8f0a
commit 9bed655c56
36 changed files with 101 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
MODULE.bazel
View File

@ -2,7 +2,7 @@ module(
name = "grpc-java", name = "grpc-java",
compatibility_level = 0, compatibility_level = 0,
repo_name = "io_grpc_grpc_java", repo_name = "io_grpc_grpc_java",
version = "1.66.0-SNAPSHOT", # CURRENT_GRPC_VERSION version = "1.67.0-SNAPSHOT", # CURRENT_GRPC_VERSION
) )
# GRPC_DEPS_START # GRPC_DEPS_START
@ -22,20 +22,20 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
"com.google.truth:truth:1.4.2", "com.google.truth:truth:1.4.2",
"com.squareup.okhttp:okhttp:2.7.5", "com.squareup.okhttp:okhttp:2.7.5",
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day "com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
"io.netty:netty-buffer:4.1.110.Final", "io.netty:netty-buffer:4.1.100.Final",
"io.netty:netty-codec-http2:4.1.110.Final", "io.netty:netty-codec-http2:4.1.100.Final",
"io.netty:netty-codec-http:4.1.110.Final", "io.netty:netty-codec-http:4.1.100.Final",
"io.netty:netty-codec-socks:4.1.110.Final", "io.netty:netty-codec-socks:4.1.100.Final",
"io.netty:netty-codec:4.1.110.Final", "io.netty:netty-codec:4.1.100.Final",
"io.netty:netty-common:4.1.110.Final", "io.netty:netty-common:4.1.100.Final",
"io.netty:netty-handler-proxy:4.1.110.Final", "io.netty:netty-handler-proxy:4.1.100.Final",
"io.netty:netty-handler:4.1.110.Final", "io.netty:netty-handler:4.1.100.Final",
"io.netty:netty-resolver:4.1.110.Final", "io.netty:netty-resolver:4.1.100.Final",
"io.netty:netty-tcnative-boringssl-static:2.0.65.Final", "io.netty:netty-tcnative-boringssl-static:2.0.61.Final",
"io.netty:netty-tcnative-classes:2.0.65.Final", "io.netty:netty-tcnative-classes:2.0.61.Final",
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.110.Final", "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.100.Final",
"io.netty:netty-transport-native-unix-common:4.1.110.Final", "io.netty:netty-transport-native-unix-common:4.1.100.Final",
"io.netty:netty-transport:4.1.110.Final", "io.netty:netty-transport:4.1.100.Final",
"io.opencensus:opencensus-api:0.31.0", "io.opencensus:opencensus-api:0.31.0",
"io.opencensus:opencensus-contrib-grpc-metrics:0.31.0", "io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
"io.perfmark:perfmark-api:0.27.0", "io.perfmark:perfmark-api:0.27.0",

36
README.md
View File

@ -44,8 +44,8 @@ For a guided tour, take a look at the [quick start
guide](https://grpc.io/docs/languages/java/quickstart) or the more explanatory [gRPC guide](https://grpc.io/docs/languages/java/quickstart) or the more explanatory [gRPC
basics](https://grpc.io/docs/languages/java/basics). basics](https://grpc.io/docs/languages/java/basics).
The [examples](https://github.com/grpc/grpc-java/tree/v1.66.0/examples) and the The [examples](https://github.com/grpc/grpc-java/tree/v1.65.0/examples) and the
[Android example](https://github.com/grpc/grpc-java/tree/v1.66.0/examples/android) [Android example](https://github.com/grpc/grpc-java/tree/v1.65.0/examples/android)
are standalone projects that showcase the usage of gRPC. are standalone projects that showcase the usage of gRPC.
Download Download
@ -56,18 +56,18 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`:
<dependency> <dependency>
<groupId>io.grpc</groupId> <groupId>io.grpc</groupId>
<artifactId>grpc-netty-shaded</artifactId> <artifactId>grpc-netty-shaded</artifactId>
<version>1.66.0</version> <version>1.65.0</version>
<scope>runtime</scope> <scope>runtime</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.grpc</groupId> <groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId> <artifactId>grpc-protobuf</artifactId>
<version>1.66.0</version> <version>1.65.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.grpc</groupId> <groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId> <artifactId>grpc-stub</artifactId>
<version>1.66.0</version> <version>1.65.0</version>
</dependency> </dependency>
<dependency> <!-- necessary for Java 9+ --> <dependency> <!-- necessary for Java 9+ -->
<groupId>org.apache.tomcat</groupId> <groupId>org.apache.tomcat</groupId>
@ -79,18 +79,18 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`:
Or for Gradle with non-Android, add to your dependencies: Or for Gradle with non-Android, add to your dependencies:
```gradle ```gradle
runtimeOnly 'io.grpc:grpc-netty-shaded:1.66.0' runtimeOnly 'io.grpc:grpc-netty-shaded:1.65.0'
implementation 'io.grpc:grpc-protobuf:1.66.0' implementation 'io.grpc:grpc-protobuf:1.65.0'
implementation 'io.grpc:grpc-stub:1.66.0' implementation 'io.grpc:grpc-stub:1.65.0'
compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+ compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+
``` ```
For Android client, use `grpc-okhttp` instead of `grpc-netty-shaded` and For Android client, use `grpc-okhttp` instead of `grpc-netty-shaded` and
`grpc-protobuf-lite` instead of `grpc-protobuf`: `grpc-protobuf-lite` instead of `grpc-protobuf`:
```gradle ```gradle
implementation 'io.grpc:grpc-okhttp:1.66.0' implementation 'io.grpc:grpc-okhttp:1.65.0'
implementation 'io.grpc:grpc-protobuf-lite:1.66.0' implementation 'io.grpc:grpc-protobuf-lite:1.65.0'
implementation 'io.grpc:grpc-stub:1.66.0' implementation 'io.grpc:grpc-stub:1.65.0'
compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+ compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+
``` ```
@ -99,7 +99,7 @@ For [Bazel](https://bazel.build), you can either
(with the GAVs from above), or use `@io_grpc_grpc_java//api` et al (see below). (with the GAVs from above), or use `@io_grpc_grpc_java//api` et al (see below).
[the JARs]: [the JARs]:
https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.66.0 https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.65.0
Development snapshots are available in [Sonatypes's snapshot Development snapshots are available in [Sonatypes's snapshot
repository](https://oss.sonatype.org/content/repositories/snapshots/). repository](https://oss.sonatype.org/content/repositories/snapshots/).
@ -129,9 +129,9 @@ For protobuf-based codegen integrated with the Maven build system, you can use
<artifactId>protobuf-maven-plugin</artifactId> <artifactId>protobuf-maven-plugin</artifactId>
<version>0.6.1</version> <version>0.6.1</version>
<configuration> <configuration>
<protocArtifact>com.google.protobuf:protoc:3.25.3:exe:${os.detected.classifier}</protocArtifact> <protocArtifact>com.google.protobuf:protoc:3.25.1:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId> <pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.66.0:exe:${os.detected.classifier}</pluginArtifact> <pluginArtifact>io.grpc:protoc-gen-grpc-java:1.65.0:exe:${os.detected.classifier}</pluginArtifact>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
@ -157,11 +157,11 @@ plugins {
protobuf { protobuf {
protoc { protoc {
artifact = "com.google.protobuf:protoc:3.25.3" artifact = "com.google.protobuf:protoc:3.25.1"
} }
plugins { plugins {
grpc { grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.66.0' artifact = 'io.grpc:protoc-gen-grpc-java:1.65.0'
} }
} }
generateProtoTasks { generateProtoTasks {
@ -190,11 +190,11 @@ plugins {
protobuf { protobuf {
protoc { protoc {
artifact = "com.google.protobuf:protoc:3.25.3" artifact = "com.google.protobuf:protoc:3.25.1"
} }
plugins { plugins {
grpc { grpc {
artifact = 'io.grpc:protoc-gen-grpc-java:1.66.0' artifact = 'io.grpc:protoc-gen-grpc-java:1.65.0'
} }
} }
generateProtoTasks { generateProtoTasks {

3
SECURITY.md
View File

@ -398,8 +398,7 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver
1.56.x | 4.1.87.Final | 2.0.61.Final 1.56.x | 4.1.87.Final | 2.0.61.Final
1.57.x-1.58.x | 4.1.93.Final | 2.0.61.Final 1.57.x-1.58.x | 4.1.93.Final | 2.0.61.Final
1.59.x | 4.1.97.Final | 2.0.61.Final 1.59.x | 4.1.97.Final | 2.0.61.Final
1.60.x-1.65.x | 4.1.100.Final | 2.0.61.Final 1.60.x- | 4.1.100.Final | 2.0.61.Final
1.66.x- | 4.1.110.Final | 2.0.65.Final
_(grpc-netty-shaded avoids issues with keeping these versions in sync.)_ _(grpc-netty-shaded avoids issues with keeping these versions in sync.)_

2
build.gradle
View File

@ -21,7 +21,7 @@ subprojects {
apply plugin: "net.ltgt.errorprone" apply plugin: "net.ltgt.errorprone"
group = "io.grpc" group = "io.grpc"
version = "1.66.0-SNAPSHOT" // CURRENT_GRPC_VERSION version = "1.67.0-SNAPSHOT" // CURRENT_GRPC_VERSION
repositories { repositories {
maven { // The google mirror is less flaky than mavenCentral() maven { // The google mirror is less flaky than mavenCentral()

2
compiler/src/test/golden/TestDeprecatedService.java.txt
View File

@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
* </pre> * </pre>
*/ */
@javax.annotation.Generated( @javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.66.0-SNAPSHOT)", value = "by gRPC proto compiler (version 1.67.0-SNAPSHOT)",
comments = "Source: grpc/testing/compiler/test.proto") comments = "Source: grpc/testing/compiler/test.proto")
@io.grpc.stub.annotations.GrpcGenerated @io.grpc.stub.annotations.GrpcGenerated
@java.lang.Deprecated @java.lang.Deprecated

2
compiler/src/test/golden/TestService.java.txt
View File

@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
* </pre> * </pre>
*/ */
@javax.annotation.Generated( @javax.annotation.Generated(
value = "by gRPC proto compiler (version 1.66.0-SNAPSHOT)", value = "by gRPC proto compiler (version 1.67.0-SNAPSHOT)",
comments = "Source: grpc/testing/compiler/test.proto") comments = "Source: grpc/testing/compiler/test.proto")
@io.grpc.stub.annotations.GrpcGenerated @io.grpc.stub.annotations.GrpcGenerated
public final class TestServiceGrpc { public final class TestServiceGrpc {

2
core/src/main/java/io/grpc/internal/GrpcUtil.java
View File

@ -219,7 +219,7 @@ public final class GrpcUtil {
public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults(); public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults();
public static final String IMPLEMENTATION_VERSION = "1.66.0-SNAPSHOT"; // CURRENT_GRPC_VERSION public static final String IMPLEMENTATION_VERSION = "1.67.0-SNAPSHOT"; // CURRENT_GRPC_VERSION
/** /**
* The default timeout in nanos for a keepalive ping request. * The default timeout in nanos for a keepalive ping request.

10
examples/android/clientcache/app/build.gradle
View File

@ -34,7 +34,7 @@ android {
protobuf { protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.25.1' } protoc { artifact = 'com.google.protobuf:protoc:3.25.1' }
plugins { plugins {
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
} }
} }
generateProtoTasks { generateProtoTasks {
@ -54,12 +54,12 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.0.0' implementation 'androidx.appcompat:appcompat:1.0.0'
// You need to build grpc-java to obtain these libraries below. // You need to build grpc-java to obtain these libraries below.
implementation 'io.grpc:grpc-okhttp:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'io.grpc:grpc-okhttp:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'io.grpc:grpc-protobuf-lite:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'io.grpc:grpc-stub:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'org.apache.tomcat:annotations-api:6.0.53' implementation 'org.apache.tomcat:annotations-api:6.0.53'
testImplementation 'junit:junit:4.13.2' testImplementation 'junit:junit:4.13.2'
testImplementation 'com.google.truth:truth:1.1.5' testImplementation 'com.google.truth:truth:1.1.5'
testImplementation 'io.grpc:grpc-testing:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION testImplementation 'io.grpc:grpc-testing:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
} }

8
examples/android/helloworld/app/build.gradle
View File

@ -32,7 +32,7 @@ android {
protobuf { protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.25.1' } protoc { artifact = 'com.google.protobuf:protoc:3.25.1' }
plugins { plugins {
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
} }
} }
generateProtoTasks { generateProtoTasks {
@ -52,8 +52,8 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.0.0' implementation 'androidx.appcompat:appcompat:1.0.0'
// You need to build grpc-java to obtain these libraries below. // You need to build grpc-java to obtain these libraries below.
implementation 'io.grpc:grpc-okhttp:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'io.grpc:grpc-okhttp:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'io.grpc:grpc-protobuf-lite:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'io.grpc:grpc-stub:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'org.apache.tomcat:annotations-api:6.0.53' implementation 'org.apache.tomcat:annotations-api:6.0.53'
} }

8
examples/android/routeguide/app/build.gradle
View File

@ -32,7 +32,7 @@ android {
protobuf { protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.25.1' } protoc { artifact = 'com.google.protobuf:protoc:3.25.1' }
plugins { plugins {
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
} }
} }
generateProtoTasks { generateProtoTasks {
@ -52,8 +52,8 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.0.0' implementation 'androidx.appcompat:appcompat:1.0.0'
// You need to build grpc-java to obtain these libraries below. // You need to build grpc-java to obtain these libraries below.
implementation 'io.grpc:grpc-okhttp:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'io.grpc:grpc-okhttp:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'io.grpc:grpc-protobuf-lite:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'io.grpc:grpc-stub:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'org.apache.tomcat:annotations-api:6.0.53' implementation 'org.apache.tomcat:annotations-api:6.0.53'
} }

8
examples/android/strictmode/app/build.gradle
View File

@ -33,7 +33,7 @@ android {
protobuf { protobuf {
protoc { artifact = 'com.google.protobuf:protoc:3.25.1' } protoc { artifact = 'com.google.protobuf:protoc:3.25.1' }
plugins { plugins {
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
} }
} }
generateProtoTasks { generateProtoTasks {
@ -53,8 +53,8 @@ dependencies {
implementation 'androidx.appcompat:appcompat:1.0.0' implementation 'androidx.appcompat:appcompat:1.0.0'
// You need to build grpc-java to obtain these libraries below. // You need to build grpc-java to obtain these libraries below.
implementation 'io.grpc:grpc-okhttp:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'io.grpc:grpc-okhttp:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-protobuf-lite:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'io.grpc:grpc-protobuf-lite:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'io.grpc:grpc-stub:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION implementation 'io.grpc:grpc-stub:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
implementation 'org.apache.tomcat:annotations-api:6.0.53' implementation 'org.apache.tomcat:annotations-api:6.0.53'
} }

2
examples/build.gradle
View File

@ -23,7 +23,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protobufVersion = '3.25.3' def protobufVersion = '3.25.3'
def protocVersion = protobufVersion def protocVersion = protobufVersion

2
examples/example-alts/build.gradle
View File

@ -24,7 +24,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.25.3' def protocVersion = '3.25.3'
dependencies { dependencies {

2
examples/example-debug/build.gradle
View File

@ -25,7 +25,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protobufVersion = '3.25.3' def protobufVersion = '3.25.3'
dependencies { dependencies {

4
examples/example-debug/pom.xml
View File

@ -6,13 +6,13 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<!-- Feel free to delete the comment at the end of these lines. It is just <!-- Feel free to delete the comment at the end of these lines. It is just
for safely updating the version in our release process. --> for safely updating the version in our release process. -->
<version>1.66.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <version>1.67.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<name>example-debug</name> <name>example-debug</name>
<url>https://github.com/grpc/grpc-java</url> <url>https://github.com/grpc/grpc-java</url>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.66.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.67.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protoc.version>3.25.3</protoc.version> <protoc.version>3.25.3</protoc.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>

2
examples/example-gauth/build.gradle
View File

@ -24,7 +24,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protobufVersion = '3.25.3' def protobufVersion = '3.25.3'
def protocVersion = protobufVersion def protocVersion = protobufVersion

4
examples/example-gauth/pom.xml
View File

@ -6,13 +6,13 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<!-- Feel free to delete the comment at the end of these lines. It is just <!-- Feel free to delete the comment at the end of these lines. It is just
for safely updating the version in our release process. --> for safely updating the version in our release process. -->
<version>1.66.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <version>1.67.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<name>example-gauth</name> <name>example-gauth</name>
<url>https://github.com/grpc/grpc-java</url> <url>https://github.com/grpc/grpc-java</url>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.66.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.67.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.25.3</protobuf.version> <protobuf.version>3.25.3</protobuf.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>

2
examples/example-gcp-csm-observability/build.gradle
View File

@ -25,7 +25,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.25.3' def protocVersion = '3.25.3'
def openTelemetryVersion = '1.40.0' def openTelemetryVersion = '1.40.0'
def openTelemetryPrometheusVersion = '1.40.0-alpha' def openTelemetryPrometheusVersion = '1.40.0-alpha'

2
examples/example-gcp-observability/build.gradle
View File

@ -25,7 +25,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.25.3' def protocVersion = '3.25.3'
dependencies { dependencies {

2
examples/example-hostname/build.gradle
View File

@ -23,7 +23,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protobufVersion = '3.25.3' def protobufVersion = '3.25.3'
dependencies { dependencies {

4
examples/example-hostname/pom.xml
View File

@ -6,13 +6,13 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<!-- Feel free to delete the comment at the end of these lines. It is just <!-- Feel free to delete the comment at the end of these lines. It is just
for safely updating the version in our release process. --> for safely updating the version in our release process. -->
<version>1.66.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <version>1.67.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<name>example-hostname</name> <name>example-hostname</name>
<url>https://github.com/grpc/grpc-java</url> <url>https://github.com/grpc/grpc-java</url>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.66.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.67.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protoc.version>3.25.3</protoc.version> <protoc.version>3.25.3</protoc.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>

2
examples/example-jwt-auth/build.gradle
View File

@ -23,7 +23,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protobufVersion = '3.25.3' def protobufVersion = '3.25.3'
def protocVersion = protobufVersion def protocVersion = protobufVersion

4
examples/example-jwt-auth/pom.xml
View File

@ -7,13 +7,13 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<!-- Feel free to delete the comment at the end of these lines. It is just <!-- Feel free to delete the comment at the end of these lines. It is just
for safely updating the version in our release process. --> for safely updating the version in our release process. -->
<version>1.66.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <version>1.67.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<name>example-jwt-auth</name> <name>example-jwt-auth</name>
<url>https://github.com/grpc/grpc-java</url> <url>https://github.com/grpc/grpc-java</url>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.66.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.67.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.25.3</protobuf.version> <protobuf.version>3.25.3</protobuf.version>
<protoc.version>3.25.3</protoc.version> <protoc.version>3.25.3</protoc.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->

2
examples/example-oauth/build.gradle
View File

@ -23,7 +23,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protobufVersion = '3.25.3' def protobufVersion = '3.25.3'
def protocVersion = protobufVersion def protocVersion = protobufVersion

4
examples/example-oauth/pom.xml
View File

@ -7,13 +7,13 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<!-- Feel free to delete the comment at the end of these lines. It is just <!-- Feel free to delete the comment at the end of these lines. It is just
for safely updating the version in our release process. --> for safely updating the version in our release process. -->
<version>1.66.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <version>1.67.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<name>example-oauth</name> <name>example-oauth</name>
<url>https://github.com/grpc/grpc-java</url> <url>https://github.com/grpc/grpc-java</url>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.66.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.67.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.25.3</protobuf.version> <protobuf.version>3.25.3</protobuf.version>
<protoc.version>3.25.3</protoc.version> <protoc.version>3.25.3</protoc.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->

2
examples/example-opentelemetry/build.gradle
View File

@ -24,7 +24,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.25.3' def protocVersion = '3.25.3'
def openTelemetryVersion = '1.40.0' def openTelemetryVersion = '1.40.0'
def openTelemetryPrometheusVersion = '1.40.0-alpha' def openTelemetryPrometheusVersion = '1.40.0-alpha'

2
examples/example-orca/build.gradle
View File

@ -18,7 +18,7 @@ java {
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8
} }
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.25.3' def protocVersion = '3.25.3'
dependencies { dependencies {

2
examples/example-reflection/build.gradle
View File

@ -18,7 +18,7 @@ java {
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8
} }
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.25.3' def protocVersion = '3.25.3'
dependencies { dependencies {

2
examples/example-servlet/build.gradle
View File

@ -16,7 +16,7 @@ java {
targetCompatibility = JavaVersion.VERSION_1_8 targetCompatibility = JavaVersion.VERSION_1_8
} }
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.25.3' def protocVersion = '3.25.3'
dependencies { dependencies {

2
examples/example-tls/build.gradle
View File

@ -24,7 +24,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.25.3' def protocVersion = '3.25.3'
dependencies { dependencies {

4
examples/example-tls/pom.xml
View File

@ -6,13 +6,13 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<!-- Feel free to delete the comment at the end of these lines. It is just <!-- Feel free to delete the comment at the end of these lines. It is just
for safely updating the version in our release process. --> for safely updating the version in our release process. -->
<version>1.66.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <version>1.67.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<name>example-tls</name> <name>example-tls</name>
<url>https://github.com/grpc/grpc-java</url> <url>https://github.com/grpc/grpc-java</url>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.66.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.67.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protoc.version>3.25.3</protoc.version> <protoc.version>3.25.3</protoc.version>
<!-- required for jdk9 --> <!-- required for jdk9 -->
<maven.compiler.source>1.8</maven.compiler.source> <maven.compiler.source>1.8</maven.compiler.source>

2
examples/example-xds/build.gradle
View File

@ -23,7 +23,7 @@ java {
// Feel free to delete the comment at the next line. It is just for safely // Feel free to delete the comment at the next line. It is just for safely
// updating the version in our release process. // updating the version in our release process.
def grpcVersion = '1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION def grpcVersion = '1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
def protocVersion = '3.25.3' def protocVersion = '3.25.3'
dependencies { dependencies {

4
examples/pom.xml
View File

@ -6,13 +6,13 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<!-- Feel free to delete the comment at the end of these lines. It is just <!-- Feel free to delete the comment at the end of these lines. It is just
for safely updating the version in our release process. --> for safely updating the version in our release process. -->
<version>1.66.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION --> <version>1.67.0-SNAPSHOT</version><!-- CURRENT_GRPC_VERSION -->
<name>examples</name> <name>examples</name>
<url>https://github.com/grpc/grpc-java</url> <url>https://github.com/grpc/grpc-java</url>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.66.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION --> <grpc.version>1.67.0-SNAPSHOT</grpc.version><!-- CURRENT_GRPC_VERSION -->
<protobuf.version>3.25.3</protobuf.version> <protobuf.version>3.25.3</protobuf.version>
<protoc.version>3.25.3</protoc.version> <protoc.version>3.25.3</protoc.version>
<!-- required for JDK 8 --> <!-- required for JDK 8 -->

5
gradle/libs.versions.toml
View File

@ -1,9 +1,8 @@
[versions] [versions]
googleauth = "1.22.0" netty = '4.1.100.Final'
netty = '4.1.110.Final'
# Keep the following references of tcnative version in sync whenever it's updated: # Keep the following references of tcnative version in sync whenever it's updated:
# SECURITY.md # SECURITY.md
nettytcnative = '2.0.65.Final' nettytcnative = '2.0.61.Final'
opencensus = "0.31.1" opencensus = "0.31.1"
# Not upgrading to 4.x as it is not yet ABI compatible. # Not upgrading to 4.x as it is not yet ABI compatible.
# https://github.com/protocolbuffers/protobuf/issues/17247 # https://github.com/protocolbuffers/protobuf/issues/17247

2
netty/shaded/src/testShadow/java/io/grpc/netty/shaded/ShadingTest.java
View File

@ -79,7 +79,7 @@ public final class ShadingTest {
InputStream inputStream = NettyChannelBuilder.class.getClassLoader() InputStream inputStream = NettyChannelBuilder.class.getClassLoader()
.getResourceAsStream( .getResourceAsStream(
"META-INF/native-image/io.grpc.netty.shaded.io.netty/netty-transport/" "META-INF/native-image/io.grpc.netty.shaded.io.netty/netty-transport/"
+ "reflect-config.json"); + "reflection-config.json");
assertThat(inputStream).isNotNull(); assertThat(inputStream).isNotNull();
Scanner s = new Scanner(inputStream, StandardCharsets.UTF_8.name()).useDelimiter("\\A"); Scanner s = new Scanner(inputStream, StandardCharsets.UTF_8.name()).useDelimiter("\\A");

28
repositories.bzl
View File

@ -26,20 +26,20 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
"com.google.truth:truth:1.4.2", "com.google.truth:truth:1.4.2",
"com.squareup.okhttp:okhttp:2.7.5", "com.squareup.okhttp:okhttp:2.7.5",
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day "com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
"io.netty:netty-buffer:4.1.110.Final", "io.netty:netty-buffer:4.1.100.Final",
"io.netty:netty-codec-http2:4.1.110.Final", "io.netty:netty-codec-http2:4.1.100.Final",
"io.netty:netty-codec-http:4.1.110.Final", "io.netty:netty-codec-http:4.1.100.Final",
"io.netty:netty-codec-socks:4.1.110.Final", "io.netty:netty-codec-socks:4.1.100.Final",
"io.netty:netty-codec:4.1.110.Final", "io.netty:netty-codec:4.1.100.Final",
"io.netty:netty-common:4.1.110.Final", "io.netty:netty-common:4.1.100.Final",
"io.netty:netty-handler-proxy:4.1.110.Final", "io.netty:netty-handler-proxy:4.1.100.Final",
"io.netty:netty-handler:4.1.110.Final", "io.netty:netty-handler:4.1.100.Final",
"io.netty:netty-resolver:4.1.110.Final", "io.netty:netty-resolver:4.1.100.Final",
"io.netty:netty-tcnative-boringssl-static:2.0.65.Final", "io.netty:netty-tcnative-boringssl-static:2.0.61.Final",
"io.netty:netty-tcnative-classes:2.0.65.Final", "io.netty:netty-tcnative-classes:2.0.61.Final",
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.110.Final", "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.100.Final",
"io.netty:netty-transport-native-unix-common:4.1.110.Final", "io.netty:netty-transport-native-unix-common:4.1.100.Final",
"io.netty:netty-transport:4.1.110.Final", "io.netty:netty-transport:4.1.100.Final",
"io.opencensus:opencensus-api:0.31.0", "io.opencensus:opencensus-api:0.31.0",
"io.opencensus:opencensus-contrib-grpc-metrics:0.31.0", "io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
"io.perfmark:perfmark-api:0.27.0", "io.perfmark:perfmark-api:0.27.0",