Skip to content

Commit 3195b48

Browse files
Daniel Muehlbachlerromani
authored andcommitted
update to JDK 11
1 parent fc881ef commit 3195b48

File tree

5 files changed

+17
-15
lines changed

5 files changed

+17
-15
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ branches:
2222
matrix:
2323
fast_finish: true
2424
include:
25-
- jdk: openjdk8
25+
- jdk: openjdk11
2626
env: CMD="./.ci/travis.sh install"
2727

28-
- jdk: openjdk8
28+
- jdk: openjdk11
2929
env: CMD="./.ci/travis.sh integration-tests"
3030

31-
- jdk: openjdk8
31+
- jdk: openjdk11
3232
env: CMD="./.ci/travis.sh nondex"

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
8.28
106106
</maven.sevntu.checkstyle.plugin.checkstyle.version>
107107
<maven.jacoco.plugin.version>0.8.5</maven.jacoco.plugin.version>
108-
<java.version>1.8</java.version>
108+
<java.version>11</java.version>
109109
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
110110
<!-- we disable ITs by default as it need download of 200MB sonar application jar -->
111111
<skipITs>true</skipITs>
@@ -718,7 +718,7 @@
718718
<configuration>
719719
<rules>
720720
<requireJavaVersion>
721-
<version>1.8</version>
721+
<version>${java.version}</version>
722722
</requireJavaVersion>
723723
<requireMavenVersion>
724724
<version>3.0.1</version>

src/main/java/org/sonar/plugins/checkstyle/CheckstyleProfileExporter.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
import java.util.List;
2929
import java.util.Map;
3030

31+
import javax.annotation.Nullable;
32+
3133
import org.apache.commons.lang.StringEscapeUtils;
3234
import org.apache.commons.lang.StringUtils;
3335
import org.sonar.api.ExtensionPoint;
@@ -224,7 +226,7 @@ private static void appendRuleParameters(Writer writer, ActiveRuleWrapper active
224226
}
225227

226228
private static void appendModuleProperty(Writer writer, String propertyKey,
227-
String propertyValue) throws IOException {
229+
@Nullable String propertyValue) throws IOException {
228230
if (StringUtils.isNotBlank(propertyValue)) {
229231
writer.append("<property name=\"");
230232
StringEscapeUtils.escapeXml(writer, propertyKey);

src/test/java/org/sonar/plugins/checkstyle/internal/ChecksTest.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919

2020
package org.sonar.plugins.checkstyle.internal;
2121

22-
import static java.nio.charset.StandardCharsets.UTF_8;
23-
2422
import java.beans.PropertyDescriptor;
2523
import java.io.File;
2624
import java.io.FileInputStream;
@@ -94,16 +92,18 @@ public void verifyTestConfigurationFiles() throws Exception {
9492
}
9593

9694
private static void validateSonarRules(Set<Class<?>> modules)
97-
throws ParserConfigurationException, IOException {
95+
throws ParserConfigurationException {
9896
final File rulesFile = new File(RULES_PATH);
9997

10098
Assert.assertTrue(RULES_PATH + " must exist", rulesFile.exists());
10199

102-
final String input = new String(Files.readAllBytes(rulesFile.toPath()), UTF_8);
103-
104-
final Document document = XmlUtil.getRawXml(rulesFile.getAbsolutePath(), input, input);
105-
106-
validateSonarRules(document, modules);
100+
try {
101+
final String input = Files.readString(rulesFile.toPath());
102+
final Document document = XmlUtil.getRawXml(rulesFile.getAbsolutePath(), input, input);
103+
validateSonarRules(document, modules);
104+
} catch(IOException ignored) {
105+
Assert.fail("Failed to read rulesFile.");
106+
}
107107
}
108108

109109
private static void validateSonarRules(Document document, Set<Class<?>> modules) {

wercker.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
box: maven:3.5.2-jdk-8
1+
box: maven:3.6.3-jdk-11
22

33
build:
44
steps:

0 commit comments

Comments
 (0)