From bee66bd22a2a41b01e910bc80ef0a659a3d96fd8 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Tue, 5 May 2020 15:27:11 -0700 Subject: [PATCH] HBASE-24284 [h3/jdk11] REST server won't start Exclude transitive includes of jax-rs 1.x and then explicitly include jax-rs 2.x glassfish impl for REST context when hadoop3. (#1625) --- .../hbase-shaded-client-project/pom.xml | 10 ++++++ hbase-client/pom.xml | 8 +++++ hbase-endpoint/pom.xml | 8 +++++ hbase-examples/pom.xml | 10 ++++++ hbase-hadoop2-compat/pom.xml | 8 +++++ hbase-http/pom.xml | 8 +++++ hbase-it/pom.xml | 10 ++++++ hbase-mapreduce/pom.xml | 18 ++++++++++ hbase-rest/pom.xml | 13 +++++-- hbase-rsgroup/pom.xml | 20 +++++++++++ hbase-server/pom.xml | 28 +++++++++++++++ hbase-shaded/hbase-shaded-mapreduce/pom.xml | 12 +++++++ .../hbase-shaded-testing-util/pom.xml | 29 +++++++++++++++- hbase-shell/pom.xml | 28 +++++++++++++++ hbase-testing-util/pom.xml | 34 +++++++++++++++++++ hbase-thrift/pom.xml | 26 ++++++++++++++ 16 files changed, 267 insertions(+), 3 deletions(-) diff --git a/hbase-archetypes/hbase-shaded-client-project/pom.xml b/hbase-archetypes/hbase-shaded-client-project/pom.xml index a10de2c5d1c..fd5bf85ce3b 100644 --- a/hbase-archetypes/hbase-shaded-client-project/pom.xml +++ b/hbase-archetypes/hbase-shaded-client-project/pom.xml @@ -45,6 +45,16 @@ hbase-testing-util ${project.version} test + + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + + org.apache.hbase diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 5d0203564be..98ea5ec91ae 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -328,6 +328,14 @@ tomcat jasper-runtime + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml index 03b1593d9f4..f7d6236fb02 100644 --- a/hbase-endpoint/pom.xml +++ b/hbase-endpoint/pom.xml @@ -311,6 +311,14 @@ com.google.guava guava + + javax.xml.bind. + jaxb-api + + + javax.ws.rs + jsr311-api + diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml index f73d16d7b6e..83f398bb485 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -280,6 +280,16 @@ org.apache.hadoop hadoop-minicluster + + + javax.xml.bind. + jaxb-api + + + javax.ws.rs + jsr311-api + + diff --git a/hbase-hadoop2-compat/pom.xml b/hbase-hadoop2-compat/pom.xml index 8fb09381913..15892225271 100644 --- a/hbase-hadoop2-compat/pom.xml +++ b/hbase-hadoop2-compat/pom.xml @@ -131,6 +131,14 @@ limitations under the License. com.google.guava guava + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + diff --git a/hbase-http/pom.xml b/hbase-http/pom.xml index 010ed284ea3..7c2237c74f0 100644 --- a/hbase-http/pom.xml +++ b/hbase-http/pom.xml @@ -399,6 +399,14 @@ com.google.guava guava + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + test diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 99df2d4dd7a..c9a6a8d0d13 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -409,6 +409,16 @@ org.apache.hadoop hadoop-minicluster + + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + + org.apache.hadoop diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml index 184780df29a..7d8bf82625c 100644 --- a/hbase-mapreduce/pom.xml +++ b/hbase-mapreduce/pom.xml @@ -219,6 +219,14 @@ org.codehaus.jackson jackson-core-asl + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + @@ -409,6 +417,16 @@ org.apache.hadoop hadoop-minicluster test + + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + + diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index d15fe1a1510..3206c1ddb9d 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -490,8 +490,8 @@ test - com.google.guava - guava + com.google.guava + guava @@ -507,6 +507,15 @@ org.apache.hadoop hadoop-auth + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + diff --git a/hbase-rsgroup/pom.xml b/hbase-rsgroup/pom.xml index 3a4fd186dfa..2e40a85e8f6 100644 --- a/hbase-rsgroup/pom.xml +++ b/hbase-rsgroup/pom.xml @@ -84,6 +84,16 @@ org.apache.hbase hbase-server + + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + + org.apache.hbase @@ -111,6 +121,16 @@ org.apache.hbase hbase-testing-util test + + + com.google.guava + guava + + + javax.xml.bind + jaxb-api + + diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index a2d5c15d29c..50474a0e241 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -636,6 +636,14 @@ com.google.guava guava + + javax.xml.bind + java-api + + + javax.xml.bind + jaxb-api + @@ -739,6 +747,16 @@ org.apache.hadoop hadoop-mapreduce-client-core + + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + + org.apache.hadoop @@ -760,6 +778,16 @@ org.apache.hadoop hadoop-minicluster test + + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + + javax.ws.rs @@ -345,6 +349,14 @@ com.google.guava guava + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + diff --git a/hbase-shaded/hbase-shaded-testing-util/pom.xml b/hbase-shaded/hbase-shaded-testing-util/pom.xml index 6fd363db8ee..a98b191abc4 100644 --- a/hbase-shaded/hbase-shaded-testing-util/pom.xml +++ b/hbase-shaded/hbase-shaded-testing-util/pom.xml @@ -61,6 +61,14 @@ org.codehaus.jackson jackson-xc + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + @@ -92,6 +100,14 @@ org.codehaus.jackson jackson-xc + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + @@ -112,6 +128,12 @@ hbase-server test-jar compile + + + javax.xml.bind + jaxb-api + + org.apache.hbase @@ -137,12 +159,17 @@ 1.9.13 compile - org.apache.hbase hbase-testing-util ${project.version} compile + + + javax.xml.bind + jaxb-api + + diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml index 8ccd6a9bd15..837f320d08e 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -266,6 +266,14 @@ com.google.guava guava + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + @@ -276,6 +284,14 @@ com.google.guava guava + + javax.xml.bind. + jaxb-api + + + javax.ws.rs + jsr311-api + @@ -288,6 +304,14 @@ com.google.guava guava + + javax.xml.bind. + jaxb-api + + + javax.ws.rs + jsr311-api + @@ -369,6 +393,10 @@ com.google.guava guava + + javax.ws.rs + jsr311-api + diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml index d3bf262aaae..4106d912453 100644 --- a/hbase-testing-util/pom.xml +++ b/hbase-testing-util/pom.xml @@ -140,6 +140,12 @@ org.apache.hadoop hadoop-common compile + + + javax.xml.bind + jaxb-api + + org.apache.hadoop @@ -155,6 +161,10 @@ com.google.guava guava + + javax.xml.bind + jaxb-api + @@ -166,6 +176,10 @@ com.google.guava guava + + javax.xml.bind + jaxb-api + @@ -227,11 +241,31 @@ org.apache.hadoop hadoop-common + + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + + org.apache.hadoop hadoop-minicluster compile + + + com.google.guava + guava + + + javax.ws.rs + jsr311-api + + org.apache.hadoop diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 3386997fbf6..520acc42ca6 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -428,6 +428,10 @@ com.google.guava guava + + javax.xml.bind + jaxb-api + @@ -438,6 +442,10 @@ com.google.guava guava + + javax.xml.bind + jaxb-api + @@ -469,6 +477,10 @@ org.apache.zookeeper zookeeper + + javax.xml.bind + jaxb-api + @@ -518,6 +530,20 @@ org.apache.hadoop hadoop-minicluster + + + com.google.guava + guava + + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + +