You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@avro.apache.org by ga...@apache.org on 2017/09/12 12:32:38 UTC
avro git commit: AVRO-2059: Remove support of Hadoop 1
Repository: avro
Updated Branches:
refs/heads/master 50eebb8a0 -> 6f8c72773
AVRO-2059: Remove support of Hadoop 1
Closes #238
Signed-off-by: Sean Busbey <bu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/avro/repo
Commit: http://git-wip-us.apache.org/repos/asf/avro/commit/6f8c7277
Tree: http://git-wip-us.apache.org/repos/asf/avro/tree/6f8c7277
Diff: http://git-wip-us.apache.org/repos/asf/avro/diff/6f8c7277
Branch: refs/heads/master
Commit: 6f8c72773753079527e6c5bc37f6ed7842915a24
Parents: 50eebb8
Author: Gabor Szadovszky <ga...@apache.org>
Authored: Tue Aug 1 09:22:14 2017 +0200
Committer: Gabor Szadovszky <ga...@apache.org>
Committed: Tue Sep 12 14:31:20 2017 +0200
----------------------------------------------------------------------
CHANGES.txt | 2 +
lang/java/build.sh | 3 -
lang/java/mapred/pom.xml | 72 +++---------------------
lang/java/pom.xml | 10 ----
lang/java/trevni/avro/pom.xml | 111 +++++++------------------------------
5 files changed, 29 insertions(+), 169 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/avro/blob/6f8c7277/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c2dba84..cd389ae 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,6 +16,8 @@ Trunk (not yet released)
AVRO-2072: ResolvingGrammarGenerator doesn't implement schema resolution correctly for unions
(Nandor Kollar via gabor)
+ AVRO-2059: Remove support of Hadoop 1 (gabor)
+
NEW FEATURES
AVRO-1704: Java: Add support for single-message encoding. (blue)
http://git-wip-us.apache.org/repos/asf/avro/blob/6f8c7277/lang/java/build.sh
----------------------------------------------------------------------
diff --git a/lang/java/build.sh b/lang/java/build.sh
index 40d32c5..bf1a4fb 100755
--- a/lang/java/build.sh
+++ b/lang/java/build.sh
@@ -38,9 +38,6 @@ for target in "$@"
do
function do_dist() {
- mvn package -DskipTests -Dhadoop.version=1;
- rm -rf mapred/target/{classes,test-classes}/;
- rm -rf trevni/avro/target/{classes,test-classes}/;
mvn -P dist package -DskipTests -Davro.version=$VERSION javadoc:aggregate
}
http://git-wip-us.apache.org/repos/asf/avro/blob/6f8c7277/lang/java/mapred/pom.xml
----------------------------------------------------------------------
diff --git a/lang/java/mapred/pom.xml b/lang/java/mapred/pom.xml
index e7e2a3f..e6dd2c5 100644
--- a/lang/java/mapred/pom.xml
+++ b/lang/java/mapred/pom.xml
@@ -92,25 +92,6 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>main</id>
- <goals><goal>jar</goal></goals>
- <phase>package</phase>
- </execution>
- <execution>
- <id>with-classifier</id>
- <goals><goal>jar</goal></goals>
- <phase>package</phase>
- <configuration>
- <classifier>${envClassifier}</classifier>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.4.1</version>
<executions>
@@ -183,52 +164,13 @@
<artifactId>commons-codec</artifactId>
<version>${commons-codec.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-client</artifactId>
+ <!-- hadoop's execution environment provides its own jars, usurping any others.
+ So we should not include it here -->
+ <scope>provided</scope>
+ </dependency>
</dependencies>
-
- <profiles>
- <profile>
- <id>hadoop1</id>
- <activation>
- <property>
- <name>hadoop.version</name>
- <value>1</value>
- </property>
- </activation>
- <properties>
- <envClassifier>hadoop1</envClassifier>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <!-- hadoop's execution environment provides its own jars, usurping any others.
- So we should not include it here -->
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop2</id>
- <activation>
- <property>
- <name>hadoop.version</name>
- <value>!1</value> <!-- if the hadoop.version is not 1 (or not set) -->
- </property>
- </activation>
- <properties>
- <envClassifier>hadoop2</envClassifier>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <!-- hadoop's execution environment provides its own jars, usurping any others.
- So we should not include it here -->
- <scope>provided</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>
http://git-wip-us.apache.org/repos/asf/avro/blob/6f8c7277/lang/java/pom.xml
----------------------------------------------------------------------
diff --git a/lang/java/pom.xml b/lang/java/pom.xml
index 74e71a4..178897a 100644
--- a/lang/java/pom.xml
+++ b/lang/java/pom.xml
@@ -38,11 +38,6 @@
<!-- version properties for dependencies -->
- <!--
- 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.7.3</hadoop2.version>
<jackson.version>1.9.13</jackson.version>
<jetty.version>6.1.26</jetty.version>
@@ -460,11 +455,6 @@
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-core</artifactId>
- <version>${hadoop1.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${hadoop2.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/avro/blob/6f8c7277/lang/java/trevni/avro/pom.xml
----------------------------------------------------------------------
diff --git a/lang/java/trevni/avro/pom.xml b/lang/java/trevni/avro/pom.xml
index 57a9d3a..01e4691 100644
--- a/lang/java/trevni/avro/pom.xml
+++ b/lang/java/trevni/avro/pom.xml
@@ -44,98 +44,27 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <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.avro</groupId>
+ <artifactId>avro-mapred</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <id>main</id>
- <goals><goal>jar</goal></goals>
- <phase>package</phase>
- </execution>
- <execution>
- <id>with-classifier</id>
- <goals><goal>jar</goal></goals>
- <phase>package</phase>
- <configuration>
- <classifier>${envClassifier}</classifier>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>hadoop1</id>
- <activation>
- <property>
- <name>hadoop.version</name>
- <value>1</value>
- </property>
- </activation>
- <properties>
- <envClassifier>hadoop1</envClassifier>
- </properties>
- <dependencies>
- <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>
- </dependency>
- <dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro-mapred</artifactId>
- <version>${project.version}</version>
- <classifier>hadoop1</classifier>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- </profile>
- <profile>
- <id>hadoop2</id>
- <activation>
- <property>
- <name>hadoop.version</name>
- <value>!1</value> <!-- if hadoop.version is not 1 (or not set) -->
- </property>
- </activation>
- <properties>
- <envClassifier>hadoop2</envClassifier>
- </properties>
- <dependencies>
- <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.avro</groupId>
- <artifactId>avro-mapred</artifactId>
- <version>${project.version}</version>
- <classifier>hadoop2</classifier>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- </profile>
- </profiles>
-
</project>