hadoop-mapreduce-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomwh...@apache.org
Subject svn commit: r959509 - in /hadoop/mapreduce/trunk: ./ ivy/ src/contrib/capacity-scheduler/ src/contrib/fairscheduler/ src/contrib/gridmix/ src/contrib/mrunit/ src/contrib/mumak/ src/contrib/raid/ src/contrib/streaming/
Date Thu, 01 Jul 2010 04:58:52 GMT
Author: tomwhite
Date: Thu Jul  1 04:58:51 2010
New Revision: 959509

URL: http://svn.apache.org/viewvc?rev=959509&view=rev
Log:
MAPREDUCE-1870. Harmonize MapReduce JAR library versions with Common and HDFS.

Modified:
    hadoop/mapreduce/trunk/CHANGES.txt
    hadoop/mapreduce/trunk/ivy.xml
    hadoop/mapreduce/trunk/ivy/libraries.properties
    hadoop/mapreduce/trunk/src/contrib/capacity-scheduler/ivy.xml
    hadoop/mapreduce/trunk/src/contrib/fairscheduler/ivy.xml
    hadoop/mapreduce/trunk/src/contrib/gridmix/ivy.xml
    hadoop/mapreduce/trunk/src/contrib/mrunit/ivy.xml
    hadoop/mapreduce/trunk/src/contrib/mumak/ivy.xml
    hadoop/mapreduce/trunk/src/contrib/raid/ivy.xml
    hadoop/mapreduce/trunk/src/contrib/streaming/ivy.xml

Modified: hadoop/mapreduce/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/CHANGES.txt?rev=959509&r1=959508&r2=959509&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/CHANGES.txt (original)
+++ hadoop/mapreduce/trunk/CHANGES.txt Thu Jul  1 04:58:51 2010
@@ -1608,3 +1608,5 @@ Release 0.21.0 - Unreleased
     MAPREDUCE-1885. Revert FileSystem create method that takes CreateFlags
     (MapReduce part of HADOOP-6826). (Ravi Gummadi via tomwhite)
 
+    MAPREDUCE-1870. Harmonize MapReduce JAR library versions with Common and
+    HDFS. (tomwhite)

Modified: hadoop/mapreduce/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/ivy.xml?rev=959509&r1=959508&r2=959509&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/ivy.xml (original)
+++ hadoop/mapreduce/trunk/ivy.xml Thu Jul  1 04:58:51 2010
@@ -98,7 +98,11 @@
    <dependency org="org.apache.lucene" name="lucene-core" 
                rev="${lucene-core.version}" conf="javadoc->default"/>
    <dependency org="org.apache.hadoop" name="avro" rev="${avro.version}" 
-               conf="common->default"/>
+               conf="common->default">
+      <exclude module="ant"/>
+      <exclude module="jetty"/>
+      <exclude module="slf4j-simple"/>
+    </dependency>
    <dependency org="org.mockito" name="mockito-all" rev="${mockito-all.version}" 
                conf="test->default"/>
    <!-- dependency addition for the fault injection -->

Modified: hadoop/mapreduce/trunk/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/ivy/libraries.properties?rev=959509&r1=959508&r2=959509&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/ivy/libraries.properties (original)
+++ hadoop/mapreduce/trunk/ivy/libraries.properties Thu Jul  1 04:58:51 2010
@@ -14,23 +14,22 @@
 #It drives ivy and the generation of a maven POM
 
 #These are the versions of our dependencies (in alphabetical order)
-apacheant.version=1.7.1
 ant-task.version=2.0.10
 
 #Aspectj depedency for Fault injection
 #This property has to be updated synchronously with aop.xml
 aspectj.version=1.6.5
 
-avro.version=1.3.0
+avro.version=1.3.2
 
 checkstyle.version=4.2
 
 commons-cli.version=1.2
 commons-collections.version=3.1
-commons-httpclient.version=3.0.1
-commons-lang.version=2.4
-commons-logging.version=1.0.4
-commons-logging-api.version=1.0.4
+commons-httpclient.version=3.1
+commons-lang.version=2.5
+commons-logging.version=1.1.1
+commons-logging-api.version=1.1
 commons-el.version=1.0
 commons-fileupload.version=1.2
 commons-io.version=1.4
@@ -47,16 +46,15 @@ hadoop-hdfs.version=0.22.0-SNAPSHOT
 
 hsqldb.version=1.8.0.10
 
-#ivy.version=2.0.0-beta2
-ivy.version=2.0.0-rc2
+ivy.version=2.1.0
 
 jasper.version=5.5.12
 jsp.version=2.1
 jsp-api.version=5.5.12
-jets3t.version=0.6.1
+jets3t.version=0.7.1
 jetty.version=6.1.14
 jetty-util.version=6.1.14
-junit.version=4.5
+junit.version=4.8.1
 jdiff.version=1.0.9
 
 kfs.version=0.3
@@ -66,7 +64,7 @@ lucene-core.version=2.3.1
 
 mina-core.version=2.0.0-M5
 
-mockito-all.version=1.8.0
+mockito-all.version=1.8.2
 
 oro.version=2.0.8
 
@@ -75,8 +73,8 @@ rats-lib.version=0.6
 servlet.version=4.0.6
 servlet-api-2.5.version=6.1.14
 servlet-api.version=2.5
-slf4j-api.version=1.4.3
-slf4j-log4j12.version=1.4.3
+slf4j-api.version=1.5.11
+slf4j-log4j12.version=1.5.11
 
 xmlenc.version=0.52
 xerces.version=1.4.4

Modified: hadoop/mapreduce/trunk/src/contrib/capacity-scheduler/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/capacity-scheduler/ivy.xml?rev=959509&r1=959508&r2=959509&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/capacity-scheduler/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/capacity-scheduler/ivy.xml Thu Jul  1 04:58:51 2010
@@ -70,6 +70,10 @@
     <dependency org="commons-httpclient" name="commons-httpclient" 
                 rev="${commons-httpclient.version}" conf="common->master"/>
     <dependency org="org.apache.hadoop" name="avro" 
-                rev="${avro.version}" conf="common->default"/>
+                rev="${avro.version}" conf="common->default">
+      <exclude module="ant"/>
+      <exclude module="jetty"/>
+      <exclude module="slf4j-simple"/>
+    </dependency>
   </dependencies>
 </ivy-module>

Modified: hadoop/mapreduce/trunk/src/contrib/fairscheduler/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/fairscheduler/ivy.xml?rev=959509&r1=959508&r2=959509&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/fairscheduler/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/fairscheduler/ivy.xml Thu Jul  1 04:58:51 2010
@@ -67,7 +67,11 @@
     <dependency org="org.apache.hadoop"
       name="avro"
       rev="${avro.version}"
-      conf="common->default"/>
+      conf="common->default">
+      <exclude module="ant"/>
+      <exclude module="jetty"/>
+      <exclude module="slf4j-simple"/>
+    </dependency>
     <dependency org="org.codehaus.jackson"
       name="jackson-mapper-asl"
       rev="${jackson.version}"

Modified: hadoop/mapreduce/trunk/src/contrib/gridmix/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/gridmix/ivy.xml?rev=959509&r1=959508&r2=959509&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/gridmix/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/gridmix/ivy.xml Thu Jul  1 04:58:51 2010
@@ -105,7 +105,11 @@
     <dependency org="org.apache.hadoop"
       name="avro"
       rev="${avro.version}"
-      conf="common->default"/>
+      conf="common->default">
+      <exclude module="ant"/>
+      <exclude module="jetty"/>
+      <exclude module="slf4j-simple"/>
+    </dependency>
     <dependency org="org.codehaus.jackson"
       name="jackson-mapper-asl"
       rev="${jackson.version}"

Modified: hadoop/mapreduce/trunk/src/contrib/mrunit/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/mrunit/ivy.xml?rev=959509&r1=959508&r2=959509&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/mrunit/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/mrunit/ivy.xml Thu Jul  1 04:58:51 2010
@@ -45,7 +45,11 @@
     <dependency org="commons-logging" name="commons-logging" rev="${commons-logging.version}"
conf="common->default"/>
     <dependency org="log4j" name="log4j" rev="${log4j.version}" conf="common->master"/>
     <dependency org="junit" name="junit" rev="${junit.version}" conf="common->master"/>
-    <dependency org="org.apache.hadoop" name="avro" rev="${avro.version}" conf="common->default"/>
+    <dependency org="org.apache.hadoop" name="avro" rev="${avro.version}" conf="common->default">
+      <exclude module="ant"/>
+      <exclude module="jetty"/>
+      <exclude module="slf4j-simple"/>
+    </dependency>
   </dependencies>
 
 </ivy-module>

Modified: hadoop/mapreduce/trunk/src/contrib/mumak/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/mumak/ivy.xml?rev=959509&r1=959508&r2=959509&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/mumak/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/mumak/ivy.xml Thu Jul  1 04:58:51 2010
@@ -117,6 +117,10 @@
     <dependency org="org.apache.hadoop"
       name="avro"
 	  rev="${avro.version}"
-      conf="common->default"/>
+      conf="common->default">
+      <exclude module="ant"/>
+      <exclude module="jetty"/>
+      <exclude module="slf4j-simple"/>
+    </dependency>
   </dependencies>
 </ivy-module>

Modified: hadoop/mapreduce/trunk/src/contrib/raid/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/raid/ivy.xml?rev=959509&r1=959508&r2=959509&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/raid/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/raid/ivy.xml Thu Jul  1 04:58:51 2010
@@ -105,7 +105,11 @@
     <dependency org="org.apache.hadoop"
       name="avro"
       rev="${avro.version}"
-      conf="common->default"/>
+      conf="common->default">
+      <exclude module="ant"/>
+      <exclude module="jetty"/>
+      <exclude module="slf4j-simple"/>
+    </dependency>
     <dependency org="org.codehaus.jackson"
       name="jackson-mapper-asl"
       rev="${jackson.version}"

Modified: hadoop/mapreduce/trunk/src/contrib/streaming/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/trunk/src/contrib/streaming/ivy.xml?rev=959509&r1=959508&r2=959509&view=diff
==============================================================================
--- hadoop/mapreduce/trunk/src/contrib/streaming/ivy.xml (original)
+++ hadoop/mapreduce/trunk/src/contrib/streaming/ivy.xml Thu Jul  1 04:58:51 2010
@@ -69,7 +69,11 @@
     <dependency org="log4j" name="log4j" 
                 rev="${log4j.version}" conf="common->master"/>
     <dependency org="org.apache.hadoop" name="avro" 
-                rev="${avro.version}" conf="common->default"/>
+                rev="${avro.version}" conf="common->default">
+      <exclude module="ant"/>
+      <exclude module="jetty"/>
+      <exclude module="slf4j-simple"/>
+    </dependency>
     <dependency org="org.slf4j" name="slf4j-api" 
                 rev="${slf4j-api.version}" conf="common->master"/>
   </dependencies>



Mime
View raw message