Skip to content
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.

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

Bump com.google.protobuf:protobuf-java from 3.16.3 to 3.25.5 #2945

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions exec/jdbc-all/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"package.namespace.prefix" equals to "oadd.". It can be overridden if necessary within any profile -->
<properties>
<package.namespace.prefix>oadd.</package.namespace.prefix>
<jdbc-all-jar.maxsize>54000000</jdbc-all-jar.maxsize>
<jdbc-all-jar.maxsize>55000000</jdbc-all-jar.maxsize>
</properties>

<dependencies>
Expand Down Expand Up @@ -902,7 +902,7 @@
<profile>
<id>hadoop-2</id>
<properties>
<jdbc-all-jar.maxsize>54500000</jdbc-all-jar.maxsize>
<jdbc-all-jar.maxsize>55000000</jdbc-all-jar.maxsize>
</properties>
</profile>
</profiles>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
<parquet.format.version>2.9.0</parquet.format.version>
<parquet.version>1.12.3</parquet.version>
<project.build.outputTimestamp>1676438963</project.build.outputTimestamp>
<protobuf.version>3.16.3</protobuf.version>
<protobuf.version>3.25.5</protobuf.version>
<proto.cas.path>${project.basedir}/src/main/protobuf/</proto.cas.path>
<protostuff.version>1.8.0</protostuff.version>
<rat.skip>true</rat.skip>
Expand Down
1 change: 1 addition & 0 deletions protocol/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
<configuration>
<cleanOutputFolder>false</cleanOutputFolder>
<outputDirectory>${basedir}/src/main/java</outputDirectory>
<ignoreVersions>true</ignoreVersions>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • needed because there is a CI job that uses an older protobuf lib than our protobuf-java lib
  • I tried to get the CI job to use a newer protobuf lib but the format of the protobuf zip has changed and I'm not sure how to get the existing build to use a newer protobuf zip

</configuration>
</execution>
</executions>
Expand Down
Loading