This is an automated email from the ASF dual-hosted git repository.
pjfanning pushed a commit to branch 1.3.x
in repository https://gitbox.apache.org/repos/asf/pekko-grpc.git
The following commit(s) were added to refs/heads/1.3.x by this push:
new a27ff8e0 Update grpc-core, grpc-interop-testing, ... to 1.83.1 (#817)
(#848)
a27ff8e0 is described below
commit a27ff8e013809ecbce6c13692805af5a1dd3966f
Author: PJ Fanning <[email protected]>
AuthorDate: Fri Aug 21 00:34:12 2026 +0100
Update grpc-core, grpc-interop-testing, ... to 1.83.1 (#817) (#848)
* Update grpc-core, grpc-interop-testing, ... to 1.83.1 (#817)
* Update grpc-core, grpc-interop-testing, ... to 1.83.1
* more
---------
Co-authored-by: PJ Fanning <[email protected]>
* Protobuf-Java 3.25.9
* Update build.sbt
* interop test failures
* Update build.sbt
* sbt version
---------
Co-authored-by: Scala Steward
<[email protected]>
---
benchmark-java/build.sbt | 2 +-
benchmark-java/project/build.properties | 2 +-
build.sbt | 8 +++++++-
.../org/apache/pekko/grpc/gradle/PekkoGrpcPluginExtension.groovy | 4 ++--
maven-plugin/src/main/maven/plugin.xml | 4 ++--
plugin-tester-java/pom.xml | 2 +-
plugin-tester-scala/pom.xml | 2 +-
project/Dependencies.scala | 7 ++++---
sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt | 2 +-
9 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/benchmark-java/build.sbt b/benchmark-java/build.sbt
index fd185699..fa4bb40c 100644
--- a/benchmark-java/build.sbt
+++ b/benchmark-java/build.sbt
@@ -14,7 +14,7 @@ run / javaOptions ++= List("-Xms1g", "-Xmx1g",
"-XX:+PrintGCDetails", "-XX:+Prin
// generate both client and server (default) in Java
pekkoGrpcGeneratedLanguages := Seq(PekkoGrpc.Java)
-val grpcVersion = "1.75.0" // checked synced by VersionSyncCheckPlugin
+val grpcVersion = "1.83.1" // checked synced by VersionSyncCheckPlugin
val runtimeProject = ProjectRef(file("../"), "runtime")
diff --git a/benchmark-java/project/build.properties
b/benchmark-java/project/build.properties
index 01a16ed1..e544c4d1 100644
--- a/benchmark-java/project/build.properties
+++ b/benchmark-java/project/build.properties
@@ -1 +1 @@
-sbt.version=1.11.7
+sbt.version=1.12.14
diff --git a/build.sbt b/build.sbt
index 307b1dab..8d504b50 100644
--- a/build.sbt
+++ b/build.sbt
@@ -72,6 +72,7 @@ lazy val codegen = Project(id = "codegen", base =
file("codegen"))
(assembly / assemblyOption) := (assembly /
assemblyOption).value.withPrependShellScript(
Some(sbtassembly.AssemblyPlugin.defaultUniversalScript(shebang = true))),
(assembly / assemblyMergeStrategy) := {
+ case PathList("META-INF", "LICENSE") =>
MergeStrategy.concat
case PathList("META-INF", "MANIFEST.MF") =>
MergeStrategy.discard
case PathList("META-INF", "versions", _, "module-info.class") =>
MergeStrategy.discard
case "LICENSE" | "LICENSE.txt" | "NOTICE" =>
MergeStrategy.discard
@@ -181,7 +182,7 @@ lazy val sbtPlugin = Project(id = "sbt-plugin", base =
file("sbt-plugin"))
val p3 = (runtime / publishLocal).value
val p4 = (interopTests / publishLocal).value
},
- scriptedSbt := "1.11.7",
+ scriptedSbt := "1.12.14",
scriptedBufferLog := false)
.settings(
crossScalaVersions := Dependencies.Versions.CrossScalaForPlugin,
@@ -212,6 +213,11 @@ lazy val interopTests = Project(id = "interop-tests", base
= file("interop-tests
// We need to be able to publish locally in order for sbt interopt tests
to work
// however this sbt project should not be published to an actual repository
publishLocal / skip := false,
+ // the following is needed to exclude the gRPC generated sources for
protobuf-java from the sources,
+ // they cause tests to fail - https://github.com/apache/pekko-grpc/pull/610
+ Compile / sources := (Compile / sources).value.filterNot { f =>
+ f.getPath.replace('\\',
'/').contains("/src_managed/main/com/google/protobuf")
+ },
Compile / doc := (Compile / doc / target).value)
.settings(inConfig(Test)(Seq(
reStart / mainClass := (Test / run / mainClass).value, {
diff --git
a/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPluginExtension.groovy
b/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPluginExtension.groovy
index d6d25625..c4b94835 100644
---
a/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPluginExtension.groovy
+++
b/gradle-plugin/src/main/groovy/org/apache/pekko/grpc/gradle/PekkoGrpcPluginExtension.groovy
@@ -14,11 +14,11 @@ import org.gradle.api.Project
class PekkoGrpcPluginExtension {
- static final String PROTOC_VERSION = "3.25.8" // checked synced by
VersionSyncCheckPlugin
+ static final String PROTOC_VERSION = "3.25.9" // checked synced by
VersionSyncCheckPlugin
static final String PROTOC_PLUGIN_SCALA_VERSION = "2.12"
- static final String GRPC_VERSION = "1.75.0" // checked synced by
VersionSyncCheckPlugin
+ static final String GRPC_VERSION = "1.83.1" // checked synced by
VersionSyncCheckPlugin
static final String PLUGIN_CODE = 'org.apache.pekko.grpc.gradle'
diff --git a/maven-plugin/src/main/maven/plugin.xml
b/maven-plugin/src/main/maven/plugin.xml
index 2a3a5492..2c8572d9 100644
--- a/maven-plugin/src/main/maven/plugin.xml
+++ b/maven-plugin/src/main/maven/plugin.xml
@@ -95,7 +95,7 @@
<extraGenerators implementation="java.util.List" default-value=""/>
<protoPaths
default-value="${project.basedir}/src/main/proto,${project.basedir}/src/main/protobuf">${pekko-grpc.protoPaths}</protoPaths>
<outputDirectory
default-value="${project.build.directory}/generated-sources">${pekko-grpc.outputDirectory}</outputDirectory>
- <protocVersion implementation="java.lang.String"
default-value="-v3.25.8">${pekko-grpc.protoc-version}</protocVersion> <!--
checked synced by VersionSyncCheckPlugin -->
+ <protocVersion implementation="java.lang.String"
default-value="-v3.25.9">${pekko-grpc.protoc-version}</protocVersion> <!--
checked synced by VersionSyncCheckPlugin -->
<includeStdTypes implementation="boolean" default-value="false" />
</configuration>
</mojo>
@@ -187,7 +187,7 @@
<extraGenerators implementation="java.util.List" default-value=""/>
<protoPaths
default-value="src/test/proto,src/test/protobuf">${pekko-grpc.protoPaths}</protoPaths>
<outputDirectory
default-value="target/generated-test-sources">${pekko-grpc.outputDirectory}</outputDirectory>
- <protocVersion implementation="java.lang.String"
default-value="-v3.25.8">${pekko-grpc.protoc-version}</protocVersion> <!--
checked synced by VersionSyncCheckPlugin -->
+ <protocVersion implementation="java.lang.String"
default-value="-v3.25.9">${pekko-grpc.protoc-version}</protocVersion> <!--
checked synced by VersionSyncCheckPlugin -->
<includeStdTypes implementation="boolean" default-value="false" />
</configuration>
</mojo>
diff --git a/plugin-tester-java/pom.xml b/plugin-tester-java/pom.xml
index f20843d2..d53cf46a 100644
--- a/plugin-tester-java/pom.xml
+++ b/plugin-tester-java/pom.xml
@@ -25,7 +25,7 @@
<maven-dependency-plugin.version>3.8.1</maven-dependency-plugin.version>
<maven-exec-plugin.version>3.5.1</maven-exec-plugin.version>
<pekko.http.version>1.2.0</pekko.http.version>
- <grpc.version>1.75.0</grpc.version> <!-- checked synced by
VersionSyncCheckPlugin -->
+ <grpc.version>1.83.1</grpc.version> <!-- checked synced by
VersionSyncCheckPlugin -->
<project.encoding>UTF-8</project.encoding>
</properties>
diff --git a/plugin-tester-scala/pom.xml b/plugin-tester-scala/pom.xml
index d8c8f2fb..1e90e582 100644
--- a/plugin-tester-scala/pom.xml
+++ b/plugin-tester-scala/pom.xml
@@ -24,7 +24,7 @@
<maven.compiler.target>1.8</maven.compiler.target>
<pekko.version>1.1.5</pekko.version>
<pekko.http.version>1.2.0</pekko.http.version>
- <grpc.version>1.75.0</grpc.version> <!-- checked synced by
VersionSyncCheckPlugin -->
+ <grpc.version>1.83.1</grpc.version> <!-- checked synced by
VersionSyncCheckPlugin -->
<project.encoding>UTF-8</project.encoding>
</properties>
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index ffefadc4..88f3ac1a 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -32,12 +32,12 @@ object Dependencies {
val pekkoHttp = PekkoHttpDependency.version
val pekkoHttpBinary = pekkoHttp.take(3)
- val grpc = "1.75.0" // checked synced by VersionSyncCheckPlugin
+ val grpc = "1.83.1" // checked synced by VersionSyncCheckPlugin
// Even referenced explicitly in the sbt-plugin's sbt-tests
// If changing this, remember to update protoc plugin version to align in
// maven-plugin/src/main/maven/plugin.xml and
org.apache.pekko.grpc.sbt.PekkoGrpcPlugin
- val googleProtoc = "3.25.8" // checked synced by VersionSyncCheckPlugin
- val googleProtobufJava = "3.25.8"
+ val googleProtoc = "3.25.9" // checked synced by VersionSyncCheckPlugin
+ val googleProtobufJava = "3.25.9"
val scalaTest = "3.2.19"
@@ -59,6 +59,7 @@ object Dependencies {
val grpcInteropTesting = ("io.grpc" % "grpc-interop-testing" %
Versions.grpc)
.exclude("io.grpc", "grpc-alts")
.exclude("io.grpc", "grpc-xds")
+ .exclude("io.opentelemetry", "opentelemetry-exporter-prometheus")
val slf4jApi = "org.slf4j" % "slf4j-api" % "2.0.17"
val mavenPluginApi = "org.apache.maven" % "maven-plugin-api" %
Versions.maven
diff --git a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
index 627fdda5..61f3aec5 100644
--- a/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
+++ b/sbt-plugin/src/sbt-test/gen-scala-server/00-interop/build.sbt
@@ -11,7 +11,7 @@ scalaVersion := "2.12.21"
organization := "org.apache.pekko"
-val grpcVersion = "1.75.0" // checked synced by VersionSyncCheckPlugin
+val grpcVersion = "1.83.1" // checked synced by VersionSyncCheckPlugin
libraryDependencies ++= Seq(
"io.grpc" % "grpc-interop-testing" % grpcVersion % "protobuf-src",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
