Revert "Revert "HBASE-12894 Upgrade to Jetty 9 for REST / Info Server…

… / Thrift Http Server"" This reverts commit 0ac5d4a. This is a revert of a revert; i.e. a reapplication! Fixes for breakage that comes in with this patch is in a follow-on.
apache · Jan 30, 2017 · ffe7dac · ffe7dac
1 parent f576f46
commit ffe7dac
Show file tree

Hide file tree

Showing 35 changed files with 1,087 additions and 704 deletions.
diff --git a/hbase-common/pom.xml b/hbase-common/pom.xml
@@ -253,10 +253,6 @@
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
-    </dependency>
     <!-- tracing Dependencies -->
     <dependency>
       <groupId>org.apache.htrace</groupId>

diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
@@ -231,11 +231,6 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-client</artifactId>
-      <version>${jersey.version}</version>
-    </dependency>
     <dependency>
       <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-core</artifactId>

diff --git a/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm b/hbase-resource-bundle/src/main/resources/META-INF/LICENSE.vm
@@ -1563,7 +1563,7 @@ You can redistribute it and/or modify it under either the terms of the GPL
 ## license mentions.
 ##
 ## See this FAQ link for justifications: https://www.apache.org/legal/resolved.html
-#set($non_aggregate_fine = [ 'Public Domain', 'New BSD license', 'BSD license', 'Mozilla Public License Version 2.0', 'Creative Commons Attribution License, Version 2.5', 'MPL 1.1'])
+#set($non_aggregate_fine = [ 'Public Domain', 'New BSD license', 'BSD license', 'Mozilla Public License Version 1.1', 'Mozilla Public License Version 2.0', 'Creative Commons Attribution License, Version 2.5', 'Eclipse Public License 1.0'])
 ## 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-resource-bundle/src/main/resources/META-INF/NOTICE.vm b/hbase-resource-bundle/src/main/resources/META-INF/NOTICE.vm
@@ -101,21 +101,13 @@ noted in the LICENSE file.
 ## Leave out all the 'optionally depends on' bits.
 
 #end
-## NOTICE.txt from jetty 6.1.26, which isn't in the org.mortbay.jetty:jetty-util jar
+
-## Obtained from fedora's mirror of the 6.1.26 source
-## http://pkgs.fedoraproject.org/repo/pkgs/jetty/jetty-6.1.26-src.zip/
-##     4980757517064efbf655e025d005a0b8/jetty-6.1.26-src.zip
-## https://github.com/toddlipcon/jetty-hadoop-fix/tree/6.1.26
-##
-## updated for server side to include jsp bits from 6.1.14 (notice files are identical save
-## copyright span)
 #macro(jetty_notice $jetty-include-unixcrypt)
 --
 This product includes portions of 'The Jetty Web Container'
 
-Copyright 1995-2009 Mort Bay Consulting Pty Ltd
+Copyright 1995-2016 Mort Bay Consulting Pty Ltd.
 
-## javax.servlet paragraph is generated via org.mortbay.jetty:servlet-api-2.5
 #if(${jetty-include-unixcrypt})
 ## UnixCrypt.java paragraph only in server
 The UnixCrypt.java code ~Implements the one way cryptography used by
@@ -126,7 +118,7 @@ for non-commercial or commercial purposes and without fee is
 granted provided that the copyright notice appears in all copies.
 
 #end
-## jsp implementation paragraph is handled via org.mortbay.jetty:jsp-2.1
+## jsp implementation paragraph is handled via org.eclipse.jetty:jetty-jsp:jar
 
 Some portions of the code are Copyright:
   2006 Tim Vernum