Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #244: update to CS 8.25 #247

Merged
merged 1 commit into from
Oct 28, 2019
Merged

Issue #244: update to CS 8.25 #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/sonar/plugins/checkstyle/CheckstyleExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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());
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/org/sonar/l10n/checkstyle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/org/sonar/plugins/checkstyle/rules.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down