This is an automated email from the ASF dual-hosted git repository.
fokko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/parquet-java.git
The following commit(s) were added to refs/heads/master by this push:
new 5040a63e8 Bump protobuf.version from 3.25.6 to 4.30.2 (#3182)
5040a63e8 is described below
commit 5040a63e817c48bd56d4a3ba6ebf5ed13e1edca8
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Fri Dec 5 22:05:40 2025 +0100
Bump protobuf.version from 3.25.6 to 4.30.2 (#3182)
* 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] <[email protected]>
* Fix the test-class
* Add `-Dmaven.buildNumber.skip=true`
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Fokko Driesprong <[email protected]>
---
.github/workflows/vector-plugins.yml | 2 +-
parquet-cli/pom.xml | 2 +-
parquet-protobuf/pom.xml | 2 +-
.../src/test/java/org/apache/parquet/proto/TestUtils.java | 6 +++---
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/.github/workflows/vector-plugins.yml
b/.github/workflows/vector-plugins.yml
index f02ac052e..cc57e97ff 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 }}
diff --git a/parquet-cli/pom.xml b/parquet-cli/pom.xml
index 17a508e8a..3c7a9b2b6 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 ace4b6300..5c202c150 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>
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 b41024462..cb06ef302 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 class TestUtils {
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))
