Skip to content

Commit f9b072c

Browse files
kannanjgithubkannanjgithub
authored
Netty upgrade to 4.1.110 in grpc-java (#11273)
* Bump Netty to 4.1.110.Final.
1 parent e567b44 commit f9b072c

File tree

36 files changed

+103
-101
lines changed

36 files changed

+103
-101
lines changed

‎MODULE.bazel‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module(
22
name = "grpc-java",
33
compatibility_level = 0,
44
repo_name = "io_grpc_grpc_java",
5-
version = "1.67.0-SNAPSHOT", # CURRENT_GRPC_VERSION
5+
version = "1.66.0-SNAPSHOT", # CURRENT_GRPC_VERSION
66
)
77

88
# GRPC_DEPS_START
@@ -22,20 +22,20 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [
2222
"com.google.truth:truth:1.4.2",
2323
"com.squareup.okhttp:okhttp:2.7.5",
2424
"com.squareup.okio:okio:2.10.0", # 3.0+ needs swapping to -jvm; need work to avoid flag-day
25-
"io.netty:netty-buffer:4.1.100.Final",
26-
"io.netty:netty-codec-http2:4.1.100.Final",
27-
"io.netty:netty-codec-http:4.1.100.Final",
28-
"io.netty:netty-codec-socks:4.1.100.Final",
29-
"io.netty:netty-codec:4.1.100.Final",
30-
"io.netty:netty-common:4.1.100.Final",
31-
"io.netty:netty-handler-proxy:4.1.100.Final",
32-
"io.netty:netty-handler:4.1.100.Final",
33-
"io.netty:netty-resolver:4.1.100.Final",
34-
"io.netty:netty-tcnative-boringssl-static:2.0.61.Final",
35-
"io.netty:netty-tcnative-classes:2.0.61.Final",
36-
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.100.Final",
37-
"io.netty:netty-transport-native-unix-common:4.1.100.Final",
38-
"io.netty:netty-transport:4.1.100.Final",
25+
"io.netty:netty-buffer:4.1.110.Final",
26+
"io.netty:netty-codec-http2:4.1.110.Final",
27+
"io.netty:netty-codec-http:4.1.110.Final",
28+
"io.netty:netty-codec-socks:4.1.110.Final",
29+
"io.netty:netty-codec:4.1.110.Final",
30+
"io.netty:netty-common:4.1.110.Final",
31+
"io.netty:netty-handler-proxy:4.1.110.Final",
32+
"io.netty:netty-handler:4.1.110.Final",
33+
"io.netty:netty-resolver:4.1.110.Final",
34+
"io.netty:netty-tcnative-boringssl-static:2.0.65.Final",
35+
"io.netty:netty-tcnative-classes:2.0.65.Final",
36+
"io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.110.Final",
37+
"io.netty:netty-transport-native-unix-common:4.1.110.Final",
38+
"io.netty:netty-transport:4.1.110.Final",
3939
"io.opencensus:opencensus-api:0.31.0",
4040
"io.opencensus:opencensus-contrib-grpc-metrics:0.31.0",
4141
"io.perfmark:perfmark-api:0.27.0",

‎README.md‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ For a guided tour, take a look at the [quick start
4444
guide](https://grpc.io/docs/languages/java/quickstart) or the more explanatory [gRPC
4545
basics](https://grpc.io/docs/languages/java/basics).
4646

47-
The [examples](https://github.com/grpc/grpc-java/tree/v1.65.0/examples) and the
48-
[Android example](https://github.com/grpc/grpc-java/tree/v1.65.0/examples/android)
47+
The [examples](https://github.com/grpc/grpc-java/tree/v1.66.0/examples) and the
48+
[Android example](https://github.com/grpc/grpc-java/tree/v1.66.0/examples/android)
4949
are standalone projects that showcase the usage of gRPC.
5050

5151
Download
@@ -56,18 +56,18 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`:
5656
<dependency>
5757
<groupId>io.grpc</groupId>
5858
<artifactId>grpc-netty-shaded</artifactId>
59-
<version>1.65.0</version>
59+
<version>1.66.0</version>
6060
<scope>runtime</scope>
6161
</dependency>
6262
<dependency>
6363
<groupId>io.grpc</groupId>
6464
<artifactId>grpc-protobuf</artifactId>
65-
<version>1.65.0</version>
65+
<version>1.66.0</version>
6666
</dependency>
6767
<dependency>
6868
<groupId>io.grpc</groupId>
6969
<artifactId>grpc-stub</artifactId>
70-
<version>1.65.0</version>
70+
<version>1.66.0</version>
7171
</dependency>
7272
<dependency> <!-- necessary for Java 9+ -->
7373
<groupId>org.apache.tomcat</groupId>
@@ -79,18 +79,18 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`:
7979

8080
Or for Gradle with non-Android, add to your dependencies:
8181
```gradle
82-
runtimeOnly 'io.grpc:grpc-netty-shaded:1.65.0'
83-
implementation 'io.grpc:grpc-protobuf:1.65.0'
84-
implementation 'io.grpc:grpc-stub:1.65.0'
82+
runtimeOnly 'io.grpc:grpc-netty-shaded:1.66.0'
83+
implementation 'io.grpc:grpc-protobuf:1.66.0'
84+
implementation 'io.grpc:grpc-stub:1.66.0'
8585
compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+
8686
```
8787

8888
For Android client, use `grpc-okhttp` instead of `grpc-netty-shaded` and
8989
`grpc-protobuf-lite` instead of `grpc-protobuf`:
9090
```gradle
91-
implementation 'io.grpc:grpc-okhttp:1.65.0'
92-
implementation 'io.grpc:grpc-protobuf-lite:1.65.0'
93-
implementation 'io.grpc:grpc-stub:1.65.0'
91+
implementation 'io.grpc:grpc-okhttp:1.66.0'
92+
implementation 'io.grpc:grpc-protobuf-lite:1.66.0'
93+
implementation 'io.grpc:grpc-stub:1.66.0'
9494
compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+
9595
```
9696

@@ -99,7 +99,7 @@ For [Bazel](https://bazel.build), you can either
9999
(with the GAVs from above), or use `@io_grpc_grpc_java//api` et al (see below).
100100

101101
[the JARs]:
102-
https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.65.0
102+
https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.66.0
103103

104104
Development snapshots are available in [Sonatypes's snapshot
105105
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
129129
<artifactId>protobuf-maven-plugin</artifactId>
130130
<version>0.6.1</version>
131131
<configuration>
132-
<protocArtifact>com.google.protobuf:protoc:3.25.1:exe:${os.detected.classifier}</protocArtifact>
132+
<protocArtifact>com.google.protobuf:protoc:3.25.3:exe:${os.detected.classifier}</protocArtifact>
133133
<pluginId>grpc-java</pluginId>
134-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.65.0:exe:${os.detected.classifier}</pluginArtifact>
134+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.66.0:exe:${os.detected.classifier}</pluginArtifact>
135135
</configuration>
136136
<executions>
137137
<execution>
@@ -157,11 +157,11 @@ plugins {
157157
158158
protobuf {
159159
protoc {
160-
artifact = "com.google.protobuf:protoc:3.25.1"
160+
artifact = "com.google.protobuf:protoc:3.25.3"
161161
}
162162
plugins {
163163
grpc {
164-
artifact = 'io.grpc:protoc-gen-grpc-java:1.65.0'
164+
artifact = 'io.grpc:protoc-gen-grpc-java:1.66.0'
165165
}
166166
}
167167
generateProtoTasks {
@@ -190,11 +190,11 @@ plugins {
190190
191191
protobuf {
192192
protoc {
193-
artifact = "com.google.protobuf:protoc:3.25.1"
193+
artifact = "com.google.protobuf:protoc:3.25.3"
194194
}
195195
plugins {
196196
grpc {
197-
artifact = 'io.grpc:protoc-gen-grpc-java:1.65.0'
197+
artifact = 'io.grpc:protoc-gen-grpc-java:1.66.0'
198198
}
199199
}
200200
generateProtoTasks {

‎SECURITY.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,8 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver
398398
1.56.x | 4.1.87.Final | 2.0.61.Final
399399
1.57.x-1.58.x | 4.1.93.Final | 2.0.61.Final
400400
1.59.x | 4.1.97.Final | 2.0.61.Final
401-
1.60.x- | 4.1.100.Final | 2.0.61.Final
401+
1.60.x-1.65.x | 4.1.100.Final | 2.0.61.Final
402+
1.66.x- | 4.1.110.Final | 2.0.65.Final
402403

403404
_(grpc-netty-shaded avoids issues with keeping these versions in sync.)_
404405

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ subprojects {
2121
apply plugin: "net.ltgt.errorprone"
2222

2323
group = "io.grpc"
24-
version = "1.67.0-SNAPSHOT" // CURRENT_GRPC_VERSION
24+
version = "1.66.0-SNAPSHOT" // CURRENT_GRPC_VERSION
2525

2626
repositories {
2727
maven { // The google mirror is less flaky than mavenCentral()

‎compiler/src/test/golden/TestDeprecatedService.java.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
88
* </pre>
99
*/
1010
@javax.annotation.Generated(
11-
value = "by gRPC proto compiler (version 1.67.0-SNAPSHOT)",
11+
value = "by gRPC proto compiler (version 1.66.0-SNAPSHOT)",
1212
comments = "Source: grpc/testing/compiler/test.proto")
1313
@io.grpc.stub.annotations.GrpcGenerated
1414
@java.lang.Deprecated

‎compiler/src/test/golden/TestService.java.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import static io.grpc.MethodDescriptor.generateFullMethodName;
88
* </pre>
99
*/
1010
@javax.annotation.Generated(
11-
value = "by gRPC proto compiler (version 1.67.0-SNAPSHOT)",
11+
value = "by gRPC proto compiler (version 1.66.0-SNAPSHOT)",
1212
comments = "Source: grpc/testing/compiler/test.proto")
1313
@io.grpc.stub.annotations.GrpcGenerated
1414
public final class TestServiceGrpc {

‎core/src/main/java/io/grpc/internal/GrpcUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public byte[] parseAsciiString(byte[] serialized) {
219219

220220
public static final Splitter ACCEPT_ENCODING_SPLITTER = Splitter.on(',').trimResults();
221221

222-
public static final String IMPLEMENTATION_VERSION = "1.67.0-SNAPSHOT"; // CURRENT_GRPC_VERSION
222+
public static final String IMPLEMENTATION_VERSION = "1.66.0-SNAPSHOT"; // CURRENT_GRPC_VERSION
223223

224224
/**
225225
* The default timeout in nanos for a keepalive ping request.

‎examples/android/clientcache/app/build.gradle‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ android {
3434
protobuf {
3535
protoc { artifact = 'com.google.protobuf:protoc:3.25.1' }
3636
plugins {
37-
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
37+
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
3838
}
3939
}
4040
generateProtoTasks {
@@ -54,12 +54,12 @@ dependencies {
5454
implementation 'androidx.appcompat:appcompat:1.0.0'
5555

5656
// You need to build grpc-java to obtain these libraries below.
57-
implementation 'io.grpc:grpc-okhttp:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
58-
implementation 'io.grpc:grpc-protobuf-lite:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
59-
implementation 'io.grpc:grpc-stub:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
57+
implementation 'io.grpc:grpc-okhttp:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
58+
implementation 'io.grpc:grpc-protobuf-lite:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
59+
implementation 'io.grpc:grpc-stub:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
6060
implementation 'org.apache.tomcat:annotations-api:6.0.53'
6161

6262
testImplementation 'junit:junit:4.13.2'
6363
testImplementation 'com.google.truth:truth:1.1.5'
64-
testImplementation 'io.grpc:grpc-testing:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
64+
testImplementation 'io.grpc:grpc-testing:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
6565
}

‎examples/android/helloworld/app/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232
protobuf {
3333
protoc { artifact = 'com.google.protobuf:protoc:3.25.1' }
3434
plugins {
35-
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
35+
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
3636
}
3737
}
3838
generateProtoTasks {
@@ -52,8 +52,8 @@ dependencies {
5252
implementation 'androidx.appcompat:appcompat:1.0.0'
5353

5454
// You need to build grpc-java to obtain these libraries below.
55-
implementation 'io.grpc:grpc-okhttp:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
56-
implementation 'io.grpc:grpc-protobuf-lite:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
57-
implementation 'io.grpc:grpc-stub:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
55+
implementation 'io.grpc:grpc-okhttp:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
56+
implementation 'io.grpc:grpc-protobuf-lite:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
57+
implementation 'io.grpc:grpc-stub:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
5858
implementation 'org.apache.tomcat:annotations-api:6.0.53'
5959
}

‎examples/android/routeguide/app/build.gradle‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ android {
3232
protobuf {
3333
protoc { artifact = 'com.google.protobuf:protoc:3.25.1' }
3434
plugins {
35-
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
35+
grpc { artifact = 'io.grpc:protoc-gen-grpc-java:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
3636
}
3737
}
3838
generateProtoTasks {
@@ -52,8 +52,8 @@ dependencies {
5252
implementation 'androidx.appcompat:appcompat:1.0.0'
5353

5454
// You need to build grpc-java to obtain these libraries below.
55-
implementation 'io.grpc:grpc-okhttp:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
56-
implementation 'io.grpc:grpc-protobuf-lite:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
57-
implementation 'io.grpc:grpc-stub:1.67.0-SNAPSHOT' // CURRENT_GRPC_VERSION
55+
implementation 'io.grpc:grpc-okhttp:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
56+
implementation 'io.grpc:grpc-protobuf-lite:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
57+
implementation 'io.grpc:grpc-stub:1.66.0-SNAPSHOT' // CURRENT_GRPC_VERSION
5858
implementation 'org.apache.tomcat:annotations-api:6.0.53'
5959
}

0 commit comments

Comments
 (0)