Author: arp
Date: Thu Sep 26 21:49:18 2013
New Revision: 1526717
URL: http://svn.apache.org/r1526717
Log:
Merging r1526366 through r1526708 from trunk to branch HDFS-2832
Modified:
hadoop/common/branches/HDFS-2832/ (props changed)
hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml
Propchange: hadoop/common/branches/HDFS-2832/
------------------------------------------------------------------------------
Merged /hadoop/common/trunk:r1526366-1526708
Modified: hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml?rev=1526717&r1=1526716&r2=1526717&view=diff
==============================================================================
--- hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml (original)
+++ hadoop/common/branches/HDFS-2832/hadoop-project/pom.xml Thu Sep 26 21:49:18
2013
@@ -59,6 +59,9 @@
<hadoop.common.build.dir>${basedir}/../../hadoop-common-project/hadoop-common/target</hadoop.common.build.dir>
<java.security.egd>file:///dev/urandom</java.security.egd>
+ <!-- avro version -->
+ <avro.version>1.7.4</avro.version>
+
<!-- jersey version -->
<jersey.version>1.9</jersey.version>
@@ -630,7 +633,7 @@
<dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
- <version>1.7.4</version>
+ <version>${avro.version}</version>
</dependency>
<dependency>
<groupId>net.sf.kosmosfs</groupId>
@@ -798,7 +801,7 @@
<plugin>
<groupId>org.apache.avro</groupId>
<artifactId>avro-maven-plugin</artifactId>
- <version>1.5.3</version>
+ <version>${avro.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo.jspc</groupId>
