Repository: hbase Updated Branches: refs/heads/branch-2 e778fbc05 -> 48bc132e1
HBASE-18723 [pom cleanup] Do a pass with dependency:analyze; remove unused and explicity list the dependencies we exploit; ADDENDUM2 Plug more holes. REST can't find JspC when it runs its antrun task. hbase-it didn't include reference to hbase-protocol-shaded Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/48bc132e Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/48bc132e Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/48bc132e Branch: refs/heads/branch-2 Commit: 48bc132e12431e0369275c2d6a578e46bfd60464 Parents: e778fbc Author: Michael Stack <st...@duboce.net> Authored: Mon Sep 4 13:10:20 2017 -0700 Committer: Michael Stack <st...@apache.org> Committed: Mon Sep 4 21:14:21 2017 -0700 ---------------------------------------------------------------------- hbase-it/pom.xml | 9 +++++++++ hbase-rest/pom.xml | 5 +++++ hbase-server/pom.xml | 5 +++++ hbase-thrift/pom.xml | 5 +++++ pom.xml | 7 +++++++ 5 files changed, 31 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/48bc132e/hbase-it/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml index 2cd0f7b..af1e1d8 100644 --- a/hbase-it/pom.xml +++ b/hbase-it/pom.xml @@ -196,6 +196,10 @@ </dependency> <dependency> <groupId>org.apache.hbase</groupId> + <artifactId>hbase-protocol-shaded</artifactId> + </dependency> + <dependency> + <groupId>org.apache.hbase</groupId> <artifactId>hbase-client</artifactId> </dependency> <dependency> @@ -296,6 +300,11 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>org.glassfish.jersey.core</groupId> + <artifactId>jersey-client</artifactId> + <version>2.25.1</version> + </dependency> </dependencies> <profiles> http://git-wip-us.apache.org/repos/asf/hbase/blob/48bc132e/hbase-rest/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 8659c8f..f9b3e4a 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -338,6 +338,11 @@ <artifactId>jersey-media-json-jackson1</artifactId> </dependency> <dependency> + <!--For JspC used in ant task--> + <groupId>org.glassfish.web</groupId> + <artifactId>javax.servlet.jsp</artifactId> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <scope>test</scope> http://git-wip-us.apache.org/repos/asf/hbase/blob/48bc132e/hbase-server/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 693f0c8..71d7835 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -489,6 +489,11 @@ <artifactId>jersey-media-json-jackson1</artifactId> </dependency> <dependency> + <!--For JspC used in ant task--> + <groupId>org.glassfish.web</groupId> + <artifactId>javax.servlet.jsp</artifactId> + </dependency> + <dependency> <groupId>org.codehaus.jackson</groupId> <artifactId>jackson-core-asl</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/hbase/blob/48bc132e/hbase-thrift/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index 1a84a15..ccf1db3 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -294,6 +294,11 @@ <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-util</artifactId> </dependency> + <dependency> + <!--For JspC used in ant task--> + <groupId>org.glassfish.web</groupId> + <artifactId>javax.servlet.jsp</artifactId> + </dependency> </dependencies> <profiles> http://git-wip-us.apache.org/repos/asf/hbase/blob/48bc132e/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b3b1d34..0219960 100644 --- a/pom.xml +++ b/pom.xml @@ -1367,6 +1367,7 @@ <servlet.api.version>3.1.0</servlet.api.version> <wx.rs.api.version>2.0.1</wx.rs.api.version> <jersey.version>2.25.1</jersey.version> + <glassfish.jsp.version>2.3.2</glassfish.jsp.version> <jetty.jspapi.version>6.1.14</jetty.jspapi.version> <jruby.version>9.1.10.0</jruby.version> <junit.version>4.12</junit.version> @@ -1936,6 +1937,12 @@ <version>${jackson.version}</version> </dependency> <dependency> + <!--This lib has JspC in it. Needed precompiling jsps in hbase-rest, etc.--> + <groupId>org.glassfish.web</groupId> + <artifactId>javax.servlet.jsp</artifactId> + <version>${glassfish.jsp.version}</version> + </dependency> + <dependency> <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> <version>${jaxb-api.version}</version>
