Skip to content

Commit

Permalink
chore: loosen protobuf dep version req
Browse files Browse the repository at this point in the history
Signed-off-by: Todd Baert <[email protected]>
  • Loading branch information
toddbaert committed Jan 3, 2025
1 parent 1c30502 commit 3a7263f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-please.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
modules=($(cat pom.xml | grep "<module>" | sed 's/\s*<.*>\(.*\)<.*>/\1/'))
for module in "${modules[@]}"
do
mvn --batch-mode --projects $module --settings release/m2-settings.xml -DskipTests clean deploy
mvn --batch-mode --projects $module --settings release/m2-settings.xml -DskipTests clean install && mvn --batch-mode --projects $module --settings release/m2-settings.xml -DskipTests -P release deploy:deploy
done
env:
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
Expand Down
17 changes: 6 additions & 11 deletions providers/flagd/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@
<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>
<!-- we use the force the minium protobuf-java version for max compatibility of grpc generated sources; the "release" profile specifies a range for publish -->
<version>${protobuf-java.min.version}</version>
</dependency>

<dependency>
Expand Down Expand Up @@ -239,19 +239,14 @@

<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>

<!-- override protobuf-java with a range in release mode, for maximum compatibility -->
<id>release</id>
<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>
<!-- 5.0.0-rc < 5.0.0, unfortunately -->
<version>[${protobuf-java.min.version},4.999999)</version>
</dependency>
</dependencies>

Expand Down

0 comments on commit 3a7263f

Please sign in to comment.