Skip to content

Commit 5245040

Browse files
netdpbJimfs Team
authored andcommitted
Bump org.apache.felix:maven-bundle-plugin from 5.1.9 to 6.0.0. Pin to 5.1.9 for JDKs before 17.
Fixes #385. RELNOTES=n/a PiperOrigin-RevId: 702401048
1 parent da4bdd3 commit 5245040

File tree

1 file changed

+23
-4
lines changed

1 file changed

+23
-4
lines changed

pom.xml

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@
196196
<plugin>
197197
<groupId>org.apache.felix</groupId>
198198
<artifactId>maven-bundle-plugin</artifactId>
199-
<version>5.1.9</version>
199+
<version>6.0.0</version>
200200
</plugin>
201201
</plugins>
202202
</pluginManagement>
@@ -248,7 +248,7 @@
248248

249249
<profiles>
250250
<profile>
251-
<id>jdk8plus</id>
251+
<id>jdk8-plus</id>
252252
<activation>
253253
<jdk>[1.8,)</jdk>
254254
</activation>
@@ -280,14 +280,33 @@
280280
</profile>
281281

282282
<profile>
283-
<id>run-error-prone</id>
283+
<id>before-jdk17</id>
284+
<activation>
285+
<jdk>(,17)</jdk>
286+
</activation>
287+
<build>
288+
<pluginManagement>
289+
<plugins>
290+
<plugin>
291+
<!-- maven-bundle-plugin 6.0.0+ requires JDK 17+ -->
292+
<groupId>org.apache.felix</groupId>
293+
<artifactId>maven-bundle-plugin</artifactId>
294+
<version>5.1.9</version>
295+
</plugin>
296+
</plugins>
297+
</pluginManagement>
298+
</build>
299+
</profile>
300+
301+
<profile>
302+
<id>jdk17-plus</id>
284303
<activation>
285-
<!-- Error Prone requires 17+: https://errorprone.info/docs/installation. -->
286304
<jdk>[17,)</jdk>
287305
</activation>
288306
<build>
289307
<plugins>
290308
<plugin>
309+
<!-- Error Prone requires 17+: https://errorprone.info/docs/installation. -->
291310
<groupId>org.apache.maven.plugins</groupId>
292311
<artifactId>maven-compiler-plugin</artifactId>
293312
<configuration>

0 commit comments

Comments
 (0)