From 382585e16bfa18ff1b1fef3cf25ad7d20c9720c1 Mon Sep 17 00:00:00 2001 From: Kannan J Date: Fri, 31 Jul 2026 12:57:34 +0000 Subject: [PATCH] Version upgrades following 1.83 release --- .github/workflows/branch-testing.yml | 4 +-- .../workflows/gradle-wrapper-validation.yml | 2 +- .github/workflows/testing.yml | 14 ++++---- MODULE.bazel | 6 ++-- .../build.gradle | 4 +-- examples/example-opentelemetry/build.gradle | 4 +-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- gradle/libs.versions.toml | 32 +++++++++---------- repositories.bzl | 6 ++-- settings.gradle | 8 ++--- 10 files changed, 41 insertions(+), 41 deletions(-) diff --git a/.github/workflows/branch-testing.yml b/.github/workflows/branch-testing.yml index 2f462242f38..32c280bf8ce 100644 --- a/.github/workflows/branch-testing.yml +++ b/.github/workflows/branch-testing.yml @@ -20,14 +20,14 @@ jobs: fail-fast: false # Should swap to true if we grow a large matrix steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - uses: actions/setup-java@v5 with: java-version: ${{ matrix.jre }} distribution: 'temurin' - name: Gradle cache - uses: actions/cache@v5 + uses: actions/cache@v6 with: path: | ~/.gradle/caches diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml index 91eada5371d..7c989ad6a84 100644 --- a/.github/workflows/gradle-wrapper-validation.yml +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -9,5 +9,5 @@ jobs: name: "Gradle wrapper validation" runs-on: ubuntu-latest steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - uses: gradle/actions/wrapper-validation@v6 diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 0292e6602f9..56bdc023187 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -21,14 +21,14 @@ jobs: fail-fast: false # Should swap to true if we grow a large matrix steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - uses: actions/setup-java@v5 with: java-version: ${{ matrix.jre }} distribution: 'temurin' - name: Gradle cache - uses: actions/cache@v5 + uses: actions/cache@v6 with: path: | ~/.gradle/caches @@ -37,7 +37,7 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- - name: Maven cache - uses: actions/cache@v5 + uses: actions/cache@v6 with: path: | ~/.m2/repository @@ -46,7 +46,7 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - name: Protobuf cache - uses: actions/cache@v5 + uses: actions/cache@v6 with: path: /tmp/protobuf-cache key: ${{ runner.os }}-maven-${{ hashFiles('buildscripts/make_dependencies.sh') }} @@ -71,7 +71,7 @@ jobs: COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }} run: ./gradlew :grpc-all:coveralls -PskipAndroid=true -x compileJava - name: Codecov - uses: codecov/codecov-action@v6 + uses: codecov/codecov-action@v7 with: token: ${{ secrets.CODECOV_TOKEN }} @@ -88,7 +88,7 @@ jobs: USE_BAZEL_VERSION: ${{ matrix.bazel_version }} steps: - - uses: actions/checkout@v6 + - uses: actions/checkout@v7 - name: Check versions match in MODULE.bazel and repositories.bzl run: | @@ -96,7 +96,7 @@ jobs: <(sed -n '/GRPC_DEPS_START/,/GRPC_DEPS_END/ {/GRPC_DEPS_/! p}' repositories.bzl) - name: Bazel cache - uses: actions/cache@v5 + uses: actions/cache@v6 with: path: | ~/.cache/bazel/*/cache diff --git a/MODULE.bazel b/MODULE.bazel index 5e9cab37c3d..293df736527 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -20,9 +20,9 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "com.google.re2j:re2j:1.8", "com.google.s2a.proto.v2:s2a-proto:0.1.3", "com.google.truth:truth:1.4.5", - "dev.cel:runtime:0.13.0", - "dev.cel:protobuf:0.13.0", - "dev.cel:common:0.13.0", + "dev.cel:runtime:0.13.1", + "dev.cel:protobuf:0.13.1", + "dev.cel:common:0.13.1", "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 "io.netty:netty-buffer:4.2.15.Final", diff --git a/examples/example-gcp-csm-observability/build.gradle b/examples/example-gcp-csm-observability/build.gradle index 3e9051acd09..b577102cf23 100644 --- a/examples/example-gcp-csm-observability/build.gradle +++ b/examples/example-gcp-csm-observability/build.gradle @@ -24,8 +24,8 @@ java { // updating the version in our release process. def grpcVersion = '1.84.0-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.25.8' -def openTelemetryVersion = '1.63.0' -def openTelemetryPrometheusVersion = '1.63.0-alpha' +def openTelemetryVersion = '1.64.0' +def openTelemetryPrometheusVersion = '1.64.0-alpha' dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" diff --git a/examples/example-opentelemetry/build.gradle b/examples/example-opentelemetry/build.gradle index 842c9cafe7f..a763b2c1e7d 100644 --- a/examples/example-opentelemetry/build.gradle +++ b/examples/example-opentelemetry/build.gradle @@ -23,8 +23,8 @@ java { // updating the version in our release process. def grpcVersion = '1.84.0-SNAPSHOT' // CURRENT_GRPC_VERSION def protocVersion = '3.25.8' -def openTelemetryVersion = '1.63.0' -def openTelemetryPrometheusVersion = '1.63.0-alpha' +def openTelemetryVersion = '1.64.0' +def openTelemetryPrometheusVersion = '1.64.0-alpha' dependencies { implementation "io.grpc:grpc-protobuf:${grpcVersion}" diff --git a/examples/gradle/wrapper/gradle-wrapper.properties b/examples/gradle/wrapper/gradle-wrapper.properties index 1e2fbf0d458..b41387345b5 100644 --- a/examples/gradle/wrapper/gradle-wrapper.properties +++ b/examples/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index ef87cfee11f..8cce5b9babe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -37,12 +37,12 @@ checkstyle = "com.puppycrawl.tools:checkstyle:10.26.1" # checkstyle 10.0+ requires Java 11+ # See https://checkstyle.sourceforge.io/releasenotes_old_8-35_10-26.html#Release_10.0 # checkForUpdates: checkstylejava8:9.+ -cel-runtime = "dev.cel:runtime:0.13.0" -cel-protobuf = "dev.cel:protobuf:0.13.0" -cel-compiler = "dev.cel:compiler:0.13.0" +cel-runtime = "dev.cel:runtime:0.13.1" +cel-protobuf = "dev.cel:protobuf:0.13.1" +cel-compiler = "dev.cel:compiler:0.13.1" checkstylejava8 = "com.puppycrawl.tools:checkstyle:9.3" commons-math3 = "org.apache.commons:commons-math3:3.6.1" -conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.5.2" +conscrypt = "org.conscrypt:conscrypt-openjdk-uber:2.6.1" # 141.7340.3+ requires Java 17+ # checkForUpdates: cronet-api:119.6045.31 cronet-api = "org.chromium.net:cronet-api:119.6045.31" @@ -82,16 +82,16 @@ javax-servlet-api = "javax.servlet:javax.servlet-api:4.0.1" # 12.0.0+ require Java 17+ # checkForUpdates: jetty-client:11.+ jetty-client = "org.eclipse.jetty:jetty-client:11.0.26" -jetty-http2-server = "org.eclipse.jetty.http2:jetty-http2-server:12.1.10" +jetty-http2-server = "org.eclipse.jetty.http2:jetty-http2-server:12.1.11" # 10.0.25+ uses uses @Deprecated(since=/forRemoval=) from Java 9 # checkForUpdates: jetty-http2-server10:10.0.24 jetty-http2-server10 = "org.eclipse.jetty.http2:http2-server:10.0.24" -jetty-servlet = "org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.10" +jetty-servlet = "org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.11" # checkForUpdates: jetty-servlet10:10.0.24 jetty-servlet10 = "org.eclipse.jetty:jetty-servlet:10.0.24" jsr305 = "com.google.code.findbugs:jsr305:3.0.2" junit = "junit:junit:4.13.2" -lincheck = "org.jetbrains.lincheck:lincheck:3.6" +lincheck = "org.jetbrains.lincheck:lincheck:3.7" # Update notes / 2023-07-19 sergiitk: # Couldn't update to 5.4.0, updated to the last in 4.x line. Version 5.x breaks some tests. # Error log: https://github.com/grpc/grpc-java/pull/10359#issuecomment-1632834435 @@ -119,11 +119,11 @@ opencensus-contrib-grpc-metrics = { module = "io.opencensus:opencensus-contrib-g opencensus-exporter-stats-stackdriver = { module = "io.opencensus:opencensus-exporter-stats-stackdriver", version.ref = "opencensus" } opencensus-exporter-trace-stackdriver = { module = "io.opencensus:opencensus-exporter-trace-stackdriver", version.ref = "opencensus" } opencensus-impl = { module = "io.opencensus:opencensus-impl", version.ref = "opencensus" } -opentelemetry-api = "io.opentelemetry:opentelemetry-api:1.63.0" -opentelemetry-exporter-prometheus = "io.opentelemetry:opentelemetry-exporter-prometheus:1.63.0-alpha" -opentelemetry-gcp-resources = "io.opentelemetry.contrib:opentelemetry-gcp-resources:1.57.0-alpha" -opentelemetry-sdk-extension-autoconfigure = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.63.0" -opentelemetry-sdk-testing = "io.opentelemetry:opentelemetry-sdk-testing:1.63.0" +opentelemetry-api = "io.opentelemetry:opentelemetry-api:1.64.0" +opentelemetry-exporter-prometheus = "io.opentelemetry:opentelemetry-exporter-prometheus:1.64.0-alpha" +opentelemetry-gcp-resources = "io.opentelemetry.contrib:opentelemetry-gcp-resources:1.59.0-alpha" +opentelemetry-sdk-extension-autoconfigure = "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.64.0" +opentelemetry-sdk-testing = "io.opentelemetry:opentelemetry-sdk-testing:1.64.0" perfmark-api = "io.perfmark:perfmark-api:0.27.0" # Not upgrading to 4.x as it is not yet ABI compatible. # https://github.com/protocolbuffers/protobuf/issues/17247 @@ -142,11 +142,11 @@ signature-android = "net.sf.androidscents.signature:android-api-level-24:7.0_r2" signature-java = "org.codehaus.mojo.signature:java18:1.0" # 11.0.0+ require Java 17+ # checkForUpdates: tomcat-embed-core:10.+ -tomcat-embed-core = "org.apache.tomcat.embed:tomcat-embed-core:10.1.55" +tomcat-embed-core = "org.apache.tomcat.embed:tomcat-embed-core:10.1.57" # checkForUpdates: tomcat-embed-core9:9.+ -tomcat-embed-core9 = "org.apache.tomcat.embed:tomcat-embed-core:9.0.118" +tomcat-embed-core9 = "org.apache.tomcat.embed:tomcat-embed-core:9.0.120" truth = "com.google.truth:truth:1.4.5" # checkForUpdates: undertow-servlet22:2.2.+ -undertow-servlet22 = "io.undertow:undertow-servlet:2.2.39.Final" +undertow-servlet22 = "io.undertow:undertow-servlet:2.2.40.Final" # checkForUpdates: undertow-servlet:2.3.+ -undertow-servlet = "io.undertow:undertow-servlet:2.3.21.Final" +undertow-servlet = "io.undertow:undertow-servlet:2.3.26.Final" diff --git a/repositories.bzl b/repositories.bzl index 88434371b2b..0bbdfb9c23d 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -25,9 +25,9 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "com.google.re2j:re2j:1.8", "com.google.s2a.proto.v2:s2a-proto:0.1.3", "com.google.truth:truth:1.4.5", - "dev.cel:runtime:0.13.0", - "dev.cel:protobuf:0.13.0", - "dev.cel:common:0.13.0", + "dev.cel:runtime:0.13.1", + "dev.cel:protobuf:0.13.1", + "dev.cel:common:0.13.1", "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 "io.netty:netty-buffer:4.2.15.Final", diff --git a/settings.gradle b/settings.gradle index 768835c8c55..abd30a63956 100644 --- a/settings.gradle +++ b/settings.gradle @@ -15,14 +15,14 @@ pluginManagement { plugins { // https://developer.android.com/build/releases/gradle-plugin // 8+ has many changes: https://github.com/grpc/grpc-java/issues/10152 - id "com.android.application" version "7.4.1" - id "com.android.library" version "7.4.1" + id "com.android.application" version "7.4.2" + id "com.android.library" version "7.4.2" // https://github.com/kt3k/coveralls-gradle-plugin/tags id "com.github.kt3k.coveralls" version "2.12.2" // https://github.com/GoogleCloudPlatform/appengine-plugins/releases id "com.google.cloud.tools.appengine" version "2.8.7" // https://github.com/GoogleContainerTools/jib/blob/master/jib-gradle-plugin/CHANGELOG.md - id "com.google.cloud.tools.jib" version "3.5.3" + id "com.google.cloud.tools.jib" version "3.5.4" // https://github.com/google/osdetector-gradle-plugin/tags id "com.google.osdetector" version "1.7.3" // https://github.com/google/protobuf-gradle-plugin/releases @@ -33,7 +33,7 @@ pluginManagement { // 8.3.1 breaks apache imports for netty/shaded, fixed in 8.3.2 id "com.gradleup.shadow" version "8.3.0" // https://github.com/melix/japicmp-gradle-plugin/blob/master/CHANGELOG.txt - id "me.champeau.gradle.japicmp" version "0.4.2" + id "me.champeau.gradle.japicmp" version "0.4.6" // https://github.com/melix/jmh-gradle-plugin/releases id "me.champeau.jmh" version "0.7.3" // https://github.com/tbroyer/gradle-errorprone-plugin/releases