Skip to content

Commit

Permalink
Update Protobuf
Browse files Browse the repository at this point in the history
3.25.1 is actually newer than 4.0.0-rc-2
  • Loading branch information
Marcono1234 committed Nov 26, 2023
1 parent e1741dd commit 3804240
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 14 deletions.
12 changes: 0 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -475,18 +475,6 @@
<!-- JDK 21 does not support Java 7 as release, must use at least Java 8 -->
<maven.compiler.release>8</maven.compiler.release>
</properties>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<!-- Don't fail on warning because javac reports lint warnings for generated code of 'proto' module -->
<failOnWarning>false</failOnWarning>
</configuration>
</plugin>
</plugins>
</build>
</profile>

<!-- Profile defining additional plugins to be executed for release -->
Expand Down
6 changes: 4 additions & 2 deletions proto/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@
<!-- Make the build reproducible, see root `pom.xml` -->
<!-- This is duplicated here because that is recommended by `artifact:check-buildplan` -->
<project.build.outputTimestamp>2023-01-01T00:00:00Z</project.build.outputTimestamp>

<protobufVersion>3.25.1</protobufVersion>
</properties>

<licenses>
Expand All @@ -50,7 +52,7 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>4.0.0-rc-2</version>
<version>${protobufVersion}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -89,7 +91,7 @@
<artifactId>protobuf-maven-plugin</artifactId>
<version>0.6.1</version>
<configuration>
<protocArtifact>com.google.protobuf:protoc:3.17.3:exe:${os.detected.classifier}</protocArtifact>
<protocArtifact>com.google.protobuf:protoc:${protobufVersion}:exe:${os.detected.classifier}</protocArtifact>
</configuration>
<executions>
<execution>
Expand Down

0 comments on commit 3804240

Please sign in to comment.