http://git-wip-us.apache.org/repos/asf/hadoop/blob/03fc6b1b/hadoop-yarn-project/hadoop-yarn/dev-support/jdiff/Null.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/dev-support/jdiff/Null.java b/hadoop-yarn-project/hadoop-yarn/dev-support/jdiff/Null.java new file mode 100644 index 0000000..7b00145 --- /dev/null +++ b/hadoop-yarn-project/hadoop-yarn/dev-support/jdiff/Null.java @@ -0,0 +1,20 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +public class Null { + public Null() { } +}
http://git-wip-us.apache.org/repos/asf/hadoop/blob/03fc6b1b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml index 187dbbb..41aef33 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/pom.xml @@ -30,6 +30,8 @@ <properties> <!-- Needed for generating FindBugs warnings using parent pom --> <yarn.basedir>${project.parent.basedir}</yarn.basedir> + <should.run.jdiff>true</should.run.jdiff> + <dev-support.relative.dir>../dev-support</dev-support.relative.dir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/hadoop/blob/03fc6b1b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml index d6ff6af..df15c7c 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/pom.xml @@ -27,6 +27,8 @@ <properties> <!-- Needed for generating FindBugs warnings using parent pom --> <yarn.basedir>${project.parent.basedir}</yarn.basedir> + <should.run.jdiff>true</should.run.jdiff> + <dev-support.relative.dir>../dev-support</dev-support.relative.dir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/hadoop/blob/03fc6b1b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml index f13d6ec..17fc6e2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/pom.xml @@ -30,6 +30,8 @@ <properties> <!-- Needed for generating FindBugs warnings using parent pom --> <yarn.basedir>${project.parent.basedir}</yarn.basedir> + <should.run.jdiff>true</should.run.jdiff> + <dev-support.relative.dir>../dev-support</dev-support.relative.dir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/hadoop/blob/03fc6b1b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml index ad9f977..f792ccd 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-common/pom.xml @@ -30,6 +30,8 @@ <properties> <!-- Needed for generating FindBugs warnings using parent pom --> <yarn.basedir>${project.parent.parent.basedir}</yarn.basedir> + <should.run.jdiff>true</should.run.jdiff> + <dev-support.relative.dir>../../dev-support</dev-support.relative.dir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/hadoop/blob/03fc6b1b/hadoop-yarn-project/hadoop-yarn/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/pom.xml b/hadoop-yarn-project/hadoop-yarn/pom.xml index 0f79226..3e31ec0 100644 --- a/hadoop-yarn-project/hadoop-yarn/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/pom.xml @@ -29,6 +29,9 @@ <test.logs>true</test.logs> <test.timeout>600000</test.timeout> <yarn.basedir>${basedir}</yarn.basedir> + <!-- Used by jdiff --> + <!-- Antrun cannot resolve yarn.basedir, so we need to setup something else --> + <dev-support.relative.dir>dev-support</dev-support.relative.dir> <hadoop.common.build.dir>${basedir}/../../../hadoop-common-project/hadoop-common/target</hadoop.common.build.dir> </properties> @@ -53,6 +56,7 @@ <excludes> <exclude>conf/slaves</exclude> <exclude>conf/container-executor.cfg</exclude> + <exclude>dev-support/jdiff/**</exclude> </excludes> </configuration> </plugin> @@ -98,6 +102,131 @@ </plugins> </build> </profile> + + <profile> + <id>docs</id> + <activation> + <activeByDefault>false</activeByDefault> + </activation> + <properties> + <jdiff.stable.api>2.7.2</jdiff.stable.api> + <jdiff.stability>-unstable</jdiff.stability> + <jdiff.compatibility></jdiff.compatibility> + <jdiff.javadoc.maxmemory>512m</jdiff.javadoc.maxmemory> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>javadoc</goal> + </goals> + <phase>prepare-package</phase> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>site</id> + <phase>prepare-package</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>jdiff</groupId> + <artifactId>jdiff</artifactId> + <version>${jdiff.version}</version> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}</outputDirectory> + <destFileName>jdiff.jar</destFileName> + </artifactItem> + <artifactItem> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-annotations</artifactId> + <version>${project.version}</version> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}</outputDirectory> + <destFileName>hadoop-annotations.jar</destFileName> + </artifactItem> + <artifactItem> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>${xerces.version.jdiff}</version> + <overWrite>false</overWrite> + <outputDirectory>${project.build.directory}</outputDirectory> + <destFileName>xerces.jar</destFileName> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>site</id> + <phase>prepare-package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target if="should.run.jdiff"> + + <!-- Jdiff --> + <mkdir dir="${project.build.directory}/site/jdiff/xml"/> + + <javadoc maxmemory="${jdiff.javadoc.maxmemory}" verbose="yes"> + <doclet name="org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsJDiffDoclet" + path="${project.build.directory}/hadoop-annotations.jar:${project.build.directory}/jdiff.jar"> + <param name="-apidir" value="${project.build.directory}/site/jdiff/xml"/> + <param name="-apiname" value="${project.name} ${project.version}"/> + <param name="${jdiff.stability}"/> + </doclet> + <packageset dir="${basedir}/src/main/java"/> + <classpath> + <path refid="maven.compile.classpath"/> + </classpath> + </javadoc> + <javadoc sourcepath="${basedir}/src/main/java" + destdir="${project.build.directory}/site/jdiff/xml" + sourceFiles="${dev-support.relative.dir}/jdiff/Null.java" + maxmemory="${jdiff.javadoc.maxmemory}"> + <doclet name="org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsJDiffDoclet" + path="${project.build.directory}/hadoop-annotations.jar:${project.build.directory}/jdiff.jar:${project.build.directory}/xerces.jar"> + <param name="-oldapi" value="${project.name} ${jdiff.stable.api}"/> + <param name="-newapi" value="${project.name} ${project.version}"/> + <param name="-oldapidir" value="${basedir}/${dev-support.relative.dir}/jdiff"/> + <param name="-newapidir" value="${project.build.directory}/site/jdiff/xml"/> + <param name="-javadocold" + value="http://hadoop.apache.org/docs/r${jdiff.stable.api}/api/"/> + <param name="-javadocnew" value="${project.build.directory}/site/apidocs/"/> + <param name="-stats"/> + <param name="${jdiff.stability}"/> + <!--param name="${jdiff.compatibility}"/--> + </doclet> + <classpath> + <path refid="maven.compile.classpath"/> + </classpath> + </javadoc> + + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> </profiles> <modules> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
