You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by kr...@apache.org on 2018/11/20 21:33:34 UTC
knox git commit: KNOX-1611 - Upgrade guava to 27.0-jre
Repository: knox
Updated Branches:
refs/heads/master ef7afca67 -> 7046c2273
KNOX-1611 - Upgrade guava to 27.0-jre
Signed-off-by: Kevin Risden <kr...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/7046c227
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/7046c227
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/7046c227
Branch: refs/heads/master
Commit: 7046c22734546adb272084aeb3d6178cb6055830
Parents: ef7afca
Author: Kevin Risden <kr...@apache.org>
Authored: Fri Nov 16 12:25:25 2018 -0500
Committer: Kevin Risden <kr...@apache.org>
Committed: Tue Nov 20 16:04:28 2018 -0500
----------------------------------------------------------------------
gateway-test-release/pom.xml | 10 ++++++++++
pom.xml | 13 +++++++------
2 files changed, 17 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/7046c227/gateway-test-release/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-test-release/pom.xml b/gateway-test-release/pom.xml
index 605ad67..11d2678 100644
--- a/gateway-test-release/pom.xml
+++ b/gateway-test-release/pom.xml
@@ -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>
@@ -240,6 +243,13 @@
<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>
http://git-wip-us.apache.org/repos/asf/knox/blob/7046c227/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2f2b8ec..ab52815 100644
--- a/pom.xml
+++ b/pom.xml
@@ -164,6 +164,7 @@
<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>
@@ -1203,12 +1204,6 @@
<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>
@@ -1502,6 +1497,12 @@
</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>