From ba2b891b63e31fc9744b0d6fa4c042d5db0c4c53 Mon Sep 17 00:00:00 2001
From: Domenico Francesco Bruscino <brusdev@apache.org>
Date: Mon, 11 Jan 2021 12:41:25 +0100
Subject: [PATCH] ARTEMIS-3060 Upgrade to Guava 30.1

---
 artemis-features/src/main/resources/features.xml | 1 +
 artemis-hawtio/artemis-console/pom.xml           | 1 +
 pom.xml                                          | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/artemis-features/src/main/resources/features.xml b/artemis-features/src/main/resources/features.xml
index a6e031a749..87af61fc7e 100644
--- a/artemis-features/src/main/resources/features.xml
+++ b/artemis-features/src/main/resources/features.xml
@@ -71,6 +71,7 @@
 		<bundle dependency="true">mvn:org.apache.commons/commons-text/${commons.text.version}</bundle>
 		<bundle dependency="true">mvn:org.apache.commons/commons-lang3/${commons.lang.version}</bundle>
 		<bundle dependency="true">mvn:org.jctools/jctools-core/${jctools.version}</bundle>
+		<bundle dependency="true">mvn:com.google.guava/failureaccess/1.0.1</bundle>
 		<bundle dependency="true">mvn:com.google.guava/guava/${guava.version}</bundle>
 		<bundle dependency="true">mvn:org.apache.commons/commons-dbcp2/${commons.dbcp2.version}</bundle>
 		<bundle dependency="true">mvn:org.apache.commons/commons-pool2/${commons.pool2.version}</bundle>
diff --git a/artemis-hawtio/artemis-console/pom.xml b/artemis-hawtio/artemis-console/pom.xml
index f062091244..b222e4d738 100644
--- a/artemis-hawtio/artemis-console/pom.xml
+++ b/artemis-hawtio/artemis-console/pom.xml
@@ -111,6 +111,7 @@
                 <exclude>img/icons/**/*</exclude>
                 <exclude>img/**/*</exclude>
                 <exclude>fonts/glyphicons**</exclude>
+                <excluse>WEB-INF/lib/guava*.jar</excluse>
               </excludes>
             </overlay>
           </overlays>
diff --git a/pom.xml b/pom.xml
index 00c49c24fd..2644a3d9c5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
       <commons.collections.version>3.2.2</commons.collections.version>
       <commons.text.version>1.8</commons.text.version>
       <fuse.mqtt.client.version>1.16</fuse.mqtt.client.version>
-      <guava.version>24.1.1-jre</guava.version>
+      <guava.version>30.1-jre</guava.version>
       <jboss.logging.version>3.4.0.Final</jboss.logging.version>
       <jetty.version>9.4.35.v20201120</jetty.version>
       <jgroups.version>3.6.13.Final</jgroups.version>