Repository: hadoop Updated Branches: refs/heads/branch-2 3e511f39c -> a299146b6
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a299146b/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 c804fca..09f630c 100644 --- a/hadoop-common-project/hadoop-common/pom.xml +++ b/hadoop-common-project/hadoop-common/pom.xml @@ -33,6 +33,7 @@ <properties> <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> @@ -493,6 +494,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/a299146b/hadoop-project-dist/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project-dist/pom.xml b/hadoop-project-dist/pom.xml index b2e2c4f..c6cff92 100644 --- a/hadoop-project-dist/pom.xml +++ b/hadoop-project-dist/pom.xml @@ -158,7 +158,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 --> @@ -171,7 +171,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-javadoc-plugin</artifactId> <executions> - <execution> + <execution> <goals> <goal>javadoc</goal> </goals> @@ -239,6 +239,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> @@ -247,7 +267,6 @@ </goals> <configuration> <target if="is.hadoop.component"> - <mkdir dir="${project.build.directory}/docs-src"/> <!-- Docs --> @@ -300,6 +319,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-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
