You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@twill.apache.org by ch...@apache.org on 2014/04/22 08:06:32 UTC
[35/50] [abbrv] git commit: #TWILL-51 Added support for Hadoop-2.3.0
#TWILL-51 Added support for Hadoop-2.3.0
Signed-off-by: Terence Yim <te...@continuuity.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-twill/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-twill/commit/c05a48d0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-twill/tree/c05a48d0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-twill/diff/c05a48d0
Branch: refs/heads/site
Commit: c05a48d0f5b1dd59c76127a3546760c36b89da0d
Parents: a96dbdc
Author: Terence Yim <te...@continuuity.com>
Authored: Tue Mar 4 10:49:45 2014 -0800
Committer: Terence Yim <te...@continuuity.com>
Committed: Tue Mar 4 15:50:17 2014 -0800
----------------------------------------------------------------------
pom.xml | 44 ++++++++++++++++++++++++++++++++++++++++++--
twill-yarn/pom.xml | 13 +++++++++++++
2 files changed, 55 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/c05a48d0/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0e692f1..8e93850 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,7 +182,7 @@
<zookeeper.version>3.4.5</zookeeper.version>
<junit.version>4.11</junit.version>
<commons-compress.version>1.5</commons-compress.version>
- <hadoop.version>[2.0.2-alpha,2.2.0]</hadoop.version>
+ <hadoop.version>[2.0.2-alpha,2.3.0]</hadoop.version>
<hadoop20.output.dir>target/hadoop20-classes</hadoop20.output.dir>
</properties>
@@ -491,6 +491,47 @@
<properties>
<hadoop.version>2.2.0</hadoop.version>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.8</version>
+ <executions>
+ <execution>
+ <id>add-source</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/main/hadoop21</source>
+ </sources>
+ </configuration>
+ </execution>
+ <execution>
+ <id>add-source-2.0</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>add-source</goal>
+ </goals>
+ <configuration>
+ <sources>
+ <source>src/main/hadoop20</source>
+ </sources>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>hadoop-2.3</id>
+ <properties>
+ <hadoop.version>2.3.0</hadoop.version>
+ </properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
@@ -530,7 +571,6 @@
</plugins>
</build>
</profile>
-
</profiles>
<dependencyManagement>
http://git-wip-us.apache.org/repos/asf/incubator-twill/blob/c05a48d0/twill-yarn/pom.xml
----------------------------------------------------------------------
diff --git a/twill-yarn/pom.xml b/twill-yarn/pom.xml
index 0c94376..de45335 100644
--- a/twill-yarn/pom.xml
+++ b/twill-yarn/pom.xml
@@ -123,5 +123,18 @@
</resources>
</build>
</profile>
+ <profile>
+ <id>hadoop-2.3</id>
+ <build>
+ <resources>
+ <resource>
+ <directory>${hadoop20.output.dir}</directory>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ </resources>
+ </build>
+ </profile>
</profiles>
</project>