[travis] Adjust travis ci builds

Author: hazendaz

travis/after_success.sh

@@ -16,49 +16,47 @@
 #
 
 
-# Get Project Repo
-mybatis_repo=$(git config --get remote.origin.url 2>&1)
-echo "Repo detected: ${mybatis_repo}"
-
 # Get Commit Message
 commit_message=$(git log --format=%B -n 1)
 echo "Current commit detected: ${commit_message}"
 
-# Get the Java version.
-# Java 1.5 will give 15.
-# Java 1.6 will give 16.
-# Java 1.7 will give 17.
-# Java 1.8 will give 18.
-VER=`java -version 2>&1 | sed 's/java version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q'`
-echo "Java detected: ${VER}"
-
 # We build for several JDKs on Travis.
 # Some actions, like analyzing the code (Coveralls) and uploading
 # artifacts on a Maven repository, should only be made for one version.
 
-# If the version is 1.6, then perform the following actions.
+# If the version is 1.8, then perform the following actions.
 # 1. Upload artifacts to Sonatype.
 # 2. Use -q option to only display Maven errors and warnings.
 # 3. Use --settings to force the usage of our "settings.xml" file.
+# 4. Notify Coveralls.
+# 5. Deploy site
+# 6. Notify Sonar
+
+if [ $TRAVIS_REPO_SLUG == "mybatis/spring" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ] && [[ "$commit_message" != *"[maven-release-plugin]"* ]]; then
 
-# If the version is 1.7, then perform the following actions.
-# 1. Notify Coveralls.
-# 2. Deploy site
-# 3. Use -q option to only display Maven errors and warnings.
+  if [ $VER == "18" ]; then
 
-if [ "$mybatis_repo" == "https://github.com/mybatis/spring.git" ] && [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_BRANCH" == "master" ] && [[ "$commit_message" != *"[maven-release-plugin]"* ]]; then
-  if [ $VER == "16" ]; then
-    mvn clean deploy -q --settings ./travis/settings.xml
+    # Deploy to sonatype
+    ./mvnw clean deploy -q --settings ./travis/settings.xml
     echo -e "Successfully deployed SNAPSHOT artifacts to Sonatype under Travis job ${TRAVIS_JOB_NUMBER}"
-  elif [ $VER == "18" ]; then
-    mvn clean test jacoco:report coveralls:report -q
+
+    # Deploy to coveralls
+    ./mvnw clean test jacoco:report coveralls:report -q --settings ./travis/settings.xml
     echo -e "Successfully ran coveralls under Travis job ${TRAVIS_JOB_NUMBER}"
-    # various issues exist currently in building this so comment for now
-    # mvn site site:deploy -q
+
+    # Deploy to site
+    # Cannot currently run site this way
+    # ./mvnw site site:deploy -q
     # echo -e "Successfully deploy site under Travis job ${TRAVIS_JOB_NUMBER}"
-    mvn clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.host.url=https://sonarqube.com -Dsonar.login=ccf0be39fd0ca5ea5aa712247c79da7233cd3caa
+
+    # Notify Sonar
+    ./mvnw clean org.jacoco:jacoco-maven-plugin:prepare-agent package sonar:sonar -Dsonar.host.url=https://sonarqube.com -Dsonar.login=ccf0be39fd0ca5ea5aa712247c79da7233cd3caa
     echo -e "Successfully ran Sonar integration under Travis job ${TRAVIS_JOB_NUMBER}"	
+  else
+    echo "Java Version does not support additonal activity for travis CI"
   fi
 else
+  echo "Travis Pull Request: $TRAVIS_PULL_REQUEST"
+  echo "Travis Branch: $TRAVIS_BRANCH"
   echo "Travis build skipped"
 fi