You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by su...@apache.org on 2012/10/16 18:02:14 UTC
svn commit: r1398865 - in
/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common:
CHANGES.branch-trunk-win.txt dev-support/saveVersion.sh pom.xml
Author: suresh
Date: Tue Oct 16 16:02:13 2012
New Revision: 1398865
URL: http://svn.apache.org/viewvc?rev=1398865&view=rev
Log:
HADOOP-8924. Hadoop Common creating package-info.java must not depend on sh. Contributed by Chris Nauroth.
Added:
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt
Removed:
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/dev-support/saveVersion.sh
Modified:
hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/pom.xml
Added: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt?rev=1398865&view=auto
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt (added)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/CHANGES.branch-trunk-win.txt Tue Oct 16 16:02:13 2012
@@ -0,0 +1,5 @@
+branch-trunk-win changes - unreleased
+
+ HADOOP-8924. Hadoop Common creating package-info.java must not depend on sh.
+ (Chris Nauroth via suresh)
+
Modified: hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/pom.xml
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/pom.xml?rev=1398865&r1=1398864&r2=1398865&view=diff
==============================================================================
--- hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/pom.xml (original)
+++ hadoop/common/branches/branch-trunk-win/hadoop-common-project/hadoop-common/pom.xml Tue Oct 16 16:02:13 2012
@@ -289,22 +289,6 @@
</configuration>
</execution>
<execution>
- <id>save-version</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <mkdir dir="${project.build.directory}/generated-sources/java"/>
- <exec executable="sh">
- <arg
- line="${basedir}/dev-support/saveVersion.sh ${project.version} ${project.build.directory}/generated-sources/java"/>
- </exec>
- </target>
- </configuration>
- </execution>
- <execution>
<id>generate-test-sources</id>
<phase>generate-test-sources</phase>
<goals>
@@ -365,6 +349,24 @@
<artifactId>exec-maven-plugin</artifactId>
<executions>
<execution>
+ <id>save-version</id>
+ <phase>generate-sources</phase>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ <configuration>
+ <executable>python</executable>
+ <arguments>
+ <argument>${basedir}/../../dev-support/saveVersion.py</argument>
+ <argument>@HadoopVersionAnnotation</argument>
+ <argument>${project.version}</argument>
+ <argument>${basedir}/src/main/java</argument>
+ <argument>org.apache.hadoop</argument>
+ <argument>${project.build.directory}/generated-sources/java/org/apache/hadoop</argument>
+ </arguments>
+ </configuration>
+ </execution>
+ <execution>
<id>compile-proto</id>
<phase>generate-sources</phase>
<goals>