You are viewing a plain text version of this content. The canonical link for it is here.
Posted to hcatalog-commits@incubator.apache.org by tr...@apache.org on 2013/01/30 17:48:42 UTC

svn commit: r1440555 - in /incubator/hcatalog/trunk: CHANGES.txt pom.xml webhcat/svr/pom.xml

Author: travis
Date: Wed Jan 30 17:48:42 2013
New Revision: 1440555

URL: http://svn.apache.org/viewvc?rev=1440555&view=rev
Log:
HCATALOG-601 fix hcatalog dependency resolution issues

Modified:
    incubator/hcatalog/trunk/CHANGES.txt
    incubator/hcatalog/trunk/pom.xml
    incubator/hcatalog/trunk/webhcat/svr/pom.xml

Modified: incubator/hcatalog/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/CHANGES.txt?rev=1440555&r1=1440554&r2=1440555&view=diff
==============================================================================
--- incubator/hcatalog/trunk/CHANGES.txt (original)
+++ incubator/hcatalog/trunk/CHANGES.txt Wed Jan 30 17:48:42 2013
@@ -180,6 +180,8 @@ Release 0.5.0 - Unreleased
   OPTIMIZATIONS
 
   BUG FIXES
+  HCAT-601 fix hcatalog dependency resolution issues (sushanth via traviscrawford)
+
   HCAT-608 exclude data files from hcatalog release audit report (traviscrawford)
 
   HCAT-606 remove hcatalog test includes/excludes files (traviscrawford)

Modified: incubator/hcatalog/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/pom.xml?rev=1440555&r1=1440554&r2=1440555&view=diff
==============================================================================
--- incubator/hcatalog/trunk/pom.xml (original)
+++ incubator/hcatalog/trunk/pom.xml Wed Jan 30 17:48:42 2013
@@ -32,7 +32,7 @@
       <hcatalog.version>${project.version}</hcatalog.version>
       <hive.version>0.10.0</hive.version>
       <jackson.version>1.8.3</jackson.version>
-      <jersey.version>1.9.1</jersey.version>
+      <jersey.version>1.14</jersey.version>
       <jetty.webhcat.version>7.6.0.v20120127</jetty.webhcat.version>
       <jms.version>1.1</jms.version>
       <pig.version>0.8.0</pig.version>
@@ -151,6 +151,16 @@
         <enabled>false</enabled>
       </snapshots>
     </repository>
+    <repository>
+      <id>glassfish-repo-archive</id>
+      <url>http://maven.glassfish.org/content/groups/glassfish</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+    </repository>
 
   </repositories>
 

Modified: incubator/hcatalog/trunk/webhcat/svr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hcatalog/trunk/webhcat/svr/pom.xml?rev=1440555&r1=1440554&r2=1440555&view=diff
==============================================================================
--- incubator/hcatalog/trunk/webhcat/svr/pom.xml (original)
+++ incubator/hcatalog/trunk/webhcat/svr/pom.xml Wed Jan 30 17:48:42 2013
@@ -58,19 +58,13 @@
         <!-- compile scope - this is packaged -->
         <dependency>
             <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-core</artifactId>
-            <version>${jersey.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
             <artifactId>jersey-json</artifactId>
             <version>${jersey.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-server</artifactId>
+            <artifactId>jersey-servlet</artifactId>
             <version>${jersey.version}</version>
             <scope>compile</scope>
         </dependency>
@@ -94,6 +88,12 @@
         </dependency>
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
+            <artifactId>jackson-core-asl</artifactId>
+            <version>${jackson.version}</version>
+            <scope>compile</scope>
+        </dependency>
+         <dependency>
+            <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-mapper-asl</artifactId>
             <version>${jackson.version}</version>
             <scope>compile</scope>