Skip to content

Bump protobuf.version from 3.25.6 to 4.30.2 #3182

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Fokko merged 4 commits into from
Dec 5, 2025
Merged

Bump protobuf.version from 3.25.6 to 4.30.2 #3182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77ed780
Bump protobuf.version from 3.25.6 to 4.30.2
dependabot[bot] Nov 19, 2025
6b43bd6
Merge branch 'master' of github.com:apache/parquet-java into dependab…
Fokko Dec 2, 2025
5041086
Fix the test-class
Fokko Dec 2, 2025
350bc86
Add `-Dmaven.buildNumber.skip=true`
Fokko Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/vector-plugins.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion parquet-cli/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion parquet-protobuf/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions parquet-protobuf/src/test/java/org/apache/parquet/proto/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down