You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ke...@apache.org on 2014/10/16 20:39:29 UTC
[1/2] git commit: ISIS-896: Updating verify-isis-release.sh tested on
1.7.0 release
Repository: isis
Updated Branches:
refs/heads/master f89e1e627 -> c7c68e8c9
ISIS-896: Updating verify-isis-release.sh tested on 1.7.0 release
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/17dd4668
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/17dd4668
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/17dd4668
Branch: refs/heads/master
Commit: 17dd46682e2856ce0e45b5f429979aa6b5bb0d29
Parents: 70dff7c
Author: Kevin <ke...@apache.org>
Authored: Thu Oct 16 20:36:38 2014 +0200
Committer: Kevin <ke...@apache.org>
Committed: Thu Oct 16 20:36:38 2014 +0200
----------------------------------------------------------------------
scripts/verify-isis-release.sh | 32 +++++++++++++++++---------------
1 file changed, 17 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/17dd4668/scripts/verify-isis-release.sh
----------------------------------------------------------------------
diff --git a/scripts/verify-isis-release.sh b/scripts/verify-isis-release.sh
index c4ccd2a..e470279 100755
--- a/scripts/verify-isis-release.sh
+++ b/scripts/verify-isis-release.sh
@@ -31,7 +31,7 @@ _download(){
do
echo 'Downloading '$fil
_execmustpass $download_cmd $fil
- _execmayfail $download_cmd $fil.asc
+ _execmustpass $download_cmd $fil.asc
done
}
@@ -39,7 +39,7 @@ _verify(){
for zip in *.zip
do
echo 'Verifying '$zip
- _execmayfail gpg --verify $zip.asc $zip
+ _execmustpass gpg --verify $zip.asc $zip
done
}
@@ -51,19 +51,14 @@ _unpack(){
}
_fetch_dependencies(){
- _execmustpass mvn dependency:go-offline
+ _execmayfail mvn dependency:go-offline
}
_build(){
echo 'Removing Isis from local repo '$module
rm -rf ~/.m2/repository/org/apache/isis
- COUNTER=0
for module in ./*/
do
- # Surely better to check if "core" is in name?
- COUNTER=$[COUNTER+1]
- #if [ $COUNTER -eq 1 ]
- #if [[ $module == "*core*" ]]
cd $module
grep -q "Isis Core" pom.xml
retcode=$?
@@ -72,23 +67,31 @@ _build(){
echo 'Building Core '$module
_fetch_dependencies
_execmustpass mvn clean install -o
- cd ..
else
echo 'Building Module '$module
- # _execmustpass mvn clean install
- cd ..
+ _execmustpass mvn clean install $offline
fi
+ cd ..
done
}
+
+if [[ $@ == *offline* ]]
+then
+ echo "enabling offline mode"
+ offline=-o
+else
+ offline=
+fi
+
# check the environment
# Check for curl or wget
download_cmd=
-curl --version
+curl --version > /dev/null 2>&1
if [[ $? -eq 0 ]]; then
- download_cmd=curl -O
+ download_cmd=curl -L -O
fi
if [[ -z "$download_cmd" ]]; then
- wget --version
+ wget --version > /dev/null 2>&1
if [[ $? -eq 0 ]]; then
download_cmd=wget
else
@@ -97,7 +100,6 @@ if [[ -z "$download_cmd" ]]; then
fi
fi
-
# The work starts here
_download
_verify
[2/2] git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/isis
Posted by ke...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/isis
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/c7c68e8c
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/c7c68e8c
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/c7c68e8c
Branch: refs/heads/master
Commit: c7c68e8c9a13b859313feecd46768f76b1ea92b4
Parents: 17dd466 f89e1e6
Author: Kevin <ke...@apache.org>
Authored: Thu Oct 16 20:37:06 2014 +0200
Committer: Kevin <ke...@apache.org>
Committed: Thu Oct 16 20:37:06 2014 +0200
----------------------------------------------------------------------
.../actionprompt/ActionPromptModalWindow.java | 2 +-
.../viewer/wicket/ui/pages/PageAbstract.css | 2 +-
.../viewer/wicket/ui/pages/PageAbstract.java | 6 ++---
.../wicket/ui/pages/PageAbstractTest.java | 23 ++++++++++++++++++++
.../bookmarks/BookmarkServiceDefault.java | 9 +++++++-
...shingServiceWithDefaultPayloadFactories.java | 3 +++
.../system/transaction/IsisTransaction.java | 2 +-
.../rendering/RendererContext.java | 3 +++
.../server/resources/DomainResourceHelper.java | 6 +++++
.../handlers/DomainObjectInvocationHandler.java | 5 +++++
.../java/dom/todo/ToDoItemSubscriptions.java | 1 +
11 files changed, 55 insertions(+), 7 deletions(-)
----------------------------------------------------------------------