Repository: james-project Updated Branches: refs/heads/master f12fb0556 -> df5d417ae
JAMES-1679 Adapt the scripts to the master main branch Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/df5d417a Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/df5d417a Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/df5d417a Branch: refs/heads/master Commit: df5d417aeabbf81781983b935ef925440aa569fa Parents: f12fb05 Author: Antoine Duprat <[email protected]> Authored: Mon Feb 1 09:49:53 2016 +0100 Committer: Antoine Duprat <[email protected]> Committed: Mon Feb 1 11:18:55 2016 +0100 ---------------------------------------------------------------------- dockerfiles/compilation/java-6/compile.sh | 2 +- dockerfiles/compilation/java-6/integration_tests.sh | 4 ++-- dockerfiles/compilation/java-8/compile.sh | 2 +- dockerfiles/compilation/java-8/integration_tests.sh | 4 ++-- dockerfiles/merge/merge.sh | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/df5d417a/dockerfiles/compilation/java-6/compile.sh ---------------------------------------------------------------------- diff --git a/dockerfiles/compilation/java-6/compile.sh b/dockerfiles/compilation/java-6/compile.sh index 7577a50..9e92e9d 100755 --- a/dockerfiles/compilation/java-6/compile.sh +++ b/dockerfiles/compilation/java-6/compile.sh @@ -34,7 +34,7 @@ do done if [ -z "$SHA1" ]; then - SHA1=trunk + SHA1=master fi # Sources retrieval http://git-wip-us.apache.org/repos/asf/james-project/blob/df5d417a/dockerfiles/compilation/java-6/integration_tests.sh ---------------------------------------------------------------------- diff --git a/dockerfiles/compilation/java-6/integration_tests.sh b/dockerfiles/compilation/java-6/integration_tests.sh index 4944182..03906ee 100755 --- a/dockerfiles/compilation/java-6/integration_tests.sh +++ b/dockerfiles/compilation/java-6/integration_tests.sh @@ -5,7 +5,7 @@ printUsage() { echo "./integration_tests.sh URL BRANCH JAMES_IP JAMES_IMAP_PORT" echo " JAMES_IP: IP of the James server to be tests" echo " JAMES_IMAP_PORT: Exposed IMAP port of this James server" - echo " SHA1(optional): Branch to build or trunk if none" + echo " SHA1(optional): Branch to build or master if none" exit 1 } @@ -43,7 +43,7 @@ if [ -z "$JAMES_IMAP_PORT" ]; then fi if [ -z "$SHA1" ]; then - SHA1=trunk + SHA1=master fi export JAMES_ADDRESS=$JAMES_ADDRESS http://git-wip-us.apache.org/repos/asf/james-project/blob/df5d417a/dockerfiles/compilation/java-8/compile.sh ---------------------------------------------------------------------- diff --git a/dockerfiles/compilation/java-8/compile.sh b/dockerfiles/compilation/java-8/compile.sh index 0e68d1b..f90baf5 100755 --- a/dockerfiles/compilation/java-8/compile.sh +++ b/dockerfiles/compilation/java-8/compile.sh @@ -34,7 +34,7 @@ do done if [ -z "$SHA1" ]; then - SHA1=trunk + SHA1=master fi # Sources retrieval http://git-wip-us.apache.org/repos/asf/james-project/blob/df5d417a/dockerfiles/compilation/java-8/integration_tests.sh ---------------------------------------------------------------------- diff --git a/dockerfiles/compilation/java-8/integration_tests.sh b/dockerfiles/compilation/java-8/integration_tests.sh index 4944182..03906ee 100755 --- a/dockerfiles/compilation/java-8/integration_tests.sh +++ b/dockerfiles/compilation/java-8/integration_tests.sh @@ -5,7 +5,7 @@ printUsage() { echo "./integration_tests.sh URL BRANCH JAMES_IP JAMES_IMAP_PORT" echo " JAMES_IP: IP of the James server to be tests" echo " JAMES_IMAP_PORT: Exposed IMAP port of this James server" - echo " SHA1(optional): Branch to build or trunk if none" + echo " SHA1(optional): Branch to build or master if none" exit 1 } @@ -43,7 +43,7 @@ if [ -z "$JAMES_IMAP_PORT" ]; then fi if [ -z "$SHA1" ]; then - SHA1=trunk + SHA1=master fi export JAMES_ADDRESS=$JAMES_ADDRESS http://git-wip-us.apache.org/repos/asf/james-project/blob/df5d417a/dockerfiles/merge/merge.sh ---------------------------------------------------------------------- diff --git a/dockerfiles/merge/merge.sh b/dockerfiles/merge/merge.sh index 3a5e1da..36b321f 100755 --- a/dockerfiles/merge/merge.sh +++ b/dockerfiles/merge/merge.sh @@ -3,7 +3,7 @@ printUsage() { echo "Usage : " echo "./merge.sh SHA1 RESULTING_BRANCH" - echo " SHA1: SHA1 to merge with trunk" + echo " SHA1: SHA1 to merge with master" echo " RESULTING_BRANCH : Resulting branch of the merge" exit 1 } @@ -20,12 +20,12 @@ if [ -z "$APACHE_REPO" ]; then git remote add apache https://github.com/apache/james-project.git fi git fetch apache -git checkout apache/trunk -b trunk +git checkout apache/master -b master git fetch origin git checkout $SHA1 git checkout -b SHA1_BRANCH -git checkout trunk +git checkout master git checkout -b $RESULTING_BRANCH git merge --no-edit SHA1_BRANCH --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
