From 5488124be049900b545a921e3a4398642ce65a83 Mon Sep 17 00:00:00 2001
From: Michael Stack <saintstack@users.noreply.github.com>
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 bdbd4b6392f..4bda6504464 100644
--- a/hbase-archetypes/hbase-shaded-client-project/pom.xml
+++ b/hbase-archetypes/hbase-shaded-client-project/pom.xml
@@ -45,6 +45,16 @@
       <artifactId>hbase-testing-util</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
+       <exclusions>
+         <exclusion>
+           <groupId>javax.xml.bind</groupId>
+           <artifactId>jaxb-api</artifactId>
+         </exclusion>
+         <exclusion>
+           <groupId>javax.ws.rs</groupId>
+           <artifactId>jsr311-api</artifactId>
+         </exclusion>
+       </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
diff --git a/hbase-backup/pom.xml b/hbase-backup/pom.xml
index 5260a44cbcc..95ec9e62745 100644
--- a/hbase-backup/pom.xml
+++ b/hbase-backup/pom.xml
@@ -64,6 +64,16 @@
     <dependency>
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-server</artifactId>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.ws.rs</groupId>
+          <artifactId>jsr311-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.apache.hbase</groupId>
@@ -93,6 +103,16 @@
       <groupId>org.apache.hbase</groupId>
       <artifactId>hbase-testing-util</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <!-- General dependencies -->
     <dependency>
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index 5343d777f90..a9a19695076 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -250,6 +250,14 @@
               <groupId>tomcat</groupId>
               <artifactId>jasper-runtime</artifactId>
             </exclusion>
+            <exclusion>
+              <groupId>javax.xml.bind</groupId>
+              <artifactId>jaxb-api</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>javax.ws.rs</groupId>
+              <artifactId>jsr311-api</artifactId>
+            </exclusion>
           </exclusions>
         </dependency>
       </dependencies>
diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml
index 3a571eb591c..de19306b873 100644
--- a/hbase-endpoint/pom.xml
+++ b/hbase-endpoint/pom.xml
@@ -208,6 +208,14 @@
               <groupId>com.google.guava</groupId>
               <artifactId>guava</artifactId>
             </exclusion>
+            <exclusion>
+              <groupId>javax.xml.bind.</groupId>
+              <artifactId>jaxb-api</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>javax.ws.rs</groupId>
+              <artifactId>jsr311-api</artifactId>
+            </exclusion>
           </exclusions>
         </dependency>
         <!-- Hadoop needs Netty 3.x at test scope for the minicluster -->
diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml
index 275173cd723..107020d48d8 100644
--- a/hbase-examples/pom.xml
+++ b/hbase-examples/pom.xml
@@ -276,6 +276,16 @@
         <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-minicluster</artifactId>
+          <exclusions>
+            <exclusion>
+              <groupId>javax.xml.bind.</groupId>
+              <artifactId>jaxb-api</artifactId>
+            </exclusion>
+            <exclusion>
+             <groupId>javax.ws.rs</groupId>
+             <artifactId>jsr311-api</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
       </dependencies>
       <build>
diff --git a/hbase-http/pom.xml b/hbase-http/pom.xml
index 41c2f61a817..e5ad251d207 100644
--- a/hbase-http/pom.xml
+++ b/hbase-http/pom.xml
@@ -329,6 +329,14 @@
               <groupId>com.google.guava</groupId>
               <artifactId>guava</artifactId>
             </exclusion>
+            <exclusion>
+              <groupId>javax.xml.bind</groupId>
+              <artifactId>jaxb-api</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>javax.ws.rs</groupId>
+              <artifactId>jsr311-api</artifactId>
+            </exclusion>
           </exclusions>
           <scope>test</scope>
         </dependency>
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index 783f046226e..1041dc0e684 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -318,6 +318,16 @@
         <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-minicluster</artifactId>
+          <exclusions>
+            <exclusion>
+              <groupId>javax.xml.bind</groupId>
+              <artifactId>jaxb-api</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>javax.ws.rs</groupId>
+              <artifactId>jsr311-api</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml
index 9059b2786b2..71fc0b210b2 100644
--- a/hbase-mapreduce/pom.xml
+++ b/hbase-mapreduce/pom.xml
@@ -195,6 +195,14 @@
           <groupId>org.codehaus.jackson</groupId>
           <artifactId>jackson-core-asl</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.ws.rs</groupId>
+          <artifactId>jsr311-api</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -264,6 +272,16 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-minicluster</artifactId>
           <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>javax.xml.bind</groupId>
+              <artifactId>jaxb-api</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>javax.ws.rs</groupId>
+              <artifactId>jsr311-api</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
       </dependencies>
     </profile>
diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index e50968e903b..afa42c175fc 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -427,8 +427,8 @@
           <scope>test</scope>
           <exclusions>
             <exclusion>
-              <groupId>com.google.guava</groupId>
-              <artifactId>guava</artifactId>
+             <groupId>com.google.guava</groupId>
+             <artifactId>guava</artifactId>
             </exclusion>
           </exclusions>
         </dependency>
@@ -444,6 +444,15 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-auth</artifactId>
         </dependency>
+        <!--Needed when jdk11/hadoop3 else complaint about
+          NoSuchMethodError: 'java.util.Map javax.ws.rs.core.Application.getProperties()'
+          when REST server is started.
+          -->
+        <dependency>
+          <groupId>org.glassfish.jaxb</groupId>
+          <artifactId>jaxb-runtime</artifactId>
+          <version>2.3.2</version>
+        </dependency>
       </dependencies>
     </profile>
     <profile>
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 1294b547260..1c27c7e1060 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -612,6 +612,16 @@
         <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-mapreduce-client-core</artifactId>
+          <exclusions>
+            <exclusion>
+              <groupId>javax.xml.bind</groupId>
+              <artifactId>jaxb-api</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>javax.ws.rs</groupId>
+              <artifactId>jsr311-api</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
         <dependency>
           <groupId>org.apache.hadoop</groupId>
@@ -633,6 +643,16 @@
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-minicluster</artifactId>
           <scope>test</scope>
+          <exclusions>
+            <exclusion>
+              <groupId>javax.xml.bind</groupId>
+              <artifactId>jaxb-api</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>javax.ws.rs</groupId>
+              <artifactId>jsr311-api</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
         <!-- Hadoop needs Netty 3.x at test scope for the minicluster>
         <dependency>
diff --git a/hbase-shaded/hbase-shaded-mapreduce/pom.xml b/hbase-shaded/hbase-shaded-mapreduce/pom.xml
index 47b0ad584c8..4fe7fe8a767 100644
--- a/hbase-shaded/hbase-shaded-mapreduce/pom.xml
+++ b/hbase-shaded/hbase-shaded-mapreduce/pom.xml
@@ -79,6 +79,10 @@
                 <groupId>javax.xml.bind</groupId>
                 <artifactId>jaxb-api</artifactId>
               </exclusion>
+              <exclusion>
+                <groupId>javax.ws.rs</groupId>
+                <artifactId>jsr311-api</artifactId>
+              </exclusion>
               <!-- Jersey not used by our MR support -->
               <exclusion>
                 <groupId>javax.ws.rs</groupId>
@@ -203,6 +207,14 @@
                   <groupId>com.google.guava</groupId>
                   <artifactId>guava</artifactId>
                 </exclusion>
+                <exclusion>
+                  <groupId>javax.xml.bind</groupId>
+                  <artifactId>jaxb-api</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>javax.ws.rs</groupId>
+                  <artifactId>jsr311-api</artifactId>
+                </exclusion>
               </exclusions>
             </dependency>
             <dependency>
diff --git a/hbase-shaded/hbase-shaded-testing-util/pom.xml b/hbase-shaded/hbase-shaded-testing-util/pom.xml
index 72d77943f0f..95ae56034ed 100644
--- a/hbase-shaded/hbase-shaded-testing-util/pom.xml
+++ b/hbase-shaded/hbase-shaded-testing-util/pom.xml
@@ -61,6 +61,14 @@
                     <groupId>org.codehaus.jackson</groupId>
                     <artifactId>jackson-xc</artifactId>
                 </exclusion>
+                <exclusion>
+                   <groupId>javax.xml.bind</groupId>
+                   <artifactId>jaxb-api</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>javax.ws.rs</groupId>
+                  <artifactId>jsr311-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -92,6 +100,14 @@
                     <groupId>org.codehaus.jackson</groupId>
                     <artifactId>jackson-xc</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+                <exclusion>
+                  <groupId>javax.ws.rs</groupId>
+                  <artifactId>jsr311-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -112,6 +128,12 @@
             <artifactId>hbase-server</artifactId>
             <type>test-jar</type>
             <scope>compile</scope>
+            <exclusions>
+              <exclusion>
+                 <groupId>javax.xml.bind</groupId>
+                 <artifactId>jaxb-api</artifactId>
+              </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.hbase</groupId>
@@ -131,12 +153,17 @@
             <version>1.9.13</version>
             <scope>compile</scope>
         </dependency>
-
         <dependency>
             <groupId>org.apache.hbase</groupId>
             <artifactId>hbase-testing-util</artifactId>
             <version>${project.version}</version>
             <scope>compile</scope>
+            <exclusions>
+              <exclusion>
+                <groupId>javax.xml.bind</groupId>
+                <artifactId>jaxb-api</artifactId>
+              </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 
diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml
index 9b7ceb23604..bb808654140 100644
--- a/hbase-shell/pom.xml
+++ b/hbase-shell/pom.xml
@@ -212,6 +212,10 @@
               <groupId>com.google.guava</groupId>
               <artifactId>guava</artifactId>
             </exclusion>
+            <exclusion>
+              <groupId>javax.ws.rs</groupId>
+              <artifactId>jsr311-api</artifactId>
+            </exclusion>
           </exclusions>
         </dependency>
         <dependency>
diff --git a/hbase-testing-util/pom.xml b/hbase-testing-util/pom.xml
index 5c285555041..c1d0bc48edd 100644
--- a/hbase-testing-util/pom.xml
+++ b/hbase-testing-util/pom.xml
@@ -117,11 +117,31 @@
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-common</artifactId>
+                    <exclusions>
+                      <exclusion>
+                         <groupId>javax.xml.bind</groupId>
+                         <artifactId>jaxb-api</artifactId>
+                      </exclusion>
+                      <exclusion>
+                       <groupId>javax.ws.rs</groupId>
+                       <artifactId>jsr311-api</artifactId>
+                      </exclusion>
+                    </exclusions>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>
                     <artifactId>hadoop-minicluster</artifactId>
                     <scope>compile</scope>
+                    <exclusions>
+                      <exclusion>
+                        <groupId>com.google.guava</groupId>
+                        <artifactId>guava</artifactId>
+                      </exclusion>
+                      <exclusion>
+                       <groupId>javax.ws.rs</groupId>
+                       <artifactId>jsr311-api</artifactId>
+                      </exclusion>
+                    </exclusions>
                 </dependency>
                 <dependency>
                     <groupId>org.apache.hadoop</groupId>
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index b9cf3d4e3bb..6035ed6abb0 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -420,6 +420,20 @@
         <dependency>
           <groupId>org.apache.hadoop</groupId>
           <artifactId>hadoop-minicluster</artifactId>
+          <exclusions>
+            <exclusion>
+              <groupId>com.google.guava</groupId>
+              <artifactId>guava</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>javax.xml.bind</groupId>
+              <artifactId>jaxb-api</artifactId>
+            </exclusion>
+            <exclusion>
+              <groupId>javax.ws.rs</groupId>
+              <artifactId>jsr311-api</artifactId>
+            </exclusion>
+          </exclusions>
         </dependency>
       </dependencies>
       <build>