tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jeag...@apache.org
Subject tez git commit: TEZ-1938. Build warning duplicate jersey-json definitions (jeagles)
Date Tue, 13 Jan 2015 16:58:35 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.6 6125f5dcf -> 9939cb0b9


TEZ-1938. Build warning duplicate jersey-json definitions (jeagles)

(cherry picked from commit 4c4bcdd3aa99b482b359d7edbc5d8440465a568e)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/9939cb0b
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/9939cb0b
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/9939cb0b

Branch: refs/heads/branch-0.6
Commit: 9939cb0b95206c4093e5b632bb452f50faf536f2
Parents: 6125f5d
Author: Jonathan Eagles <jeagles@gmail.com>
Authored: Tue Jan 13 10:57:04 2015 -0600
Committer: Jonathan Eagles <jeagles@gmail.com>
Committed: Tue Jan 13 10:58:12 2015 -0600

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 pom.xml     | 5 -----
 2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/9939cb0b/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 92b159e..c16c6e1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,6 +6,7 @@ Release 0.6.0: Unreleased
 INCOMPATIBLE CHANGES
 
 ALL CHANGES:
+  TEZ-1938. Build warning duplicate jersey-json definitions
   TEZ-1910. Build fails against hadoop-2.2.0.
   TEZ-1882. Tez UI build does not work on Windows
   TEZ-1915. Add public key to KEYS

http://git-wip-us.apache.org/repos/asf/tez/blob/9939cb0b/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index c57e29d..99ef06b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -539,11 +539,6 @@
         </exclusions>
       </dependency>
       <dependency>
-        <groupId>com.sun.jersey</groupId>
-        <artifactId>jersey-json</artifactId>
-        <version>1.9</version>
-      </dependency>
-      <dependency>
         <groupId>org.apache.hadoop</groupId>
         <artifactId>hadoop-hdfs</artifactId>
         <type>test-jar</type>


Mime
View raw message