Skip to content

Commit 194def0

Browse files
Suszyński Krzysztofcardil
authored andcommitted
Fix the exit()
1 parent 1297157 commit 194def0

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ notifications:
77
matrix:
88
include:
99
- jdk: openjdk6
10-
env: JACOCO=true COVERALLS=true
10+
env: JACOCO=true
1111
- jdk: openjdk7
1212
env: JACOCO=true COVERALLS=true
1313
- jdk: oraclejdk7
14-
env: JACOCO=true COVERALLS=true
14+
env: JACOCO=true
1515
- jdk: oraclejdk8
16-
env: JACOCO=true COVERALLS=true
16+
env: JACOCO=true
1717
- jdk: openjdk7
1818
env: JACOCO=true GDMSESSION=sonar SONAR_ANALYSIS_MODE=publish
1919
script: mvn clean install -Dsonar.analysis.mode=publish --fail-at-end

pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,7 @@
322322

323323
<profiles>
324324
<profile>
325-
<id>ci</id>
325+
<id>jacoco</id>
326326
<activation>
327327
<property>
328328
<name>env.JACOCO</name>
@@ -389,6 +389,7 @@
389389
<defaults>
390390
<sonar.issues.file>${sonar.working.directory}/${sonar.report.export.path}
391391
</sonar.issues.file>
392+
<sonar.skip>${sonar.skip}</sonar.skip>
392393
</defaults>
393394
<source>${project.basedir}/src/test/groovy/verify-sonar-issues.groovy</source>
394395
</configuration>

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
import groovy.json.JsonSlurper
22

3-
propertyName = 'sonar.issues.file'
4-
filepath = new File(properties.getAt(propertyName))
5-
log.info('Sonar Issues file: ' + filepath)
6-
if (!filepath.canRead()) {
7-
log.warn('Cant read issues file: ' + filepath)
8-
exit(0)
3+
String skip = properties.getAt('sonar.skip')
4+
if (skip == 'true') {
5+
log.info('sonar.skip = true: Skipping Sonar issues file analysis.')
6+
return;
97
}
10-
11-
def slurper = new JsonSlurper()
12-
def contents = filepath.getText('UTF-8')
8+
String issueFile = properties.getAt('sonar.issues.file')
9+
filepath = new File(issueFile)
10+
log.info('Sonar Issues file: ' + filepath)
11+
JsonSlurper slurper = new JsonSlurper()
12+
String contents = filepath.getText('UTF-8')
1313
def json = slurper.parseText(contents)
1414

1515
def major = 0

0 commit comments

Comments
 (0)