This is an automated email from the ASF dual-hosted git repository.
pjfanning pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/pekko-connectors.git
The following commit(s) were added to refs/heads/main by this push:
new a233eb3e7 build with protobuf4 (#1662)
a233eb3e7 is described below
commit a233eb3e7af9a6871fcf005a9e26717f34dd4bd3
Author: PJ Fanning <[email protected]>
AuthorDate: Tue Jun 16 15:26:11 2026 +0100
build with protobuf4 (#1662)
* test with protobuf4
* Update .scala-steward.conf
* Create protobuf4.35.excludes
* Update protobuf4.35.excludes
* Update build.sbt
* Update check-build-test.yml
* doc issues
* remove staging repo resolver
---
.scala-steward.conf | 2 --
build.sbt | 5 +--
.../2.0.x.backwards.excludes/protobuf4.35.excludes | 36 ++++++++++++++++++++++
project/Dependencies.scala | 2 +-
project/plugins.sbt | 3 +-
5 files changed, 41 insertions(+), 7 deletions(-)
diff --git a/.scala-steward.conf b/.scala-steward.conf
index 60021c37f..66199e0d8 100644
--- a/.scala-steward.conf
+++ b/.scala-steward.conf
@@ -1,8 +1,6 @@
updates.pin = [
# pin to hadoop 3.3.x until 3.4.x beomes more widely adopted
{ groupId = "org.apache.hadoop", version = "3.3." }
- # pin to protobuf-java 3 - see
https://github.com/apache/pekko-grpc/issues/245
- { groupId = "com.google.protobuf", version = "3." }
# solrj 9.+ requires Java 11
{ groupId = "org.apache.solr", version = "8." }
# https://github.com/apache/pekko-connectors/issues/503
diff --git a/build.sbt b/build.sbt
index fbdd6328c..eef31cb6c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -108,10 +108,11 @@ lazy val `pekko-connectors` = project
// Therefore some versions are excluded here.
ScalaUnidoc / unidoc / fullClasspath := {
(ScalaUnidoc / unidoc / fullClasspath).value
- .filterNot(_.data.getAbsolutePath.contains("protobuf-java-2.5.0.jar"))
+ .filterNot(_.data.getAbsolutePath.contains("protobuf-java-2."))
+ .filterNot(_.data.getAbsolutePath.contains("protobuf-java-3."))
+ .filterNot(_.data.getAbsolutePath.contains("protobuf-java-4.2"))
.filterNot(_.data.getAbsolutePath.contains("guava-28.1-android.jar"))
.filterNot(_.data.getAbsolutePath.contains("commons-net-3.1.jar"))
- .filterNot(_.data.getAbsolutePath.contains("protobuf-java-2.6.1.jar"))
},
ScalaUnidoc / unidoc / unidocProjectFilter := inAnyProject
-- inProjects(
diff --git
a/google-cloud-pub-sub-grpc/src/main/mima-filters/2.0.x.backwards.excludes/protobuf4.35.excludes
b/google-cloud-pub-sub-grpc/src/main/mima-filters/2.0.x.backwards.excludes/protobuf4.35.excludes
new file mode 100644
index 000000000..7eb98b6f7
--- /dev/null
+++
b/google-cloud-pub-sub-grpc/src/main/mima-filters/2.0.x.backwards.excludes/protobuf4.35.excludes
@@ -0,0 +1,36 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# Upgrading to protobuf-java 4.35.0 caused these issues
+ProblemFilters.exclude[MissingTypesProblem]("io.grpc.alts.internal.*")
+ProblemFilters.exclude[DirectMissingMethodProblem]("io.grpc.alts.internal.*")
+ProblemFilters.exclude[IncompatibleTemplateDefProblem]("io.grpc.alts.internal.*")
+ProblemFilters.exclude[MissingTypesProblem]("io.grpc.binarylog.v1.*")
+ProblemFilters.exclude[DirectMissingMethodProblem]("io.grpc.binarylog.v1.*")
+ProblemFilters.exclude[IncompatibleTemplateDefProblem]("io.grpc.binarylog.v1.*")
+ProblemFilters.exclude[MissingTypesProblem]("io.grpc.channelz.v1.*")
+ProblemFilters.exclude[DirectMissingMethodProblem]("io.grpc.channelz.v1.*")
+ProblemFilters.exclude[IncompatibleTemplateDefProblem]("io.grpc.channelz.v1.*")
+ProblemFilters.exclude[MissingTypesProblem]("io.grpc.health.v1.*")
+ProblemFilters.exclude[DirectMissingMethodProblem]("io.grpc.health.v1.*")
+ProblemFilters.exclude[IncompatibleTemplateDefProblem]("io.grpc.health.v1.*")
+ProblemFilters.exclude[MissingTypesProblem]("io.grpc.reflection.v1.*")
+ProblemFilters.exclude[DirectMissingMethodProblem]("io.grpc.reflection.v1.*")
+ProblemFilters.exclude[IncompatibleTemplateDefProblem]("io.grpc.reflection.v1.*")
+ProblemFilters.exclude[MissingTypesProblem]("io.grpc.reflection.v1alpha.*")
+ProblemFilters.exclude[DirectMissingMethodProblem]("io.grpc.reflection.v1alpha.*")
+ProblemFilters.exclude[IncompatibleTemplateDefProblem]("io.grpc.reflection.v1alpha.*")
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 508842d3a..913900b95 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -39,7 +39,7 @@ object Dependencies {
val ScalaTestVersion = "3.2.20"
val TestContainersScalaTestVersion = "0.44.1"
val mockitoVersion = "5.23.0" // check even
https://github.com/scalatest/scalatestplus-mockito/releases
- val protobufJavaVersion = "3.25.9"
+ val protobufJavaVersion = "4.35.0"
val hoverflyVersion = "0.20.2"
val scalaCheckVersion = "1.19.0"
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 89f4df273..5de58726a 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -29,8 +29,7 @@ addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" %
"0.10.7")
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.6.1")
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" %
"3.0.3")
// Pekko gRPC -- sync with PekkoGrpcBinaryVersion in Dependencies.scala
-resolvers += Resolver.ApacheMavenStagingRepo
-addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "2.0.0-M1")
+addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "2.0.0-M2")
// templating
addSbtPlugin("com.github.sbt" % "sbt-boilerplate" % "0.8.0")
// Run JUnit 5 tests with sbt
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
