This is an automated email from the ASF dual-hosted git repository. slachiewicz pushed a commit to branch MCHECKSTYLE-402 in repository https://gitbox.apache.org/repos/asf/maven-checkstyle-plugin.git
commit 58c6a50d191ff51d9afd63340dfb2d81a54502f0 Author: Sylwester Lachiewicz <slachiew...@apache.org> AuthorDate: Mon Apr 5 18:34:23 2021 +0200 [MCHECKSTYLE-402] Require Maven 3.1.1 --- pom.xml | 24 ++++++++++++++-------- .../checkstyle/CheckstyleReportGenerator.java | 2 +- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/pom.xml b/pom.xml index 90dc78d..a9ce6a8 100644 --- a/pom.xml +++ b/pom.xml @@ -65,7 +65,7 @@ under the License. <properties> <!-- Because Checkstyle 7+ requires Java 8 --> <javaVersion>8</javaVersion> - <mavenVersion>3.0</mavenVersion> + <mavenVersion>3.1.1</mavenVersion> <checkstyleVersion>8.41.1</checkstyleVersion> <doxiaVersion>1.4</doxiaVersion> <sitePluginVersion>3.9.1</sitePluginVersion> @@ -122,13 +122,7 @@ under the License. <dependency> <groupId>org.apache.maven.reporting</groupId> <artifactId>maven-reporting-impl</artifactId> - <version>2.3</version> - <exclusions> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - </exclusion> - </exclusions> + <version>3.0.0</version> </dependency> <!-- doxia --> @@ -172,6 +166,12 @@ under the License. <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-resources</artifactId> <version>1.1.0</version> + <exclusions> + <exclusion> + <artifactId>plexus-container-default</artifactId> + <groupId>org.codehaus.plexus</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -227,8 +227,14 @@ under the License. <dependency> <groupId>org.apache.maven.plugin-testing</groupId> <artifactId>maven-plugin-testing-harness</artifactId> - <version>2.1</version> + <version>3.1.0</version> <scope>test</scope> + <exclusions> + <exclusion> + <artifactId>plexus-container-default</artifactId> + <groupId>org.codehaus.plexus</groupId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.maven</groupId> diff --git a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReportGenerator.java b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReportGenerator.java index 4f97b48..a05abf1 100644 --- a/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReportGenerator.java +++ b/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReportGenerator.java @@ -27,8 +27,8 @@ import java.util.List; import java.util.ResourceBundle; import org.apache.maven.doxia.sink.Sink; -import org.apache.maven.doxia.sink.SinkEventAttributeSet; import org.apache.maven.doxia.sink.SinkEventAttributes; +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; import org.apache.maven.doxia.tools.SiteTool; import org.apache.maven.plugin.logging.Log; import org.apache.maven.plugin.logging.SystemStreamLog;