hbase-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From st...@apache.org
Subject hbase git commit: HBASE-18723 [pom cleanup] Do a pass with dependency:analyze; remove unused and explicity list the dependencies we exploit; ADDENDUM2
Date Tue, 05 Sep 2017 04:13:46 GMT
Repository: hbase
Updated Branches:
  refs/heads/master 8ec5d59a0 -> 52d4b2575


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/52d4b257
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/52d4b257
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/52d4b257

Branch: refs/heads/master
Commit: 52d4b25754a227983170bdbadc477756a639ea8e
Parents: 8ec5d59
Author: Michael Stack <stack@duboce.net>
Authored: Mon Sep 4 13:10:20 2017 -0700
Committer: Michael Stack <stack@apache.org>
Committed: Mon Sep 4 21:13:36 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/52d4b257/hbase-it/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index 61db4dc..1899711 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/52d4b257/hbase-rest/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index 226a99e..36d39b6 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/52d4b257/hbase-server/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 0277894..3d5ecf7 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/52d4b257/hbase-thrift/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index aca8baa..a0a0b5a 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/52d4b257/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ae7aec5..6ea87d1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1405,6 +1405,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>
@@ -1981,6 +1982,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>


Mime
View raw message