From b96523d4d74f22709d0ab169458c7d214408682f Mon Sep 17 00:00:00 2001
From: Nick Tan <missedone@gmail.com>
Date: Fri, 2 Dec 2016 17:05:32 -0800
Subject: [PATCH] updat release script to deploy onto Bintray

---
 .travis.yml                                   |  2 +-
 new-release                                   | 25 +++++--------------
 scripts/new-release-old                       | 24 ++++++++++++++++++
 .../{upload-snapshot => upload-updatesite}    |  4 +++
 testng-eclipse-update-site/build.gradle       |  2 +-
 5 files changed, 36 insertions(+), 21 deletions(-)
 create mode 100644 scripts/new-release-old
 rename scripts/{upload-snapshot => upload-updatesite} (93%)

diff --git a/.travis.yml b/.travis.yml
index cbb41ab8..6c756abb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,4 +16,4 @@ before_install: echo "MAVEN_OPTS='-Xmx1024m -XX:MaxPermSize=512m'" > ~/.mavenrc
 script:
   - mvn -e -U -Dci clean install
 
-after_success: test "${TRAVIS_PULL_REQUEST}" == "false" && test ${TRAVIS_BRANCH} == "master" && ./scripts/upload-snapshot
+after_success: test "${TRAVIS_PULL_REQUEST}" == "false" && test ${TRAVIS_BRANCH} == "master" && ./scripts/upload-updatesite
diff --git a/new-release b/new-release
index 70178e08..64e8265b 100755
--- a/new-release
+++ b/new-release
@@ -1,24 +1,11 @@
+#!/bin/bash
 
-TESTNG_DIR=../testng/build/libs
-
-TESTNG_JAR=`ls -ltr ${TESTNG_DIR}/testng*jar|grep -v source|grep -v javadoc|awk '{print $9}'`
-cp -f ${TESTNG_JAR} testng-eclipse-plugin/lib/testng.jar
-TESTNG_SRC_JAR=`ls -ltr ${TESTNG_DIR}/testng*-sources.jar|awk '{print $9}'`
-cp -f ${TESTNG_SRC_JAR} testng-eclipse-plugin/lib/testng-sources.jar
-
-#scripts/set-version $1
-mvn clean package
+mvn -e -Dci clean install
 
 VER=$(echo $(basename `ls testng-eclipse-update-site/target/site/features/org.testng.eclipse_*.jar`) | cut -d'_' -f2 | rev | cut -f 2- -d '.' | rev)
-echo "Created version: $VER"
+echo "Build version: $VER"
 
-if [ $# -eq 1 ]
-then
-  echo "Uploading..."
-  scripts/upload-release -m $2
+scripts/upload-updatesite 'release'
 
-  git tag -a $VER -m "release $VER"
-  git push origin $VER
-else
-  echo "No message supplied, not uploading"
-fi
+git tag -a $VER -m "release $VER"
+git push origin $VER
diff --git a/scripts/new-release-old b/scripts/new-release-old
new file mode 100644
index 00000000..4fff910d
--- /dev/null
+++ b/scripts/new-release-old
@@ -0,0 +1,24 @@
+
+TESTNG_DIR=../testng/build/libs
+
+TESTNG_JAR=`ls -ltr ${TESTNG_DIR}/testng*jar|grep -v source|grep -v javadoc|awk '{print $9}'`
+cp -f ${TESTNG_JAR} testng-eclipse-plugin/lib/testng.jar
+TESTNG_SRC_JAR=`ls -ltr ${TESTNG_DIR}/testng*-sources.jar|awk '{print $9}'`
+cp -f ${TESTNG_SRC_JAR} testng-eclipse-plugin/lib/testng-sources.jar
+
+#scripts/set-version $1
+mvn clean package
+
+VER=$(echo $(basename `ls testng-eclipse-update-site/target/site/features/org.testng.eclipse_*.jar`) | cut -d'_' -f2 | rev | cut -f 2- -d '.' | rev)
+echo "Created version: $VER"
+
+if [ $# -eq 1 ]
+then
+  echo "Uploading..."
+  ./upload-release -m $2
+
+  git tag -a $VER -m "release $VER"
+  git push origin $VER
+else
+  echo "No message supplied, not uploading"
+fi
diff --git a/scripts/upload-snapshot b/scripts/upload-updatesite
similarity index 93%
rename from scripts/upload-snapshot
rename to scripts/upload-updatesite
index 85b7e00a..969d5f8d 100755
--- a/scripts/upload-snapshot
+++ b/scripts/upload-updatesite
@@ -10,11 +10,15 @@ fi
 BINTRAY_USER=${BINTRAY_USER:?bintray user is not defined}
 BINTRAY_API_KEY=${BINTRAY_API_KEY:?bintray api key is not defined}
 
+BUILD_MODE=$1
+
 base_dir=$(cd `dirname $0` && pwd)
 site_dir=$base_dir/../testng-eclipse-update-site/
 
 export BINTRAY_USER
 export BINTRAY_API_KEY
+export BUILD_MODE
+
 cd $site_dir
 ./gradlew --stacktrace
 cd -
diff --git a/testng-eclipse-update-site/build.gradle b/testng-eclipse-update-site/build.gradle
index bdb0e0d4..e2b2ba67 100644
--- a/testng-eclipse-update-site/build.gradle
+++ b/testng-eclipse-update-site/build.gradle
@@ -14,7 +14,7 @@ defaultTasks 'publishP2Repo'
 
 publishP2Repo {
     repoOwner = 'testng-team'
-    repoName = 'testng-eclipse'
+    repoName = System.getenv('BUILD_MODE') == 'release' ? 'testng-eclipse-release' : 'testng-eclipse'
     compositePackage = ''
     subCompositeStrategy = 'MICRO'
     repoDir = new File("target/site")