You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gb...@apache.org on 2017/01/19 21:06:24 UTC
svn commit: r1779527 - in /maven/plugins/trunk/maven-checkstyle-plugin: ./
src/main/java/org/apache/maven/plugin/
src/main/java/org/apache/maven/plugins/
src/main/java/org/apache/maven/plugins/checkstyle/
src/main/java/org/apache/maven/plugins/checksty...
Author: gboue
Date: Thu Jan 19 21:06:23 2017
New Revision: 1779527
URL: http://svn.apache.org/viewvc?rev=1779527&view=rev
Log:
[MCHECKSTYLE-335] Migrate plugin to Maven 3.0
Upgrading the Maven version to 3.0 in the POM:
- Passing version to 3.0.0-SNAPSHOT to mark the upgrade
- Renaming the packages to org.apache.maven.plugins
- Removing Maven 2 specific quirks
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
- copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleAggregateReport.java
- copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java
- copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReportGenerator.java
- copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java
- copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/IconTool.java
- copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/IconTool.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/ReportResource.java
- copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/ReportResource.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/RuleUtil.java
- copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/RuleUtil.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/
- copied from r1779526, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/exec/
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/resource/
- copied from r1779526, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/resource/
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/
- copied from r1779526, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/rss/
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/org/apache/maven/plugins/
- copied from r1779526, maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/org/apache/maven/plugin/
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleReportTest.java
- copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojoTest.java
- copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojoTest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/ReportResourceTest.java
- copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/ReportResourceTest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/RuleUtilTest.java
- copied, changed from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/RuleUtilTest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/exec/
- copied from r1779526, maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/exec/
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/
- copied from r1779526, maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/stubs/
Removed:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/org/apache/maven/plugin/
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleCheckerListener.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutor.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorException.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorRequest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResults.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/DefaultCheckstyleExecutor.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/resource/LicenseResourceManager.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/CheckstyleRssGenerator.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/CheckstyleRssGeneratorRequest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/DefaultCheckstyleRssGenerator.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/VelocityTemplate.java
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/inline-checker-config.apt.vm
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/usage.apt.vm
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerMultiSourceTest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerTest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResultsTest.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithExceptionsStub.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithNoJxrPluginStub.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MinMavenProjectStub.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/ModuleMavenProjectStub.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MultiMavenProjectStub.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/custom-plugin-config.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/dep-resolution-exception-plugin-config.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/fail-on-error-plugin-config.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/min-plugin-config.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/multi-plugin-config.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-files-plugin-config.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-rules-plugin-config.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-severity-plugin-config.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-source-plugin-config.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/test-source-directory-plugin-config.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/useFile-plugin-config.xml
Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/pom.xml?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Thu Jan 19 21:06:23 2017
@@ -30,7 +30,7 @@ under the License.
</parent>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.18-SNAPSHOT</version>
+ <version>3.0.0-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Apache Maven Checkstyle Plugin</name>
@@ -62,7 +62,7 @@ under the License.
<javaVersion>7</javaVersion>
<maven.compiler.source>1.${javaVersion}</maven.compiler.source>
<maven.compiler.target>1.${javaVersion}</maven.compiler.target>
- <mavenVersion>2.2.1</mavenVersion>
+ <mavenVersion>3.0</mavenVersion>
<checkstyleVersion>6.11.2</checkstyleVersion>
<doxiaVersion>1.4</doxiaVersion>
<sitePluginVersion>3.4</sitePluginVersion>
@@ -103,16 +103,6 @@ under the License.
<version>${mavenVersion}</version>
</dependency>
<dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-descriptor</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-project</artifactId>
- <version>${mavenVersion}</version>
- </dependency>
- <dependency>
<groupId>org.apache.maven.plugin-tools</groupId>
<artifactId>maven-plugin-annotations</artifactId>
<scope>provided</scope>
@@ -128,6 +118,12 @@ under the License.
<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>
</dependency>
<!-- doxia -->
@@ -238,7 +234,13 @@ under the License.
<dependency>
<groupId>org.apache.maven.plugin-testing</groupId>
<artifactId>maven-plugin-testing-harness</artifactId>
- <version>1.2</version>
+ <version>2.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>${mavenVersion}</version>
<scope>test</scope>
</dependency>
</dependencies>
Copied: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java (from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java?p2=maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java&p1=maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java&r1=1776692&r2=1779527&rev=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle;
+package org.apache.maven.plugins.checkstyle;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -40,16 +40,15 @@ import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginManagement;
import org.apache.maven.model.ReportPlugin;
import org.apache.maven.model.Resource;
-import org.apache.maven.plugin.MojoExecution;
-import org.apache.maven.plugin.checkstyle.exec.CheckstyleExecutor;
-import org.apache.maven.plugin.checkstyle.exec.CheckstyleExecutorException;
-import org.apache.maven.plugin.checkstyle.exec.CheckstyleExecutorRequest;
-import org.apache.maven.plugin.checkstyle.exec.CheckstyleResults;
-import org.apache.maven.plugin.checkstyle.rss.CheckstyleRssGenerator;
-import org.apache.maven.plugin.checkstyle.rss.CheckstyleRssGeneratorRequest;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Parameter;
+import org.apache.maven.plugins.checkstyle.exec.CheckstyleExecutor;
+import org.apache.maven.plugins.checkstyle.exec.CheckstyleExecutorException;
+import org.apache.maven.plugins.checkstyle.exec.CheckstyleExecutorRequest;
+import org.apache.maven.plugins.checkstyle.exec.CheckstyleResults;
+import org.apache.maven.plugins.checkstyle.rss.CheckstyleRssGenerator;
+import org.apache.maven.plugins.checkstyle.rss.CheckstyleRssGeneratorRequest;
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
import org.codehaus.plexus.resource.ResourceManager;
@@ -71,7 +70,7 @@ import com.puppycrawl.tools.checkstyle.a
public abstract class AbstractCheckstyleReport
extends AbstractMavenReport
{
- public static final String PLUGIN_RESOURCES = "org/apache/maven/plugin/checkstyle";
+ public static final String PLUGIN_RESOURCES = "org/apache/maven/plugins/checkstyle";
protected static final String JAVA_FILES = "**\\/*.java";
@@ -388,10 +387,6 @@ public abstract class AbstractCheckstyle
@Parameter( defaultValue = "${plugin}", readonly = true, required = true )
private PluginDescriptor plugin;
- // remove when requiring Maven 3.x, just use #plugin
- @Parameter( defaultValue = "${mojoExecution}", readonly = true, required = true )
- private MojoExecution mojoExecution;
-
/**
* Link the violation line numbers to the source xref. Will link
* automatically if Maven JXR plugin is being used.
@@ -507,15 +502,8 @@ public abstract class AbstractCheckstyle
protected abstract CheckstyleExecutorRequest createRequest()
throws MavenReportException;
- @SuppressWarnings( "unchecked" )
private List<Artifact> collectArtifacts( String hint )
{
- if ( plugin == null || plugin.getGroupId() == null )
- {
- // Maven 2.x workaround
- plugin = mojoExecution.getMojoDescriptor().getPluginDescriptor();
- }
-
List<Artifact> artifacts = new ArrayList<>();
PluginManagement pluginManagement = project.getBuild().getPluginManagement();
Copied: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleAggregateReport.java (from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleAggregateReport.java?p2=maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleAggregateReport.java&p1=maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java&r1=1776692&r2=1779527&rev=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleAggregateReport.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleAggregateReport.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle;
+package org.apache.maven.plugins.checkstyle;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,10 +19,10 @@ package org.apache.maven.plugin.checksty
* under the License.
*/
-import org.apache.maven.plugin.checkstyle.exec.CheckstyleExecutorRequest;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.plugins.checkstyle.exec.CheckstyleExecutorRequest;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.MavenReportException;
Copied: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java (from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java?p2=maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java&p1=maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java&r1=1776692&r2=1779527&rev=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReport.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReport.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle;
+package org.apache.maven.plugins.checkstyle;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -28,10 +28,10 @@ import java.util.Locale;
import java.util.Map;
import org.apache.maven.model.Resource;
-import org.apache.maven.plugin.checkstyle.exec.CheckstyleExecutorRequest;
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.plugins.checkstyle.exec.CheckstyleExecutorRequest;
import org.apache.maven.project.MavenProject;
import org.apache.maven.reporting.MavenReportException;
import org.codehaus.plexus.util.StringUtils;
Copied: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReportGenerator.java (from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReportGenerator.java?p2=maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReportGenerator.java&p1=maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java&r1=1776692&r2=1779527&rev=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleReportGenerator.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle;
+package org.apache.maven.plugins.checkstyle;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -30,9 +30,9 @@ 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.tools.SiteTool;
-import org.apache.maven.plugin.checkstyle.exec.CheckstyleResults;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugin.logging.SystemStreamLog;
+import org.apache.maven.plugins.checkstyle.exec.CheckstyleResults;
import org.codehaus.plexus.util.StringUtils;
import com.puppycrawl.tools.checkstyle.api.AuditEvent;
Copied: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java (from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java?p2=maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java&p1=maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java&r1=1776692&r2=1779527&rev=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle;
+package org.apache.maven.plugins.checkstyle;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -38,12 +38,8 @@ import org.apache.maven.model.Plugin;
import org.apache.maven.model.PluginManagement;
import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecution;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
-import org.apache.maven.plugin.checkstyle.exec.CheckstyleExecutor;
-import org.apache.maven.plugin.checkstyle.exec.CheckstyleExecutorException;
-import org.apache.maven.plugin.checkstyle.exec.CheckstyleExecutorRequest;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugins.annotations.Component;
import org.apache.maven.plugins.annotations.Execute;
@@ -51,10 +47,12 @@ import org.apache.maven.plugins.annotati
import org.apache.maven.plugins.annotations.Mojo;
import org.apache.maven.plugins.annotations.Parameter;
import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.apache.maven.plugins.checkstyle.exec.CheckstyleExecutor;
+import org.apache.maven.plugins.checkstyle.exec.CheckstyleExecutorException;
+import org.apache.maven.plugins.checkstyle.exec.CheckstyleExecutorRequest;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.configuration.PlexusConfiguration;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.IOUtil;
import org.codehaus.plexus.util.PathTool;
import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
@@ -338,10 +336,6 @@ public class CheckstyleViolationCheckMoj
@Parameter( defaultValue = "${plugin}", readonly = true, required = true )
private PluginDescriptor plugin;
- // remove when requiring Maven 3.x, just use #plugin
- @Parameter( defaultValue = "${mojoExecution}", readonly = true, required = true )
- private MojoExecution mojoExecution;
-
/**
* If <code>null</code>, the Checkstyle plugin will display violations on stdout.
* Otherwise, a text file will be created with the violations.
@@ -445,7 +439,7 @@ public class CheckstyleViolationCheckMoj
/**
* By using this property, you can specify the whole Checkstyle rules
- * inline directly inside this pom. This feature requires Maven 3+.
+ * inline directly inside this pom.
*
* <pre>
* <plugin>
@@ -567,11 +561,8 @@ public class CheckstyleViolationCheckMoj
return;
}
- Reader reader = null;
- try
+ try ( Reader reader = new BufferedReader( ReaderFactory.newXmlReader( outputFile ) ) )
{
- reader = new BufferedReader( ReaderFactory.newXmlReader( outputFile ) );
-
XmlPullParser xpp = new MXParser();
xpp.setInput( reader );
@@ -592,19 +583,12 @@ public class CheckstyleViolationCheckMoj
getLog().warn( "checkstyle:check violations detected but failOnViolation set to false" );
}
-
- reader.close();
- reader = null;
}
catch ( IOException | XmlPullParserException e )
{
throw new MojoExecutionException( "Unable to read Checkstyle results xml: " + outputFile.getAbsolutePath(),
e );
}
- finally
- {
- IOUtil.close( reader );
- }
}
private int countViolations( XmlPullParser xpp )
@@ -801,15 +785,8 @@ public class CheckstyleViolationCheckMoj
return listener;
}
- @SuppressWarnings( "unchecked" )
private List<Artifact> collectArtifacts( String hint )
{
- if ( plugin == null || plugin.getGroupId() == null )
- {
- // Maven 2.x workaround
- plugin = mojoExecution.getMojoDescriptor().getPluginDescriptor();
- }
-
List<Artifact> artifacts = new ArrayList<>();
PluginManagement pluginManagement = project.getBuild().getPluginManagement();
Copied: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/IconTool.java (from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/IconTool.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/IconTool.java?p2=maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/IconTool.java&p1=maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/IconTool.java&r1=1776692&r2=1779527&rev=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/IconTool.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/IconTool.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle;
+package org.apache.maven.plugins.checkstyle;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/ReportResource.java (from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/ReportResource.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/ReportResource.java?p2=maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/ReportResource.java&p1=maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/ReportResource.java&r1=1776692&r2=1779527&rev=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/ReportResource.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/ReportResource.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle;
+package org.apache.maven.plugins.checkstyle;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/RuleUtil.java (from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/RuleUtil.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/RuleUtil.java?p2=maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/RuleUtil.java&p1=maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/RuleUtil.java&r1=1776692&r2=1779527&rev=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/RuleUtil.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/RuleUtil.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle;
+package org.apache.maven.plugins.checkstyle;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleCheckerListener.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleCheckerListener.java?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleCheckerListener.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleCheckerListener.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle.exec;
+package org.apache.maven.plugins.checkstyle.exec;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutor.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutor.java?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutor.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutor.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle.exec;
+package org.apache.maven.plugins.checkstyle.exec;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorException.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorException.java?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorException.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorException.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle.exec;
+package org.apache.maven.plugins.checkstyle.exec;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -28,6 +28,8 @@ public class CheckstyleExecutorException
extends Exception
{
+ private static final long serialVersionUID = 3239899539232498912L;
+
/**
*
*/
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorRequest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorRequest.java?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorRequest.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleExecutorRequest.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle.exec;
+package org.apache.maven.plugins.checkstyle.exec;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResults.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResults.java?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResults.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResults.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle.exec;
+package org.apache.maven.plugins.checkstyle.exec;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/DefaultCheckstyleExecutor.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/DefaultCheckstyleExecutor.java?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/DefaultCheckstyleExecutor.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/exec/DefaultCheckstyleExecutor.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle.exec;
+package org.apache.maven.plugins.checkstyle.exec;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -86,13 +86,6 @@ public class DefaultCheckstyleExecutor
public CheckstyleResults executeCheckstyle( CheckstyleExecutorRequest request )
throws CheckstyleExecutorException, CheckstyleException
{
- // Checkstyle will always use the context classloader in order
- // to load resources (dtds),
- // so we have to fix it
- // olamy this hack is not anymore needed in Maven 3.x
- ClassLoader checkstyleClassLoader = PackageNamesLoader.class.getClassLoader();
- Thread.currentThread().setContextClassLoader( checkstyleClassLoader );
-
if ( getLogger().isDebugEnabled() )
{
getLogger().debug( "executeCheckstyle start headerLocation : " + request.getHeaderLocation() );
@@ -171,7 +164,7 @@ public class DefaultCheckstyleExecutor
{
try
{
- urls.add( new File( path ).toURL() );
+ urls.add( new File( path ).toURI().toURL() );
}
catch ( MalformedURLException e )
{
@@ -188,7 +181,7 @@ public class DefaultCheckstyleExecutor
File outputDirectoryFile = new File( outputDirectoryString );
if ( outputDirectoryFile.exists() )
{
- URL outputDirectoryUrl = outputDirectoryFile.toURL();
+ URL outputDirectoryUrl = outputDirectoryFile.toURI().toURL();
getLogger().debug( "Adding the outputDirectory " + outputDirectoryUrl.toString()
+ " to the Checkstyle class path" );
urls.add( outputDirectoryUrl );
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/resource/LicenseResourceManager.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/resource/LicenseResourceManager.java?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/resource/LicenseResourceManager.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/resource/LicenseResourceManager.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle.resource;
+package org.apache.maven.plugins.checkstyle.resource;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/CheckstyleRssGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/CheckstyleRssGenerator.java?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/CheckstyleRssGenerator.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/CheckstyleRssGenerator.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle.rss;
+package org.apache.maven.plugins.checkstyle.rss;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ package org.apache.maven.plugin.checksty
* under the License.
*/
-import org.apache.maven.plugin.checkstyle.exec.CheckstyleResults;
+import org.apache.maven.plugins.checkstyle.exec.CheckstyleResults;
import org.apache.maven.reporting.MavenReportException;
/**
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/CheckstyleRssGeneratorRequest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/CheckstyleRssGeneratorRequest.java?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/CheckstyleRssGeneratorRequest.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/CheckstyleRssGeneratorRequest.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle.rss;
+package org.apache.maven.plugins.checkstyle.rss;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/DefaultCheckstyleRssGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/DefaultCheckstyleRssGenerator.java?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/DefaultCheckstyleRssGenerator.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/DefaultCheckstyleRssGenerator.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle.rss;
+package org.apache.maven.plugins.checkstyle.rss;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,8 +22,8 @@ package org.apache.maven.plugin.checksty
import java.io.IOException;
import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.checkstyle.CheckstyleReport;
-import org.apache.maven.plugin.checkstyle.exec.CheckstyleResults;
+import org.apache.maven.plugins.checkstyle.CheckstyleReport;
+import org.apache.maven.plugins.checkstyle.exec.CheckstyleResults;
import org.apache.maven.reporting.MavenReportException;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.context.Context;
@@ -48,7 +48,7 @@ public class DefaultCheckstyleRssGenerat
private VelocityComponent velocityComponent;
/**
- * @see org.apache.maven.plugin.checkstyle.rss.CheckstyleRssGenerator#generateRSS(org.apache.maven.plugin.checkstyle.exec.CheckstyleResults)
+ * @see org.apache.maven.plugins.checkstyle.rss.CheckstyleRssGenerator#generateRSS(org.apache.maven.plugins.checkstyle.exec.CheckstyleResults)
*/
public void generateRSS( CheckstyleResults results, CheckstyleRssGeneratorRequest checkstyleRssGeneratorRequest )
throws MavenReportException
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/VelocityTemplate.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/VelocityTemplate.java?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/VelocityTemplate.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/rss/VelocityTemplate.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle.rss;
+package org.apache.maven.plugins.checkstyle.rss;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/inline-checker-config.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/inline-checker-config.apt.vm?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/inline-checker-config.apt.vm (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/inline-checker-config.apt.vm Thu Jan 19 21:06:23 2017
@@ -28,8 +28,7 @@
Using an Inline Checkstyle Checker Configuration
Since version 2.12, an inlined {{{http://checkstyle.sourceforge.net/config.html#Checker}Checker configuration}} can
- be defined directly in the <<<configuration>>> section of the plugin itself inside your <<<pom.xml>>>. This feature
- requires Maven 3+.
+ be defined directly in the <<<configuration>>> section of the plugin itself inside your <<<pom.xml>>>.
This is especially useful when the Checkstyle checks should be executed with every compile
and you do not like to create an own project for your Checkstyle rules and neither
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/usage.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/usage.apt.vm?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/usage.apt.vm (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/usage.apt.vm Thu Jan 19 21:06:23 2017
@@ -82,8 +82,7 @@ mvn checkstyle:checkstyle
the build, you must add an execution of <<<checkstyle::check>>> to the <<<\<build\>>>> element
and configure any options that you need.
- (Note in that for Maven 3, as per {{{https://cwiki.apache.org/confluence/display/MAVEN/Maven+3.x+Compatibility+Notes}Maven 3 Compatibility Notes}},
- in Maven 3, options you set in the <<<\<reporting\>>>> element do not have any effect on executions in the <<<\<build\>>>> element.)
+ Options you set in the <<<\<reporting\>>>> element do not have any effect on executions in the <<<\<build\>>>> element.
Note that the phase that <<<checkstyle::check>>> is bound to is very important. If bound to the validate phase, it would check the code prior to compiling the code. If the code is invalid, the parsing errors reported by checkstyle may be different than what would be expected from the javac compiler. However, it's guaranteed to run. Another popular option is to bind it to the verify phase which would run much later (and allow the javac compiler to flag invalid code prior to checkstyle). However, if developers generally just use "mvn test" prior to pushing changes, checkstyle would not run as verify occurs after the test phase.
Copied: maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleReportTest.java (from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleReportTest.java?p2=maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleReportTest.java&p1=maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java&r1=1776692&r2=1779527&rev=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleReportTest.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleReportTest.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle;
+package org.apache.maven.plugins.checkstyle;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -33,6 +33,7 @@ import org.apache.maven.doxia.siterender
import org.apache.maven.doxia.siterenderer.SiteRenderingContext;
import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
+import org.apache.maven.plugins.checkstyle.CheckstyleReport;
import org.apache.maven.reporting.MavenReport;
import org.codehaus.plexus.util.FileUtils;
import org.codehaus.plexus.util.IOUtil;
Copied: maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojoTest.java (from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojoTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojoTest.java?p2=maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojoTest.java&p1=maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojoTest.java&r1=1776692&r2=1779527&rev=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojoTest.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojoTest.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle;
+package org.apache.maven.plugins.checkstyle;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,6 +27,7 @@ import org.apache.maven.plugin.MojoExecu
import org.apache.maven.plugin.MojoFailureException;
import org.apache.maven.plugin.testing.AbstractMojoTestCase;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
+import org.apache.maven.plugins.checkstyle.CheckstyleViolationCheckMojo;
/**
* @author Edwin Punzalan
@@ -137,6 +138,8 @@ public class CheckstyleViolationCheckMoj
{
return new Build()
{
+ private static final long serialVersionUID = -743084937617131258L;
+
public String getDirectory()
{
return getBasedir() + "/target/classes";
Copied: maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/ReportResourceTest.java (from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/ReportResourceTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/ReportResourceTest.java?p2=maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/ReportResourceTest.java&p1=maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/ReportResourceTest.java&r1=1776692&r2=1779527&rev=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/ReportResourceTest.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/ReportResourceTest.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle;
+package org.apache.maven.plugins.checkstyle;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,6 +20,8 @@ package org.apache.maven.plugin.checksty
*/
import junit.framework.TestCase;
+
+import org.apache.maven.plugins.checkstyle.ReportResource;
import org.codehaus.plexus.PlexusTestCase;
import java.io.File;
Copied: maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/RuleUtilTest.java (from r1776692, maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/RuleUtilTest.java)
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/RuleUtilTest.java?p2=maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/RuleUtilTest.java&p1=maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/RuleUtilTest.java&r1=1776692&r2=1779527&rev=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/RuleUtilTest.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/RuleUtilTest.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,6 @@
-package org.apache.maven.plugin.checkstyle;
+package org.apache.maven.plugins.checkstyle;
+
+import org.apache.maven.plugins.checkstyle.RuleUtil;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerMultiSourceTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerMultiSourceTest.java?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerMultiSourceTest.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerMultiSourceTest.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle.exec;
+package org.apache.maven.plugins.checkstyle.exec;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -29,8 +29,8 @@ import java.io.File;
import java.util.HashMap;
import java.util.Map;
-import org.apache.maven.plugin.checkstyle.exec.CheckstyleCheckerListener;
-import org.apache.maven.plugin.checkstyle.exec.CheckstyleResults;
+import org.apache.maven.plugins.checkstyle.exec.CheckstyleCheckerListener;
+import org.apache.maven.plugins.checkstyle.exec.CheckstyleResults;
/**
*
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerTest.java?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerTest.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleReportListenerTest.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle.exec;
+package org.apache.maven.plugins.checkstyle.exec;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -29,8 +29,8 @@ import java.io.File;
import java.util.HashMap;
import java.util.Map;
-import org.apache.maven.plugin.checkstyle.exec.CheckstyleCheckerListener;
-import org.apache.maven.plugin.checkstyle.exec.CheckstyleResults;
+import org.apache.maven.plugins.checkstyle.exec.CheckstyleCheckerListener;
+import org.apache.maven.plugins.checkstyle.exec.CheckstyleResults;
/**
* @author Edwin Punzalan
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResultsTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResultsTest.java?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResultsTest.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/exec/CheckstyleResultsTest.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle.exec;
+package org.apache.maven.plugins.checkstyle.exec;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,12 +27,13 @@ import com.puppycrawl.tools.checkstyle.a
import java.util.Collections;
import java.util.Map;
+
+import org.apache.maven.plugins.checkstyle.exec.CheckstyleResults;
+
import java.util.HashMap;
import java.util.List;
import java.util.ArrayList;
-import org.apache.maven.plugin.checkstyle.exec.CheckstyleResults;
-
/**
* @author Edwin Punzalan
* @version $Id$
@@ -141,7 +142,7 @@ public class CheckstyleResultsTest
assertEquals( "test ERROR severity count", 3, results.getSeverityCount( SeverityLevel.ERROR ) );
assertEquals( "test IGNORE severity count", 4, results.getSeverityCount( SeverityLevel.IGNORE ) );
- results.setFileViolations( "file", Collections.EMPTY_LIST );
+ results.setFileViolations( "file", Collections.<AuditEvent>emptyList() );
assertEquals( "test file violations", 0, results.getFileViolations( "file" ).size() );
}
}
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithExceptionsStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithExceptionsStub.java?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithExceptionsStub.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithExceptionsStub.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle.stubs;
+package org.apache.maven.plugins.checkstyle.stubs;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithNoJxrPluginStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithNoJxrPluginStub.java?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithNoJxrPluginStub.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MavenProjectWithNoJxrPluginStub.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle.stubs;
+package org.apache.maven.plugins.checkstyle.stubs;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -40,6 +40,6 @@ public class MavenProjectWithNoJxrPlugin
/** {@inheritDoc} */
public List<ReportPlugin> getReportPlugins()
{
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
}
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MinMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MinMavenProjectStub.java?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MinMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MinMavenProjectStub.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle.stubs;
+package org.apache.maven.plugins.checkstyle.stubs;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/ModuleMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/ModuleMavenProjectStub.java?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/ModuleMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/ModuleMavenProjectStub.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle.stubs;
+package org.apache.maven.plugins.checkstyle.stubs;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MultiMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MultiMavenProjectStub.java?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MultiMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/stubs/MultiMavenProjectStub.java Thu Jan 19 21:06:23 2017
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.checkstyle.stubs;
+package org.apache.maven.plugins.checkstyle.stubs;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -52,14 +52,14 @@ public class MultiMavenProjectStub
public List<String> getCompileClasspathElements()
throws DependencyResolutionRequiredException
{
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
/** {@inheritDoc} */
public List<String> getTestClasspathElements()
throws DependencyResolutionRequiredException
{
- return Collections.EMPTY_LIST;
+ return Collections.emptyList();
}
/** {@inheritDoc} */
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/custom-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/custom-plugin-config.xml?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/custom-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/custom-plugin-config.xml Thu Jan 19 21:06:23 2017
@@ -37,7 +37,7 @@ under the License.
<outputFileFormat>plain</outputFileFormat>
<failsOnError>false</failsOnError>
<sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
- <project implementation="org.apache.maven.plugin.checkstyle.stubs.MavenProjectWithNoJxrPluginStub"/>
+ <project implementation="org.apache.maven.plugins.checkstyle.stubs.MavenProjectWithNoJxrPluginStub"/>
<consoleOutput>true</consoleOutput>
<linkXRef>true</linkXRef>
<!-- value not really important, just point to an existing dir -->
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/dep-resolution-exception-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/dep-resolution-exception-plugin-config.xml?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/dep-resolution-exception-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/dep-resolution-exception-plugin-config.xml Thu Jan 19 21:06:23 2017
@@ -37,7 +37,7 @@ under the License.
<outputFileFormat>xml</outputFileFormat>
<failsOnError>false</failsOnError>
<sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
- <project implementation="org.apache.maven.plugin.checkstyle.stubs.MavenProjectWithExceptionsStub"/>
+ <project implementation="org.apache.maven.plugins.checkstyle.stubs.MavenProjectWithExceptionsStub"/>
<consoleOutput>false</consoleOutput>
<linkXRef>true</linkXRef>
<xrefLocation>${basedir}/target/site/xref</xrefLocation>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/fail-on-error-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/fail-on-error-plugin-config.xml?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/fail-on-error-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/fail-on-error-plugin-config.xml Thu Jan 19 21:06:23 2017
@@ -37,7 +37,7 @@ under the License.
<outputFileFormat>xml</outputFileFormat>
<failsOnError>true</failsOnError>
<sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
- <project implementation="org.apache.maven.plugin.checkstyle.stubs.MinMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.checkstyle.stubs.MinMavenProjectStub"/>
<consoleOutput>false</consoleOutput>
<linkXRef>true</linkXRef>
<xrefLocation>${basedir}/target/site/xref</xrefLocation>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/min-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/min-plugin-config.xml?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/min-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/min-plugin-config.xml Thu Jan 19 21:06:23 2017
@@ -37,7 +37,7 @@ under the License.
<outputFileFormat>xml</outputFileFormat>
<failsOnError>false</failsOnError>
<sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
- <project implementation="org.apache.maven.plugin.checkstyle.stubs.MinMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.checkstyle.stubs.MinMavenProjectStub"/>
<consoleOutput>false</consoleOutput>
<linkXRef>true</linkXRef>
<xrefLocation>${basedir}/target/site/xref</xrefLocation>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/multi-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/multi-plugin-config.xml?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/multi-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/multi-plugin-config.xml Thu Jan 19 21:06:23 2017
@@ -35,9 +35,9 @@ under the License.
<outputFile>${basedir}/target/test-harness/checkstyle/multi/checkstyle-result.xml</outputFile>
<outputFileFormat>xml</outputFileFormat>
<failsOnError>false</failsOnError>
- <project implementation="org.apache.maven.plugin.checkstyle.stubs.MultiMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.checkstyle.stubs.MultiMavenProjectStub"/>
<reactorProjects>
- <project implementation="org.apache.maven.plugin.checkstyle.stubs.ModuleMavenProjectStub" />
+ <project implementation="org.apache.maven.plugins.checkstyle.stubs.ModuleMavenProjectStub" />
</reactorProjects>
<consoleOutput>false</consoleOutput>
<linkXRef>true</linkXRef>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-files-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-files-plugin-config.xml?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-files-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-files-plugin-config.xml Thu Jan 19 21:06:23 2017
@@ -37,7 +37,7 @@ under the License.
<outputFileFormat>xml</outputFileFormat>
<failsOnError>false</failsOnError>
<sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
- <project implementation="org.apache.maven.plugin.checkstyle.stubs.MinMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.checkstyle.stubs.MinMavenProjectStub"/>
<consoleOutput>false</consoleOutput>
<linkXRef>true</linkXRef>
<xrefLocation>${basedir}/target/site/xref</xrefLocation>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-rules-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-rules-plugin-config.xml?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-rules-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-rules-plugin-config.xml Thu Jan 19 21:06:23 2017
@@ -37,7 +37,7 @@ under the License.
<outputFileFormat>xml</outputFileFormat>
<failsOnError>false</failsOnError>
<sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
- <project implementation="org.apache.maven.plugin.checkstyle.stubs.MinMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.checkstyle.stubs.MinMavenProjectStub"/>
<consoleOutput>false</consoleOutput>
<linkXRef>true</linkXRef>
<xrefLocation>${basedir}/target/site/xref</xrefLocation>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-severity-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-severity-plugin-config.xml?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-severity-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-severity-plugin-config.xml Thu Jan 19 21:06:23 2017
@@ -37,7 +37,7 @@ under the License.
<outputFileFormat>xml</outputFileFormat>
<failsOnError>false</failsOnError>
<sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
- <project implementation="org.apache.maven.plugin.checkstyle.stubs.MinMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.checkstyle.stubs.MinMavenProjectStub"/>
<consoleOutput>false</consoleOutput>
<linkXRef>true</linkXRef>
<xrefLocation>${basedir}/target/site/xref</xrefLocation>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-source-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-source-plugin-config.xml?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-source-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/no-source-plugin-config.xml Thu Jan 19 21:06:23 2017
@@ -37,7 +37,7 @@ under the License.
<outputFileFormat>xml</outputFileFormat>
<failsOnError>false</failsOnError>
<sourceDirectory>${basedir}/src/test/no-sources</sourceDirectory>
- <project implementation="org.apache.maven.plugin.checkstyle.stubs.MinMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.checkstyle.stubs.MinMavenProjectStub"/>
<consoleOutput>false</consoleOutput>
<linkXRef>true</linkXRef>
<xrefLocation>${basedir}/target/site/xref</xrefLocation>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/test-source-directory-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/test-source-directory-plugin-config.xml?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/test-source-directory-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/test-source-directory-plugin-config.xml Thu Jan 19 21:06:23 2017
@@ -38,7 +38,7 @@ under the License.
<failsOnError>false</failsOnError>
<sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
<testSourceDirectory>${basedir}/src/test/test-sources</testSourceDirectory>
- <project implementation="org.apache.maven.plugin.checkstyle.stubs.MinMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.checkstyle.stubs.MinMavenProjectStub"/>
<consoleOutput>false</consoleOutput>
<linkXRef>true</linkXRef>
<xrefLocation>${basedir}/target/site/xref</xrefLocation>
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/useFile-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/useFile-plugin-config.xml?rev=1779527&r1=1779526&r2=1779527&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/useFile-plugin-config.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/plugin-configs/useFile-plugin-config.xml Thu Jan 19 21:06:23 2017
@@ -37,7 +37,7 @@ under the License.
<outputFileFormat>xml</outputFileFormat>
<failsOnError>false</failsOnError>
<sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
- <project implementation="org.apache.maven.plugin.checkstyle.stubs.MinMavenProjectStub"/>
+ <project implementation="org.apache.maven.plugins.checkstyle.stubs.MinMavenProjectStub"/>
<consoleOutput>true</consoleOutput>
<linkXRef>true</linkXRef>
<xrefLocation>${basedir}/target/site/xref</xrefLocation>
Re: svn commit: r1779527 - in
/maven/plugins/trunk/maven-checkstyle-plugin: ./
src/main/java/org/apache/maven/plugin/ src/main/java/org/apache/maven/plugins/
src/main/java/org/apache/maven/plugins/checkstyle/
src/main/java/org/apache/maven/plugins/checksty...
Posted by Robert Scholte <rf...@apache.org>.
Done
On Tue, 24 Jan 2017 20:54:20 +0100, Guillaume Boué <gb...@apache.org>
wrote:
> Could the 2.18 version on JIRA be renamed to 3.0.0? I'll close the issue
> and start looking at all the others we can fix with this upgrade (like
> MCHECKSTYLE-275 for a start).
>
> Guillaume
>
>
> Le 20/01/2017 à 16:37, Robert Scholte a écrit :
>> Very nice, another plugin moving forward
>>
>> Robert
>>
>> On Thu, 19 Jan 2017 22:06:24 +0100, <gb...@apache.org> wrote:
>>
>>> Author: gboue
>>> Date: Thu Jan 19 21:06:23 2017
>>> New Revision: 1779527
>>>
>>> URL: http://svn.apache.org/viewvc?rev=1779527&view=rev
>>> Log:
>>> [MCHECKSTYLE-335] Migrate plugin to Maven 3.0
>>>
>>> Upgrading the Maven version to 3.0 in the POM:
>>> - Passing version to 3.0.0-SNAPSHOT to mark the upgrade
>>> - Renaming the packages to org.apache.maven.plugins
>>> - Removing Maven 2 specific quirks
>>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
>> For additional commands, e-mail: dev-help@maven.apache.org
>>
>
>
> ---
> L'absence de virus dans ce courrier électronique a été vérifiée par le
> logiciel antivirus Avast.
> https://www.avast.com/antivirus
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r1779527 - in
/maven/plugins/trunk/maven-checkstyle-plugin: ./
src/main/java/org/apache/maven/plugin/
src/main/java/org/apache/maven/plugins/
src/main/java/org/apache/maven/plugins/checkstyle/
src/main/java/org/apache/maven/plugins/checksty...
Posted by Guillaume Boué <gb...@apache.org>.
Could the 2.18 version on JIRA be renamed to 3.0.0? I'll close the issue
and start looking at all the others we can fix with this upgrade (like
MCHECKSTYLE-275 for a start).
Guillaume
Le 20/01/2017 16:37, Robert Scholte a crit :
> Very nice, another plugin moving forward
>
> Robert
>
> On Thu, 19 Jan 2017 22:06:24 +0100, <gb...@apache.org> wrote:
>
>> Author: gboue
>> Date: Thu Jan 19 21:06:23 2017
>> New Revision: 1779527
>>
>> URL: http://svn.apache.org/viewvc?rev=1779527&view=rev
>> Log:
>> [MCHECKSTYLE-335] Migrate plugin to Maven 3.0
>>
>> Upgrading the Maven version to 3.0 in the POM:
>> - Passing version to 3.0.0-SNAPSHOT to mark the upgrade
>> - Renaming the packages to org.apache.maven.plugins
>> - Removing Maven 2 specific quirks
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
> For additional commands, e-mail: dev-help@maven.apache.org
>
---
L'absence de virus dans ce courrier lectronique a t vrifie par le logiciel antivirus Avast.
https://www.avast.com/antivirus
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r1779527 - in
/maven/plugins/trunk/maven-checkstyle-plugin: ./
src/main/java/org/apache/maven/plugin/ src/main/java/org/apache/maven/plugins/
src/main/java/org/apache/maven/plugins/checkstyle/
src/main/java/org/apache/maven/plugins/checksty...
Posted by Robert Scholte <rf...@apache.org>.
Very nice, another plugin moving forward
Robert
On Thu, 19 Jan 2017 22:06:24 +0100, <gb...@apache.org> wrote:
> Author: gboue
> Date: Thu Jan 19 21:06:23 2017
> New Revision: 1779527
>
> URL: http://svn.apache.org/viewvc?rev=1779527&view=rev
> Log:
> [MCHECKSTYLE-335] Migrate plugin to Maven 3.0
>
> Upgrading the Maven version to 3.0 in the POM:
> - Passing version to 3.0.0-SNAPSHOT to mark the upgrade
> - Renaming the packages to org.apache.maven.plugins
> - Removing Maven 2 specific quirks
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org