Author: tomwhite
Date: Thu Jul 1 04:36:17 2010
New Revision: 959503
URL: http://svn.apache.org/viewvc?rev=959503&view=rev
Log:
Merge -r 959500:959501 from trunk to branch-0.21. Fixes: HADOOP-6800.
Modified:
hadoop/common/branches/branch-0.21/CHANGES.txt
hadoop/common/branches/branch-0.21/ivy.xml
hadoop/common/branches/branch-0.21/ivy/hadoop-common-instrumented-template.xml
hadoop/common/branches/branch-0.21/ivy/hadoop-common-template.xml
hadoop/common/branches/branch-0.21/ivy/libraries.properties
Modified: hadoop/common/branches/branch-0.21/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/CHANGES.txt?rev=959503&r1=959502&r2=959503&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.21/CHANGES.txt Thu Jul 1 04:36:17 2010
@@ -1566,6 +1566,8 @@ Release 0.21.0 - Unreleased
HADOOP-6782. TestAvroRpc fails with avro-1.3.1 and avro-1.3.2.
(Doug Cutting via tomwhite)
+ HADOOP-6800. Harmonize JAR library versions. (tomwhite)
+
Release 0.20.3 - Unreleased
NEW FEATURES
Modified: hadoop/common/branches/branch-0.21/ivy.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/ivy.xml?rev=959503&r1=959502&r2=959503&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/ivy.xml (original)
+++ hadoop/common/branches/branch-0.21/ivy.xml Thu Jul 1 04:36:17 2010
@@ -265,6 +265,8 @@
name="avro"
rev="${avro.version}"
conf="common->default">
+ <exclude module="ant"/>
+ <exclude module="jetty"/>
<exclude module="slf4j-simple"/>
</dependency>
<dependency org="org.codehaus.jackson"
Modified:
hadoop/common/branches/branch-0.21/ivy/hadoop-common-instrumented-template.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/ivy/hadoop-common-instrumented-template.xml?rev=959503&r1=959502&r2=959503&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.21/ivy/hadoop-common-instrumented-template.xml
(original)
+++
hadoop/common/branches/branch-0.21/ivy/hadoop-common-instrumented-template.xml
Thu Jul 1 04:36:17 2010
@@ -36,7 +36,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.0.1</version>
+ <version>3.1</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -106,7 +106,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.5</version>
+ <version>4.8.1</version>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
@@ -121,7 +121,19 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>avro</artifactId>
- <version>1.3.0</version>
+ <version>1.3.2</version>
+ <exclusions>
+ <exclusion>
+ <!-- Don't pull in Avro's (later) version of Jetty.-->
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- Exclude Avro's version of ant since it conflicts with
Jetty's.-->
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</project>
Modified: hadoop/common/branches/branch-0.21/ivy/hadoop-common-template.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.21/ivy/hadoop-common-template.xml?rev=959503&r1=959502&r2=959503&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/ivy/hadoop-common-template.xml (original)
+++ hadoop/common/branches/branch-0.21/ivy/hadoop-common-template.xml Thu Jul
1 04:36:17 2010
@@ -36,7 +36,7 @@
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>3.0.1</version>
+ <version>3.1</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
@@ -106,7 +106,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.5</version>
+ <version>4.8.1</version>
</dependency>
<dependency>
<groupId>hsqldb</groupId>
@@ -121,7 +121,19 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>avro</artifactId>
- <version>1.3.0</version>
+ <version>1.3.2</version>
+ <exclusions>
+ <exclusion>
+ <!-- Don't pull in Avro's (later) version of Jetty.-->
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <!-- Exclude Avro's version of ant since it conflicts with
Jetty's.-->
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
</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=959503&r1=959502&r2=959503&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.21/ivy/libraries.properties (original)
+++ hadoop/common/branches/branch-0.21/ivy/libraries.properties Thu Jul 1
04:36:17 2010
@@ -14,7 +14,6 @@
#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
avro.version=1.3.2
@@ -25,8 +24,8 @@ commons-cli.version=1.2
commons-cli2.version=2.0-mahout
commons-codec.version=1.4
commons-collections.version=3.1
-commons-httpclient.version=3.0.1
-commons-lang.version=2.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
@@ -50,7 +49,7 @@ jsp-api.version=5.5.12
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
json.version=1.0
@@ -68,13 +67,13 @@ 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
aspectj.version=1.6.5
-mockito-all.version=1.8.0
+mockito-all.version=1.8.2
