This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new ecaf0f8017a [codex] Upgrade protobuf to 4.34.0 (#17995)
ecaf0f8017a is described below
commit ecaf0f8017aeb11d61c9fdd0ca253faa7336fc70
Author: Xiang Fu <[email protected]>
AuthorDate: Sun Mar 29 02:32:48 2026 -0700
[codex] Upgrade protobuf to 4.34.0 (#17995)
* Upgrade protobuf to 4.34.0
* Scope Confluent protobuf plugin to protobuf 3.x
* Align Confluent protobuf plugin with shared protobuf version
* Stabilize protobuf upgrade CI
* Upgrade Confluent schema registry to 8.2.0
* Drop unrelated controller test tweak
* Fix protobuf upgrade CI regressions
* Revert sqlparser CI script changes
* Address PR review comments: bump Google Cloud libs, scope jsr305
- Bump google.cloud.libraries.version from 26.74.0 to 26.79.0 to align
with protobuf 4.x upgrade
- Add provided scope to jsr305 dependency in pinot-confluent-protobuf
since it is only needed at compile time for javax.annotation annotations
Co-Authored-By: Claude Opus 4.6 (1M context) <[email protected]>
---------
Co-authored-by: Claude Opus 4.6 (1M context) <[email protected]>
---
...emaRegistryAvroMessageDecoderRealtimeClusterIntegrationTest.java | 4 ++--
pinot-plugins/pinot-input-format/pinot-confluent-protobuf/pom.xml | 5 +++++
pom.xml | 6 +++---
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git
a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/KafkaConfluentSchemaRegistryAvroMessageDecoderRealtimeClusterIntegrationTest.java
b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/KafkaConfluentSchemaRegistryAvroMessageDecoderRealtimeClusterIntegrationTest.java
index 5c643b863e3..c344c5f0d2b 100644
---
a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/KafkaConfluentSchemaRegistryAvroMessageDecoderRealtimeClusterIntegrationTest.java
+++
b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/KafkaConfluentSchemaRegistryAvroMessageDecoderRealtimeClusterIntegrationTest.java
@@ -19,7 +19,7 @@
package org.apache.pinot.integration.tests;
import com.google.common.primitives.Longs;
-import io.confluent.kafka.serializers.AbstractKafkaAvroSerDeConfig;
+import io.confluent.kafka.serializers.AbstractKafkaSchemaSerDeConfig;
import java.io.File;
import java.net.URI;
import java.util.ArrayList;
@@ -116,7 +116,7 @@ public class
KafkaConfluentSchemaRegistryAvroMessageDecoderRealtimeClusterIntegr
throws Exception {
Properties avroProducerProps = new Properties();
avroProducerProps.put(ProducerConfig.BOOTSTRAP_SERVERS_CONFIG,
"localhost:" + getKafkaPort());
-
avroProducerProps.put(AbstractKafkaAvroSerDeConfig.SCHEMA_REGISTRY_URL_CONFIG,
_schemaRegistry.getUrl());
+
avroProducerProps.put(AbstractKafkaSchemaSerDeConfig.SCHEMA_REGISTRY_URL_CONFIG,
_schemaRegistry.getUrl());
avroProducerProps.put(ProducerConfig.KEY_SERIALIZER_CLASS_CONFIG,
"org.apache.kafka.common.serialization.ByteArraySerializer");
avroProducerProps.put(ProducerConfig.VALUE_SERIALIZER_CLASS_CONFIG,
diff --git a/pinot-plugins/pinot-input-format/pinot-confluent-protobuf/pom.xml
b/pinot-plugins/pinot-input-format/pinot-confluent-protobuf/pom.xml
index 6fbf6dae85e..58d68139593 100644
--- a/pinot-plugins/pinot-input-format/pinot-confluent-protobuf/pom.xml
+++ b/pinot-plugins/pinot-input-format/pinot-confluent-protobuf/pom.xml
@@ -53,6 +53,11 @@
<groupId>io.confluent</groupId>
<artifactId>kafka-schema-registry-client</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.testcontainers</groupId>
diff --git a/pom.xml b/pom.xml
index b94a17efa8c..944c23f262e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -199,7 +199,7 @@
<spark3.version>3.5.8</spark3.version>
<kafka3.version>3.9.2</kafka3.version>
<kafka4.version>4.1.1</kafka4.version>
- <confluent.version>7.9.5</confluent.version>
+ <confluent.version>8.2.0</confluent.version>
<pulsar.version>4.0.9</pulsar.version>
<flink.version>1.20.3</flink.version>
@@ -240,9 +240,9 @@
<httpcore5.version>5.4.2</httpcore5.version>
<!-- Google Libraries -->
- <protobuf.version>3.25.9</protobuf.version>
+ <protobuf.version>4.34.0</protobuf.version>
<grpc.version>1.80.0</grpc.version>
- <google.cloud.libraries.version>26.74.0</google.cloud.libraries.version>
+ <google.cloud.libraries.version>26.79.0</google.cloud.libraries.version>
<google.auto-service.version>1.1.1</google.auto-service.version>
<google.re2j.version>1.8</google.re2j.version>
<google.errorprone.version>2.48.0</google.errorprone.version>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
