From 86ce519849857ff84fe7db7bc940ea1ecf085c10 Mon Sep 17 00:00:00 2001
From: Sakthi <sakthivel.azhaku@gmail.com>
Date: Mon, 15 Apr 2019 17:52:44 -0700
Subject: [PATCH] HBASE-22249 Rest Server throws NoClassDefFoundError with Java
 11 (run-time)

Signed-off-by: Andrew Purtell <apurtell@apache.org>
---
 hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm | 2 +-
 hbase-rest/pom.xml                                           | 4 ++++
 pom.xml                                                      | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
index 0b1ad131e53..78b676499c5 100644
--- a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
+++ b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
@@ -1340,7 +1340,7 @@ You can redistribute it and/or modify it under either the terms of the
 ## See this FAQ link for justifications: https://www.apache.org/legal/resolved.html
 ##
 ## NB: This list is later compared as lower-case. New entries must also be all lower-case
-#set($non_aggregate_fine = [ 'public domain', 'new bsd license', 'bsd license', 'bsd', 'bsd 2-clause license', 'mozilla public license version 1.1', 'mozilla public license version 2.0', 'creative commons attribution license, version 2.5' ])
+#set($non_aggregate_fine = [ 'public domain', 'new bsd license', 'bsd license', 'bsd', 'bsd 2-clause license', 'mozilla public license version 1.1', 'mozilla public license version 2.0', 'creative commons attribution license, version 2.5', 'cddl/gplv2+ce' ])
 ## include LICENSE sections for anything not under ASL2.0
 #foreach( ${dep} in ${projects} )
 ## if there are no licenses we'll fail the build later, so
diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index ee03cd43e74..22a04f844dd 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -291,6 +291,10 @@
       <groupId>javax.servlet</groupId>
       <artifactId>javax.servlet-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.sun.activation</groupId>
+      <artifactId>javax.activation</artifactId>
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-server</artifactId>
diff --git a/pom.xml b/pom.xml
index 94962b44bfe..c3aca7032ec 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1920,6 +1920,11 @@
         <artifactId>javax.ws.rs-api</artifactId>
         <version>${wx.rs.api.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.sun.activation</groupId>
+        <artifactId>javax.activation</artifactId>
+        <version>1.2.0</version>
+      </dependency>
       <dependency>
         <groupId>org.eclipse.jetty</groupId>
         <artifactId>jetty-server</artifactId>