This is an automated email from the ASF dual-hosted git repository.
stack pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 36511f4 HBASE-22052 pom cleaning; filter out jersey-core in hadoop2
to match hadoop3 and remove redunant version specifications
36511f4 is described below
commit 36511f429c855721c029d275b789cbff3342676b
Author: stack <[email protected]>
AuthorDate: Fri Mar 15 00:27:13 2019 -0700
HBASE-22052 pom cleaning; filter out jersey-core in hadoop2 to match
hadoop3 and remove redunant version specifications
jersey-core is problematic. It was transitively included from hadoop
and polluting our CLASSPATH with an implementation of a 1.x version
of the javax.ws.rs.core.Response Interface from jsr311-api when we
want the javax.ws.rs-api 2.x version.
M hbase-endpoint/pom.xml
M hbase-http/pom.xml
M hbase-mapreduce/pom.xml
M hbase-rest/pom.xml
M hbase-server/pom.xml
M hbase-zookeeper/pom.xml
Remove redundant version specification (and the odd property define
done already up in parent pom).
M hbase-it/pom.xml
M hbase-rest/pom.xml
Exclude jersey-core explicitly.
M hbase-procedure/pom.xml
Remove redundant version and classifier.
M pom.xml
Add jersey-core exclusions to all dependencies that pull it in
except hadoop-minicluster. mr tests fail w/o the jersey-core
so let it in for minicluster and then in modules, exclude it
where it causes damage as in hbase-it.
---
hbase-endpoint/pom.xml | 3 --
hbase-http/pom.xml | 3 --
hbase-it/pom.xml | 24 +++++++++++---
hbase-mapreduce/pom.xml | 4 ---
hbase-rest/pom.xml | 28 ++++++++++------
hbase-server/pom.xml | 6 ++--
hbase-zookeeper/pom.xml | 3 --
pom.xml | 86 +++++++++++++++++++++++++++++++++++++++++++++++++
8 files changed, 127 insertions(+), 30 deletions(-)
diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml
index 3b5f2f1..98d3de5 100644
--- a/hbase-endpoint/pom.xml
+++ b/hbase-endpoint/pom.xml
@@ -337,9 +337,6 @@
<value>3.0</value>
</property>
</activation>
- <properties>
- <hadoop.version>${hadoop-three.version}</hadoop.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hbase-http/pom.xml b/hbase-http/pom.xml
index a22d386..e6ac295 100644
--- a/hbase-http/pom.xml
+++ b/hbase-http/pom.xml
@@ -416,9 +416,6 @@
<value>3.0</value>
</property>
</activation>
- <properties>
- <hadoop.version>${hadoop-three.version}</hadoop.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index 5b44e9c..160fc49 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -162,6 +162,16 @@
</build>
<dependencies>
+ <!--This one is upfront to get in front of
+ any dependency that pulls in jersey-core.
+ Jersey-core has implemented version 1
+ Interfaces of what is in this dependency
+ which does version 2.-->
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- Intra-project dependencies -->
<dependency>
<groupId>org.apache.hbase</groupId>
@@ -218,6 +228,15 @@
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-testing-util</artifactId>
+ <exclusions>
+ <!--This dependency pulls in hadoop-minicluster
+ which pulls in the below. It messes up
+ this build at assembly time. See HBASE-22029-->
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hbase.thirdparty</groupId>
@@ -244,11 +263,6 @@
<artifactId>htrace-core4</artifactId>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.glassfish.jersey.core</groupId>
<artifactId>jersey-client</artifactId>
</dependency>
diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml
index 30b8829..9ec2ebe 100644
--- a/hbase-mapreduce/pom.xml
+++ b/hbase-mapreduce/pom.xml
@@ -359,7 +359,6 @@
<artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
- <version>${hadoop-two.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -410,9 +409,6 @@
<value>3.0</value>
</property>
</activation>
- <properties>
- <hadoop.version>${hadoop-three.version}</hadoop.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index acf176f..dc33c96 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -172,6 +172,15 @@
</pluginManagement>
</build>
<dependencies>
+ <!--This one is upfront to get in front of
+ any dependency that pulls in jersey-core.
+ Jersey-core has implemented version 1
+ Interfaces of what is in this dependency
+ which does version 2.-->
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ </dependency>
<!-- Intra-project dependencies -->
<dependency>
<groupId>org.apache.hbase</groupId>
@@ -227,6 +236,15 @@
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-testing-util</artifactId>
<scope>test</scope>
+ <exclusions>
+ <!--This dependency pulls in hadoop-minicluster
+ which pulls in the below. It messes up
+ this build at assembly time. See HBASE-22029-->
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
@@ -274,10 +292,6 @@
<artifactId>javax.servlet-api</artifactId>
</dependency>
<dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- </dependency>
- <dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
</dependency>
@@ -401,7 +415,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
- <version>${hadoop-two.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -436,7 +449,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-nodemanager</artifactId>
- <version>${hadoop-three.version}</version>
<exclusions>
<exclusion>
<groupId>com.sun.jersey</groupId>
@@ -447,7 +459,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-resourcemanager</artifactId>
- <version>${hadoop-three.version}</version>
<exclusions>
<exclusion>
<groupId>com.sun.jersey</groupId>
@@ -458,7 +469,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-server-timelineservice</artifactId>
- <version>${hadoop-three.version}</version>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
@@ -469,7 +479,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-yarn-common</artifactId>
- <version>${hadoop-three.version}</version>
<exclusions>
<exclusion>
<groupId>com.sun.jersey</groupId>
@@ -488,7 +497,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
- <version>${hadoop-three.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index c272cba..08b8eef 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -683,6 +683,8 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-distcp</artifactId>
+ <!--This dependency is not in top-level pom so needs
+ version specified-->
<version>${hadoop-two.version}</version>
</dependency>
<dependency>
@@ -696,7 +698,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
- <version>${hadoop-two.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -803,6 +804,8 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-distcp</artifactId>
+ <!--This dependency is not in top-level pom so needs
+ version specified-->
<version>${hadoop-three.version}</version>
</dependency>
<dependency>
@@ -816,7 +819,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-annotations</artifactId>
- <version>${hadoop-three.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/hbase-zookeeper/pom.xml b/hbase-zookeeper/pom.xml
index d46af2f..47240a8 100644
--- a/hbase-zookeeper/pom.xml
+++ b/hbase-zookeeper/pom.xml
@@ -335,9 +335,6 @@
<value>3.0</value>
</property>
</activation>
- <properties>
- <hadoop.version>${hadoop-three.version}</hadoop.version>
- </properties>
<dependencies>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/pom.xml b/pom.xml
index 29e788d..112f95a 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2379,6 +2379,10 @@
<version>${hadoop-two.version}</version>
<exclusions>
<exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
@@ -2406,6 +2410,10 @@
<version>${hadoop-two.version}</version>
<exclusions>
<exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
@@ -2423,6 +2431,10 @@
<scope>test</scope>
<exclusions>
<exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
@@ -2438,6 +2450,10 @@
<version>${hadoop-two.version}</version>
<exclusions>
<exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
@@ -2518,6 +2534,10 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -2531,6 +2551,10 @@
<version>${hadoop-two.version}</version>
<exclusions>
<exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
</exclusion>
@@ -2574,6 +2598,23 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop-two.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${hadoop-two.version}</version>
</dependency>
@@ -2584,6 +2625,18 @@
<artifactId>hadoop-minicluster</artifactId>
<version>${hadoop-two.version}</version>
<exclusions>
+ <!--If we comment this in, a few tests in hbase-mapreduce
+ fail. They depend on jersey-core somehow. But excluding
+ jersey-core here messes up hbase-it because jersey-core
+ implements a 1.x jaxrs Response Interface when we depend
+ on the 2.x Interface... . Letting this jar come in
+ transitively here but will exclude it down in hbase-it.
+ See HBASE-22029.
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ -->
<exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
@@ -2620,6 +2673,11 @@
<version>${hadoop-two.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-annotations</artifactId>
+ <version>${hadoop-two.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
</profile>
@@ -2656,6 +2714,10 @@
<version>${hadoop-three.version}</version>
<exclusions>
<exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
@@ -2683,6 +2745,10 @@
<version>${hadoop-three.version}</version>
<exclusions>
<exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
@@ -2696,6 +2762,10 @@
<scope>test</scope>
<exclusions>
<exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>io.netty</groupId>
<artifactId>netty</artifactId>
</exclusion>
@@ -2892,6 +2962,10 @@
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -2911,6 +2985,18 @@
<artifactId>hadoop-minicluster</artifactId>
<version>${hadoop-three.version}</version>
<exclusions>
+ <!--If we comment this in, a few tests in hbase-mapreduce
+ fail. They depend on jersey-core somehow. But excluding
+ jersey-core here messes up hbase-it because jersey-core
+ implements a 1.x jaxrs Response Interface when we depend
+ on the 2.x Interface... . Letting this jar come in
+ transitively here but will exclude it down in hbase-it.
+ See HBASE-22029.
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-core</artifactId>
+ </exclusion>
+ -->
<exclusion>
<groupId>org.apache.htrace</groupId>
<artifactId>htrace-core</artifactId>
