From 2e6deccbda41c29f2e9d82501bfc8a98ba3e813f Mon Sep 17 00:00:00 2001 From: Sakthi Date: Mon, 15 Apr 2019 17:52:44 -0700 Subject: [PATCH] Rest patch --- 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 0b1ad131e53aa339c9d782d97080889f56719a8d..78b676499c52673f14253335f54185076773e2c8 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 594993d7efe1afa1bc922de78bac57cd2f08ead7..e26011ab74232b568c897c5b68b641a6c718d03f 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -291,6 +291,10 @@ javax.servlet javax.servlet-api + + com.sun.activation + javax.activation + org.eclipse.jetty jetty-server diff --git a/pom.xml b/pom.xml index bd10d5c9c5db9f4259cb5aa1b69fbf87e8d17616..77278c67602f5d27f4c4170c6f9b0b6e57249ec8 100755 --- a/pom.xml +++ b/pom.xml @@ -1919,6 +1919,11 @@ javax.ws.rs-api ${wx.rs.api.version} + + com.sun.activation + javax.activation + 1.2.0 + org.eclipse.jetty jetty-server -- 2.20.1 (Apple Git-117)