Skip to content

Commit

Permalink
KNOX-1161 - Update hadoop dependencies to Hadoop 3 (Colm O hEigeartai…
Browse files Browse the repository at this point in the history
…gh, reviewed by Sandeep More)
  • Loading branch information
coheigea committed Jan 9, 2018
1 parent 772bc33 commit 99e6a54
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 25 deletions.
40 changes: 39 additions & 1 deletion LICENSE
Expand Up @@ -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
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.

1 change: 1 addition & 0 deletions gateway-release/src/assembly.xml
Expand Up @@ -93,6 +93,7 @@
<excludes>
<exclude>${gateway-group}:gateway-*</exclude>
<exclude>${gateway-group}:hadoop-examples</exclude>
<exclude>org.apache.kerby:*</exclude>
</excludes>
</dependencySet>
<dependencySet>
Expand Down
13 changes: 3 additions & 10 deletions gateway-test-release/pom.xml
Expand Up @@ -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>


Expand All @@ -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>

Expand Down Expand Up @@ -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>

Expand Down Expand Up @@ -223,11 +221,6 @@
<artifactId>gateway-test-utils</artifactId>
</dependency>

<dependency>
<groupId>org.apache.kerby</groupId>
<artifactId>kerb-simplekdc</artifactId>
</dependency>

<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
Expand Down
16 changes: 2 additions & 14 deletions pom.xml
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -1039,12 +1033,6 @@
</exclusions>
</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>
Expand Down Expand Up @@ -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>

Expand Down

0 comments on commit 99e6a54

Please sign in to comment.