Skip to content

Commit

Permalink
Bump org.apache.felix:maven-bundle-plugin from 5.1.9 to 6.0.0. Pin …
Browse files Browse the repository at this point in the history
…to 5.1.9 for JDKs before 17.

Fixes #385.

RELNOTES=n/a
PiperOrigin-RevId: 702401048
  • Loading branch information
netdpb authored and Jimfs Team committed Dec 3, 2024
1 parent da4bdd3 commit 5245040
Showing 1 changed file with 23 additions and 4 deletions.
27 changes: 23 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.9</version>
<version>6.0.0</version>
</plugin>
</plugins>
</pluginManagement>
Expand Down Expand Up @@ -248,7 +248,7 @@

<profiles>
<profile>
<id>jdk8plus</id>
<id>jdk8-plus</id>
<activation>
<jdk>[1.8,)</jdk>
</activation>
Expand Down Expand Up @@ -280,14 +280,33 @@
</profile>

<profile>
<id>run-error-prone</id>
<id>before-jdk17</id>
<activation>
<jdk>(,17)</jdk>
</activation>
<build>
<pluginManagement>
<plugins>
<plugin>
<!-- maven-bundle-plugin 6.0.0+ requires JDK 17+ -->
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>5.1.9</version>
</plugin>
</plugins>
</pluginManagement>
</build>
</profile>

<profile>
<id>jdk17-plus</id>
<activation>
<!-- Error Prone requires 17+: https://errorprone.info/docs/installation. -->
<jdk>[17,)</jdk>
</activation>
<build>
<plugins>
<plugin>
<!-- Error Prone requires 17+: https://errorprone.info/docs/installation. -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
Expand Down

0 comments on commit 5245040

Please sign in to comment.