Fix the exit()

.travis.yml

@@ -7,16 +7,18 @@ notifications:
 matrix:
   include:
   - jdk: openjdk6
-    env: JACOCO=true COVERALLS=true
+    env: JACOCO=true
   - jdk: openjdk7
     env: JACOCO=true COVERALLS=true
   - jdk: oraclejdk7
-    env: JACOCO=true COVERALLS=true
+    env: JACOCO=true
   - jdk: oraclejdk8
-    env: JACOCO=true COVERALLS=true
+    env: JACOCO=true
+  - jdk: openjdk7
+    env: JACOCO=true GDMSESSION=sonar
   - jdk: openjdk7
-    env: JACOCO=true GDMSESSION=sonar SONAR_ANALYSIS_MODE=publish
-    script: mvn clean install -Dsonar.analysis.mode=publish --fail-at-end
+    env: JACOCO=true SONAR=publish
+    script: mvn clean install sonar:sonar --fail-at-end
   - jdk: openjdk6
     env: JACOCO=false
   - jdk: openjdk7

pom.xml

@@ -322,7 +322,7 @@
 
     <profiles>
         <profile>
-            <id>ci</id>
+            <id>jacoco</id>
             <activation>
                 <property>
                     <name>env.JACOCO</name>
@@ -389,6 +389,7 @@
                             <defaults>
                                 <sonar.issues.file>${sonar.working.directory}/${sonar.report.export.path}
                                 </sonar.issues.file>
+                                <sonar.skip>${sonar.skip}</sonar.skip>
                             </defaults>
                             <source>${project.basedir}/src/test/groovy/verify-sonar-issues.groovy</source>
                         </configuration>

src/test/groovy/verify-sonar-issues.groovy

@@ -1,15 +1,15 @@
 import groovy.json.JsonSlurper
 
-propertyName = 'sonar.issues.file'
-filepath = new File(properties.getAt(propertyName))
-log.info('Sonar Issues file: ' + filepath)
-if (!filepath.canRead()) {
-    log.warn('Cant read issues file: ' + filepath)
-    exit(0)
+String skip = properties.getAt('sonar.skip')
+if (skip == 'true') {
+    log.info('sonar.skip = true: Skipping Sonar issues file analysis.')
+    return;
 }
-
-def slurper = new JsonSlurper()
-def contents = filepath.getText('UTF-8')
+String issueFile = properties.getAt('sonar.issues.file')
+filepath = new File(issueFile)
+log.info('Sonar Issues file: ' + filepath)
+JsonSlurper slurper = new JsonSlurper()
+String contents = filepath.getText('UTF-8')
 def json = slurper.parseText(contents)
 
 def major = 0