You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2024/06/06 17:22:45 UTC
(maven-checkstyle-plugin) 01/01: Try Checkstyle 10.x
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch checkstyle-10.x
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git
commit e4de1be3e32110cb0f2cdc6f52ebba69ab39797a
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jun 6 19:22:34 2024 +0200
Try Checkstyle 10.x
---
pom.xml | 4 ++--
src/it/MCHECKSTYLE-357-with-header-override/pom.xml | 2 +-
.../org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java | 2 +-
.../apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java | 2 +-
src/site/apt/examples/inline-checker-config.apt.vm | 2 +-
src/site/apt/examples/upgrading-checkstyle.apt.vm | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3310d7c..850fe4f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,10 +73,10 @@ under the License.
</distributionManagement>
<properties>
- <javaVersion>8</javaVersion>
+ <javaVersion>11</javaVersion>
<mavenVersion>3.6.3</mavenVersion>
<resolverVersion>1.4.1</resolverVersion>
- <checkstyleVersion>9.3</checkstyleVersion>
+ <checkstyleVersion>10.17.0</checkstyleVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<doxiaVersion>2.0.0-M12</doxiaVersion>
<doxiaSitetoolsVersion>2.0.0-M19</doxiaSitetoolsVersion>
diff --git a/src/it/MCHECKSTYLE-357-with-header-override/pom.xml b/src/it/MCHECKSTYLE-357-with-header-override/pom.xml
index b05481e..8702236 100644
--- a/src/it/MCHECKSTYLE-357-with-header-override/pom.xml
+++ b/src/it/MCHECKSTYLE-357-with-header-override/pom.xml
@@ -170,7 +170,7 @@
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>8.15</version>
+ <version>@checkstyleVersion@</version>
</dependency>
</dependencies>
</plugin>
diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java b/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
index 0193c54..686d7ba 100644
--- a/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
+++ b/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
@@ -31,11 +31,11 @@ import java.util.List;
import java.util.Locale;
import java.util.Map;
+import com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions;
import com.puppycrawl.tools.checkstyle.DefaultLogger;
import com.puppycrawl.tools.checkstyle.SarifLogger;
import com.puppycrawl.tools.checkstyle.XMLLogger;
import com.puppycrawl.tools.checkstyle.api.AuditListener;
-import com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.execution.MavenSession;
diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java
index 14c8443..70bc31c 100644
--- a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java
+++ b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java
@@ -33,11 +33,11 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
+import com.puppycrawl.tools.checkstyle.AbstractAutomaticBean.OutputStreamOptions;
import com.puppycrawl.tools.checkstyle.DefaultLogger;
import com.puppycrawl.tools.checkstyle.SarifLogger;
import com.puppycrawl.tools.checkstyle.XMLLogger;
import com.puppycrawl.tools.checkstyle.api.AuditListener;
-import com.puppycrawl.tools.checkstyle.api.AutomaticBean.OutputStreamOptions;
import com.puppycrawl.tools.checkstyle.api.CheckstyleException;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.model.Dependency;
diff --git a/src/site/apt/examples/inline-checker-config.apt.vm b/src/site/apt/examples/inline-checker-config.apt.vm
index 9432013..045fc02 100644
--- a/src/site/apt/examples/inline-checker-config.apt.vm
+++ b/src/site/apt/examples/inline-checker-config.apt.vm
@@ -151,7 +151,7 @@ Using a different header
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>8.15</version>
+ <version>${checkstyleVersion}</version>
</dependency>
</dependencies>
</plugin>
diff --git a/src/site/apt/examples/upgrading-checkstyle.apt.vm b/src/site/apt/examples/upgrading-checkstyle.apt.vm
index d5b3a0d..c141281 100644
--- a/src/site/apt/examples/upgrading-checkstyle.apt.vm
+++ b/src/site/apt/examples/upgrading-checkstyle.apt.vm
@@ -28,7 +28,7 @@
Upgrading Checkstyle at Runtime
Maven Checkstyle plugin comes with a default Checkstyle version: for <<<maven-checkstyle-plugin ${project.version}>>>,
- Checkstyle ${checkstyleVersion} is used by default.
+ Checkstyle ${checkstyleVersion} is used by default.
Given Checkstyle generally keeps good compatibility between versions, you can override the version used at runtime to
benefit from {{{https://checkstyle.org/releasenotes.html}Checkstyle latest bugfixes}}: