diff --git a/hadoop-common/CHANGES.txt b/hadoop-common/CHANGES.txt index f8b24db420..8c739df144 100644 --- a/hadoop-common/CHANGES.txt +++ b/hadoop-common/CHANGES.txt @@ -498,6 +498,9 @@ Trunk (unreleased changes) HADOOP-7545. Common -tests JAR should not include properties and configs. (todd) + HADOOP-7536. Correct the dependency version regressions introduced in + HADOOP-6671. (Alejandro Abdelnur via tomwhite) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 3c8cb5c42a..3cc455a848 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -191,7 +191,7 @@ commons-logging commons-logging - 1.0.4 + 1.1.1 avalon-framework @@ -210,7 +210,7 @@ commons-logging commons-logging-api - 1.0.4 + 1.1 log4j @@ -292,12 +292,12 @@ org.slf4j slf4j-api - 1.5.8 + 1.5.11 org.slf4j slf4j-log4j12 - 1.5.8 + 1.5.11 org.eclipse.jdt