Skip to content

Commit 0af92eb

Browse files
authored
chore: upgrade protobuf runtime and pin compiler version (#1251)
This way we can upgrade protobuf-java while staying on the same runtime version. So we don't get ahead of eg WildFly
1 parent 559068c commit 0af92eb

4 files changed

Lines changed: 6 additions & 4 deletions

File tree

‎compat-0.3/spec-grpc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@
131131
<skip>${skip.protobuf.generate}</skip>
132132
<cleanOutputDirectories>true</cleanOutputDirectories>
133133
<protoc kind="binary-maven">
134-
<version>${protobuf-java.version}</version>
134+
<version>${protobuf-protoc.version}</version>
135135
</protoc>
136136
<outputDirectory>${project.basedir}/src/main/java/</outputDirectory>
137137
<plugins>

‎itk/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@
123123
<version>${protobuf-maven-plugin.version}</version>
124124
<configuration>
125125
<protoc kind="binary-maven">
126-
<version>${protobuf-java.version}</version>
126+
<version>${protobuf-protoc.version}</version>
127127
</protoc>
128128
<sourceDirectories>
129129
<sourceDirectory>${a2a.itk.proto.dir}</sourceDirectory>

‎pom.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,10 @@
7171
<okhttp.version>4.12.0</okhttp.version>
7272
<mutiny-zero.version>1.3.1</mutiny-zero.version>
7373
<os-maven-plugin.version>1.7.1</os-maven-plugin.version>
74-
<protobuf-java.version>4.35.0</protobuf-java.version>
74+
<protobuf-java.version>4.36.2</protobuf-java.version>
7575
<protobuf-maven-plugin.version>5.1.11</protobuf-maven-plugin.version>
76+
<!-- Keep generation compatible with the protobuf runtime supplied by the WildFly gRPC feature pack. -->
77+
<protobuf-protoc.version>4.35.0</protobuf-protoc.version>
7678
<quarkus.platform.version>3.39.2</quarkus.platform.version>
7779
<rest-assured.version>6.0.1</rest-assured.version>
7880
<slf4j.version>2.0.19</slf4j.version>

‎spec-grpc/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
<skip>${skip.protobuf.generate}</skip>
102102
<cleanOutputDirectories>true</cleanOutputDirectories>
103103
<protoc kind="binary-maven">
104-
<version>${protobuf-java.version}</version>
104+
<version>${protobuf-protoc.version}</version>
105105
</protoc>
106106
<outputDirectory>${project.basedir}/src/main/java/</outputDirectory>
107107
<plugins>

0 commit comments

Comments
 (0)