You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@yetus.apache.org by bu...@apache.org on 2016/03/30 05:33:24 UTC
[1/4] yetus git commit: YETUS-344 begin 0.2.1 branch.
Repository: yetus
Updated Branches:
refs/heads/YETUS-344 df5627009 -> 53bb6749c
YETUS-344 begin 0.2.1 branch.
Project: http://git-wip-us.apache.org/repos/asf/yetus/repo
Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/a2a9dcb7
Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/a2a9dcb7
Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/a2a9dcb7
Branch: refs/heads/YETUS-344
Commit: a2a9dcb79531f794f38e54b72b89ef9bcf194403
Parents: df56270
Author: Sean Busbey <bu...@apache.org>
Authored: Tue Mar 22 13:14:51 2016 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Tue Mar 22 13:37:10 2016 -0500
----------------------------------------------------------------------
VERSION | 2 +-
audience-annotations-component/audience-annotations-jdiff/pom.xml | 2 +-
audience-annotations-component/audience-annotations/pom.xml | 2 +-
audience-annotations-component/pom.xml | 2 +-
yetus-project/pom.xml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/yetus/blob/a2a9dcb7/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index 0ea3a94..b8e2ce4 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.0
+0.2.1-SNAPSHOT
http://git-wip-us.apache.org/repos/asf/yetus/blob/a2a9dcb7/audience-annotations-component/audience-annotations-jdiff/pom.xml
----------------------------------------------------------------------
diff --git a/audience-annotations-component/audience-annotations-jdiff/pom.xml b/audience-annotations-component/audience-annotations-jdiff/pom.xml
index 4156096..1973c34 100644
--- a/audience-annotations-component/audience-annotations-jdiff/pom.xml
+++ b/audience-annotations-component/audience-annotations-jdiff/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.yetus</groupId>
<artifactId>yetus-project</artifactId>
- <version>0.2.0</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../../yetus-project</relativePath>
</parent>
<artifactId>audience-annotations-jdiff</artifactId>
http://git-wip-us.apache.org/repos/asf/yetus/blob/a2a9dcb7/audience-annotations-component/audience-annotations/pom.xml
----------------------------------------------------------------------
diff --git a/audience-annotations-component/audience-annotations/pom.xml b/audience-annotations-component/audience-annotations/pom.xml
index 83be551..80c4967 100644
--- a/audience-annotations-component/audience-annotations/pom.xml
+++ b/audience-annotations-component/audience-annotations/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.yetus</groupId>
<artifactId>yetus-project</artifactId>
- <version>0.2.0</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../../yetus-project</relativePath>
</parent>
<artifactId>audience-annotations</artifactId>
http://git-wip-us.apache.org/repos/asf/yetus/blob/a2a9dcb7/audience-annotations-component/pom.xml
----------------------------------------------------------------------
diff --git a/audience-annotations-component/pom.xml b/audience-annotations-component/pom.xml
index 8a0ad91..764e610 100644
--- a/audience-annotations-component/pom.xml
+++ b/audience-annotations-component/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.yetus</groupId>
<artifactId>yetus-project</artifactId>
- <version>0.2.0</version>
+ <version>0.2.1-SNAPSHOT</version>
<relativePath>../yetus-project</relativePath>
</parent>
<artifactId>audience-annotations-component</artifactId>
http://git-wip-us.apache.org/repos/asf/yetus/blob/a2a9dcb7/yetus-project/pom.xml
----------------------------------------------------------------------
diff --git a/yetus-project/pom.xml b/yetus-project/pom.xml
index d7966cb..190fb57 100644
--- a/yetus-project/pom.xml
+++ b/yetus-project/pom.xml
@@ -30,7 +30,7 @@
</parent>
<groupId>org.apache.yetus</groupId>
<artifactId>yetus-project</artifactId>
- <version>0.2.0</version>
+ <version>0.2.1-SNAPSHOT</version>
<description>Project-wide definitions for Apache Yetus</description>
<name>Apache Yetus Project</name>
<packaging>pom</packaging>
[4/4] yetus git commit: YETUS-344 Stage version 0.2.1
Posted by bu...@apache.org.
YETUS-344 Stage version 0.2.1
Project: http://git-wip-us.apache.org/repos/asf/yetus/repo
Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/53bb6749
Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/53bb6749
Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/53bb6749
Branch: refs/heads/YETUS-344
Commit: 53bb6749c6832d178743ef047f9b1d07d2551ddf
Parents: ed75663
Author: Sean Busbey <bu...@apache.org>
Authored: Tue Mar 22 13:23:48 2016 -0500
Committer: Sean Busbey <bu...@apache.org>
Committed: Tue Mar 29 21:07:51 2016 -0500
----------------------------------------------------------------------
VERSION | 2 +-
audience-annotations-component/audience-annotations-jdiff/pom.xml | 2 +-
audience-annotations-component/audience-annotations/pom.xml | 2 +-
audience-annotations-component/pom.xml | 2 +-
yetus-project/pom.xml | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/yetus/blob/53bb6749/VERSION
----------------------------------------------------------------------
diff --git a/VERSION b/VERSION
index b8e2ce4..0c62199 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.1-SNAPSHOT
+0.2.1
http://git-wip-us.apache.org/repos/asf/yetus/blob/53bb6749/audience-annotations-component/audience-annotations-jdiff/pom.xml
----------------------------------------------------------------------
diff --git a/audience-annotations-component/audience-annotations-jdiff/pom.xml b/audience-annotations-component/audience-annotations-jdiff/pom.xml
index 1973c34..31e8d8f 100644
--- a/audience-annotations-component/audience-annotations-jdiff/pom.xml
+++ b/audience-annotations-component/audience-annotations-jdiff/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.yetus</groupId>
<artifactId>yetus-project</artifactId>
- <version>0.2.1-SNAPSHOT</version>
+ <version>0.2.1</version>
<relativePath>../../yetus-project</relativePath>
</parent>
<artifactId>audience-annotations-jdiff</artifactId>
http://git-wip-us.apache.org/repos/asf/yetus/blob/53bb6749/audience-annotations-component/audience-annotations/pom.xml
----------------------------------------------------------------------
diff --git a/audience-annotations-component/audience-annotations/pom.xml b/audience-annotations-component/audience-annotations/pom.xml
index 80c4967..c09e10e 100644
--- a/audience-annotations-component/audience-annotations/pom.xml
+++ b/audience-annotations-component/audience-annotations/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.yetus</groupId>
<artifactId>yetus-project</artifactId>
- <version>0.2.1-SNAPSHOT</version>
+ <version>0.2.1</version>
<relativePath>../../yetus-project</relativePath>
</parent>
<artifactId>audience-annotations</artifactId>
http://git-wip-us.apache.org/repos/asf/yetus/blob/53bb6749/audience-annotations-component/pom.xml
----------------------------------------------------------------------
diff --git a/audience-annotations-component/pom.xml b/audience-annotations-component/pom.xml
index 764e610..a1caebc 100644
--- a/audience-annotations-component/pom.xml
+++ b/audience-annotations-component/pom.xml
@@ -25,7 +25,7 @@
<parent>
<groupId>org.apache.yetus</groupId>
<artifactId>yetus-project</artifactId>
- <version>0.2.1-SNAPSHOT</version>
+ <version>0.2.1</version>
<relativePath>../yetus-project</relativePath>
</parent>
<artifactId>audience-annotations-component</artifactId>
http://git-wip-us.apache.org/repos/asf/yetus/blob/53bb6749/yetus-project/pom.xml
----------------------------------------------------------------------
diff --git a/yetus-project/pom.xml b/yetus-project/pom.xml
index 190fb57..b1b18aa 100644
--- a/yetus-project/pom.xml
+++ b/yetus-project/pom.xml
@@ -30,7 +30,7 @@
</parent>
<groupId>org.apache.yetus</groupId>
<artifactId>yetus-project</artifactId>
- <version>0.2.1-SNAPSHOT</version>
+ <version>0.2.1</version>
<description>Project-wide definitions for Apache Yetus</description>
<name>Apache Yetus Project</name>
<packaging>pom</packaging>
[3/4] yetus git commit: YETUS-345. mvn dependency dupe fix broke
hadoop
Posted by bu...@apache.org.
YETUS-345. mvn dependency dupe fix broke hadoop
Signed-off-by: Sean Busbey <bu...@apache.org>
Signed-off-by: Kengo Seki <se...@apache.org>
(cherry picked from commit 7355288fee3d503442583423a0a829d5150ed118)
Conflicts:
precommit/test-patch.d/maven.sh
Project: http://git-wip-us.apache.org/repos/asf/yetus/repo
Commit: http://git-wip-us.apache.org/repos/asf/yetus/commit/ed756631
Tree: http://git-wip-us.apache.org/repos/asf/yetus/tree/ed756631
Diff: http://git-wip-us.apache.org/repos/asf/yetus/diff/ed756631
Branch: refs/heads/YETUS-344
Commit: ed7566311cfb4253d9a2f29bd7d43af782b6960f
Parents: cf19ecc
Author: Allen Wittenauer <aw...@apache.org>
Authored: Wed Mar 23 10:03:32 2016 -0700
Committer: Sean Busbey <bu...@apache.org>
Committed: Tue Mar 29 21:01:22 2016 -0500
----------------------------------------------------------------------
precommit/test-patch.d/checkstyle.sh | 2 +-
precommit/test-patch.d/maven.sh | 25 ++++++++++++++-----------
precommit/test-patch.sh | 4 ++--
3 files changed, 17 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/yetus/blob/ed756631/precommit/test-patch.d/checkstyle.sh
----------------------------------------------------------------------
diff --git a/precommit/test-patch.d/checkstyle.sh b/precommit/test-patch.d/checkstyle.sh
index 1ad657a..95c7598 100755
--- a/precommit/test-patch.d/checkstyle.sh
+++ b/precommit/test-patch.d/checkstyle.sh
@@ -367,7 +367,7 @@ function checkstyle_postapply
statstring=$(generic_calcdiff_status "${numbranch}" "${numpatch}" "${addpatch}" )
mod=${module}
- if [[ ${mod} == . ]]; then
+ if [[ ${mod} = \. ]]; then
mod=root
fi
http://git-wip-us.apache.org/repos/asf/yetus/blob/ed756631/precommit/test-patch.d/maven.sh
----------------------------------------------------------------------
diff --git a/precommit/test-patch.d/maven.sh b/precommit/test-patch.d/maven.sh
index 91088f4..a90e959 100755
--- a/precommit/test-patch.d/maven.sh
+++ b/precommit/test-patch.d/maven.sh
@@ -607,20 +607,22 @@ function maven_reorder_module_process
for indexm in ${CHANGED_MODULES}; do
# modules could be foo/bar, where bar is the artifactid
# so get the basename and compare that too
- basemod=${indexm##*/}
- if [[ " ${module} " = " ${indexm} "
- || " ${module} " = " ${basemod} " ]]; then
+ basemod="${indexm##*/}"
+ if [[ "${module}" = "${indexm}"
+ || "${module}" = "${basemod}" ]]; then
yetus_debug "mrm: placing ${indexm}"
- newlist=("${newlist[@]}" " ${indexm} ")
+ newlist=("${newlist[@]}" "${indexm}")
+ break
fi
done
- done < <(${GREP} maven-enforcer "${PATCH_DIR}/maven-${repostatus}-validate-${fn}.txt" |
- ${SED} -e 's,^.* --- .* @ \(.*\) ---$,module:\1,g' \
- -e '/^\[INFO\]/d' )
+ done < <(${GREP} '\[INFO\]' \
+ "${PATCH_DIR}/maven-${repostatus}-validate-${fn}.txt" |
+ ${SED} -e 's,^.* --- .* @ \(.*\) ---$,module:\1,g' -e '/^\[INFO\]/d' |
+ uniq )
popd >/dev/null
if [[ "${needroot}" = true ]]; then
- newlist=("${newlist[@]}" " . ")
+ newlist=("${newlist[@]}" ".")
fi
indexm=$(echo "${CHANGED_MODULES}" | wc -w)
@@ -630,14 +632,15 @@ function maven_reorder_module_process
yetus_debug "mrm: Missed a module"
for indexm in ${CHANGED_MODULES}; do
found=false
- for indexn in ${newlist[*]}; do
+ for indexn in "${newlist[@]}"; do
if [[ "${indexn}" = "${indexm}" ]]; then
found=true
+ break
fi
done
if [[ ${found} = false ]]; then
yetus_debug "mrm: missed ${indexm}"
- newlist=("${newlist[@]}" " ${indexm} ")
+ newlist=("${newlist[@]}" "${indexm}")
fi
done
fi
@@ -677,4 +680,4 @@ function maven_reorder_modules
yetus_debug "Finished list: ${CHANGED_MODULES}"
add_vote_table 0 mvndep "Maven dependency ordering for ${repostatus}"
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/yetus/blob/ed756631/precommit/test-patch.sh
----------------------------------------------------------------------
diff --git a/precommit/test-patch.sh b/precommit/test-patch.sh
index 793190a..44eaed9 100755
--- a/precommit/test-patch.sh
+++ b/precommit/test-patch.sh
@@ -104,7 +104,7 @@ function setup_defaults
function module_file_fragment
{
local mod=$1
- if [[ ${mod} == . ]]; then
+ if [[ ${mod} = \. ]]; then
echo root
else
echo "$1" | tr '/' '_' | tr '\\' '_'
@@ -1840,7 +1840,7 @@ function modules_workers
modulesuffix=$(basename "${MODULE[${modindex}]}")
buildtool_cwd "${modindex}"
- if [[ ${modulesuffix} == . ]]; then
+ if [[ ${modulesuffix} = \. ]]; then
modulesuffix="root"
fi
[2/4] yetus git commit: YETUS-334. mvn dependency ordering generates
duplicates
Posted by bu...@apache.org.
YETUS-334. mvn dependency ordering generates duplicates
Signed-off-by: Sean Busbey <bu...@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 <bu...@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