This is an automated email from the ASF dual-hosted git repository.
FrankChen021 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 5604d22139e build(deps): upgrade Protobuf from 3.25.8 to 4.33.0 with
gencode compatibility (#18650)
5604d22139e is described below
commit 5604d22139e9e03f474df2b55b5e3b953a0f1a56
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Jul 28 14:18:15 2026 +0800
build(deps): upgrade Protobuf from 3.25.8 to 4.33.0 with gencode
compatibility (#18650)
* Bump protobuf.version from 3.25.8 to 4.33.0
Bumps `protobuf.version` from 3.25.8 to 4.33.0.
Updates `com.google.protobuf:protobuf-java` from 3.25.8 to 4.33.0
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
-
[Changelog](https://github.com/protocolbuffers/protobuf/blob/main/protobuf_release.bzl)
- [Commits](https://github.com/protocolbuffers/protobuf/commits)
Updates `com.google.protobuf:protobuf-java-util` from 3.25.8 to 4.33.0
---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
dependency-version: 4.33.0
dependency-type: direct:production
update-type: version-update:semver-major
- dependency-name: com.google.protobuf:protobuf-java-util
dependency-version: 4.33.0
dependency-type: direct:production
update-type: version-update:semver-major
...
Signed-off-by: dependabot[bot] <[email protected]>
* Fix gRPC query compatibility with Protobuf 4
* Update Protobuf license metadata
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Frank Chen <[email protected]>
---
extensions-contrib/grpc-query/pom.xml | 2 +-
.../main/java/org/apache/druid/grpc/server/ProtobufWriter.java | 8 ++++----
.../src/main/java/org/apache/druid/grpc/server/QueryDriver.java | 6 +++---
licenses.yaml | 4 ++--
pom.xml | 2 +-
5 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/extensions-contrib/grpc-query/pom.xml
b/extensions-contrib/grpc-query/pom.xml
index 3a9d4699513..6d1f24ec098 100644
--- a/extensions-contrib/grpc-query/pom.xml
+++ b/extensions-contrib/grpc-query/pom.xml
@@ -280,7 +280,7 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.6.1</version>
<configuration>
-
<protocArtifact>com.google.protobuf:protoc:3.21.7:exe:${os.detected.classifier}</protocArtifact>
+
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
<pluginId>grpc-java</pluginId>
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.52.0:exe:${os.detected.classifier}</pluginArtifact>
</configuration>
diff --git
a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/ProtobufWriter.java
b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/ProtobufWriter.java
index bf88c33d08a..17514b3f9aa 100644
---
a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/ProtobufWriter.java
+++
b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/ProtobufWriter.java
@@ -20,7 +20,7 @@
package org.apache.druid.grpc.server;
import com.google.protobuf.Descriptors;
-import com.google.protobuf.GeneratedMessageV3;
+import com.google.protobuf.GeneratedMessage;
import com.google.protobuf.Message;
import org.apache.calcite.rel.type.RelDataType;
import org.apache.druid.segment.column.RowSignature;
@@ -41,18 +41,18 @@ import java.util.Map;
public class ProtobufWriter implements ResultFormat.Writer
{
private final OutputStream outputStream;
- private final GeneratedMessageV3 message;
+ private final GeneratedMessage message;
private Message.Builder rowBuilder;
private final Map<String, Method> methods = new HashMap<>();
- public ProtobufWriter(OutputStream outputStream, Class<GeneratedMessageV3>
clazz)
+ public ProtobufWriter(OutputStream outputStream, Class<GeneratedMessage>
clazz)
{
this.outputStream = outputStream;
this.message = get(clazz);
}
- private GeneratedMessageV3 get(Class<GeneratedMessageV3> clazz)
+ private GeneratedMessage get(Class<GeneratedMessage> clazz)
{
try {
final Method method = clazz.getMethod("getDefaultInstance", new
Class<?>[0]);
diff --git
a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/QueryDriver.java
b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/QueryDriver.java
index df457cf7d14..acfc3cd8f86 100644
---
a/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/QueryDriver.java
+++
b/extensions-contrib/grpc-query/src/main/java/org/apache/druid/grpc/server/QueryDriver.java
@@ -25,7 +25,7 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableMap;
import com.google.protobuf.ByteString;
-import com.google.protobuf.GeneratedMessageV3;
+import com.google.protobuf.GeneratedMessage;
import org.apache.calcite.avatica.SqlType;
import org.apache.calcite.rel.type.RelDataType;
import org.apache.druid.grpc.proto.QueryOuterClass;
@@ -749,10 +749,10 @@ public class QueryDriver
}
@SuppressWarnings("unchecked")
- private Class<GeneratedMessageV3> getProtobufClass(final QueryRequest
request)
+ private Class<GeneratedMessage> getProtobufClass(final QueryRequest request)
{
try {
- return (Class<GeneratedMessageV3>)
Class.forName(request.getProtobufMessageName());
+ return (Class<GeneratedMessage>)
Class.forName(request.getProtobufMessageName());
}
catch (ClassNotFoundException e) {
throw new RequestError(
diff --git a/licenses.yaml b/licenses.yaml
index d0855d9e262..63ebaa9d1a0 100644
--- a/licenses.yaml
+++ b/licenses.yaml
@@ -3678,7 +3678,7 @@ name: Protocol Buffers
license_category: binary
module: java-core
license_name: BSD-3-Clause License
-version: 3.25.5
+version: 4.33.0
copyright: Google, Inc.
license_file_path:
- licenses/bin/protobuf-java.BSD3
@@ -3844,7 +3844,7 @@ name: Protocol Buffers
license_category: binary
module: extensions/druid-protobuf-extensions
license_name: BSD-3-Clause License
-version: 3.25.8
+version: 4.33.0
copyright: Google, Inc.
license_file_path: licenses/bin/protobuf-java.BSD3
libraries:
diff --git a/pom.xml b/pom.xml
index fcc26bc508b..86cd94f4024 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,7 +113,7 @@
<netty3.version>3.10.6.Final</netty3.version>
<netty4.version>4.2.15.Final</netty4.version>
<postgresql.version>42.7.12</postgresql.version>
- <protobuf.version>3.25.8</protobuf.version>
+ <protobuf.version>4.33.0</protobuf.version>
<resilience4j.version>1.3.1</resilience4j.version>
<slf4j.version>2.0.17</slf4j.version>
<jna.version>5.18.1</jna.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
