Repository: hbase Updated Branches: refs/heads/branch-2 430b056ad -> b9a4c552e refs/heads/master a838f7631 -> 0d33caa39
HBASE-20617 Removed jetty-jsp module. Signed-off-by: Mike Drob <md...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0d33caa3 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0d33caa3 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0d33caa3 Branch: refs/heads/master Commit: 0d33caa39a623c9edc72b9de51ba8f001d868230 Parents: a838f76 Author: Sakthi <jatsak...@cloudera.com> Authored: Fri Jul 6 14:00:28 2018 -0700 Committer: Mike Drob <md...@apache.org> Committed: Wed Jul 11 11:41:55 2018 -0500 ---------------------------------------------------------------------- .../src/main/resources/supplemental-models.xml | 14 -------------- hbase-shaded/hbase-shaded-mapreduce/pom.xml | 4 ---- hbase-thrift/pom.xml | 5 ----- pom.xml | 6 ------ 4 files changed, 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/0d33caa3/hbase-resource-bundle/src/main/resources/supplemental-models.xml ---------------------------------------------------------------------- diff --git a/hbase-resource-bundle/src/main/resources/supplemental-models.xml b/hbase-resource-bundle/src/main/resources/supplemental-models.xml index 39ca47e..c42e284 100644 --- a/hbase-resource-bundle/src/main/resources/supplemental-models.xml +++ b/hbase-resource-bundle/src/main/resources/supplemental-models.xml @@ -209,20 +209,6 @@ under the License. <supplement> <project> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-jsp</artifactId> - - <licenses> - <license> - <name>Apache License, Version 2.0</name> - <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url> - <distribution>repo</distribution> - </license> - </licenses> - </project> - </supplement> - <supplement> - <project> - <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-security</artifactId> <licenses> http://git-wip-us.apache.org/repos/asf/hbase/blob/0d33caa3/hbase-shaded/hbase-shaded-mapreduce/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-shaded/hbase-shaded-mapreduce/pom.xml b/hbase-shaded/hbase-shaded-mapreduce/pom.xml index 598f3af..fec88f1 100644 --- a/hbase-shaded/hbase-shaded-mapreduce/pom.xml +++ b/hbase-shaded/hbase-shaded-mapreduce/pom.xml @@ -130,10 +130,6 @@ <artifactId>jetty-util-ajax</artifactId> </exclusion> <exclusion> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-jsp</artifactId> - </exclusion> - <exclusion> <groupId>org.glassfish</groupId> <artifactId>javax.el</artifactId> </exclusion> http://git-wip-us.apache.org/repos/asf/hbase/blob/0d33caa3/hbase-thrift/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 990e41c..c516c3f 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -258,11 +258,6 @@ <artifactId>jetty-servlet</artifactId> </dependency> <dependency> - <!--Ant task needs this--> - <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-jsp</artifactId> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/hbase/blob/0d33caa3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index f65091d..73bed74 100755 --- a/pom.xml +++ b/pom.xml @@ -1474,7 +1474,6 @@ <jackson.version>2.9.2</jackson.version> <jaxb-api.version>2.2.12</jaxb-api.version> <jetty.version>9.3.19.v20170502</jetty.version> - <jetty-jsp.version>9.2.19.v20160908</jetty-jsp.version> <servlet.api.version>3.1.0</servlet.api.version> <wx.rs.api.version>2.0.1</wx.rs.api.version> <!-- Jersey 2.26 requires jetty 9.4 which breaks hadoop. Tread lightly. --> @@ -2085,11 +2084,6 @@ </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> - <artifactId>jetty-jsp</artifactId> - <version>${jetty-jsp.version}</version> - </dependency> - <dependency> - <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-jmx</artifactId> <version>${jetty.version}</version> </dependency>
