HCATALOG-601 fix hcatalog dependency resolution issues
git-svn-id: https://svn.apache.org/repos/asf/incubator/hcatalog/branches/branch-0.5@1440577 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 71590db..d0c3fad 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -166,6 +166,8 @@
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)
diff --git a/pom.xml b/pom.xml
index 840ff6e..fcf92b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>
diff --git a/webhcat/svr/pom.xml b/webhcat/svr/pom.xml
index b3e28ce..75a124b 100644
--- a/webhcat/svr/pom.xml
+++ b/webhcat/svr/pom.xml
@@ -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>
