big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-7536. Correct the dependency version regressions introduced in HADOOP-6671. Contributed by Alejandro Abdelnur.

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1158347 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Thomas White 2011-08-16 16:12:04 +00:00
parent e5508496dc
commit 86ef57ff07
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-common/CHANGES.txt
View File

@ -498,6 +498,9 @@ Trunk (unreleased changes)
HADOOP-7545. Common -tests JAR should not include properties and configs. HADOOP-7545. Common -tests JAR should not include properties and configs.
(todd) (todd)
HADOOP-7536. Correct the dependency version regressions introduced in
HADOOP-6671. (Alejandro Abdelnur via tomwhite)
Release 0.22.0 - Unreleased Release 0.22.0 - Unreleased
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

8
hadoop-project/pom.xml
View File

@ -191,7 +191,7 @@
<dependency> <dependency>
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId> <artifactId>commons-logging</artifactId>
<version>1.0.4</version> <version>1.1.1</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>avalon-framework</groupId> <groupId>avalon-framework</groupId>
@ -210,7 +210,7 @@
<dependency> <dependency>
<groupId>commons-logging</groupId> <groupId>commons-logging</groupId>
<artifactId>commons-logging-api</artifactId> <artifactId>commons-logging-api</artifactId>
<version>1.0.4</version> <version>1.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>log4j</groupId> <groupId>log4j</groupId>
@ -292,12 +292,12 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>slf4j-api</artifactId>
<version>1.5.8</version> <version>1.5.11</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<version>1.5.8</version> <version>1.5.11</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.jdt</groupId> <groupId>org.eclipse.jdt</groupId>