From 77ed780362c0400cb5f3cbfd83a4313ec3764bf5 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 19 Nov 2025 23:27:14 +0000
Subject: [PATCH 1/3] Bump protobuf.version from 3.25.6 to 4.30.2

Bumps `protobuf.version` from 3.25.6 to 4.30.2.

Updates `com.google.protobuf:protobuf-java` from 3.25.6 to 4.30.2
- [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/compare/v3.25.6...v4.30.2)

Updates `com.google.protobuf:protobuf-java-util` from 3.25.6 to 4.30.2

---
updated-dependencies:
- dependency-name: com.google.protobuf:protobuf-java
  dependency-version: 4.30.2
  dependency-type: direct:production
  update-type: version-update:semver-major
- dependency-name: com.google.protobuf:protobuf-java-util
  dependency-version: 4.30.2
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 parquet-cli/pom.xml      | 2 +-
 parquet-protobuf/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/parquet-cli/pom.xml b/parquet-cli/pom.xml
index 17a508e8a0..3c7a9b2b69 100644
--- a/parquet-cli/pom.xml
+++ b/parquet-cli/pom.xml
@@ -97,7 +97,7 @@
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
-      <version>3.25.6</version>
+      <version>4.33.1</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/parquet-protobuf/pom.xml b/parquet-protobuf/pom.xml
index ace4b63001..5c202c150a 100644
--- a/parquet-protobuf/pom.xml
+++ b/parquet-protobuf/pom.xml
@@ -31,7 +31,7 @@
 
   <properties>
     <elephant-bird.version>4.4</elephant-bird.version>
-    <protobuf.version>3.25.6</protobuf.version>
+    <protobuf.version>4.33.1</protobuf.version>
     <common-protos.version>2.59.2</common-protos.version>  <!-- make sure it's compatible with protobuf.version -->
     <truth-proto-extension.version>1.4.4</truth-proto-extension.version>
   </properties>

From 50410861bfe35ea7135d81a000d3650e612f6c43 Mon Sep 17 00:00:00 2001
From: Fokko Driesprong <fokko@apache.org>
Date: Tue, 2 Dec 2025 20:11:44 +0100
Subject: [PATCH 2/3] Fix the test-class

---
 .../src/test/java/org/apache/parquet/proto/TestUtils.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/parquet-protobuf/src/test/java/org/apache/parquet/proto/TestUtils.java b/parquet-protobuf/src/test/java/org/apache/parquet/proto/TestUtils.java
index b41024462c..cb06ef3024 100644
--- a/parquet-protobuf/src/test/java/org/apache/parquet/proto/TestUtils.java
+++ b/parquet-protobuf/src/test/java/org/apache/parquet/proto/TestUtils.java
@@ -85,14 +85,14 @@ public static <T extends MessageOrBuilder> List<T> testData(T... messages) throw
     List<Message> outputAsMessages = asMessages(output);
     Descriptors.Descriptor messageDescriptor =
         Protobufs.getMessageDescriptor(asMessage(messages[0]).getClass());
-    Descriptors.FileDescriptor.Syntax syntax = messageDescriptor.getFile().getSyntax();
+    String syntax = messageDescriptor.getFile().toProto().getSyntax();
     for (int i = 0; i < messages.length; i++) {
-      if (Descriptors.FileDescriptor.Syntax.PROTO2.equals(syntax)) {
+      if (!"proto3".equals(syntax)) {
         com.google.common.truth.extensions.proto.ProtoTruth.assertThat(outputAsMessages.get(i))
             .ignoringRepeatedFieldOrder()
             .reportingMismatchesOnly()
             .isEqualTo(asMessage(messages[i]));
-      } else if (Descriptors.FileDescriptor.Syntax.PROTO3.equals(syntax)) {
+      } else if ("proto3".equals(syntax)) {
         // proto3 will return default values for absent fields which is what is returned in output
         // this is why we can ignore absent fields here
         com.google.common.truth.extensions.proto.ProtoTruth.assertThat(outputAsMessages.get(i))

From 350bc863b997f1ddb9ea9e3743fc2c46dda0c1a1 Mon Sep 17 00:00:00 2001
From: Fokko Driesprong <fokko@apache.org>
Date: Tue, 2 Dec 2025 20:20:08 +0100
Subject: [PATCH 3/3] Add `-Dmaven.buildNumber.skip=true`

---
 .github/workflows/vector-plugins.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/vector-plugins.yml b/.github/workflows/vector-plugins.yml
index f02ac052e0..cc57e97ffd 100644
--- a/.github/workflows/vector-plugins.yml
+++ b/.github/workflows/vector-plugins.yml
@@ -46,7 +46,7 @@ jobs:
         run: |
           EXTRA_JAVA_TEST_ARGS=$(./mvnw help:evaluate -Dexpression=extraJavaTestArgs -q -DforceStdout)
           export MAVEN_OPTS="$MAVEN_OPTS $EXTRA_JAVA_TEST_ARGS"
-          ./mvnw install --batch-mode -Pvector-plugins -DskipTests=true -Dmaven.javadoc.skip=true -Dsource.skip=true -Djava.version=${{ matrix.java }} -pl parquet-plugins/parquet-encoding-vector,parquet-plugins/parquet-plugins-benchmarks -am
+          ./mvnw install --batch-mode -Pvector-plugins -DskipTests=true -Dmaven.javadoc.skip=true -Dsource.skip=true -Dmaven.buildNumber.skip=true -Djava.version=${{ matrix.java }} -pl parquet-plugins/parquet-encoding-vector,parquet-plugins/parquet-plugins-benchmarks -am
       - name: verify
         env:
           TEST_CODECS: ${{ matrix.codes }}