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 2016/03/18 00:16:26 UTC

yetus git commit: YETUS-334. mvn dependency ordering generates duplicates

Repository: yetus
Updated Branches:
  refs/heads/master 3e3347aca -> 21a88d7cd


YETUS-334. mvn dependency ordering generates duplicates

Signed-off-by: Sean Busbey <bu...@apache.org>


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

Branch: refs/heads/master
Commit: 21a88d7cd74d74f9bba921993e015e84ce1494f2
Parents: 3e3347a
Author: Allen Wittenauer <aw...@apache.org>
Authored: Tue Mar 15 08:13:48 2016 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Thu Mar 17 16:16:12 2016 -0700

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


http://git-wip-us.apache.org/repos/asf/yetus/blob/21a88d7c/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