This is an automated email from the ASF dual-hosted git repository. stack pushed a commit to branch branch-2.1 in repository https://gitbox.apache.org/repos/asf/hbase.git
commit 1f84dfc796e0191d11aa092868a9d96bad829322 Author: stack <[email protected]> AuthorDate: Thu Mar 21 08:21:44 2019 -0700 Revert "HBASE-22052 pom cleaning; filter out jersey-core in hadoop2 to match hadoop3 and remove redunant version specifications" This reverts commit ba29af8f54ecb5656db643c60e2b8900f83214aa. --- 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 | 36 ------------------- hbase-zookeeper/pom.xml | 3 ++ pom.xml | 94 ------------------------------------------------- 8 files changed, 28 insertions(+), 167 deletions(-) diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml index 52ebb63..caa8bf6 100644 --- a/hbase-endpoint/pom.xml +++ b/hbase-endpoint/pom.xml @@ -327,6 +327,9 @@ <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 74bb31d..df091d1 100644 --- a/hbase-http/pom.xml +++ b/hbase-http/pom.xml @@ -416,6 +416,9 @@ <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 005bb36..f0023c9 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -162,16 +162,6 @@ </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> @@ -228,15 +218,6 @@ <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> @@ -263,6 +244,11 @@ <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 10979cf..1947572 100644 --- a/hbase-mapreduce/pom.xml +++ b/hbase-mapreduce/pom.xml @@ -369,6 +369,7 @@ <artifactId>xercesImpl</artifactId> </exclusion> </exclusions> + <version>${hadoop-two.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -415,6 +416,9 @@ <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 594993d..29d01d9 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -172,15 +172,6 @@ </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> @@ -236,15 +227,6 @@ <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> @@ -292,6 +274,10 @@ <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> @@ -428,6 +414,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-annotations</artifactId> + <version>${hadoop-two.version}</version> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -456,6 +443,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-server-nodemanager</artifactId> + <version>${hadoop-three.version}</version> <exclusions> <exclusion> <groupId>com.sun.jersey</groupId> @@ -466,6 +454,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-server-resourcemanager</artifactId> + <version>${hadoop-three.version}</version> <exclusions> <exclusion> <groupId>com.sun.jersey</groupId> @@ -476,6 +465,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-server-timelineservice</artifactId> + <version>${hadoop-three.version}</version> <exclusions> <exclusion> <groupId>javax.ws.rs</groupId> @@ -486,6 +476,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-yarn-common</artifactId> + <version>${hadoop-three.version}</version> <exclusions> <exclusion> <groupId>com.sun.jersey</groupId> @@ -504,6 +495,7 @@ <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 86d9736..7b49071 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -696,35 +696,10 @@ <dependencies> <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> - <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-auth</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-annotations</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-client</artifactId> - <exclusions> - <exclusion> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-mapreduce-client-core</artifactId> <exclusions> <exclusion> @@ -817,13 +792,6 @@ <dependencies> <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> - <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> </dependency> <dependency> @@ -853,10 +821,6 @@ </dependency> <dependency> <groupId>org.apache.hadoop</groupId> - <artifactId>hadoop-annotations</artifactId> - </dependency> - <dependency> - <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-minicluster</artifactId> <scope>test</scope> </dependency> diff --git a/hbase-zookeeper/pom.xml b/hbase-zookeeper/pom.xml index 7a55b82..1acd157 100644 --- a/hbase-zookeeper/pom.xml +++ b/hbase-zookeeper/pom.xml @@ -342,6 +342,9 @@ <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 f157359..b48d9b1 100755 --- a/pom.xml +++ b/pom.xml @@ -2421,10 +2421,6 @@ <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> @@ -2452,10 +2448,6 @@ <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> @@ -2473,10 +2465,6 @@ <scope>test</scope> <exclusions> <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - </exclusion> - <exclusion> <groupId>io.netty</groupId> <artifactId>netty</artifactId> </exclusion> @@ -2492,14 +2480,6 @@ <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> - <exclusion> <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> </exclusion> @@ -2572,10 +2552,6 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </exclusion> - <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -2589,14 +2565,6 @@ <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> - <exclusion> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> </exclusion> @@ -2636,23 +2604,6 @@ </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> @@ -2663,18 +2614,6 @@ <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>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> @@ -2707,11 +2646,6 @@ <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> @@ -2748,10 +2682,6 @@ <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> @@ -2779,10 +2709,6 @@ <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> @@ -2796,10 +2722,6 @@ <scope>test</scope> <exclusions> <exclusion> - <groupId>com.sun.jersey</groupId> - <artifactId>jersey-core</artifactId> - </exclusion> - <exclusion> <groupId>io.netty</groupId> <artifactId>netty</artifactId> </exclusion> @@ -2984,10 +2906,6 @@ <groupId>com.sun.jersey</groupId> <artifactId>jersey-core</artifactId> </exclusion> - <exclusion> - <groupId>com.google.code.findbugs</groupId> - <artifactId>jsr305</artifactId> - </exclusion> </exclusions> </dependency> <dependency> @@ -3007,18 +2925,6 @@ <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>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId>
