HADOOP-14835. mvn site build throws SAX errors. Contributed by Andrew Wang and Sean Mackrory.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3cf3540f Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3cf3540f Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3cf3540f Branch: refs/heads/YARN-6592 Commit: 3cf3540f19b5fd1a174690db9f1b7be2977d96ba Parents: b3d6130 Author: Andrew Wang <w...@apache.org> Authored: Mon Sep 18 15:13:42 2017 -0700 Committer: Andrew Wang <w...@apache.org> Committed: Mon Sep 18 15:13:42 2017 -0700 ---------------------------------------------------------------------- BUILDING.txt | 2 ++ dev-support/bin/create-release | 1 + .../hadoop-mapreduce-client/pom.xml | 17 ++++++++++++++++- hadoop-project-dist/pom.xml | 17 ++++++++++++++++- hadoop-project/pom.xml | 2 ++ hadoop-yarn-project/hadoop-yarn/pom.xml | 17 ++++++++++++++++- 6 files changed, 53 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/3cf3540f/BUILDING.txt ---------------------------------------------------------------------- diff --git a/BUILDING.txt b/BUILDING.txt index 14deec8..47aaab4 100644 --- a/BUILDING.txt +++ b/BUILDING.txt @@ -308,6 +308,8 @@ Create a local staging version of the website (in /tmp/hadoop-site) $ mvn clean site -Preleasedocs; mvn site:stage -DstagingDirectory=/tmp/hadoop-site +Note that the site needs to be built in a second pass after other artifacts. + ---------------------------------------------------------------------------------- Installing Hadoop http://git-wip-us.apache.org/repos/asf/hadoop/blob/3cf3540f/dev-support/bin/create-release ---------------------------------------------------------------------- diff --git a/dev-support/bin/create-release b/dev-support/bin/create-release index b22e90b..b98c058 100755 --- a/dev-support/bin/create-release +++ b/dev-support/bin/create-release @@ -564,6 +564,7 @@ function makearelease "${MVN}" "${MVN_ARGS[@]}" install \ site site:stage \ -DskipTests \ + -DskipShade \ -Pdist,src \ "${DOCFLAGS}" http://git-wip-us.apache.org/repos/asf/hadoop/blob/3cf3540f/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml index aa7c7b1..274a821 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/pom.xml @@ -196,6 +196,13 @@ <jdiff.stability>-unstable</jdiff.stability> <jdiff.javadoc.maxmemory>512m</jdiff.javadoc.maxmemory> </properties> + <dependencies> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>${xerces.jdiff.version}</version> + </dependency> + </dependencies> <build> <plugins> <plugin> @@ -238,6 +245,14 @@ <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> @@ -275,7 +290,7 @@ sourceFiles="${dev-support.relative.dir}/jdiff/Null.java" maxmemory="${jdiff.javadoc.maxmemory}"> <doclet name="org.apache.hadoop.classification.tools.IncludePublicAnnotationsJDiffDoclet" - 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="${project.name} ${jdiff.stable.api}"/> <param name="-newapi" value="${project.name} ${project.version}"/> <param name="-oldapidir" value="${basedir}/${dev-support.relative.dir}/jdiff"/> http://git-wip-us.apache.org/repos/asf/hadoop/blob/3cf3540f/hadoop-project-dist/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project-dist/pom.xml b/hadoop-project-dist/pom.xml index addc2a5..8815dd4 100644 --- a/hadoop-project-dist/pom.xml +++ b/hadoop-project-dist/pom.xml @@ -152,6 +152,13 @@ <jdiff.compatibility></jdiff.compatibility> <jdiff.javadoc.maxmemory>512m</jdiff.javadoc.maxmemory> </properties> + <dependencies> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>${xerces.jdiff.version}</version> + </dependency> + </dependencies> <build> <plugins> <plugin> @@ -194,6 +201,14 @@ <outputDirectory>${project.build.directory}</outputDirectory> <destFileName>hadoop-annotations.jar</destFileName> </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> </configuration> </execution> @@ -259,7 +274,7 @@ sourceFiles="${basedir}/dev-support/jdiff/Null.java" maxmemory="${jdiff.javadoc.maxmemory}"> <doclet name="org.apache.hadoop.classification.tools.IncludePublicAnnotationsJDiffDoclet" - 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="${project.name} ${jdiff.stable.api}"/> <param name="-newapi" value="${project.name} ${project.version}"/> <param name="-oldapidir" value="${basedir}/dev-support/jdiff"/> http://git-wip-us.apache.org/repos/asf/hadoop/blob/3cf3540f/hadoop-project/pom.xml ---------------------------------------------------------------------- diff --git a/hadoop-project/pom.xml b/hadoop-project/pom.xml index b8fb961..a698126 100755 --- a/hadoop-project/pom.xml +++ b/hadoop-project/pom.xml @@ -45,6 +45,8 @@ <!-- These 2 versions are defined here because they are used --> <!-- JDIFF generation from embedded ant in the antrun plugin --> <jdiff.version>1.0.9</jdiff.version> + <!-- Version number for xerces used by JDiff --> + <xerces.jdiff.version>2.11.0</xerces.jdiff.version> <kafka.version>0.8.2.1</kafka.version> <hbase.version>1.2.6</hbase.version> http://git-wip-us.apache.org/repos/asf/hadoop/blob/3cf3540f/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 be435d5..288f4bc 100644 --- a/hadoop-yarn-project/hadoop-yarn/pom.xml +++ b/hadoop-yarn-project/hadoop-yarn/pom.xml @@ -113,6 +113,13 @@ <jdiff.compatibility></jdiff.compatibility> <jdiff.javadoc.maxmemory>512m</jdiff.javadoc.maxmemory> </properties> + <dependencies> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>${xerces.jdiff.version}</version> + </dependency> + </dependencies> <build> <plugins> <plugin> @@ -155,6 +162,14 @@ <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> @@ -193,7 +208,7 @@ sourceFiles="${dev-support.relative.dir}/jdiff/Null.java" maxmemory="${jdiff.javadoc.maxmemory}"> <doclet name="org.apache.hadoop.classification.tools.IncludePublicAnnotationsJDiffDoclet" - 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="${project.name} ${jdiff.stable.api}"/> <param name="-newapi" value="${project.name} ${project.version}"/> <param name="-oldapidir" value="${basedir}/${dev-support.relative.dir}/jdiff"/> --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org