Skip to content

feat: relax protobuf-java version req #1134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 3, 2025
Merged

feat: relax protobuf-java version req #1134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .release-please-manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"providers/flagd": "0.10.4",
"providers/flagd": "0.10.5",
"hooks/open-telemetry": "3.2.0",
"providers/go-feature-flag": "0.4.0",
"providers/flagsmith": "0.0.9",
Expand Down
34 changes: 14 additions & 20 deletions providers/flagd/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
<!-- exclusion expression for e2e tests -->
<testExclusions>**/e2e/*.java</testExclusions>
<io.grpc.version>1.69.0</io.grpc.version>
<!-- caution - updating this will break compatibility with older protobuf-java versions -->
<protobuf-java.min.version>3.25.5</protobuf-java.min.version>
</properties>

Expand All @@ -38,8 +39,6 @@
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<!-- 5.0.0-rc < 5.0.0, unfortunately -->
<version>[${protobuf-java.min.version},4.999999)</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -153,6 +152,19 @@

</dependencies>

<dependencyManagement>
<dependencies>
<!-- we need to generate protobuf sources with the minium protobuf version we want to be compatible with -->
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<!-- caution - updating this will break compatibility with older protobuf-java versions -->
<version>${protobuf-java.min.version}</version>
</dependency>
</dependencies>

</dependencyManagement>

<build>
<!-- required for protobuf generation -->
<extensions>
Expand Down Expand Up @@ -238,24 +250,6 @@
</build>

<profiles>
<profile>
<!-- this profile forces us to compile against our minimum version of protobuf-java,
which is required so we can be compatible with both protobuf-java@v3 and protobuf-java@v4 consumers -->
<id>build</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>

<dependencies>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<!-- must match minimum version in protobuf-java dependency range above -->
<version>${protobuf-java.min.version}</version>
</dependency>
</dependencies>

</profile>
<profile>
<!-- this profile handles running the flagd e2e tests -->
<id>e2e</id>
Expand Down
2 changes: 1 addition & 1 deletion providers/flagd/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.10.4
0.10.5
Loading