Merge branch 'jetty-9.4.x' into jetty-10.0.x

pom.xml

@@ -33,7 +33,6 @@
     <jmh.version>1.21</jmh.version>
     <jmhjar.name>benchmarks</jmhjar.name>
     <tycho-version>1.4.0</tycho-version>
-    <cbi-plugins.version>1.1.7</cbi-plugins.version>
     <junit.version>5.5.1</junit.version>
     <maven.version>3.6.0</maven.version>
     <maven.resolver.version>1.3.1</maven.resolver.version>
@@ -1380,6 +1379,9 @@
           <name>eclipse-sign</name>
         </property>
       </activation>
+      <properties>
+        <cbi-plugins.version>1.1.7</cbi-plugins.version>
+      </properties>
       <build>
         <plugins>
           <plugin>
@@ -1427,6 +1429,15 @@
           </plugin>
         </plugins>
       </build>
+      <pluginRepositories>
+        <pluginRepository>
+          <id>cbi-releases</id>
+          <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+        </pluginRepository>
+      </pluginRepositories>
     </profile>
     <profile>
       <id>snapshot-repositories</id>
@@ -1455,21 +1466,6 @@
         </repository>
       </repositories>
     </profile>
-    <profile>
-      <id>cbi-repository</id>
-      <activation>
-        <activeByDefault>true</activeByDefault>
-      </activation>
-      <pluginRepositories>
-        <pluginRepository>
-          <id>cbi-releases</id>
-          <url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
-          <snapshots>
-            <enabled>false</enabled>
-          </snapshots>
-        </pluginRepository>
-      </pluginRepositories>
-    </profile>
   </profiles>
 
   <issueManagement>