You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by sl...@apache.org on 2021/11/21 03:03:19 UTC
[maven-checkstyle-plugin] branch MCHECKSTYLE-406 created (now c20e456)
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a change to branch MCHECKSTYLE-406
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git.
at c20e456 [MCHECKSTYLE-406] Upgrade Checkstyle to 9.1
This branch includes the following new commits:
new da68e36 (doc) added Dependabot config
new 855b26c Bump junit from 4.13.1 to 4.13.2
new c20e456 [MCHECKSTYLE-406] Upgrade Checkstyle to 9.1
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[maven-checkstyle-plugin] 02/03: Bump junit from 4.13.1 to 4.13.2
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MCHECKSTYLE-406
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git
commit 855b26ca0062c3d1be94afc784088c89d0e49bd1
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Nov 21 03:37:56 2021 +0100
Bump junit from 4.13.1 to 4.13.2
---
Jenkinsfile | 2 +-
pom.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Jenkinsfile b/Jenkinsfile
index b4e13d9..e9f05f7 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,4 +17,4 @@
* under the License.
*/
-asfMavenTlpPlgnBuild(jdk:['8','11','16'])
+asfMavenTlpPlgnBuild()
diff --git a/pom.xml b/pom.xml
index 90dc78d..5c463dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -221,7 +221,7 @@ under the License.
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.13.1</version>
+ <version>4.13.2</version>
<scope>test</scope>
</dependency>
<dependency>
[maven-checkstyle-plugin] 01/03: (doc) added Dependabot config
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MCHECKSTYLE-406
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git
commit da68e365cc40309e2c04cb16cb3a22f73722261a
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Nov 21 03:29:54 2021 +0100
(doc) added Dependabot config
---
.github/dependabot.yml | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..08c6295
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,29 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+#
+version: 2
+updates:
+ - package-ecosystem: "maven"
+ directory: "/"
+ schedule:
+ interval: "daily"
+ ignore:
+ - dependency-name: org.apache.maven:*
+ versions:
+ - "> 3.1.0"
[maven-checkstyle-plugin] 03/03: [MCHECKSTYLE-406] Upgrade Checkstyle to 9.1
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slachiewicz pushed a commit to branch MCHECKSTYLE-406
in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git
commit c20e4560b3d6fe94ae5685bda2845f7e98fb033a
Author: Sylwester Lachiewicz <sl...@apache.org>
AuthorDate: Sun Nov 21 04:01:05 2021 +0100
[MCHECKSTYLE-406] Upgrade Checkstyle to 9.1
---
pom.xml | 6 +++---
.../exec/CheckstyleReportListenerMultiSourceTest.java | 12 ++++++------
.../checkstyle/exec/CheckstyleReportListenerTest.java | 11 ++++++-----
.../maven/plugins/checkstyle/exec/CheckstyleResultsTest.java | 10 +++++-----
4 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5c463dc..980ed98 100644
--- a/pom.xml
+++ b/pom.xml
@@ -66,7 +66,7 @@ under the License.
<!-- Because Checkstyle 7+ requires Java 8 -->
<javaVersion>8</javaVersion>
<mavenVersion>3.0</mavenVersion>
- <checkstyleVersion>8.41.1</checkstyleVersion>
+ <checkstyleVersion>9.1</checkstyleVersion>
<doxiaVersion>1.4</doxiaVersion>
<sitePluginVersion>3.9.1</sitePluginVersion>
<surefire.version>2.22.2</surefire.version>
@@ -278,12 +278,12 @@ under the License.
<dependency>
<groupId>com.puppycrawl.tools</groupId>
<artifactId>checkstyle</artifactId>
- <version>8.41.1</version>
+ <version>9.1</version>
</dependency>
<dependency>
<groupId>org.apache.maven.shared</groupId>
<artifactId>maven-shared-resources</artifactId>
- <version>3</version>
+ <version>4</version>
</dependency>
</dependencies>
</plugin>
diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerMultiSourceTest.java b/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerMultiSourceTest.java
index b0f8acb..0befa3b 100644
--- a/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerMultiSourceTest.java
+++ b/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerMultiSourceTest.java
@@ -20,8 +20,8 @@ package org.apache.maven.plugins.checkstyle.exec;
*/
import com.puppycrawl.tools.checkstyle.api.AuditEvent;
-import com.puppycrawl.tools.checkstyle.api.LocalizedMessage;
import com.puppycrawl.tools.checkstyle.api.SeverityLevel;
+import com.puppycrawl.tools.checkstyle.api.Violation;
import junit.framework.TestCase;
@@ -69,21 +69,21 @@ public class CheckstyleReportListenerMultiSourceTest
AuditEvent event = new AuditEvent( this, "/source/path/file1", null );
fireFileStarted( event );
- LocalizedMessage message =
- new LocalizedMessage( 0, 0, "", "", null, SeverityLevel.INFO, null, getClass(), null );
+ Violation message =
+ new Violation( 0, 0, "", "", null, SeverityLevel.INFO, null, getClass(), null );
fireAddError( new AuditEvent( this, "/source/path/file1", message ) );
fireFileFinished( event );
event = new AuditEvent( this, "/source/path2/file2", null );
fireFileStarted( event );
- message = new LocalizedMessage( 0, 0, "", "", null, SeverityLevel.WARNING, null, getClass(), null );
+ message = new Violation( 0, 0, "", "", null, SeverityLevel.WARNING, null, getClass(), null );
fireAddError( new AuditEvent( this, "/source/path2/file2", message ) );
fireAddError( new AuditEvent( this, "/source/path2/file2", message ) );
fireFileFinished( event );
event = new AuditEvent( this, "/source/path/file3", null );
fireFileStarted( event );
- message = new LocalizedMessage( 0, 0, "", "", null, SeverityLevel.ERROR, null, getClass(), null );
+ message = new Violation( 0, 0, "", "", null, SeverityLevel.ERROR, null, getClass(), null );
fireAddError( new AuditEvent( this, "/source/path/file3", message ) );
fireAddError( new AuditEvent( this, "/source/path/file3", message ) );
fireAddError( new AuditEvent( this, "/source/path/file3", message ) );
@@ -91,7 +91,7 @@ public class CheckstyleReportListenerMultiSourceTest
event = new AuditEvent( this, "/source/path2/file4", null );
fireFileStarted( event );
- message = new LocalizedMessage( 0, 0, "", "", null, SeverityLevel.IGNORE, null, getClass(), null );
+ message = new Violation( 0, 0, "", "", null, SeverityLevel.IGNORE, null, getClass(), null );
fireAddError( new AuditEvent( this, "/source/path2/file4", message ) );
fireAddError( new AuditEvent( this, "/source/path2/file4", message ) );
fireAddError( new AuditEvent( this, "/source/path2/file4", message ) );
diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerTest.java b/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerTest.java
index eeb7cc9..a6e48e0 100644
--- a/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerTest.java
+++ b/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerTest.java
@@ -20,8 +20,9 @@ package org.apache.maven.plugins.checkstyle.exec;
*/
import com.puppycrawl.tools.checkstyle.api.AuditEvent;
-import com.puppycrawl.tools.checkstyle.api.LocalizedMessage;
import com.puppycrawl.tools.checkstyle.api.SeverityLevel;
+import com.puppycrawl.tools.checkstyle.api.Violation;
+
import junit.framework.TestCase;
@@ -67,20 +68,20 @@ public class CheckstyleReportListenerTest
AuditEvent event = new AuditEvent( this, "/source/path/file1", null );
fireFileStarted( event );
- LocalizedMessage message = new LocalizedMessage( 0, 0, "", "", null, SeverityLevel.INFO, null, getClass(), null );
+ Violation message = new Violation( 0, 0, "", "", null, SeverityLevel.INFO, null, getClass(), null );
fireAddError( new AuditEvent( this, "/source/path/file1", message ) );
fireFileFinished( event );
event = new AuditEvent( this, "/source/path/file2", null );
fireFileStarted( event );
- message = new LocalizedMessage( 0, 0, "", "", null, SeverityLevel.WARNING, null, getClass(), null );
+ message = new Violation( 0, 0, "", "", null, SeverityLevel.WARNING, null, getClass(), null );
fireAddError( new AuditEvent( this, "/source/path/file2", message ) );
fireAddError( new AuditEvent( this, "/source/path/file2", message ) );
fireFileFinished( event );
event = new AuditEvent( this, "/source/path/file3", null );
fireFileStarted( event );
- message = new LocalizedMessage( 0, 0, "", "", null, SeverityLevel.ERROR, null, getClass(), null );
+ message = new Violation( 0, 0, "", "", null, SeverityLevel.ERROR, null, getClass(), null );
fireAddError( new AuditEvent( this, "/source/path/file3", message ) );
fireAddError( new AuditEvent( this, "/source/path/file3", message ) );
fireAddError( new AuditEvent( this, "/source/path/file3", message ) );
@@ -88,7 +89,7 @@ public class CheckstyleReportListenerTest
event = new AuditEvent( this, "/source/path/file4", null );
fireFileStarted( event );
- message = new LocalizedMessage( 0, 0, "", "", null, SeverityLevel.IGNORE, null, getClass(), null );
+ message = new Violation( 0, 0, "", "", null, SeverityLevel.IGNORE, null, getClass(), null );
fireAddError( new AuditEvent( this, "/source/path/file4", message ) );
fireAddError( new AuditEvent( this, "/source/path/file4", message ) );
fireAddError( new AuditEvent( this, "/source/path/file4", message ) );
diff --git a/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResultsTest.java b/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResultsTest.java
index 2c2180e..513457f 100644
--- a/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResultsTest.java
+++ b/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResultsTest.java
@@ -23,7 +23,7 @@ import junit.framework.TestCase;
import com.puppycrawl.tools.checkstyle.api.SeverityLevel;
import com.puppycrawl.tools.checkstyle.api.AuditEvent;
-import com.puppycrawl.tools.checkstyle.api.LocalizedMessage;
+import com.puppycrawl.tools.checkstyle.api.Violation;
import java.util.Collections;
import java.util.Map;
@@ -75,24 +75,24 @@ public class CheckstyleResultsTest
{
Map<String, List<AuditEvent>> files = new HashMap<>();
- LocalizedMessage message = new LocalizedMessage( 0, 0, "", "", null, SeverityLevel.INFO, null, getClass(), null );
+ Violation message = new Violation( 0, 0, "", "", null, SeverityLevel.INFO, null, getClass(), null );
AuditEvent event = new AuditEvent( this, "file1", message );
files.put( "file1", Collections.singletonList( event ) );
- message = new LocalizedMessage( 0, 0, "", "", null, SeverityLevel.WARNING, null, getClass(), null );
+ message = new Violation( 0, 0, "", "", null, SeverityLevel.WARNING, null, getClass(), null );
List<AuditEvent> events = new ArrayList<>();
events.add( new AuditEvent( this, "file2", message ) );
events.add( new AuditEvent( this, "file2", message ) );
files.put( "file2", events );
- message = new LocalizedMessage( 0, 0, "", "", null, SeverityLevel.ERROR, null, getClass(), null );
+ message = new Violation( 0, 0, "", "", null, SeverityLevel.ERROR, null, getClass(), null );
events = new ArrayList<>();
events.add( new AuditEvent( this, "file3", message ) );
events.add( new AuditEvent( this, "file3", message ) );
events.add( new AuditEvent( this, "file3", message ) );
files.put( "file3", events );
- message = new LocalizedMessage( 0, 0, "", "", null, SeverityLevel.IGNORE, null, getClass(), null );
+ message = new Violation( 0, 0, "", "", null, SeverityLevel.IGNORE, null, getClass(), null );
events = new ArrayList<>();
events.add( new AuditEvent( this, "file4", message ) );
events.add( new AuditEvent( this, "file4", message ) );