You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@knox.apache.org by mo...@apache.org on 2018/01/09 19:52:01 UTC
[10/16] knox git commit: KNOX-1161 - Update hadoop dependencies to
Hadoop 3 (Colm O hEigeartaigh, reviewed by Sandeep More)
KNOX-1161 - Update hadoop dependencies to Hadoop 3 (Colm O hEigeartaigh, reviewed by Sandeep More)
Project: http://git-wip-us.apache.org/repos/asf/knox/repo
Commit: http://git-wip-us.apache.org/repos/asf/knox/commit/99e6a54a
Tree: http://git-wip-us.apache.org/repos/asf/knox/tree/99e6a54a
Diff: http://git-wip-us.apache.org/repos/asf/knox/diff/99e6a54a
Branch: refs/heads/KNOX-998-Package_Restructuring
Commit: 99e6a54afb53fdd8b4311f9a5892698d2551c635
Parents: 772bc33
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Jan 9 16:31:29 2018 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Jan 9 16:31:29 2018 +0000
----------------------------------------------------------------------
LICENSE | 40 ++++++++++++++++++++++++++++++++++-
gateway-release/src/assembly.xml | 1 +
gateway-test-release/pom.xml | 13 +++---------
pom.xml | 16 ++------------
4 files changed, 45 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/knox/blob/99e6a54a/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 3f69cac..218b998 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1331,4 +1331,42 @@ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY
OF SUCH DAMAGE.
Julian Seward, Cambridge, UK.
-jseward@acm.org
\ No newline at end of file
+jseward@acm.org
+
+------------------------------------------------------------------------------
+RE2J License (BSD 3-clause)
+------------------------------------------------------------------------------
+
+This is a work derived from Russ Cox's RE2 in Go, whose license
+http://golang.org/LICENSE is as follows:
+
+Copyright (c) 2009 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ * Neither the name of Google Inc. nor the names of its contributors
+ may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
http://git-wip-us.apache.org/repos/asf/knox/blob/99e6a54a/gateway-release/src/assembly.xml
----------------------------------------------------------------------
diff --git a/gateway-release/src/assembly.xml b/gateway-release/src/assembly.xml
index 83a5428..af6237f 100644
--- a/gateway-release/src/assembly.xml
+++ b/gateway-release/src/assembly.xml
@@ -93,6 +93,7 @@
<excludes>
<exclude>${gateway-group}:gateway-*</exclude>
<exclude>${gateway-group}:hadoop-examples</exclude>
+ <exclude>org.apache.kerby:*</exclude>
</excludes>
</dependencySet>
<dependencySet>
http://git-wip-us.apache.org/repos/asf/knox/blob/99e6a54a/gateway-test-release/pom.xml
----------------------------------------------------------------------
diff --git a/gateway-test-release/pom.xml b/gateway-test-release/pom.xml
index 48def02..d51bc97 100644
--- a/gateway-test-release/pom.xml
+++ b/gateway-test-release/pom.xml
@@ -36,8 +36,6 @@
<properties>
<jetty.version>9.3.19.v20170502</jetty.version>
- <mockito.version>1.8.4</mockito.version>
- <jackson2.version>2.7.8</jackson2.version>
</properties>
@@ -46,13 +44,13 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson2.version}</version>
+ <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>${mockito.version}</version>
+ <version>${mockito-version}</version>
<scope>test</scope>
</dependency>
@@ -143,7 +141,7 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minikdc</artifactId>
- <version>3.0.0-alpha1</version>
+ <version>${hadoop-version}</version>
<scope>test</scope>
</dependency>
@@ -224,11 +222,6 @@
</dependency>
<dependency>
- <groupId>org.apache.kerby</groupId>
- <artifactId>kerb-simplekdc</artifactId>
- </dependency>
-
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/knox/blob/99e6a54a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 6bd9396..c6ee580 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,15 +115,14 @@
<hadoop-version>3.0.0</hadoop-version>
<jackson.version>2.8.10</jackson.version>
<jetty-version>9.2.15.v20160210</jetty-version>
+ <mockito-version>1.10.19</mockito-version>
<surefire-version>2.16</surefire-version>
<failsafe-version>2.19.1</failsafe-version>
<apacheds-version>2.0.0-M16</apacheds-version>
<javax-websocket-version>1.1</javax-websocket-version>
<metrics-version>3.1.2</metrics-version>
<shiro.version>1.2.6</shiro.version>
- <kerb-simplekdc-version>1.0.0-RC2</kerb-simplekdc-version>
<commons-beanutils-version>1.9.3</commons-beanutils-version>
- <jackson2.version>2.2.2</jackson2.version>
</properties>
<licenses>
@@ -1024,11 +1023,6 @@
<artifactId>jersey-servlet</artifactId>
</exclusion>
- <exclusion>
- <groupId>org.apache.kerby</groupId>
- <artifactId>kerb-simplekdc</artifactId>
- </exclusion>
-
<!--
<exclusion>
<groupId>com.fasterxml.jackson.core</groupId>
@@ -1040,12 +1034,6 @@
</dependency>
<dependency>
- <groupId>org.apache.kerby</groupId>
- <artifactId>kerb-simplekdc</artifactId>
- <version>${kerb-simplekdc-version}</version>
- </dependency>
-
- <dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson.version}</version>
@@ -1354,7 +1342,7 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>1.10.19</version>
+ <version>${mockito-version}</version>
<scope>test</scope>
</dependency>