Author: tomwhite
Date: Tue Jul 7 10:30:22 2015
New Revision: 1689626
URL: http://svn.apache.org/r1689626
Log:
AVRO-1586. Build against Hadoop 2.
Modified:
avro/trunk/CHANGES.txt
avro/trunk/build.sh
avro/trunk/lang/java/mapred/pom.xml
avro/trunk/lang/java/pom.xml
avro/trunk/lang/java/tools/pom.xml
avro/trunk/lang/java/trevni/avro/pom.xml
Modified: avro/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/avro/trunk/CHANGES.txt?rev=1689626&r1=1689625&r2=1689626&view=diff
==============================================================================
--- avro/trunk/CHANGES.txt (original)
+++ avro/trunk/CHANGES.txt Tue Jul 7 10:30:22 2015
@@ -13,6 +13,11 @@ Trunk (not yet released)
AVRO-1602. Java: Remove Dapper-style RPC trace facility. This
seems unused and has been a source of build problems. (cutting)
+ AVRO-1586. Build against Hadoop 2. With this change the avro-mapred and
+ trevni-avro JARs without a hadoop1 or hadoop2 Maven classifier are Hadoop 2
+ artifacts. To use with Hadoop 1, set the classifier to hadoop1.
+ (tomwhite)
+
NEW FEATURES
AVRO-1555. C#: Add support for RPC over HTTP. (Dmitry Kovalev via cutting)
Modified: avro/trunk/build.sh
URL:
http://svn.apache.org/viewvc/avro/trunk/build.sh?rev=1689626&r1=1689625&r2=1689626&view=diff
==============================================================================
--- avro/trunk/build.sh (original)
+++ avro/trunk/build.sh Tue Jul 7 10:30:22 2015
@@ -96,7 +96,7 @@ case "$target" in
# build lang-specific artifacts
- (cd lang/java; mvn package -DskipTests -Dhadoop.version=2; rm -rf
mapred/target/classes/;
+ (cd lang/java; mvn package -DskipTests -Dhadoop.version=1; rm -rf
mapred/target/classes/;
mvn -P dist package -DskipTests -Davro.version=$VERSION
javadoc:aggregate)
(cd lang/java/trevni/doc; mvn site)
(mvn -N -P copy-artifacts antrun:run)
Modified: avro/trunk/lang/java/mapred/pom.xml
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/java/mapred/pom.xml?rev=1689626&r1=1689625&r2=1689626&view=diff
==============================================================================
--- avro/trunk/lang/java/mapred/pom.xml (original)
+++ avro/trunk/lang/java/mapred/pom.xml Tue Jul 7 10:30:22 2015
@@ -159,7 +159,8 @@
<id>hadoop1</id>
<activation>
<property>
- <name>!hadoop.version</name> <!-- if no hadoop.version is set -->
+ <name>hadoop.version</name>
+ <value>1</value>
</property>
</activation>
<properties>
@@ -179,8 +180,7 @@
<id>hadoop2</id>
<activation>
<property>
- <name>hadoop.version</name>
- <value>2</value>
+ <name>!hadoop.version</name> <!-- if no hadoop.version is set -->
</property>
</activation>
<properties>
@@ -194,16 +194,6 @@
So we should not include it here -->
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-common</artifactId>
- <scope>test</scope> <!-- for LocalJobRunner -->
- </dependency>
- <dependency>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- <scope>test</scope> <!-- for LocalJobRunner -->
- </dependency>
</dependencies>
</profile>
</profiles>
Modified: avro/trunk/lang/java/pom.xml
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/java/pom.xml?rev=1689626&r1=1689625&r2=1689626&view=diff
==============================================================================
--- avro/trunk/lang/java/pom.xml (original)
+++ avro/trunk/lang/java/pom.xml Tue Jul 7 10:30:22 2015
@@ -39,11 +39,11 @@
<!-- version properties for dependencies -->
<!--
- To build the avro-mapred module against Hadoop 2 specify
- -Dhadoop.version=2 or leave unspecified to build against Hadoop 1
+ To build the avro-mapred module against Hadoop 1 specify
+ -Dhadoop.version=1 or leave unspecified to build against Hadoop 2
-->
<hadoop1.version>1.2.1</hadoop1.version>
- <hadoop2.version>2.5.0</hadoop2.version>
+ <hadoop2.version>2.5.1</hadoop2.version>
<jackson.version>1.9.13</jackson.version>
<jetty.version>6.1.26</jetty.version>
<jetty-servlet-api.version>2.5-20081211</jetty-servlet-api.version>
@@ -448,17 +448,6 @@
<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>
Modified: avro/trunk/lang/java/tools/pom.xml
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/java/tools/pom.xml?rev=1689626&r1=1689625&r2=1689626&view=diff
==============================================================================
--- avro/trunk/lang/java/tools/pom.xml (original)
+++ avro/trunk/lang/java/tools/pom.xml Tue Jul 7 10:30:22 2015
@@ -65,6 +65,7 @@
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<mainClass>org.apache.avro.tool.Main</mainClass>
</transformer>
+ <transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer"
/>
</transformers>
</configuration>
</execution>
@@ -171,82 +172,8 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
+ <artifactId>hadoop-client</artifactId>
<optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-api-2.1</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1</artifactId>
- </exclusion>
- <exclusion>
- <groupId>tomcat</groupId>
- <artifactId>jasper-compiler</artifactId>
- </exclusion>
- <exclusion>
- <groupId>tomcat</groupId>
- <artifactId>jasper-runtime</artifactId>
- </exclusion>
- <exclusion>
- <groupId>net.java.dev.jets3t</groupId>
- <artifactId>jets3t</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-httpclient</groupId>
- <artifactId>commons-httpclient</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-el</groupId>
- <artifactId>commons-el</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xmlenc</groupId>
- <artifactId>xmlenc</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>servlet-api-2.5</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.eclipse.jdt</groupId>
- <artifactId>core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-cli</groupId>
- <artifactId>commons-cli</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>hsqldb</groupId>
- <artifactId>hsqldb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>net.sf.jopt-simple</groupId>
Modified: avro/trunk/lang/java/trevni/avro/pom.xml
URL:
http://svn.apache.org/viewvc/avro/trunk/lang/java/trevni/avro/pom.xml?rev=1689626&r1=1689625&r2=1689626&view=diff
==============================================================================
--- avro/trunk/lang/java/trevni/avro/pom.xml (original)
+++ avro/trunk/lang/java/trevni/avro/pom.xml Tue Jul 7 10:30:22 2015
@@ -77,11 +77,12 @@
<profiles>
<profile>
<id>hadoop1</id>
- <activation>
- <property>
- <name>!hadoop.version</name> <!-- if no hadoop.version is set -->
- </property>
- </activation>
+ <activation>
+ <property>
+ <name>hadoop.version</name>
+ <value>2</value>
+ </property>
+ </activation>
<properties>
<envClassifier>hadoop1</envClassifier>
</properties>
@@ -107,8 +108,7 @@
<id>hadoop2</id>
<activation>
<property>
- <name>hadoop.version</name>
- <value>2</value>
+ <name>!hadoop.version</name> <!-- if no hadoop.version is set -->
</property>
</activation>
<properties>
@@ -124,18 +124,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-mapreduce-client-common</artifactId>
- <version>${hadoop2.version}</version>
- <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>
- <dependency>
<groupId>org.apache.avro</groupId>
<artifactId>avro-mapred</artifactId>
<version>${project.version}</version>
