From 348a5aba53f48a47e11dbbc082aa111f8fe7a4b3 Mon Sep 17 00:00:00 2001 From: Myyk Seok Date: Mon, 20 Apr 2015 17:57:24 -0700 Subject: [PATCH 1/4] Add more projects. --- bin/update-gilt-sbt-build.sh | 4 ++-- projects.txt | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/bin/update-gilt-sbt-build.sh b/bin/update-gilt-sbt-build.sh index 00646f3..118e5f0 100755 --- a/bin/update-gilt-sbt-build.sh +++ b/bin/update-gilt-sbt-build.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION="6.4.0" +VERSION="6.5.2" while read -r LINE || [[ -n $LINE ]]; do printf "%s\n" "${LINE}" @@ -9,6 +9,6 @@ while read -r LINE || [[ -n $LINE ]]; do git pull git checkout -b "upgrade-to-g-s-b-$VERSION" sed -i "" -E 's/addSbtPlugin\("com.giltgroupe"[[:space:]]+%[[:space:]]+"gilt-sbt-build"[[:space:]]+%[[:space:]]+"[[:digit:]]+.[[:digit:]]+.[[:digit:]]+"\)/addSbtPlugin("com.giltgroupe" % "gilt-sbt-build" % "'"$VERSION"'")/g' project/build.sbt - git commit -a -m "NOJIRA-0: Upgrade gilt-sbt-build tp $VERSION" + git commit -m "NOJIRA-0: Upgrade gilt-sbt-build to $VERSION" project/build.sbt git push origin HEAD:refs/for/master done < projects.txt diff --git a/projects.txt b/projects.txt index f15651d..b57161f 100644 --- a/projects.txt +++ b/projects.txt @@ -1,3 +1,17 @@ +admin-invoice-detail +admin-region +admin-shipping-calculator +commons-5-to-6-conversion +lib-alipay +lib-masterpass +lib-vertexinc-taxlookup +order_service +payment_service +payment_service-client +svc-alipay +svc-invoice-detail +svc-metrics-by-query svc-payment-manager svc-region -svc-shipping-calculator \ No newline at end of file +svc-shipping-calculator +web-checkout-legacy \ No newline at end of file From 5ae27cfe2452123b39184477a5c423f154a69307 Mon Sep 17 00:00:00 2001 From: Myyk Seok Date: Wed, 22 Apr 2015 16:46:29 -0700 Subject: [PATCH 2/4] Add script to upgrade sbt. --- bin/update-gilt-sbt-build.sh | 2 +- bin/update-sbt.sh | 16 ++++++++++++++++ projects.txt | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100755 bin/update-sbt.sh diff --git a/bin/update-gilt-sbt-build.sh b/bin/update-gilt-sbt-build.sh index 118e5f0..61fb4f4 100755 --- a/bin/update-gilt-sbt-build.sh +++ b/bin/update-gilt-sbt-build.sh @@ -7,7 +7,7 @@ while read -r LINE || [[ -n $LINE ]]; do cd "/web/${LINE}" git checkout master git pull - git checkout -b "upgrade-to-g-s-b-$VERSION" + git checkout -b "upgrade-g-s-b-to-$VERSION" sed -i "" -E 's/addSbtPlugin\("com.giltgroupe"[[:space:]]+%[[:space:]]+"gilt-sbt-build"[[:space:]]+%[[:space:]]+"[[:digit:]]+.[[:digit:]]+.[[:digit:]]+"\)/addSbtPlugin("com.giltgroupe" % "gilt-sbt-build" % "'"$VERSION"'")/g' project/build.sbt git commit -m "NOJIRA-0: Upgrade gilt-sbt-build to $VERSION" project/build.sbt git push origin HEAD:refs/for/master diff --git a/bin/update-sbt.sh b/bin/update-sbt.sh new file mode 100755 index 0000000..1f4eb9e --- /dev/null +++ b/bin/update-sbt.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +VERSION="0.13.8" + +while read -r LINE || [[ -n $LINE ]]; do + printf "%s\n" "${LINE}" + cd "/web/${LINE}" + git checkout master + git pull + git checkout -b "upgrade-sbt-to-$VERSION" + sbt.version=0.13.8 + + sed -i "" -E 's/sbt.version[[:space:]]*=[[:space:]]*[[:digit:]]+.[[:digit:]]+.[[:digit:]]+/sbt.version='"$VERSION"'/g' project/*.properties + git commit -m "NOJIRA-0: Upgrade sbt to $VERSION" project/build.sbt + git push origin HEAD:refs/for/master +done < projects.txt diff --git a/projects.txt b/projects.txt index b57161f..9e9d794 100644 --- a/projects.txt +++ b/projects.txt @@ -1,3 +1,4 @@ +account_service admin-invoice-detail admin-region admin-shipping-calculator From 7360eb7748d22a3317414f1405d018bda67170ab Mon Sep 17 00:00:00 2001 From: Myyk Seok Date: Wed, 22 Apr 2015 17:04:52 -0700 Subject: [PATCH 3/4] Fixed update-sbt.sh. --- bin/update-sbt.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bin/update-sbt.sh b/bin/update-sbt.sh index 1f4eb9e..fcffaa7 100755 --- a/bin/update-sbt.sh +++ b/bin/update-sbt.sh @@ -8,9 +8,7 @@ while read -r LINE || [[ -n $LINE ]]; do git checkout master git pull git checkout -b "upgrade-sbt-to-$VERSION" - sbt.version=0.13.8 - sed -i "" -E 's/sbt.version[[:space:]]*=[[:space:]]*[[:digit:]]+.[[:digit:]]+.[[:digit:]]+/sbt.version='"$VERSION"'/g' project/*.properties - git commit -m "NOJIRA-0: Upgrade sbt to $VERSION" project/build.sbt + git commit -m "NOJIRA-0: Upgrade sbt to $VERSION" project/*.properties git push origin HEAD:refs/for/master done < projects.txt From 156cc591fb14da74854fc20a9eeeb6132b6cd579 Mon Sep 17 00:00:00 2001 From: Myyk Seok Date: Thu, 23 Apr 2015 14:28:38 -0700 Subject: [PATCH 4/4] Updated version of gilt-sbt-build. --- bin/update-gilt-sbt-build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/update-gilt-sbt-build.sh b/bin/update-gilt-sbt-build.sh index 61fb4f4..4b491d3 100755 --- a/bin/update-gilt-sbt-build.sh +++ b/bin/update-gilt-sbt-build.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION="6.5.2" +VERSION="6.6.0" while read -r LINE || [[ -n $LINE ]]; do printf "%s\n" "${LINE}"