From commits-return-1351-archive-asf-public=cust-asf.ponee.io@yetus.apache.org Tue May 21 03:27:53 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 [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 5CF05180627 for ; Tue, 21 May 2019 05:27:53 +0200 (CEST) Received: (qmail 80603 invoked by uid 500); 21 May 2019 03:27:52 -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 80594 invoked by uid 99); 21 May 2019 03:27:52 -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; Tue, 21 May 2019 03:27:52 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id E7DAF85D03; Tue, 21 May 2019 03:27:48 +0000 (UTC) Date: Tue, 21 May 2019 03:27:48 +0000 To: "commits@yetus.apache.org" Subject: [yetus] branch master updated: YETUS-886. maven_reorder_module_process is eating the directory stack (#59) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155840926888.12373.4658409837326542311@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: ae2c5d83b4f10cc90d60091db24469a29b5bf476 X-Git-Newrev: cfdb40219484cc7ebb72dc5b47febbf96bea99f5 X-Git-Rev: cfdb40219484cc7ebb72dc5b47febbf96bea99f5 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 cfdb402 YETUS-886. maven_reorder_module_process is eating the directory stack (#59) cfdb402 is described below commit cfdb40219484cc7ebb72dc5b47febbf96bea99f5 Author: Allen Wittenauer AuthorDate: Mon May 20 20:27:44 2019 -0700 YETUS-886. maven_reorder_module_process is eating the directory stack (#59) --- precommit/src/main/shell/core.d/change-analysis.sh | 1 - precommit/src/main/shell/test-patch.d/maven.sh | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/precommit/src/main/shell/core.d/change-analysis.sh b/precommit/src/main/shell/core.d/change-analysis.sh index 3c4f40e..d1ac42a 100755 --- a/precommit/src/main/shell/core.d/change-analysis.sh +++ b/precommit/src/main/shell/core.d/change-analysis.sh @@ -278,5 +278,4 @@ function find_changed_modules "${BUILDTOOL}_reorder_modules" "${repostatus}" fi popd >/dev/null || return 1 - } diff --git a/precommit/src/main/shell/test-patch.d/maven.sh b/precommit/src/main/shell/test-patch.d/maven.sh index 22ad6a4..8d022ec 100755 --- a/precommit/src/main/shell/test-patch.d/maven.sh +++ b/precommit/src/main/shell/test-patch.d/maven.sh @@ -694,17 +694,16 @@ function maven_reorder_module_process fi done + pushd "${BASEDIR}" >/dev/null || return 1 if [[ "${BUILDMODE}" == patch ]] && [[ "${MAVEN_FOUND_ROOT_POM}" == true ]]; then echo "" echo "Testing root pom.xml file for version change" echo "" - fn=$(module_file_fragment "${CHANGED_UNION_MODULES}") - pushd "${BASEDIR}/${CHANGED_UNION_MODULES}" >/dev/null || return 1 # shellcheck disable=SC2046 echo_and_redirect \ - "${PATCH_DIR}/maven-${repostatus}-version-${fn}.txt" \ + "${PATCH_DIR}/maven-${repostatus}-version-log.txt" \ $("${BUILDTOOL}_executor") \ "-fae" \ "org.apache.maven.plugins:maven-help-plugin:evaluate" \