Author: tomwhite
Date: Mon Dec 16 16:32:22 2013
New Revision: 1551255
URL: http://svn.apache.org/r1551255
Log:
AVRO-1410. Explicit version specification in pom prevents dependency
management. Contributed by Eric Sammer.
Modified:
avro/trunk/lang/java/mapred/pom.xml
avro/trunk/lang/java/pom.xml
Modified: avro/trunk/lang/java/mapred/pom.xml
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/java/mapred/pom.xml?rev=1551255&r1=1551254&r2=1551255&view=diff
==============================================================================
--- avro/trunk/lang/java/mapred/pom.xml (original)
+++ avro/trunk/lang/java/mapred/pom.xml Mon Dec 16 16:32:22 2013
@@ -113,24 +113,20 @@
<dependency>
<groupId>org.easymock</groupId>
<artifactId>easymock</artifactId>
- <version>${easymock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
- <version>${hamcrest.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-core-asl</artifactId>
- <version>${jackson.version}</version>
</dependency>
<dependency>
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson.version}</version>
</dependency>
</dependencies>
@@ -149,7 +145,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-core</artifactId>
- <version>${hadoop1.version}</version>
<!-- hadoop's execution environment provides its own jars, usurping
any others.
So we should not include it here -->
<scope>provided</scope>
@@ -171,21 +166,18 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
- <version>${hadoop2.version}</version>
<!-- hadoop's execution environment provides its own jars, usurping
any others.
So we should not include it here -->
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-common</artifactId>
- <version>${hadoop2.version}</version>
+ <artifactId>hadoop-mapreduce-client-common</artifactId>
<scope>test</scope> <!-- for LocalJobRunner -->
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
- <version>${commons-httpclient.version}</version>
<scope>test</scope> <!-- for LocalJobRunner -->
</dependency>
</dependencies>
Modified: avro/trunk/lang/java/pom.xml
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/java/pom.xml?rev=1551255&r1=1551254&r2=1551255&view=diff
==============================================================================
--- avro/trunk/lang/java/pom.xml (original)
+++ avro/trunk/lang/java/pom.xml Mon Dec 16 16:32:22 2013
@@ -381,6 +381,32 @@
<version>${hadoop1.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <version>${hadoop2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-mapreduce-client-common</artifactId>
+ <version>${hadoop2.version}</version>
+ </dependency>
+ <dependency>
+ <!-- for Hadoop's LocalJobRunner -->
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${commons-httpclient.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>${easymock.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <version>${hamcrest.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
<version>${snappy.version}</version>
