From 63820e5405df2be76f3938bf70f21dfa580892e9 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Fri, 21 Dec 2018 21:35:31 +1000
Subject: [PATCH] activate Maven enforcer Upper bound dependencies check
 (#3116)

* add requireUpperBoundDeps rule

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
---
 .../jetty-gcloud-session-manager/pom.xml      | 21 ++++++++++++++++++-
 jetty-home/pom.xml                            |  5 +++++
 jetty-infinispan/pom.xml                      |  2 +-
 jetty-maven-plugin/pom.xml                    |  5 +++++
 jetty-osgi/test-jetty-osgi/pom.xml            | 18 ++++++++++------
 pom.xml                                       |  3 ++-
 6 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml b/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
index c8504c6e5fb..e69d5e769ee 100644
--- a/jetty-gcloud/jetty-gcloud-session-manager/pom.xml
+++ b/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>
diff --git a/jetty-home/pom.xml b/jetty-home/pom.xml
index fb0a49adc3d..2baec3ce6c6 100644
--- a/jetty-home/pom.xml
+++ b/jetty-home/pom.xml
@@ -648,6 +648,11 @@
       <artifactId>cdi-servlet</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>
diff --git a/jetty-infinispan/pom.xml b/jetty-infinispan/pom.xml
index 19682871a81..f16371074a1 100644
--- a/jetty-infinispan/pom.xml
+++ b/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>
diff --git a/jetty-maven-plugin/pom.xml b/jetty-maven-plugin/pom.xml
index 49644e908e8..9635cf2df76 100644
--- a/jetty-maven-plugin/pom.xml
+++ b/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>
diff --git a/jetty-osgi/test-jetty-osgi/pom.xml b/jetty-osgi/test-jetty-osgi/pom.xml
index 13ea322a862..f599bfc5945 100644
--- a/jetty-osgi/test-jetty-osgi/pom.xml
+++ b/jetty-osgi/test-jetty-osgi/pom.xml
@@ -40,6 +40,18 @@
         <version>${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>
@@ -566,12 +578,6 @@
           <version>${project.version}</version>
           <scope>test</scope>
         </dependency>
-        <dependency>
-          <groupId>org.conscrypt</groupId>
-          <artifactId>conscrypt-openjdk-uber</artifactId>
-          <version>${conscrypt.version}</version>
-          <scope>test</scope>
-        </dependency>
         <dependency>
           <groupId>org.eclipse.jetty</groupId>
           <artifactId>jetty-alpn-java-server</artifactId>
diff --git a/pom.xml b/pom.xml
index 8037056b5b5..a0a4461a84d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,6 +152,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>
@@ -892,7 +893,7 @@
       <dependency>
         <groupId>javax.annotation</groupId>
         <artifactId>javax.annotation-api</artifactId>
-        <version>1.2</version>
+        <version>1.3</version>
       </dependency>
       <dependency>
         <groupId>org.ow2.asm</groupId>