From 439d79fc1e8882cebf209c3ad326e3cf668bfefa Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Wed, 30 Jan 2019 02:20:33 -0600 Subject: [PATCH] HBASE-21808 Ensure we can build with JDK11 targetting JDK8 --- hbase-assembly/pom.xml | 1 + hbase-assembly/src/main/assembly/client.xml | 5 ++++- .../src/main/assembly/hadoop-two-compat.xml | 5 ++++- hbase-it/pom.xml | 15 +++++++++++-- hbase-protocol-shaded/pom.xml | 14 ++++++++++++ hbase-protocol/pom.xml | 12 +++++++++++ hbase-shaded/hbase-shaded-client/pom.xml | 2 ++ hbase-shaded/pom.xml | 2 ++ pom.xml | 25 ++++++++++++++++++++-- 9 files changed, 75 insertions(+), 6 deletions(-) diff --git a/hbase-assembly/pom.xml b/hbase-assembly/pom.xml index f0aa8c68e9..e519849b63 100644 --- a/hbase-assembly/pom.xml +++ b/hbase-assembly/pom.xml @@ -138,6 +138,7 @@ unpack-dependencies + pom true **\/NOTICE,**\/NOTICE.txt diff --git a/hbase-assembly/src/main/assembly/client.xml b/hbase-assembly/src/main/assembly/client.xml index c875b9534f..acaea0d4e8 100644 --- a/hbase-assembly/src/main/assembly/client.xml +++ b/hbase-assembly/src/main/assembly/client.xml @@ -42,8 +42,11 @@ lib - + + javax.annotation:javax.annotation-api + com.sun.xml.ws:jaxws-ri + org.jruby:jruby-complete com.sun.jersey:* com.sun.jersey.contribs:* diff --git a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml index be15c6e0bd..9aada98718 100644 --- a/hbase-assembly/src/main/assembly/hadoop-two-compat.xml +++ b/hbase-assembly/src/main/assembly/hadoop-two-compat.xml @@ -65,8 +65,11 @@ false - + + javax.annotation:javax.annotation-api + com.sun.xml.ws:jaxws-ri + org.jruby:jruby-complete com.sun.jersey:* com.sun.jersey.contribs:* diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 4c17245a9e..ff65e811af 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -298,8 +298,19 @@ true - - + + build-with-jdk11 + + [1.11,) + + + + com.sun.xml.ws + jaxws-ri + pom + + + hadoop-2.0 diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml index ba4fa2dae0..f5a1cabe80 100644 --- a/hbase-protocol-shaded/pom.xml +++ b/hbase-protocol-shaded/pom.xml @@ -162,6 +162,8 @@ + + javax.annotation:javax.annotation-api org.apache.hbase.thirdparty:* @@ -275,5 +277,17 @@ true + + build-with-jdk11 + + [1.11,) + + + + javax.annotation + javax.annotation-api + + + diff --git a/hbase-protocol/pom.xml b/hbase-protocol/pom.xml index bfe2588712..63da0038f5 100644 --- a/hbase-protocol/pom.xml +++ b/hbase-protocol/pom.xml @@ -190,5 +190,17 @@ true + + build-with-jdk11 + + [1.11,) + + + + javax.annotation + javax.annotation-api + + + diff --git a/hbase-shaded/hbase-shaded-client/pom.xml b/hbase-shaded/hbase-shaded-client/pom.xml index 3f19305f50..37ea416160 100644 --- a/hbase-shaded/hbase-shaded-client/pom.xml +++ b/hbase-shaded/hbase-shaded-client/pom.xml @@ -54,6 +54,8 @@ + + javax.annotation:javax.annotation-api + javax.annotation:javax.annotation-api org.apache.hadoop:* diff --git a/pom.xml b/pom.xml index 0769380496..629cc9cb21 100755 --- a/pom.xml +++ b/pom.xml @@ -1612,7 +1612,7 @@ 1.8 3.3.0 3.0.0 - 3.6.1 + 3.8.0 3.0.1 2.10 2.5.2 @@ -2404,7 +2404,7 @@ build-with-jdk8 - 1.8 + [1.8,) @@ -2432,6 +2432,27 @@ + + build-with-jdk11 + + [1.11,) + + + + + javax.annotation + javax.annotation-api + 1.3.2 + + + com.sun.xml.ws + jaxws-ri + 2.3.1 + pom + + + + jenkins.patch -- 2.16.1