KNOX-1611 - Upgrade guava to 27.0-jre
authorKevin Risden <krisden@apache.org>
Fri, 16 Nov 2018 17:25:25 +0000 (12:25 -0500)
committerKevin Risden <krisden@apache.org>
Tue, 20 Nov 2018 21:04:28 +0000 (16:04 -0500)
Signed-off-by: Kevin Risden <krisden@apache.org>
gateway-test-release/pom.xml
pom.xml

index 605ad67..11d2678 100644 (file)
@@ -39,6 +39,9 @@
              Otherwise Jetty 9.3.x and 9.4.x will not both be available.
              Jetty 9.4.x is needed for Knox and Jetty 9.3.x for Hadoop -->
         <hadoop-jetty.version>9.3.25.v20180904</hadoop-jetty.version>
+        <!-- Guava 26.0-jre removes Future related methods that break 
+             the Hadoop integration tests -->
+        <hadoop-guava.version>25.1-jre</hadoop-guava.version>
     </properties>
 
     <dependencies>
             <version>${hadoop.version}</version>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+             <groupId>com.google.guava</groupId>
+             <artifactId>guava</artifactId>
+             <version>${hadoop-guava.version}</version>
+             <scope>test</scope>
+        </dependency>
         
         <dependency>
             <groupId>log4j</groupId>
diff --git a/pom.xml b/pom.xml
index 2f2b8ec..ab52815 100644 (file)
--- a/pom.xml
+++ b/pom.xml
         <findsecbugs-plugin.version>1.8.0</findsecbugs-plugin.version>
         <forbiddenapis.version>2.6</forbiddenapis.version>
         <groovy.version>2.5.3</groovy.version>
+        <guava.version>27.0-jre</guava.version>
         <hadoop.version>3.1.1</hadoop.version>
         <hamcrest.version>1.3</hamcrest.version>
         <hamcrest-json.version>0.2</hamcrest-json.version>
                 <artifactId>hadoop-common</artifactId>
                 <version>${hadoop.version}</version>
                 <exclusions>
-                    <!--
-                    <exclusion>
-                        <groupId>com.google.guava</groupId>
-                        <artifactId>guava</artifactId>
-                    </exclusion>
-                    -->
                     <exclusion>
                         <groupId>com.google.protobuf</groupId>
                         <artifactId>protobuf-java</artifactId>
             </dependency>
 
             <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>${guava.version}</version>
+            </dependency>
+
+            <dependency>
                 <groupId>org.apache.shiro</groupId>
                 <artifactId>shiro-core</artifactId>
                 <version>${shiro.version}</version>