You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@yetus.apache.org by aw...@apache.org on 2019/01/18 13:53:28 UTC
[yetus] branch master updated: YETUS-780. mvn site breaks when
maven-built versions are added to the pom
This is an automated email from the ASF dual-hosted git repository.
aw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yetus.git
The following commit(s) were added to refs/heads/master by this push:
new f5c8892 YETUS-780. mvn site breaks when maven-built versions are added to the pom
f5c8892 is described below
commit f5c889239de1768f19bfa5d54b232fe993530921
Author: Allen Wittenauer <aw...@apache.org>
AuthorDate: Thu Jan 17 10:58:30 2019 -0500
YETUS-780. mvn site breaks when maven-built versions are added to the pom
Signed-off-by: Akira Ajisaka <aa...@apache.org>
---
asf-site-src/config.rb | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/asf-site-src/config.rb b/asf-site-src/config.rb
index 85677bf..dc65fef 100644
--- a/asf-site-src/config.rb
+++ b/asf-site-src/config.rb
@@ -107,7 +107,7 @@ end
GITREPO = 'https://github.com/apache/yetus.git'.freeze
-def build_release_docs(output, version) # rubocop:disable Metrics/AbcSize
+def build_release_docs(output, version) # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
# TODO: get the version date from jira and do an up to date check instead of building each time.
puts "Building docs for release #{version}"
puts "\tcleaning up output directories in #{output}"
@@ -130,10 +130,17 @@ def build_release_docs(output, version) # rubocop:disable Metrics/AbcSize
"#{output}/#{version}.html.md"
)
FileUtils.mkdir "#{output}/#{version}/precommit-apidocs"
- precommit_shelldocs(
- "#{output}/#{version}/precommit-apidocs",
- "#{output}/build-#{version}/precommit"
- )
+ if version =~ /^0.[0-8]./
+ precommit_shelldocs(
+ "#{output}/#{version}/precommit-apidocs",
+ "#{output}/build-#{version}/precommit"
+ )
+ else
+ precommit_shelldocs(
+ "#{output}/#{version}/precommit-apidocs",
+ "#{output}/build-#{version}/precommit/src/main/shell"
+ )
+ end
puts "\tgenerating javadocs"
`(cd "#{output}/build-#{version}/audience-annotations-component" && mvn -DskipTests -Pinclude-jdiff-module javadoc:aggregate) >"#{output}/#{version}_mvn.log" 2>&1` # rubocop:disable Metrics/LineLength