Merge pull request #84 from leonardehrenfried/master

Update to latest version of protobuf compiler and Java runtime
This commit is contained in:
Jochen Topf 2024-11-13 11:09:54 +01:00 committed by GitHub
commit a8c4dd1c11
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 2 deletions

15
pom.xml
View File

@ -31,9 +31,20 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<protobuf.version>4.28.3</protobuf.version>
</properties> </properties>
<build> <build>
<extensions>
<!-- makes build variables like os.detected.classifier available.
use to select the correct protoc instance for the OS.
see protobuf-maven-plugin below -->
<extension>
<groupId>kr.motd.maven</groupId>
<artifactId>os-maven-plugin</artifactId>
<version>1.7.1</version>
</extension>
</extensions>
<sourceDirectory>${basedir}/src.java</sourceDirectory> <sourceDirectory>${basedir}/src.java</sourceDirectory>
<testSourceDirectory>${basedir}/test.java</testSourceDirectory> <testSourceDirectory>${basedir}/test.java</testSourceDirectory>
@ -59,7 +70,7 @@
<artifactId>protobuf-maven-plugin</artifactId> <artifactId>protobuf-maven-plugin</artifactId>
<version>0.6.1</version> <version>0.6.1</version>
<configuration> <configuration>
<protocExecutable>protoc</protocExecutable> <protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
@ -143,7 +154,7 @@
<dependency> <dependency>
<groupId>com.google.protobuf</groupId> <groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId> <artifactId>protobuf-java</artifactId>
<version>3.16.3</version> <version>${protobuf.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>