MAPREDUCE-6310. Add jdiff support to MapReduce. (Li Lu/vinodkv via wangda)
(cherry picked from commit 3d937457ee60d617d71b36bb6a29344e771670b4) (cherry picked from commit 65822e55fd99511ab0c39f802d3ec58290445f9d)
This commit is contained in:
parent
6f1a9f1b6a
commit
e2bd490236
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
20
hadoop-mapreduce-project/dev-support/jdiff/Null.java
Normal file
20
hadoop-mapreduce-project/dev-support/jdiff/Null.java
Normal file
@ -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() { }
|
||||||
|
}
|
@ -30,6 +30,8 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Needed for generating FindBugs warnings using parent pom -->
|
<!-- Needed for generating FindBugs warnings using parent pom -->
|
||||||
<mr.basedir>${project.parent.basedir}/../</mr.basedir>
|
<mr.basedir>${project.parent.basedir}/../</mr.basedir>
|
||||||
|
<should.run.jdiff>true</should.run.jdiff>
|
||||||
|
<dev-support.relative.dir>../../dev-support</dev-support.relative.dir>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -30,6 +30,8 @@
|
|||||||
<properties>
|
<properties>
|
||||||
<!-- Needed for generating FindBugs warnings using parent pom -->
|
<!-- Needed for generating FindBugs warnings using parent pom -->
|
||||||
<mr.basedir>${project.parent.basedir}/..</mr.basedir>
|
<mr.basedir>${project.parent.basedir}/..</mr.basedir>
|
||||||
|
<should.run.jdiff>true</should.run.jdiff>
|
||||||
|
<dev-support.relative.dir>../../dev-support</dev-support.relative.dir>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -31,6 +31,8 @@
|
|||||||
<fork.mode>always</fork.mode>
|
<fork.mode>always</fork.mode>
|
||||||
<!-- Needed for generating FindBugs warnings using parent pom -->
|
<!-- Needed for generating FindBugs warnings using parent pom -->
|
||||||
<mr.basedir>${project.parent.basedir}/../</mr.basedir>
|
<mr.basedir>${project.parent.basedir}/../</mr.basedir>
|
||||||
|
<should.run.jdiff>true</should.run.jdiff>
|
||||||
|
<dev-support.relative.dir>../../dev-support</dev-support.relative.dir>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
@ -31,6 +31,9 @@
|
|||||||
|
|
||||||
<properties>
|
<properties>
|
||||||
<hadoop.common.build.dir>${basedir}/../../../hadoop-common-project/hadoop-common/target</hadoop.common.build.dir>
|
<hadoop.common.build.dir>${basedir}/../../../hadoop-common-project/hadoop-common/target</hadoop.common.build.dir>
|
||||||
|
<!-- 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>
|
||||||
</properties>
|
</properties>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
@ -178,6 +181,130 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
<profiles>
|
||||||
|
<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.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/api/"/>
|
||||||
|
<param name="-stats"/>
|
||||||
|
<param name="${jdiff.stability}"/>
|
||||||
|
</doclet>
|
||||||
|
<classpath>
|
||||||
|
<path refid="maven.compile.classpath"/>
|
||||||
|
</classpath>
|
||||||
|
</javadoc>
|
||||||
|
<property name="compile_classpath" refid="maven.compile.classpath"/>
|
||||||
|
|
||||||
|
</target>
|
||||||
|
</configuration>
|
||||||
|
</execution>
|
||||||
|
</executions>
|
||||||
|
</plugin>
|
||||||
|
</plugins>
|
||||||
|
</build>
|
||||||
|
</profile>
|
||||||
|
</profiles>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
<module>hadoop-mapreduce-client-core</module>
|
<module>hadoop-mapreduce-client-core</module>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user