From 6cfabec9d340c454e0fcc35be1fa7c9f305a8089 Mon Sep 17 00:00:00 2001
From: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Date: Tue, 14 Sep 2021 21:54:47 -0500
Subject: [PATCH] Jetty 9.4.x - more dependency backlog catch-up (#6827)

* Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0

Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.0.0-M3 to 3.0.0.
- [Release notes](https://github.com/apache/maven-enforcer/releases)
- [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.0.0-M3...enforcer-3.0.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-enforcer-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix some upperbound issues
* Bump maven-plugin-plugin to 3.6.1
* Bump asciidoctor-maven-plugin to 2.2.1
* Bump cbi-plugins.version to 1.3.2
* Bump maven.invoker.version to 1.3.2
* Bump tycho.version to 2.3.0
* Align google.errorprone.version to 2.9.0
* Bump checkstyle to 9.0
* Fix checkstyle violation

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
---
 .../TestSecurityAnnotationConversions.java    | 16 +++--
 jetty-cdi/pom.xml                             | 10 +++
 jetty-gcloud/pom.xml                          |  2 +-
 jetty-osgi/test-jetty-osgi/pom.xml            |  1 -
 pom.xml                                       | 67 ++++++++++++++++---
 5 files changed, 78 insertions(+), 18 deletions(-)

diff --git a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestSecurityAnnotationConversions.java b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestSecurityAnnotationConversions.java
index bcb08663e05..3c96fa4e477 100644
--- a/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestSecurityAnnotationConversions.java
+++ b/jetty-annotations/src/test/java/org/eclipse/jetty/annotations/TestSecurityAnnotationConversions.java
@@ -70,12 +70,16 @@ public class TestSecurityAnnotationConversions
     {
     }
 
-    @ServletSecurity(value = @HttpConstraint(value = EmptyRoleSemantic.PERMIT, transportGuarantee = TransportGuarantee.CONFIDENTIAL, rolesAllowed =
-        {
-            "tom", "dick", "harry"
-        }), httpMethodConstraints = {
-        @HttpMethodConstraint(value = "GET", transportGuarantee = TransportGuarantee.CONFIDENTIAL)
-    })
+    @ServletSecurity(
+        value = @HttpConstraint(
+            value = EmptyRoleSemantic.PERMIT,
+            transportGuarantee = TransportGuarantee.CONFIDENTIAL,
+            rolesAllowed = {
+                "tom", "dick", "harry"
+            }),
+        httpMethodConstraints = {
+            @HttpMethodConstraint(value = "GET", transportGuarantee = TransportGuarantee.CONFIDENTIAL)
+        })
     public static class Method2Servlet extends HttpServlet
     {
     }
diff --git a/jetty-cdi/pom.xml b/jetty-cdi/pom.xml
index 6e8eea2a4b9..b58315b97ec 100644
--- a/jetty-cdi/pom.xml
+++ b/jetty-cdi/pom.xml
@@ -13,6 +13,16 @@
     <bundle-symbolic-name>${project.groupId}.cdi</bundle-symbolic-name>
   </properties>
   <dependencies>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.jetty</groupId>
+      <artifactId>jetty-server</artifactId>
+      <scope>compile</scope>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>
diff --git a/jetty-gcloud/pom.xml b/jetty-gcloud/pom.xml
index ee10ecd6db6..e26421a28e9 100644
--- a/jetty-gcloud/pom.xml
+++ b/jetty-gcloud/pom.xml
@@ -13,7 +13,7 @@
   <name>Jetty :: GCloud</name>
 
   <properties>
-    <gcloud.version>1.105.0</gcloud.version>
+    <gcloud.version>2.1.0</gcloud.version>
   </properties>
 
   <modules>
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index 68a7c113509..aff16bd78a8 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -107,7 +107,6 @@
     <dependency>
       <groupId>biz.aQute.bnd</groupId>
       <artifactId>biz.aQute.bndlib</artifactId>
-      <version>${bnd.version}</version>
       <exclusions>
         <exclusion>
           <groupId>org.osgi</groupId>
diff --git a/pom.xml b/pom.xml
index 90174a9d4aa..f7af6d9d7cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
     <jetty.url>https://eclipse.org/jetty</jetty.url>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <build-support.version>1.5</build-support.version>
-    <checkstyle.version>8.37</checkstyle.version>
+    <checkstyle.version>9.0</checkstyle.version>
     <slf4j.version>1.7.32</slf4j.version>
     <log4j2.version>2.14.0</log4j2.version>
     <disruptor.version>3.4.2</disruptor.version>
@@ -29,12 +29,13 @@
     <infinispan.protostream.version>4.3.4.Final</infinispan.protostream.version>
     <gson.version>2.8.8</gson.version>
     <grpc.version>1.40.1</grpc.version>
+    <google.errorprone.version>2.9.0</google.errorprone.version>
     <alpn.agent.version>2.0.10</alpn.agent.version>
     <conscrypt.version>2.5.2</conscrypt.version>
     <asm.version>9.2</asm.version>
     <jmh.version>1.33</jmh.version>
     <jmhjar.name>benchmarks</jmhjar.name>
-    <tycho-version>2.1.0</tycho-version>
+    <tycho.version>2.3.0</tycho.version>
     <junit.version>5.8.0</junit.version>
     <maven.version>3.8.2</maven.version>
     <maven.resolver.version>1.7.2</maven.resolver.version>
@@ -50,6 +51,7 @@
     <jpms-module-name>${bundle-symbolic-name}</jpms-module-name>
 
     <!-- some maven plugins versions -->
+    <maven.invoker.version>3.2.2</maven.invoker.version>
     <maven.surefire.version>3.0.0-M5</maven.surefire.version>
     <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
     <maven.dependency.plugin.version>3.2.0</maven.dependency.plugin.version>
@@ -498,7 +500,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-enforcer-plugin</artifactId>
-          <version>3.0.0-M3</version>
+          <version>3.0.0</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -508,7 +510,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-invoker-plugin</artifactId>
-          <version>3.2.1</version>
+          <version>${maven.invoker.version}</version>
           <configuration>
             <mergeUserSettings>true</mergeUserSettings>
             <writeJunitReport>true</writeJunitReport>
@@ -585,7 +587,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-plugin-plugin</artifactId>
-          <version>3.6.0</version>
+          <version>3.6.1</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -717,7 +719,7 @@
         <plugin>
           <groupId>org.asciidoctor</groupId>
           <artifactId>asciidoctor-maven-plugin</artifactId>
-          <version>2.1.0</version>
+          <version>2.2.1</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
@@ -930,6 +932,11 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-server</artifactId>
+        <version>${project.version}</version>
+      </dependency>
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>javax.servlet-api</artifactId>
@@ -1057,6 +1064,11 @@
         <version>${maven.plugin-tools.version}</version>
         <scope>provided</scope>
       </dependency>
+      <dependency>
+        <groupId>org.codehaus.plexus</groupId>
+        <artifactId>plexus-container-default</artifactId>
+        <version>2.1.0</version>
+      </dependency>
       <dependency>
         <groupId>org.junit.jupiter</groupId>
         <artifactId>junit-jupiter</artifactId>
@@ -1132,6 +1144,41 @@
         <artifactId>jnr-unixsocket</artifactId>
         <version>0.38.10</version>
       </dependency>
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>org.osgi.core</artifactId>
+        <version>6.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>org.osgi</groupId>
+        <artifactId>osgi.annotation</artifactId>
+        <version>8.0.0</version>
+      </dependency>
+      <dependency>
+        <groupId>biz.aQute.bnd</groupId>
+        <artifactId>biz.aQute.bndlib</artifactId>
+        <version>5.3.0</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+        <version>3.0.2</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.guava</groupId>
+        <artifactId>guava</artifactId>
+        <version>30.1.1-jre</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.inject</groupId>
+        <artifactId>guice</artifactId>
+        <version>4.2.2</version>
+      </dependency>
+      <dependency>
+        <groupId>com.google.errorprone</groupId>
+        <artifactId>error_prone_annotations</artifactId>
+        <version>${google.errorprone.version}</version>
+      </dependency>
       <!-- avoid depending on a range dependency from a transitive dependency -->
       <dependency>
         <groupId>io.grpc</groupId>
@@ -1170,7 +1217,7 @@
                   <path>
                     <groupId>com.google.errorprone</groupId>
                     <artifactId>error_prone_core</artifactId>
-                    <version>2.4.0</version>
+                    <version>${google.errorprone.version}</version>
                   </path>
                 </annotationProcessorPaths>
               </configuration>
@@ -1447,14 +1494,14 @@
         </property>
       </activation>
       <properties>
-        <cbi-plugins.version>1.1.7</cbi-plugins.version>
+        <cbi-plugins.version>1.3.2</cbi-plugins.version>
       </properties>
       <build>
         <plugins>
           <plugin>
             <groupId>org.eclipse.tycho.extras</groupId>
             <artifactId>tycho-pack200a-plugin</artifactId>
-            <version>${tycho-version}</version>
+            <version>${tycho.version}</version>
             <executions>
               <execution>
                 <id>pack200-normalize</id>
@@ -1482,7 +1529,7 @@
           <plugin>
             <groupId>org.eclipse.tycho.extras</groupId>
             <artifactId>tycho-pack200b-plugin</artifactId>
-            <version>${tycho-version}</version>
+            <version>${tycho.version}</version>
             <executions>
               <execution>
                 <id>pack200-pack</id>