From 7ac34806abcd61856b798c5d8fffe81b8ca45020 Mon Sep 17 00:00:00 2001
From: Brian Demers <bdemers@apache.org>
Date: Thu, 6 Oct 2022 17:39:05 -0500
Subject: [PATCH 1/2] Update guava to 31.1

---
 pom.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pom.xml b/pom.xml
index de9fd5314d..af2fc1f5a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1192,6 +1192,11 @@
                 <artifactId>guice</artifactId>
                 <version>${guice.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>31.1-jre</version>
+            </dependency>
             <dependency>
                 <groupId>com.google.inject.extensions</groupId>
                 <artifactId>guice-multibindings</artifactId>

From 7bbb0e0c7048f31fbdfe4b9f71519bf2305540cc Mon Sep 17 00:00:00 2001
From: Brian Demers <bdemers@apache.org>
Date: Thu, 6 Oct 2022 17:39:34 -0500
Subject: [PATCH 2/2] Add optional flag to skip dependency check for
 integration tets

---
 integration-tests/pom.xml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index efc6d0b91a..7c94671a92 100644
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -37,6 +37,7 @@
         <japicmp.skip>true</japicmp.skip>
         <maven.deploy.skip>true</maven.deploy.skip>
         <nexus.deploy.skip>true</nexus.deploy.skip>
+        <skipItDepCheck>false</skipItDepCheck>
     </properties>
 
     <modules>
@@ -45,6 +46,17 @@
         <module>guice4</module>
     </modules>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.owasp</groupId>
+                <artifactId>dependency-check-maven</artifactId>
+                <configuration>
+                    <skip>${skipItDepCheck}</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
     <reporting>
         <plugins>
             <plugin>