big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HADOOP-11776. Fixed the broken JDiff support in Hadoop 2. Contributed by Li Lu.

Browse Source
This commit is contained in:
Vinod Kumar Vavilapalli 2015-04-04 13:52:01 -07:00
parent 5370e7128b
commit 4b3948ea36
5 changed files with 65137 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-common-project/hadoop-common/CHANGES.txt
View File

@ -1205,6 +1205,8 @@ Release 2.7.0 - UNRELEASED
HADOOP-11377. Added Null.java without which jdiff completely flops. (Tsuyoshi HADOOP-11377. Added Null.java without which jdiff completely flops. (Tsuyoshi
Ozawa via vinodkv) Ozawa via vinodkv)
HADOOP-11776. Fixed the broken JDiff support in Hadoop 2. (Li Lu via vinodkv)
Release 2.6.1 - UNRELEASED Release 2.6.1 - UNRELEASED

45596
hadoop-common-project/hadoop-common/dev-support/jdiff/Apache_Hadoop_Common_2.6.0.xml Normal file
View File

File diff suppressed because one or more lines are too long

19520
hadoop-hdfs-project/hadoop-hdfs/dev-support/jdiff/Apache_Hadoop_HDFS_2.6.0.xml Normal file
View File

File diff suppressed because one or more lines are too long

24
hadoop-project-dist/pom.xml
View File

@ -165,8 +165,10 @@
<activeByDefault>false</activeByDefault> <activeByDefault>false</activeByDefault>
</activation> </activation>
<properties> <properties>
<jdiff.stable.api>0.20.2</jdiff.stable.api> <jdiff.stable.api>2.6.0</jdiff.stable.api>
<jdiff.stability>-unstable</jdiff.stability> <jdiff.stability>-unstable</jdiff.stability>
<!-- Commented out for HADOOP-11776 -->
<!-- Uncomment param name="${jdiff.compatibility}" in javadoc doclet if compatibility is not empty -->
<jdiff.compatibility></jdiff.compatibility> <jdiff.compatibility></jdiff.compatibility>
<jdiff.javadoc.maxmemory>512m</jdiff.javadoc.maxmemory> <jdiff.javadoc.maxmemory>512m</jdiff.javadoc.maxmemory>
</properties> </properties>
@ -227,6 +229,14 @@
<outputDirectory>${project.build.directory}</outputDirectory> <outputDirectory>${project.build.directory}</outputDirectory>
<destFileName>hadoop-annotations.jar</destFileName> <destFileName>hadoop-annotations.jar</destFileName>
</artifactItem> </artifactItem>
<artifactItem>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${xerces.jdiff.version}</version>
<overWrite>false</overWrite>
<outputDirectory>${project.build.directory}</outputDirectory>
<destFileName>xerces.jar</destFileName>
</artifactItem>
</artifactItems> </artifactItems>
</configuration> </configuration>
</execution> </execution>
@ -276,7 +286,7 @@
<doclet name="org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsJDiffDoclet" <doclet name="org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsJDiffDoclet"
path="${project.build.directory}/hadoop-annotations.jar:${project.build.directory}/jdiff.jar"> path="${project.build.directory}/hadoop-annotations.jar:${project.build.directory}/jdiff.jar">
<param name="-apidir" value="${project.build.directory}/site/jdiff/xml"/> <param name="-apidir" value="${project.build.directory}/site/jdiff/xml"/>
<param name="-apiname" value="hadoop-core ${project.version}"/> <param name="-apiname" value="${project.name} ${project.version}"/>
<param name="${jdiff.stability}"/> <param name="${jdiff.stability}"/>
</doclet> </doclet>
<packageset dir="${basedir}/src/main/java"/> <packageset dir="${basedir}/src/main/java"/>
@ -289,17 +299,17 @@
sourceFiles="${basedir}/dev-support/jdiff/Null.java" sourceFiles="${basedir}/dev-support/jdiff/Null.java"
maxmemory="${jdiff.javadoc.maxmemory}"> maxmemory="${jdiff.javadoc.maxmemory}">
<doclet name="org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsJDiffDoclet" <doclet name="org.apache.hadoop.classification.tools.ExcludePrivateAnnotationsJDiffDoclet"
path="${project.build.directory}/hadoop-annotations.jar:${project.build.directory}/jdiff.jar"> path="${project.build.directory}/hadoop-annotations.jar:${project.build.directory}/jdiff.jar:${project.build.directory}/xerces.jar">
<param name="-oldapi" value="hadoop-core ${jdiff.stable.api}"/> <param name="-oldapi" value="${project.name} ${jdiff.stable.api}"/>
<param name="-newapi" value="hadoop-core ${project.version}"/> <param name="-newapi" value="${project.name} ${project.version}"/>
<param name="-oldapidir" value="${basedir}/dev-support/jdiff"/> <param name="-oldapidir" value="${basedir}/dev-support/jdiff"/>
<param name="-newapidir" value="${project.build.directory}/site/jdiff/xml"/> <param name="-newapidir" value="${project.build.directory}/site/jdiff/xml"/>
<param name="-javadocold" <param name="-javadocold"
value="http://hadoop.apache.org/docs/${jdiff.stable.api}/api/"/> value="http://hadoop.apache.org/docs/r${jdiff.stable.api}/api/"/>
<param name="-javadocnew" value="${project.build.directory}/site/api"/> <param name="-javadocnew" value="${project.build.directory}/site/api"/>
<param name="-stats"/> <param name="-stats"/>
<param name="${jdiff.stability}"/> <param name="${jdiff.stability}"/>
<param name="${jdiff.compatibility}"/> <!--param name="${jdiff.compatibility}"/-->
</doclet> </doclet>
<classpath> <classpath>
<path refid="maven.compile.classpath"/> <path refid="maven.compile.classpath"/>

2
hadoop-project/pom.xml
View File

@ -42,6 +42,8 @@
<!-- These 2 versions are defined here becuase they are used --> <!-- These 2 versions are defined here becuase they are used -->
<!-- JDIFF generation from embedded ant in the antrun plugin --> <!-- JDIFF generation from embedded ant in the antrun plugin -->
<jdiff.version>1.0.9</jdiff.version> <jdiff.version>1.0.9</jdiff.version>
<!-- Version number for xerces used by JDiff -->
<xerces.jdiff.version>2.11.0</xerces.jdiff.version>
<hadoop.assemblies.version>${project.version}</hadoop.assemblies.version> <hadoop.assemblies.version>${project.version}</hadoop.assemblies.version>