Skip to content

Commit 5040a63

Browse files
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](protocolbuffers/protobuf@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]>
1 parent 2ccc243 commit 5040a63

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/vector-plugins.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
run: |
4747
EXTRA_JAVA_TEST_ARGS=$(./mvnw help:evaluate -Dexpression=extraJavaTestArgs -q -DforceStdout)
4848
export MAVEN_OPTS="$MAVEN_OPTS $EXTRA_JAVA_TEST_ARGS"
49-
./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
49+
./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
5050
- name: verify
5151
env:
5252
TEST_CODECS: ${{ matrix.codes }}

parquet-cli/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
<dependency>
9898
<groupId>com.google.protobuf</groupId>
9999
<artifactId>protobuf-java</artifactId>
100-
<version>3.25.6</version>
100+
<version>4.33.1</version>
101101
<scope>test</scope>
102102
</dependency>
103103
<dependency>

parquet-protobuf/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<properties>
3333
<elephant-bird.version>4.4</elephant-bird.version>
34-
<protobuf.version>3.25.6</protobuf.version>
34+
<protobuf.version>4.33.1</protobuf.version>
3535
<common-protos.version>2.59.2</common-protos.version> <!-- make sure it's compatible with protobuf.version -->
3636
<truth-proto-extension.version>1.4.4</truth-proto-extension.version>
3737
</properties>

parquet-protobuf/src/test/java/org/apache/parquet/proto/TestUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@ public static <T extends MessageOrBuilder> List<T> testData(T... messages) throw
8585
List<Message> outputAsMessages = asMessages(output);
8686
Descriptors.Descriptor messageDescriptor =
8787
Protobufs.getMessageDescriptor(asMessage(messages[0]).getClass());
88-
Descriptors.FileDescriptor.Syntax syntax = messageDescriptor.getFile().getSyntax();
88+
String syntax = messageDescriptor.getFile().toProto().getSyntax();
8989
for (int i = 0; i < messages.length; i++) {
90-
if (Descriptors.FileDescriptor.Syntax.PROTO2.equals(syntax)) {
90+
if (!"proto3".equals(syntax)) {
9191
com.google.common.truth.extensions.proto.ProtoTruth.assertThat(outputAsMessages.get(i))
9292
.ignoringRepeatedFieldOrder()
9393
.reportingMismatchesOnly()
9494
.isEqualTo(asMessage(messages[i]));
95-
} else if (Descriptors.FileDescriptor.Syntax.PROTO3.equals(syntax)) {
95+
} else if ("proto3".equals(syntax)) {
9696
// proto3 will return default values for absent fields which is what is returned in output
9797
// this is why we can ignore absent fields here
9898
com.google.common.truth.extensions.proto.ProtoTruth.assertThat(outputAsMessages.get(i))

0 commit comments

Comments
 (0)