Repository: hadoop Updated Branches: refs/heads/branch-2 ea875939f -> d82222920
HADOOP-11884. test-patch.sh should pull the real findbugs version (Kengo Seki via aw) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d8222292 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d8222292 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d8222292 Branch: refs/heads/branch-2 Commit: d82222920e861625d4996c2bd070c1cb2d8103ac Parents: ea87593 Author: Allen Wittenauer <[email protected]> Authored: Mon May 18 16:08:49 2015 +0000 Committer: Allen Wittenauer <[email protected]> Committed: Mon May 18 16:09:34 2015 +0000 ---------------------------------------------------------------------- dev-support/test-patch.sh | 5 +++-- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/d8222292/dev-support/test-patch.sh ---------------------------------------------------------------------- diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh index 9cc5bb0..00a638c 100755 --- a/dev-support/test-patch.sh +++ b/dev-support/test-patch.sh @@ -1859,8 +1859,6 @@ function check_findbugs return 1 fi - findbugs_version=$("${FINDBUGS_HOME}/bin/findbugs" -version) - for module in ${modules} do pushd "${module}" >/dev/null @@ -1872,6 +1870,9 @@ function check_findbugs popd >/dev/null done + #shellcheck disable=SC2016 + findbugs_version=$(${AWK} 'match($0, /findbugs-maven-plugin:[^:]*:findbugs/) { print substr($0, RSTART + 22, RLENGTH - 31); exit }' "${PATCH_DIR}/patchFindBugsOutput${module_suffix}.txt") + if [[ ${rc} -ne 0 ]]; then add_jira_table -1 findbugs "The patch appears to cause Findbugs (version ${findbugs_version}) to fail." return 1 http://git-wip-us.apache.org/repos/asf/hadoop/blob/d8222292/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 117bca2..ec11a02 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -104,6 +104,9 @@ Release 2.8.0 - UNRELEASED HADOOP-11939. Deprecate DistCpV1 and Logalyzer. (Brahma Reddy Battula via aajisaka) + HADOOP-11884. test-patch.sh should pull the real findbugs version + (Kengo Seki via aw) + OPTIMIZATIONS HADOOP-11785. Reduce the number of listStatus operation in distcp
