yetus-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bus...@apache.org
Subject [2/4] yetus git commit: YETUS-334. mvn dependency ordering generates duplicates
Date Wed, 30 Mar 2016 03:33:25 GMT
YETUS-334. mvn dependency ordering generates duplicates

Signed-off-by: Sean Busbey <busbey@apache.org>
(cherry picked from commit 21a88d7cd74d74f9bba921993e015e84ce1494f2)


Project: http://git-wip-us.apache.org/repos/asf/yetus/repo
Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/cf19ecc3
Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/cf19ecc3
Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/cf19ecc3

Branch: refs/heads/YETUS-344
Commit: cf19ecc3e8806f85045521450fe5041da4448d84
Parents: a2a9dcb
Author: Allen Wittenauer <aw@apache.org>
Authored: Tue Mar 15 08:13:48 2016 -0700
Committer: Sean Busbey <busbey@apache.org>
Committed: Tue Mar 22 13:38:18 2016 -0500

----------------------------------------------------------------------
 precommit/test-patch.d/maven.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/yetus/blob/cf19ecc3/precommit/test-patch.d/maven.sh
----------------------------------------------------------------------
diff --git a/precommit/test-patch.d/maven.sh b/precommit/test-patch.d/maven.sh
index f311d64..91088f4 100755
--- a/precommit/test-patch.d/maven.sh
+++ b/precommit/test-patch.d/maven.sh
@@ -610,12 +610,13 @@ function maven_reorder_module_process
       basemod=${indexm##*/}
       if [[ " ${module} " = " ${indexm} "
          || " ${module} " = " ${basemod} " ]]; then
-         yetus_debug "mrm: placying ${indexm}"
+         yetus_debug "mrm: placing ${indexm}"
         newlist=("${newlist[@]}" " ${indexm} ")
       fi
     done
-  done < <(sed -e 's,^.* --- .* @ \(.*\) ---$,module:\1,g' \
-    -e '/^\[INFO\]/d' "${PATCH_DIR}/maven-${repostatus}-validate-${fn}.txt")
+  done < <(${GREP} maven-enforcer "${PATCH_DIR}/maven-${repostatus}-validate-${fn}.txt"
|
+    ${SED} -e 's,^.* --- .* @ \(.*\) ---$,module:\1,g' \
+    -e '/^\[INFO\]/d' )
   popd >/dev/null
 
   if [[ "${needroot}" = true ]]; then


Mime
View raw message