Author: magicaltrout
Date: Wed Jan 21 22:21:58 2015
New Revision: 1653674
URL: http://svn.apache.org/r1653674
Log:
Attempt to fix Jenkins build
Modified:
oodt/trunk/CHANGES.txt
oodt/trunk/resource/pom.xml
Modified: oodt/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/oodt/trunk/CHANGES.txt?rev=1653674&r1=1653673&r2=1653674&view=diff
==============================================================================
--- oodt/trunk/CHANGES.txt (original)
+++ oodt/trunk/CHANGES.txt Wed Jan 21 22:21:58 2015
@@ -2,6 +2,7 @@ Apache OODT Change Log
======================
Release 0.9 - Current Development
-------------------------------------------
+* OODT-804 Broken trunk build on Jenkins
* OODT-699 Mesos cluster manager backend to resource manager
Modified: oodt/trunk/resource/pom.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/resource/pom.xml?rev=1653674&r1=1653673&r2=1653674&view=diff
==============================================================================
--- oodt/trunk/resource/pom.xml (original)
+++ oodt/trunk/resource/pom.xml Wed Jan 21 22:21:58 2015
@@ -99,7 +99,18 @@ the License.
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>2.4.0</version>
- </dependency>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.jersey</groupId>
+ <artifactId>jersey-client</artifactId>
+ <version>1.14</version>
+ </dependency>
<dependency>
<groupId>org.apache.oodt</groupId>
<artifactId>cas-metadata</artifactId>
