Issue #244: update to CS 8.25

checkstyle · Oct 28, 2019 · 6a225f9 · 6a225f9
1 parent 4ec4c9d
commit 6a225f9
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -21,6 +21,7 @@ Compatibility matrix from checkstyle team:
 
 Checkstyle Plugin|Sonar min|Sonar max|Checkstyle|Jdk
 -----------------|---------|---------|----------|---
+4.25|6.7  |7.7+|8.25|1.8
 4.24|6.7  |7.7+|8.24|1.8
 4.23|6.7  |7.7+|8.23|1.8
 4.22|6.7  |7.7+|8.22|1.8

diff --git a/pom.xml b/pom.xml
@@ -81,7 +81,7 @@
   </ciManagement>
 
   <properties>
-    <checkstyle.version>8.24</checkstyle.version>
+    <checkstyle.version>8.25</checkstyle.version>
     <sonar.version>6.7</sonar.version>
     <sonar-java.version>5.12.0.17701</sonar-java.version>
     <maven.checkstyle.plugin.version>2.17</maven.checkstyle.plugin.version>

diff --git a/src/main/java/org/sonar/plugins/checkstyle/CheckstyleExecutor.java b/src/main/java/org/sonar/plugins/checkstyle/CheckstyleExecutor.java
@@ -34,6 +34,7 @@
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import com.puppycrawl.tools.checkstyle.api.AutomaticBean;
 import org.apache.commons.io.FileUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -103,7 +104,7 @@ private void executeWithClassLoader(URLClassLoader projectClassloader) {
             if (xmlReport != null) {
                 LOG.info("Checkstyle output report: {}", xmlReport.getAbsolutePath());
                 xmlOutput = FileUtils.openOutputStream(xmlReport);
-                checker.addListener(new XMLLogger(xmlOutput, true));
+                checker.addListener(new XMLLogger(xmlOutput, AutomaticBean.OutputStreamOptions.CLOSE));
             }
 
             checker.setCharset(configuration.getCharset().name());

diff --git a/src/main/resources/org/sonar/l10n/checkstyle.properties b/src/main/resources/org/sonar/l10n/checkstyle.properties
@@ -200,6 +200,7 @@ rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.regexp.RegexpMultilineChe
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.regexp.RegexpMultilineCheck.param.ignoreCase=Controls whether to ignore case when searching. Default value is false.
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.regexp.RegexpMultilineCheck.param.format=illegal pattern. Default value is ^$ (empty).
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.regexp.RegexpMultilineCheck.param.maximum=The maximum number of matches required in each file. Default value is 0.
+rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.regexp.RegexpMultilineCheck.param.matchAcrossLines=Control whether to match expressions across multiple lines.
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.regexp.RegexpMultilineCheck.param.fileExtensions=file type extension of files to process
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.regexp.RegexpOnFilenameCheck.name=Regexp On Filename
 rule.checkstyle.com.puppycrawl.tools.checkstyle.checks.regexp.RegexpOnFilenameCheck.param.folderPattern=Regular expression to match the folder path against.

diff --git a/src/main/resources/org/sonar/plugins/checkstyle/rules.xml b/src/main/resources/org/sonar/plugins/checkstyle/rules.xml
@@ -156,6 +156,9 @@
     </param>
     <param key="maximum" type="INTEGER">
     </param>
+    <param key="matchAcrossLines" type="BOOLEAN">
+      <defaultValue>false</defaultValue>
+    </param>
     <param key="fileExtensions" type="s{}">
       <defaultValue/>
     </param>