diff --git a/pom.xml b/pom.xml
index 9c22609f..d8309172 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
@@ -248,7 +248,7 @@
 
   <profiles>
     <profile>
-      <id>jdk8plus</id>
+      <id>jdk8-plus</id>
       <activation>
         <jdk>[1.8,)</jdk>
       </activation>
@@ -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>