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

jetty-gcloud/jetty-gcloud-session-manager/pom.xml

@@ -32,7 +32,26 @@
           <artifactId>javax.servlet-api</artifactId>
         </exclusion>
       </exclusions>
-
+    </dependency>
+    <dependency>
+      <groupId>com.google.auto.value</groupId>
+      <artifactId>auto-value</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>3.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client-jackson2</artifactId>
+      <version>1.21.0</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <version>3.0.0</version>
     </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>

jetty-home/pom.xml

@@ -638,6 +638,11 @@
       <artifactId>jetty-spring</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging</artifactId>
+      <version>3.3.0.Final</version>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.cdi</groupId>
       <artifactId>cdi-2</artifactId>

jetty-infinispan/pom.xml

@@ -10,7 +10,7 @@
   <url>http://www.eclipse.org/jetty</url>
   <properties>
     <bundle-symbolic-name>${project.groupId}.infinispan</bundle-symbolic-name>
-    <infinispan.version>7.1.1.Final</infinispan.version>
+    <infinispan.version>9.1.0.Final</infinispan.version>
   </properties>
   <build>
     <defaultGoal>install</defaultGoal>

jetty-maven-plugin/pom.xml

@@ -144,6 +144,11 @@
       <artifactId>maven-artifact-transfer</artifactId>
       <version>0.9.1</version>
     </dependency>
+    <dependency>
+      <groupId>javax.enterprise</groupId>
+      <artifactId>cdi-api</artifactId>
+      <version>1.2</version>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-util</artifactId>

jetty-osgi/test-jetty-osgi/pom.xml

@@ -39,6 +39,18 @@
         <version>${pax.exam.version}</version>
         <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.swissbox</groupId>
+      <artifactId>pax-swissbox-framework</artifactId>
+      <version>1.8.3</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.ops4j.pax.swissbox</groupId>
+      <artifactId>pax-swissbox-tracker</artifactId>
+      <version>1.8.3</version>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.ops4j.pax.exam</groupId>
       <artifactId>pax-exam-junit4</artifactId>

pom.xml

@@ -173,6 +173,7 @@
                 <versionOsgiRule implementation="org.eclipse.jetty.toolchain.enforcer.rules.RequireOsgiCompatibleVersionRule" />
                 <versionRedhatRule implementation="org.eclipse.jetty.toolchain.enforcer.rules.RequireRedhatCompatibleVersionRule" />
                 <versionDebianRule implementation="org.eclipse.jetty.toolchain.enforcer.rules.RequireDebianCompatibleVersionRule" />
+                <requireUpperBoundDeps/>
               </rules>
             </configuration>
           </execution>

tests/test-webapps/test-jetty-webapp/pom.xml

@@ -196,7 +196,6 @@
     <dependency>
       <groupId>javax.websocket</groupId>
       <artifactId>javax.websocket-api</artifactId>
-      <version>1.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>