Merge pull request #2367 from tronprotocol/hotFix/jipackSupport

jipackSupport

Author: DorianRust

.travis.yml

@@ -1,21 +1,22 @@
 sudo: required
+dist: trusty
 language: java
 jdk: oraclejdk8
 addons:
   ssh_known_hosts:
-    - 47.93.42.145:22008
-    - 47.93.42.145:22008
-    - 47.93.42.145:22008
-    - 47.93.18.60:22008
-    - 47.93.18.60:22008
-    - 47.93.18.60:22008
+  - 47.93.42.145:22008
+  - 47.93.42.145:22008
+  - 47.93.42.145:22008
+  - 47.93.18.60:22008
+  - 47.93.18.60:22008
+  - 47.93.18.60:22008
   sonarcloud:
     organization: tron-zhaohong
     token:
       secure: "KXWEeQ1elAoQ0XfR54TQWfhrIdDP0+2CYPv2X9aWpU/YDl7hqZBAjcCOAUGvlbyM54jtG6YMaWwG48jlrOwwl5l/VjWSnUXF+7ixQy5ki0Ci9s7Y1pTQwV9SpL8TLIK2TYqabN8Mw+FJULASXLjYr9GerbbcUbCPTmcL6mQKw6ivxxpNPmz4eNoKAEuOzruO9fTXGAV3yr8Nn85c+mVxV8EUhkR17zpE9O8fvzOtSnYArWNOSCgDBn0EG45UNNPF2vn44s1c3h3gX1m3WK6PeCXPgy3hPqRn3wTG+xglnbqthGpo2wt1rJ83af+BwdYwvPEcUq84yLgXcE/aMkTKcVAfPWBP/6vblaoI90jxCeFji+MdMimKZAqIXt7oLqDZVmIq65de5YC5s7QTSbzJNY/tsAu3dqzSfbUJY6CRNFDcoenVpvgQkqb37TkDah4mJM8EUjbu2A9Q2HSFbyCVsQJtdasuu9cBOf6azK3U0XgFNBc0y2aziZrTnX30q7bi+5L/mbTnRdXrDqBOqyPeGtT77UZfcajHHmEWU/e6gYWiA/c+K25n13DD53Au6gpnnQ6ALeUl/1gDwz3fPBebJ5bVWrkIcLj7bbysjzfOvQmDS6G13RNz58Hm0/B7bVtZTr1E1q6Z1zEJwbuJYEJASNcezAfK5x/hIfZTGNqT3M8="
 cache:
   directories:
-    - '$HOME/.sonar/cache'
+  - '$HOME/.sonar/cache'
 matrix:
   include:
   - name: build

build.gradle

@@ -23,7 +23,7 @@ apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: "jacoco"
 apply plugin: 'maven-publish'
 
-jar.enabled = false
+jar.enabled = true
 shadowJar.enabled = true
 
 sourceCompatibility = 1.8

querySonar.sh

@@ -1,10 +1,12 @@
-
-PassFlag=`curl -s 'https://sonarcloud.io/api/project_badges/measure?project=java-tron&metric=alert_status'|grep -A4 "quality gate"|grep "pass"|wc -l`
-echo "Please visit https://sonarcloud.io/dashboard?id=java-tron for more details"
-if [ $PassFlag -eq 0 ]; then
+echo "current branch is : "$BUILDKITE_PIPELINE_DEFAULT_BRANCH
+SonarStatus_Url="https://sonarcloud.io/api/qualitygates/project_status?projectKey=java-tron&branch="$BUILDKITE_PIPELINE_DEFAULT_BRANCH
+Status=`curl -s $SonarStatus_Url | jq '.projectStatus.status'`
+echo "current branch sonarcloud status is : "$Status
+if [ "$Status"x = "ERROR"x ]; then
     echo "Sonar Check Failed"
+    echo "Please visit https://sonarcloud.io/dashboard?branch="$BUILDKITE_PIPELINE_DEFAULT_BRANCH"&id=java-tron for more details"
     exit 1
 else
     echo "Sonar Check Pass"
     exit 0
-fi
+fi