hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject svn commit: r884429 - in /hadoop/common/branches/branch-0.21: ./ CHANGES.txt ivy.xml ivy/hadoop-core-template.xml ivy/libraries.properties src/contrib/ec2/ src/docs/ src/java/ src/test/core/
Date Thu, 26 Nov 2009 07:37:23 GMT
Author: omalley
Date: Thu Nov 26 07:37:23 2009
New Revision: 884429

URL: http://svn.apache.org/viewvc?rev=884429&view=rev
Log:
HADOOP-6395. Upgrade some libraries to be consistent across common, hdfs,
and mapreduce. (omalley)

Modified:
    hadoop/common/branches/branch-0.21/   (props changed)
    hadoop/common/branches/branch-0.21/CHANGES.txt   (contents, props changed)
    hadoop/common/branches/branch-0.21/ivy.xml
    hadoop/common/branches/branch-0.21/ivy/hadoop-core-template.xml
    hadoop/common/branches/branch-0.21/ivy/libraries.properties
    hadoop/common/branches/branch-0.21/src/contrib/ec2/   (props changed)
    hadoop/common/branches/branch-0.21/src/docs/   (props changed)
    hadoop/common/branches/branch-0.21/src/java/   (props changed)
    hadoop/common/branches/branch-0.21/src/test/core/   (props changed)

Propchange: hadoop/common/branches/branch-0.21/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 07:37:23 2009
@@ -1,2 +1,2 @@
-/hadoop/common/trunk:818543,819670,824900-824942,831032,831070,832157
+/hadoop/common/trunk:818543,819670,824900-824942,831032,831070,832157,884428
 /hadoop/core/branches/branch-0.19/core:713112

Modified: hadoop/common/branches/branch-0.21/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/CHANGES.txt?rev=884429&r1=884428&r2=884429&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.21/CHANGES.txt Thu Nov 26 07:37:23 2009
@@ -613,6 +613,9 @@
     HADOOP-6367. Removes Access Token implementation from common.
     (Kan Zhang via ddas)
 
+    HADOOP-6395. Upgrade some libraries to be consistent across common, hdfs,
+    and mapreduce. (omalley)
+
   OPTIMIZATIONS
 
     HADOOP-5595. NameNode does not need to run a replicator to choose a

Propchange: hadoop/common/branches/branch-0.21/CHANGES.txt
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 07:37:23 2009
@@ -1,4 +1,4 @@
-/hadoop/common/trunk/CHANGES.txt:818543,819670,823756,824900-824942,831032,831070,832157
+/hadoop/common/trunk/CHANGES.txt:818543,819670,823756,824900-824942,831032,831070,832157,884428
 /hadoop/core/branches/branch-0.18/CHANGES.txt:727226
 /hadoop/core/branches/branch-0.19/CHANGES.txt:713112
 /hadoop/core/trunk/CHANGES.txt:776175-785643,785929-786278

Modified: hadoop/common/branches/branch-0.21/ivy.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/ivy.xml?rev=884429&r1=884428&r2=884429&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/ivy.xml (original)
+++ hadoop/common/branches/branch-0.21/ivy.xml Thu Nov 26 07:37:23 2009
@@ -269,7 +269,9 @@
     <dependency org="org.apache.hadoop"
       name="avro"
       rev="${avro.version}"
-      conf="common->default"/>
+      conf="common->default">
+      <exclude module="slf4j-simple"/>
+    </dependency>
     <dependency org="org.codehaus.jackson"
       name="jackson-mapper-asl"
       rev="${jackson.version}"

Modified: hadoop/common/branches/branch-0.21/ivy/hadoop-core-template.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/ivy/hadoop-core-template.xml?rev=884429&r1=884428&r2=884429&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/ivy/hadoop-core-template.xml (original)
+++ hadoop/common/branches/branch-0.21/ivy/hadoop-core-template.xml Thu Nov 26 07:37:23 2009
@@ -121,7 +121,7 @@
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>avro</artifactId>
-      <version>1.0.0</version>
+      <version>1.2.0</version>
     </dependency>
   </dependencies>
 </project>

Modified: hadoop/common/branches/branch-0.21/ivy/libraries.properties
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/ivy/libraries.properties?rev=884429&r1=884428&r2=884429&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/ivy/libraries.properties (original)
+++ hadoop/common/branches/branch-0.21/ivy/libraries.properties Thu Nov 26 07:37:23 2009
@@ -27,8 +27,8 @@
 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-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
@@ -78,4 +78,4 @@
 xmlenc.version=0.52
 xerces.version=1.4.4
 
-aspectj.version=1.6.4
+aspectj.version=1.6.5

Propchange: hadoop/common/branches/branch-0.21/src/contrib/ec2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 07:37:23 2009
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/contrib/ec2:818543,819670,831032,831070,832157
+/hadoop/common/trunk/src/contrib/ec2:818543,819670,831032,831070,832157,884428
 /hadoop/core/branches/branch-0.19/core/src/contrib/ec2:713112
 /hadoop/core/trunk/src/contrib/ec2:776175-784663

Propchange: hadoop/common/branches/branch-0.21/src/docs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 07:37:23 2009
@@ -1,2 +1,2 @@
-/hadoop/common/trunk/src/docs:818543,819670,831032,831070,832157
+/hadoop/common/trunk/src/docs:818543,819670,831032,831070,832157,884428
 /hadoop/core/branches/branch-0.19/src/docs:713112

Propchange: hadoop/common/branches/branch-0.21/src/java/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 07:37:23 2009
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/java:818543,819670,831032,831070,832157
+/hadoop/common/trunk/src/java:818543,819670,831032,831070,832157,884428
 /hadoop/core/branches/branch-0.19/core/src/java:713112
 /hadoop/core/trunk/src/core:776175-785643,785929-786278

Propchange: hadoop/common/branches/branch-0.21/src/test/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 26 07:37:23 2009
@@ -1,3 +1,3 @@
-/hadoop/common/trunk/src/test/core:818543,819670,831032,831070,832157
+/hadoop/common/trunk/src/test/core:818543,819670,831032,831070,832157,884428
 /hadoop/core/branches/branch-0.19/core/src/test/core:713112
 /hadoop/core/trunk/src/test/core:776175-785643,785929-786278



Mime
View raw message