From commits-return-1254-archive-asf-public=cust-asf.ponee.io@yetus.apache.org Fri Jan 18 14:53:30 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 2E9C8180647 for ; Fri, 18 Jan 2019 14:53:30 +0100 (CET) Received: (qmail 76927 invoked by uid 500); 18 Jan 2019 13:53:29 -0000 Mailing-List: contact commits-help@yetus.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@yetus.apache.org Delivered-To: mailing list commits@yetus.apache.org Received: (qmail 76918 invoked by uid 99); 18 Jan 2019 13:53:29 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 18 Jan 2019 13:53:29 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id BC86A87628; Fri, 18 Jan 2019 13:53:28 +0000 (UTC) Date: Fri, 18 Jan 2019 13:53:28 +0000 To: "commits@yetus.apache.org" Subject: [yetus] branch master updated: YETUS-780. mvn site breaks when maven-built versions are added to the pom MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <154781960869.14186.17965477021528441105@gitbox.apache.org> From: aw@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: yetus X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 269ed7f4b89cdf50ee152fe2e7aa1eb805c964f0 X-Git-Newrev: f5c889239de1768f19bfa5d54b232fe993530921 X-Git-Rev: f5c889239de1768f19bfa5d54b232fe993530921 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 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 --- 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