Skip to content

Commit a8c4dd1

Browse files
authored
Merge pull request #84 from leonardehrenfried/master
Update to latest version of protobuf compiler and Java runtime
2 parents 7050448 + 5050528 commit a8c4dd1

File tree

1 file changed

+13
-2
lines changed

1 file changed

+13
-2
lines changed

pom.xml

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,20 @@
3131

3232
<properties>
3333
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
34+
<protobuf.version>4.28.3</protobuf.version>
3435
</properties>
3536

3637
<build>
38+
<extensions>
39+
<!-- makes build variables like os.detected.classifier available.
40+
use to select the correct protoc instance for the OS.
41+
see protobuf-maven-plugin below -->
42+
<extension>
43+
<groupId>kr.motd.maven</groupId>
44+
<artifactId>os-maven-plugin</artifactId>
45+
<version>1.7.1</version>
46+
</extension>
47+
</extensions>
3748
<sourceDirectory>${basedir}/src.java</sourceDirectory>
3849
<testSourceDirectory>${basedir}/test.java</testSourceDirectory>
3950

@@ -59,7 +70,7 @@
5970
<artifactId>protobuf-maven-plugin</artifactId>
6071
<version>0.6.1</version>
6172
<configuration>
62-
<protocExecutable>protoc</protocExecutable>
73+
<protocArtifact>com.google.protobuf:protoc:${protobuf.version}:exe:${os.detected.classifier}</protocArtifact>
6374
</configuration>
6475
<executions>
6576
<execution>
@@ -143,7 +154,7 @@
143154
<dependency>
144155
<groupId>com.google.protobuf</groupId>
145156
<artifactId>protobuf-java</artifactId>
146-
<version>3.16.3</version>
157+
<version>${protobuf.version}</version>
147158
</dependency>
148159
</dependencies>
149160

0 commit comments

Comments
 (0)