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 cd...@apache.org on 2016/08/23 22:31:36 UTC
[24/50] [abbrv] hadoop git commit: HADOOP-13428. Fixed hadoop-common
build files to generate jdiff by working around a jdiff-bug. Contributed by
Wangda Tan.
http://git-wip-us.apache.org/repos/asf/hadoop/blob/99603e90/hadoop-common-project/hadoop-common/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/pom.xml b/hadoop-common-project/hadoop-common/pom.xml
index c28a05c..54d1cdd 100644
--- a/hadoop-common-project/hadoop-common/pom.xml
+++ b/hadoop-common-project/hadoop-common/pom.xml
@@ -34,6 +34,7 @@
<kdc.resource.dir>src/test/resources/kdc</kdc.resource.dir>
<hadoop.component>common</hadoop.component>
<is.hadoop.component>true</is.hadoop.component>
+ <is.hadoop.common.component>true</is.hadoop.common.component>
<wsce.config.dir>../etc/hadoop</wsce.config.dir>
<wsce.config.file>wsce-site.xml</wsce.config.file>
</properties>
@@ -512,6 +513,7 @@
<exclude>src/test/resources/test.har/_masterindex</exclude>
<exclude>src/test/resources/test.har/part-0</exclude>
<exclude>src/test/resources/javakeystoreprovider.password</exclude>
+ <exclude>dev-support/jdiff-workaround.patch</exclude>
</excludes>
</configuration>
</plugin>
http://git-wip-us.apache.org/repos/asf/hadoop/blob/99603e90/hadoop-project-dist/pom.xml
----------------------------------------------------------------------
diff --git a/hadoop-project-dist/pom.xml b/hadoop-project-dist/pom.xml
index 0357269..0ee9895 100644
--- a/hadoop-project-dist/pom.xml
+++ b/hadoop-project-dist/pom.xml
@@ -160,7 +160,7 @@
<activeByDefault>false</activeByDefault>
</activation>
<properties>
- <jdiff.stable.api>2.6.0</jdiff.stable.api>
+ <jdiff.stable.api>2.7.2</jdiff.stable.api>
<jdiff.stability>-unstable</jdiff.stability>
<!-- Commented out for HADOOP-11776 -->
<!-- Uncomment param name="${jdiff.compatibility}" in javadoc doclet if compatibility is not empty -->
@@ -173,7 +173,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<executions>
- <execution>
+ <execution>
<goals>
<goal>javadoc</goal>
</goals>
@@ -241,6 +241,26 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
+
+ <!-- Pre site -->
+ <execution>
+ <id>pre-site</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target if="is.hadoop.common.component">
+ <!-- HADOOP-13428: This is for workaround issues of JDiff
+ - https://sourceforge.net/p/javadiff/bugs/19/ -->
+ <exec executable="patch" input="dev-support/jdiff-workaround.patch" dir="${basedir}">
+ <arg value="-p3"/>
+ </exec>
+ </target>
+ </configuration>
+ </execution>
+
+
<execution>
<id>site</id>
<phase>prepare-package</phase>
@@ -249,7 +269,6 @@
</goals>
<configuration>
<target if="is.hadoop.component">
-
<mkdir dir="${project.build.directory}/docs-src"/>
<!-- Docs -->
@@ -302,6 +321,25 @@
</target>
</configuration>
</execution>
+
+ <!-- post site phase -->
+ <execution>
+ <id>post-site</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ <configuration>
+ <target if="is.hadoop.common.component">
+ <!-- HADOOP-13428: Revert temporary patch-->
+ <exec executable="patch" input="dev-support/jdiff-workaround.patch" dir="${basedir}">
+ <arg value="-p3"/>
+ <arg value="-R"/>
+ </exec>
+ </target>
+ </configuration>
+ </execution>
+
</executions>
</plugin>
</plugins>
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org