From 5488124be049900b545a921e3a4398642ce65a83 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-backup/pom.xml | 20 +++++++++++++ hbase-client/pom.xml | 8 +++++ hbase-endpoint/pom.xml | 8 +++++ hbase-examples/pom.xml | 10 +++++++ hbase-http/pom.xml | 8 +++++ hbase-it/pom.xml | 10 +++++++ hbase-mapreduce/pom.xml | 18 ++++++++++++ hbase-rest/pom.xml | 13 +++++++-- hbase-server/pom.xml | 20 +++++++++++++ hbase-shaded/hbase-shaded-mapreduce/pom.xml | 12 ++++++++ .../hbase-shaded-testing-util/pom.xml | 29 ++++++++++++++++++- hbase-shell/pom.xml | 4 +++ hbase-testing-util/pom.xml | 20 +++++++++++++ hbase-thrift/pom.xml | 14 +++++++++ 15 files changed, 201 insertions(+), 3 deletions(-) diff --git a/hbase-archetypes/hbase-shaded-client-project/pom.xml b/hbase-archetypes/hbase-shaded-client-project/pom.xml index bdbd4b6392f7..4bda65044644 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-backup/pom.xml b/hbase-backup/pom.xml index 5260a44cbcc8..95ec9e62745e 100644 --- a/hbase-backup/pom.xml +++ b/hbase-backup/pom.xml @@ -64,6 +64,16 @@ org.apache.hbase hbase-server + + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + + org.apache.hbase @@ -93,6 +103,16 @@ org.apache.hbase hbase-testing-util test + + + com.google.guava + guava + + + javax.xml.bind + jaxb-api + + diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml index 5343d777f90b..a9a196950768 100644 --- a/hbase-client/pom.xml +++ b/hbase-client/pom.xml @@ -250,6 +250,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 3a571eb591ce..de19306b873e 100644 --- a/hbase-endpoint/pom.xml +++ b/hbase-endpoint/pom.xml @@ -208,6 +208,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 275173cd7230..107020d48d80 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -276,6 +276,16 @@ org.apache.hadoop hadoop-minicluster + + + javax.xml.bind. + jaxb-api + + + javax.ws.rs + jsr311-api + + diff --git a/hbase-http/pom.xml b/hbase-http/pom.xml index 41c2f61a817b..e5ad251d207e 100644 --- a/hbase-http/pom.xml +++ b/hbase-http/pom.xml @@ -329,6 +329,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 783f046226e9..1041dc0e6846 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -318,6 +318,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 9059b2786b27..71fc0b210b28 100644 --- a/hbase-mapreduce/pom.xml +++ b/hbase-mapreduce/pom.xml @@ -195,6 +195,14 @@ org.codehaus.jackson jackson-core-asl + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + @@ -264,6 +272,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 e50968e903b7..afa42c175fc7 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -427,8 +427,8 @@ test - com.google.guava - guava + com.google.guava + guava @@ -444,6 +444,15 @@ org.apache.hadoop hadoop-auth + + + org.glassfish.jaxb + jaxb-runtime + 2.3.2 + diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 1294b5472608..1c27c7e10607 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -612,6 +612,16 @@ org.apache.hadoop hadoop-mapreduce-client-core + + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + + org.apache.hadoop @@ -633,6 +643,16 @@ org.apache.hadoop hadoop-minicluster test + + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + + javax.ws.rs @@ -203,6 +207,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 72d77943f0fb..95ae56034ed5 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 @@ -131,12 +153,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 9b7ceb236045..bb8086541402 100644 --- a/hbase-shell/pom.xml +++ b/hbase-shell/pom.xml @@ -212,6 +212,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 5c2855550419..c1d0bc48edd0 100644 --- a/hbase-testing-util/pom.xml +++ b/hbase-testing-util/pom.xml @@ -117,11 +117,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 b9cf3d4e3bbb..6035ed6abb05 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -420,6 +420,20 @@ org.apache.hadoop hadoop-minicluster + + + com.google.guava + guava + + + javax.xml.bind + jaxb-api + + + javax.ws.rs + jsr311-api + +