Skip to content

Use grpc-okhttp instead of grpc-netty-shaded in the runtime jars #548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ludoch wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Use grpc-okhttp instead of grpc-netty-shaded in the runtime jars #548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb3e92e
Use grpc-okhttp instead of grpc-netty-shaded in the runtime jars
ludoch Oct 24, 2026
e8f9158
Keep okio on 1.x: ignore okio 2+ updates and enforce okio.version
ludoch Oct 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,11 @@ updates:
- dependency-name: "org.eclipse.jetty.*:*"
- dependency-name: "org.springframework.boot:spring-boot-starter-parent"
- dependency-name: "org.springframework.boot:spring-boot-starter-web"
# The runtime jars use the pure Java okio 1.x with grpc-okhttp; okio 2+ is written in Kotlin
# and needs kotlin-stdlib. okio.version is also checked by the runtime_impl poms.
- dependency-name: "com.squareup.okio:okio"
versions:
- ">= 2.0.0"

- package-ecosystem: "github-actions"
directory: "/"
Expand Down
9 changes: 9 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,8 @@
<auto-service.version>1.1.1</auto-service.version>
<auto-value.version>1.11.1</auto-value.version>
<grpc.version>1.85.0</grpc.version>
<!-- Must stay 1.x, enforced in the runtime_impl poms: okio 2+ is written in Kotlin. -->
<okio.version>1.17.6</okio.version>
<jetty12.version>12.0.40</jetty12.version>
<jetty121.version>12.1.14</jetty121.version>
<slf4j.version>2.0.20</slf4j.version>
Expand Down Expand Up @@ -771,6 +773,13 @@
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<!-- Pure Java okio for grpc-okhttp in the runtime jars, instead of okio 3.x which needs the
Kotlin stdlib. All okio APIs used by grpc-okhttp are present in 1.17.6. -->
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<version>${okio.version}</version>
</dependency>
<dependency>
<groupId>com.google.auth</groupId>
<artifactId>google-auth-library-oauth2-http</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions renovate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,12 @@
],
"enabled": false
},
{
"matchPackageNames": [
"com.squareup.okio:okio"
],
"allowedVersions": "<2.0.0"
},
{
"major": {
"enabled": false
Expand Down
48 changes: 41 additions & 7 deletions runtime/runtime_impl_jetty12/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,24 @@
<artifactId>appengine-apis</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<!-- Lighter gRPC transport than grpc-netty-shaded for the bundled Cloud Tasks client. -->
<groupId>io.grpc</groupId>
<artifactId>grpc-okhttp</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
<!-- okio 3.x is written in Kotlin and pulls in kotlin-stdlib. -->
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>runtime-util</artifactId>
Expand Down Expand Up @@ -317,6 +335,27 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>require-okio-1</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireProperty>
<property>okio.version</property>
<regex>1\.\d+(\.\d+)*</regex>
<regexMessage>okio.version must stay 1.x: the runtime jar bundles grpc-okhttp with the pure Java okio 1.x, while okio 2+ is written in Kotlin and needs kotlin-stdlib, which this jar does not bundle.</regexMessage>
</requireProperty>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand All @@ -335,12 +374,6 @@
</relocation>
</relocations>
<filters>
<filter>
<artifact>io.grpc:grpc-netty-shaded</artifact>
<excludes>
<exclude>META-INF/native/**</exclude>
</excludes>
</filter>
<filter>
<artifact>*:*</artifact>
<excludes>
Expand Down Expand Up @@ -515,7 +548,8 @@
<include>io.grpc:grpc-auth</include>
<include>io.grpc:grpc-context</include>
<include>io.grpc:grpc-core</include>
<include>io.grpc:grpc-netty-shaded</include>
<include>io.grpc:grpc-okhttp</include>
<include>com.squareup.okio:okio</include>
<include>io.grpc:grpc-protobuf</include>
<include>io.grpc:grpc-protobuf-lite</include>
<include>io.grpc:grpc-stub</include>
Expand Down
48 changes: 41 additions & 7 deletions runtime/runtime_impl_jetty121/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,24 @@
<artifactId>appengine-apis</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<!-- Lighter gRPC transport than grpc-netty-shaded for the bundled Cloud Tasks client. -->
<groupId>io.grpc</groupId>
<artifactId>grpc-okhttp</artifactId>
<optional>true</optional>
<exclusions>
<exclusion>
<!-- okio 3.x is written in Kotlin and pulls in kotlin-stdlib. -->
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>com.squareup.okio</groupId>
<artifactId>okio</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>com.google.appengine</groupId>
<artifactId>runtime-util</artifactId>
Expand Down Expand Up @@ -340,6 +358,27 @@

<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>require-okio-1</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireProperty>
<property>okio.version</property>
<regex>1\.\d+(\.\d+)*</regex>
<regexMessage>okio.version must stay 1.x: the runtime jar bundles grpc-okhttp with the pure Java okio 1.x, while okio 2+ is written in Kotlin and needs kotlin-stdlib, which this jar does not bundle.</regexMessage>
</requireProperty>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
Expand All @@ -358,12 +397,6 @@
</relocation>
</relocations>
<filters>
<filter>
<artifact>io.grpc:grpc-netty-shaded</artifact>
<excludes>
<exclude>META-INF/native/**</exclude>
</excludes>
</filter>
<filter>
<artifact>*:*</artifact>
<excludes>
Expand Down Expand Up @@ -543,7 +576,8 @@
<include>io.grpc:grpc-auth</include>
<include>io.grpc:grpc-context</include>
<include>io.grpc:grpc-core</include>
<include>io.grpc:grpc-netty-shaded</include>
<include>io.grpc:grpc-okhttp</include>
<include>com.squareup.okio:okio</include>
<include>io.grpc:grpc-protobuf</include>
<include>io.grpc:grpc-protobuf-lite</include>
<include>io.grpc:grpc-stub</include>
Expand Down
Loading