hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hashut...@apache.org
Subject svn commit: r1601131 - in /hive/trunk: hcatalog/webhcat/svr/pom.xml hwi/pom.xml jdbc/pom.xml pom.xml service/pom.xml shims/0.20/pom.xml shims/0.20S/pom.xml shims/0.23/pom.xml
Date Sat, 07 Jun 2014 15:37:01 GMT
Author: hashutosh
Date: Sat Jun  7 15:37:00 2014
New Revision: 1601131

URL: http://svn.apache.org/r1601131
Log:
HIVE-7187 : Reconcile jetty versions in hive (Ashutosh Chauhan via Vaibhav Gumashta)

Modified:
    hive/trunk/hcatalog/webhcat/svr/pom.xml
    hive/trunk/hwi/pom.xml
    hive/trunk/jdbc/pom.xml
    hive/trunk/pom.xml
    hive/trunk/service/pom.xml
    hive/trunk/shims/0.20/pom.xml
    hive/trunk/shims/0.20S/pom.xml
    hive/trunk/shims/0.23/pom.xml

Modified: hive/trunk/hcatalog/webhcat/svr/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/webhcat/svr/pom.xml?rev=1601131&r1=1601130&r2=1601131&view=diff
==============================================================================
--- hive/trunk/hcatalog/webhcat/svr/pom.xml (original)
+++ hive/trunk/hcatalog/webhcat/svr/pom.xml Sat Jun  7 15:37:00 2014
@@ -85,7 +85,7 @@
     <dependency>
       <groupId>org.eclipse.jetty.aggregate</groupId>
       <artifactId>jetty-all-server</artifactId>
-      <version>${jetty.webhcat.version}</version>
+      <version>${jetty.version}</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

Modified: hive/trunk/hwi/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/hwi/pom.xml?rev=1601131&r1=1601130&r2=1601131&view=diff
==============================================================================
--- hive/trunk/hwi/pom.xml (original)
+++ hive/trunk/hwi/pom.xml Sat Jun  7 15:37:00 2014
@@ -61,13 +61,8 @@
       <version>${commons-logging.version}</version>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty-util</artifactId>
+      <groupId>org.eclipse.jetty.aggregate</groupId>
+      <artifactId>jetty-all-server</artifactId>
       <version>${jetty.version}</version>
     </dependency>
     <!-- test intra-project -->

Modified: hive/trunk/jdbc/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/jdbc/pom.xml?rev=1601131&r1=1601130&r2=1601131&view=diff
==============================================================================
--- hive/trunk/jdbc/pom.xml (original)
+++ hive/trunk/jdbc/pom.xml Sat Jun  7 15:37:00 2014
@@ -130,13 +130,11 @@
                   <exclude>org.apache.ant:*</exclude>
                   <exclude>junit:*</exclude>
                   <exclude>org.hamcrest:*</exclude>
-                  <exclude>org.mortbay.jetty:*</exclude>
                   <exclude>org.ow2.asm:*</exclude>
                   <exclude>javax.jms:*</exclude>
                   <exclude>com.sun.jersey:*</exclude>
                   <exclude>com.sun.jersey.contribs:*</exclude>
                   <exclude>org.eclipse.jetty.aggregate:*</exclude>
-                  <exclude>org.eclipse.jetty.orbit:*</exclude>
                   <exclude>org.tukaani:*</exclude>
                   <exclude>org.iq80.snappy:*</exclude>
                   <exclude>org.apache.velocity:*</exclude>

Modified: hive/trunk/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/pom.xml?rev=1601131&r1=1601130&r2=1601131&view=diff
==============================================================================
--- hive/trunk/pom.xml (original)
+++ hive/trunk/pom.xml Sat Jun  7 15:37:00 2014
@@ -120,10 +120,7 @@
     <javaewah.version>0.3.2</javaewah.version>
     <javolution.version>5.5.1</javolution.version>
     <jdo-api.version>3.0.1</jdo-api.version>
-    <!-- TODO figure out how to reconcile jetty versions -->
-    <jetty.version>6.1.26</jetty.version>
-    <jetty.webhcat.version>7.6.0.v20120127</jetty.webhcat.version>
-    <jetty.hive-service.version>7.6.0.v20120127</jetty.hive-service.version>
+    <jetty.version>7.6.0.v20120127</jetty.version>
     <jersey.version>1.14</jersey.version>
     <jline.version>0.9.94</jline.version>
     <jms.version>1.1</jms.version>
@@ -468,7 +465,7 @@
       <dependency>
         <groupId>org.eclipse.jetty.aggregate</groupId>
         <artifactId>jetty-all-server</artifactId>
-        <version>${jetty.webhcat.version}</version>
+        <version>${jetty.version}</version>
       </dependency>
       <dependency>
         <groupId>org.datanucleus</groupId>
@@ -501,16 +498,6 @@
         <version>${mockito-all.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty</artifactId>
-        <version>${jetty.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.mortbay.jetty</groupId>
-        <artifactId>jetty-util</artifactId>
-        <version>${jetty.version}</version>
-      </dependency>
-      <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>slf4j-api</artifactId>
         <version>${slf4j.version}</version>

Modified: hive/trunk/service/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/service/pom.xml?rev=1601131&r1=1601130&r2=1601131&view=diff
==============================================================================
--- hive/trunk/service/pom.xml (original)
+++ hive/trunk/service/pom.xml Sat Jun  7 15:37:00 2014
@@ -74,7 +74,7 @@
     <dependency>
       <groupId>org.eclipse.jetty.aggregate</groupId>
       <artifactId>jetty-all</artifactId>
-        <version>${jetty.hive-service.version}</version>
+        <version>${jetty.version}</version>
     </dependency>
     <dependency>
       <groupId>org.apache.thrift</groupId>

Modified: hive/trunk/shims/0.20/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/shims/0.20/pom.xml?rev=1601131&r1=1601130&r2=1601131&view=diff
==============================================================================
--- hive/trunk/shims/0.20/pom.xml (original)
+++ hive/trunk/shims/0.20/pom.xml Sat Jun  7 15:37:00 2014
@@ -59,10 +59,5 @@
       <version>${hadoop-20.version}</version>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>
   </dependencies>
 </project>

Modified: hive/trunk/shims/0.20S/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/shims/0.20S/pom.xml?rev=1601131&r1=1601130&r2=1601131&view=diff
==============================================================================
--- hive/trunk/shims/0.20S/pom.xml (original)
+++ hive/trunk/shims/0.20S/pom.xml Sat Jun  7 15:37:00 2014
@@ -53,10 +53,5 @@
       <version>${hadoop-20S.version}</version>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>${jetty.version}</version>
-    </dependency>
   </dependencies>
 </project>

Modified: hive/trunk/shims/0.23/pom.xml
URL: http://svn.apache.org/viewvc/hive/trunk/shims/0.23/pom.xml?rev=1601131&r1=1601130&r2=1601131&view=diff
==============================================================================
--- hive/trunk/shims/0.23/pom.xml (original)
+++ hive/trunk/shims/0.23/pom.xml Sat Jun  7 15:37:00 2014
@@ -84,12 +84,6 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>${jetty.version}</version>
-      <optional>true</optional>
-    </dependency>
-    <dependency>
       <groupId>org.apache.tez</groupId>
       <artifactId>tez-api</artifactId>
       <version>${tez.version}</version>



Mime
View raw message