Skip to content

Commit f0c5eb0

Browse files
committed
chore: relax protobuf-java version req
Signed-off-by: Todd Baert <[email protected]>
1 parent 1c30502 commit f0c5eb0

File tree

1 file changed

+14
-20
lines changed

1 file changed

+14
-20
lines changed

providers/flagd/pom.xml

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<!-- exclusion expression for e2e tests -->
1717
<testExclusions>**/e2e/*.java</testExclusions>
1818
<io.grpc.version>1.69.0</io.grpc.version>
19+
<!-- caution - updating this will break compatibility with older protobuf-java versions -->
1920
<protobuf-java.min.version>3.25.5</protobuf-java.min.version>
2021
</properties>
2122

@@ -38,8 +39,6 @@
3839
<dependency>
3940
<groupId>com.google.protobuf</groupId>
4041
<artifactId>protobuf-java</artifactId>
41-
<!-- 5.0.0-rc < 5.0.0, unfortunately -->
42-
<version>[${protobuf-java.min.version},4.999999)</version>
4342
</dependency>
4443

4544
<dependency>
@@ -153,6 +152,19 @@
153152

154153
</dependencies>
155154

155+
<dependencyManagement>
156+
<dependencies>
157+
<!-- we need to generate protobuf sources with the minium protobuf version we want to be compatible with -->
158+
<dependency>
159+
<groupId>com.google.protobuf</groupId>
160+
<artifactId>protobuf-java</artifactId>
161+
<!-- caution - updating this will break compatibility with older protobuf-java versions -->
162+
<version>${protobuf-java.min.version}</version>
163+
</dependency>
164+
</dependencies>
165+
166+
</dependencyManagement>
167+
156168
<build>
157169
<!-- required for protobuf generation -->
158170
<extensions>
@@ -238,24 +250,6 @@
238250
</build>
239251

240252
<profiles>
241-
<profile>
242-
<!-- this profile forces us to compile against our minimum version of protobuf-java,
243-
which is required so we can be compatible with both protobuf-java@v3 and protobuf-java@v4 consumers -->
244-
<id>build</id>
245-
<activation>
246-
<activeByDefault>true</activeByDefault>
247-
</activation>
248-
249-
<dependencies>
250-
<dependency>
251-
<groupId>com.google.protobuf</groupId>
252-
<artifactId>protobuf-java</artifactId>
253-
<!-- must match minimum version in protobuf-java dependency range above -->
254-
<version>${protobuf-java.min.version}</version>
255-
</dependency>
256-
</dependencies>
257-
258-
</profile>
259253
<profile>
260254
<!-- this profile handles running the flagd e2e tests -->
261255
<id>e2e</id>

0 commit comments

Comments
 (0)