Skip to content

Commit 3a7263f

Browse files
committed
chore: loosen protobuf dep version req
Signed-off-by: Todd Baert <[email protected]>
1 parent 1c30502 commit 3a7263f

File tree

2 files changed

+7
-12
lines changed

2 files changed

+7
-12
lines changed

.github/workflows/release-please.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
modules=($(cat pom.xml | grep "<module>" | sed 's/\s*<.*>\(.*\)<.*>/\1/'))
5858
for module in "${modules[@]}"
5959
do
60-
mvn --batch-mode --projects $module --settings release/m2-settings.xml -DskipTests clean deploy
60+
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
6161
done
6262
env:
6363
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}

providers/flagd/pom.xml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@
3838
<dependency>
3939
<groupId>com.google.protobuf</groupId>
4040
<artifactId>protobuf-java</artifactId>
41-
<!-- 5.0.0-rc < 5.0.0, unfortunately -->
42-
<version>[${protobuf-java.min.version},4.999999)</version>
41+
<!-- we use the force the minium protobuf-java version for max compatibility of grpc generated sources; the "release" profile specifies a range for publish -->
42+
<version>${protobuf-java.min.version}</version>
4343
</dependency>
4444

4545
<dependency>
@@ -239,19 +239,14 @@
239239

240240
<profiles>
241241
<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-
242+
<!-- override protobuf-java with a range in release mode, for maximum compatibility -->
243+
<id>release</id>
249244
<dependencies>
250245
<dependency>
251246
<groupId>com.google.protobuf</groupId>
252247
<artifactId>protobuf-java</artifactId>
253-
<!-- must match minimum version in protobuf-java dependency range above -->
254-
<version>${protobuf-java.min.version}</version>
248+
<!-- 5.0.0-rc < 5.0.0, unfortunately -->
249+
<version>[${protobuf-java.min.version},4.999999)</version>
255250
</dependency>
256251
</dependencies>
257252

0 commit comments

Comments
 (0)