diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 82182173d43..f1003e2b4f2 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -110,6 +110,9 @@ Release 2.1.2 - UNRELEASED HADOOP-9948. Add a config value to CLITestHelper to skip tests on Windows. (Chuan Liu via cnauroth) + HADOOP-9976. Different versions of avro and avro-maven-plugin (Karthik + Kambatla via Sandy Ryza) + OPTIMIZATIONS BUG FIXES diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index 3d9e2c817ee..fca1afffdfb 100644 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -59,6 +59,9 @@ ${basedir}/../../hadoop-common-project/hadoop-common/target file:///dev/urandom + + 1.7.4 + 1.9 @@ -629,7 +632,7 @@ org.apache.avro avro - 1.7.4 + ${avro.version} net.sf.kosmosfs @@ -797,7 +800,7 @@ org.apache.avro avro-maven-plugin - 1.5.3 + ${avro.version} org.codehaus.mojo.jspc