Author: gboue
Date: Sun Feb 12 14:51:16 2017
New Revision: 1782671
URL: http://svn.apache.org/viewvc?rev=1782671&view=rev
Log:
[MCHECKSTYLE-336] Fail the build when deprecated parameters sourceDirectory or
testSourceDirectory are used
With the major upgrade to 3.0.0, let's prepare the removal of the deprecated
parameters. The build will fail if they are specified so that users can catch
their usage more easily. They can be removed from the code in a later version.
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-137/pom.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.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/site/apt/index.apt.vm
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojoTest.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/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/src/it/MCHECKSTYLE-137/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-137/pom.xml?rev=1782671&r1=1782670&r2=1782671&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-137/pom.xml
(original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-137/pom.xml
Sun Feb 12 14:51:16 2017
@@ -51,7 +51,9 @@
<consoleOutput>true</consoleOutput>
<failsOnError>true</failsOnError>
<linkXRef>false</linkXRef>
- <sourceDirectory>${basedir}/src</sourceDirectory>
+ <sourceDirectories>
+ <sourceDirectory>${basedir}/src</sourceDirectory>
+ </sourceDirectories>
</configuration>
<goals>
<goal>checkstyle</goal>
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/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?rev=1782671&r1=1782670&r2=1782671&view=diff
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/AbstractCheckstyleReport.java
Sun Feb 12 14:51:16 2017
@@ -27,7 +27,6 @@ import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Calendar;
-import java.util.Collections;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -266,7 +265,8 @@ public abstract class AbstractCheckstyle
/**
* Specifies the location of the source directory to be used for
Checkstyle.
*
- * @deprecated instead use {@link #sourceDirectories}
+ * @deprecated instead use {@link #sourceDirectories}. For version 3.0.0,
this parameter is only defined to break
+ * the build if you use it!
*/
@Deprecated
@Parameter
@@ -282,11 +282,11 @@ public abstract class AbstractCheckstyle
private List<String> sourceDirectories;
/**
- * Specifies the location of the test source directory to be used for
- * Checkstyle.
+ * Specifies the location of the test source directory to be used for
Checkstyle.
*
* @since 2.2
- * @deprecated instead use {@link #testSourceDirectories}
+ * @deprecated instead use {@link #testSourceDirectories}. For version
3.0.0, this parameter is only defined to
+ * break the build if you use it!
*/
@Parameter
@Deprecated
@@ -452,6 +452,9 @@ public abstract class AbstractCheckstyle
public void executeReport( Locale locale )
throws MavenReportException
{
+ checkDeprecatedParameterUsage( sourceDirectory, "sourceDirectory",
"sourceDirectories" );
+ checkDeprecatedParameterUsage( testSourceDirectory,
"testSourceDirectory", "testSourceDirectories" );
+
locator.addSearchPath( FileResourceLoader.ID,
project.getFile().getParentFile().getAbsolutePath() );
locator.addSearchPath( "url", "" );
@@ -497,6 +500,17 @@ public abstract class AbstractCheckstyle
}
}
+ private void checkDeprecatedParameterUsage( Object parameter, String name,
String replacement )
+ throws MavenReportException
+ {
+ if ( parameter != null )
+ {
+ throw new MavenReportException( "You are using '" + name + "'
which has been removed"
+ + " from the maven-checkstyle-plugin. " + "Please use '" +
replacement
+ + "' and refer to the >>Major Version Upgrade to version
3.0.0<< " + "on the plugin site." );
+ }
+ }
+
/**
* Create the Checkstyle executor request.
*
@@ -715,49 +729,29 @@ public abstract class AbstractCheckstyle
protected List<File> getSourceDirectories()
{
- List<File> sourceDirs = null;
- // if sourceDirectory is explicitly set, use it
- if ( sourceDirectory != null )
+ if ( sourceDirectories == null )
{
- sourceDirs = Collections.singletonList( sourceDirectory );
+ sourceDirectories = project.getCompileSourceRoots();
}
- else
+ List<File> sourceDirs = new ArrayList<>( sourceDirectories.size() );
+ for ( String sourceDir : sourceDirectories )
{
- if ( sourceDirectories == null )
- {
- sourceDirectories = project.getCompileSourceRoots();
- }
- sourceDirs = new ArrayList<>( sourceDirectories.size() );
- for ( String sourceDir : sourceDirectories )
- {
- sourceDirs.add( FileUtils.resolveFile( project.getBasedir(),
sourceDir ) );
- }
+ sourceDirs.add( FileUtils.resolveFile( project.getBasedir(),
sourceDir ) );
}
-
return sourceDirs;
}
protected List<File> getTestSourceDirectories()
{
- List<File> testSourceDirs = null;
- // if testSourceDirectory is explicitly set, use it
- if ( testSourceDirectory != null )
+ if ( testSourceDirectories == null )
{
- testSourceDirs = Collections.singletonList( testSourceDirectory );
+ testSourceDirectories = project.getTestCompileSourceRoots();
}
- else
+ List<File> testSourceDirs = new ArrayList<>(
testSourceDirectories.size() );
+ for ( String testSourceDir : testSourceDirectories )
{
- if ( testSourceDirectories == null )
- {
- testSourceDirectories = project.getTestCompileSourceRoots();
- }
- testSourceDirs = new ArrayList<>( testSourceDirectories.size() );
- for ( String testSourceDir : testSourceDirectories )
- {
- testSourceDirs.add( FileUtils.resolveFile(
project.getBasedir(), testSourceDir ) );
- }
+ testSourceDirs.add( FileUtils.resolveFile( project.getBasedir(),
testSourceDir ) );
}
-
return testSourceDirs;
}
}
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/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?rev=1782671&r1=1782670&r2=1782671&view=diff
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojo.java
Sun Feb 12 14:51:16 2017
@@ -28,7 +28,6 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.Reader;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -381,11 +380,11 @@ public class CheckstyleViolationCheckMoj
private boolean failsOnError;
/**
- * Specifies the location of the test source directory to be used for
- * Checkstyle.
+ * Specifies the location of the test source directory to be used for
Checkstyle.
*
* @since 2.2
- * @deprecated instead use {@link #testSourceDirectories}
+ * @deprecated instead use {@link #testSourceDirectories}. For version
3.0.0, this parameter is only defined to
+ * break the build if you use it!
*/
@Deprecated
@Parameter
@@ -411,7 +410,8 @@ public class CheckstyleViolationCheckMoj
/**
* Specifies the location of the source directory to be used for
Checkstyle.
*
- * @deprecated instead use {@link #sourceDirectories}
+ * @deprecated instead use {@link #sourceDirectories}. For version 3.0.0,
this parameter is only defined to break
+ * the build if you use it!
*/
@Deprecated
@Parameter
@@ -480,6 +480,8 @@ public class CheckstyleViolationCheckMoj
public void execute()
throws MojoExecutionException, MojoFailureException
{
+ checkDeprecatedParameterUsage( sourceDirectory, "sourceDirectory",
"sourceDirectories" );
+ checkDeprecatedParameterUsage( testSourceDirectory,
"testSourceDirectory", "testSourceDirectories" );
if ( skip )
{
return;
@@ -594,6 +596,17 @@ public class CheckstyleViolationCheckMoj
}
}
+ private void checkDeprecatedParameterUsage( Object parameter, String name,
String replacement )
+ throws MojoFailureException
+ {
+ if ( parameter != null )
+ {
+ throw new MojoFailureException( "You are using '" + name + "'
which has been removed"
+ + " from the maven-checkstyle-plugin. " + "Please use '" +
replacement
+ + "' and refer to the >>Major Version Upgrade to version
3.0.0<< " + "on the plugin site." );
+ }
+ }
+
private int countViolations( XmlPullParser xpp )
throws XmlPullParserException, IOException
{
@@ -822,49 +835,29 @@ public class CheckstyleViolationCheckMoj
private List<File> getSourceDirectories()
{
- List<File> sourceDirs = null;
- // if sourceDirectory is explicitly set, use it
- if ( sourceDirectory != null )
+ if ( sourceDirectories == null )
{
- sourceDirs = Collections.singletonList( sourceDirectory );
+ sourceDirectories = project.getCompileSourceRoots();
}
- else
+ List<File> sourceDirs = new ArrayList<>( sourceDirectories.size() );
+ for ( String sourceDir : sourceDirectories )
{
- if ( sourceDirectories == null )
- {
- sourceDirectories = project.getCompileSourceRoots();
- }
- sourceDirs = new ArrayList<>( sourceDirectories.size() );
- for ( String sourceDir : sourceDirectories )
- {
- sourceDirs.add( FileUtils.resolveFile( project.getBasedir(),
sourceDir ) );
- }
+ sourceDirs.add( FileUtils.resolveFile( project.getBasedir(),
sourceDir ) );
}
-
return sourceDirs;
}
private List<File> getTestSourceDirectories()
{
- List<File> testSourceDirs = null;
- // if testSourceDirectory is explicitly set, use it
- if ( testSourceDirectory != null )
+ if ( testSourceDirectories == null )
{
- testSourceDirs = Collections.singletonList( testSourceDirectory );
+ testSourceDirectories = project.getTestCompileSourceRoots();
}
- else
+ List<File> testSourceDirs = new ArrayList<>(
testSourceDirectories.size() );
+ for ( String testSourceDir : testSourceDirectories )
{
- if ( testSourceDirectories == null )
- {
- testSourceDirectories = project.getTestCompileSourceRoots();
- }
- testSourceDirs = new ArrayList<>( testSourceDirectories.size() );
- for ( String testSourceDir : testSourceDirectories )
- {
- testSourceDirs.add( FileUtils.resolveFile(
project.getBasedir(), testSourceDir ) );
- }
+ testSourceDirs.add( FileUtils.resolveFile( project.getBasedir(),
testSourceDir ) );
}
-
return testSourceDirs;
}
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=1782671&r1=1782670&r2=1782671&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
Sun Feb 12 14:51:16 2017
@@ -22,7 +22,6 @@ package org.apache.maven.plugins.checkst
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import org.apache.maven.artifact.Artifact;
@@ -213,37 +212,6 @@ public class CheckstyleExecutorRequest
this.includeTestSourceDirectory = includeTestSourceDirectory;
return this;
}
-
- /**
- *
- * @return first entry of testSourceDirectories, otherwise {@code null}
- * @deprecated instead use {@link #getTestSourceDirectories()}
- */
- @Deprecated
- public File getTestSourceDirectory()
- {
- if ( testSourceDirectories == null || testSourceDirectories.size() ==
0 )
- {
- return null;
- }
- else
- {
- return testSourceDirectories.iterator().next();
- }
- }
-
- /**
- *
- * @param testSourceDirectory a single testSourceDirectory
- * @return this request
- * @deprecated instead use {@link #setTestSourceDirectories(Collection)}
- */
- @Deprecated
- public CheckstyleExecutorRequest setTestSourceDirectory( File
testSourceDirectory )
- {
- this.testSourceDirectories = Collections.singletonList(
testSourceDirectory );
- return this;
- }
public Collection<File> getTestSourceDirectories()
{
@@ -256,36 +224,6 @@ public class CheckstyleExecutorRequest
return this;
}
- /**
- * @return first entry of sourceDirectories, otherwise {@code null}
- * @deprecated instead use {@link #getSourceDirectories()}
- */
- @Deprecated
- public File getSourceDirectory()
- {
- if ( sourceDirectories == null || sourceDirectories.size() == 0 )
- {
- return null;
- }
- else
- {
- return sourceDirectories.iterator().next();
- }
- }
-
- /**
- *
- * @param sourceDirectory a single sourceDirectory
- * @return this request
- * @deprecated instead use {@link #setSourceDirectories(Collection)}
- */
- @Deprecated
- public CheckstyleExecutorRequest setSourceDirectory( File sourceDirectory )
- {
- this.sourceDirectories = Collections.singletonList( sourceDirectory );
- return this;
- }
-
public Collection<File> getSourceDirectories()
{
return sourceDirectories;
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm?rev=1782671&r1=1782670&r2=1782671&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
(original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm Sun
Feb 12 14:51:16 2017
@@ -50,6 +50,14 @@ ${project.name}
* {{{./check-mojo.html}checkstyle:check}} is a goal that performs
Checkstyle analysis and outputs violations or a count of violations to the
console, potentially failing the build. It can also be configured to re-use an
earlier analysis.
+* Major Version Upgrade to version 3.0.0
+
+ Please note that the following parameters have been completely removed from
the plugin configuration:
+
+ * <<<sourceDirectory>>>: use <<<sourceDirectories>>> instead;
+
+ * <<<testSourceDirectory>>>: use <<<testSourceDirectories>>> instead.
+
* Usage
General instructions on how to use the Checkstyle Plugin can be found on the
{{{./usage.html}usage page}}. Some more
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/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?rev=1782671&r1=1782670&r2=1782671&view=diff
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojoTest.java
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugins/checkstyle/CheckstyleViolationCheckMojoTest.java
Sun Feb 12 14:51:16 2017
@@ -20,6 +20,7 @@ package org.apache.maven.plugins.checkst
*/
import java.io.File;
+import java.util.Arrays;
import org.apache.maven.model.Build;
import org.apache.maven.plugin.Mojo;
@@ -151,7 +152,7 @@ public class CheckstyleViolationCheckMoj
setVariableValueToObject( mojo, "configLocation", "sun_checks.xml" );
setVariableValueToObject( mojo, "cacheFile", getBasedir() +
"/target/classes/checkstyle-cachefile" );
- setVariableValueToObject( mojo, "sourceDirectory", new File(
getBasedir(), "src/test/plugin-configs/src" ));// new File( getBasedir() +
"/target" ) );
+ setVariableValueToObject( mojo, "sourceDirectories", Arrays.asList(
getBasedir() + "/src/test/plugin-configs/src" ));// new File( getBasedir() +
"/target" ) );
setVariableValueToObject( mojo, "encoding", "UTF-8" );
setVariableValueToObject( mojo, "skipExec", Boolean.TRUE );
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=1782671&r1=1782670&r2=1782671&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
Sun Feb 12 14:51:16 2017
@@ -35,7 +35,9 @@ under the License.
<outputFile>${basedir}/target/test-harness/checkstyle/custom/checkstyle-result.xml</outputFile>
<outputFileFormat>plain</outputFileFormat>
<failsOnError>false</failsOnError>
- <sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
+ <sourceDirectories>
+ <sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
+ </sourceDirectories>
<project
implementation="org.apache.maven.plugins.checkstyle.stubs.MavenProjectWithNoJxrPluginStub"/>
<consoleOutput>true</consoleOutput>
<linkXRef>true</linkXRef>
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=1782671&r1=1782670&r2=1782671&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
Sun Feb 12 14:51:16 2017
@@ -35,7 +35,9 @@ under the License.
<outputFile>${basedir}/target/test-harness/checkstyle/dep-resolution/checkstyle-result.xml</outputFile>
<outputFileFormat>xml</outputFileFormat>
<failsOnError>false</failsOnError>
- <sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
+ <sourceDirectories>
+ <sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
+ </sourceDirectories>
<project
implementation="org.apache.maven.plugins.checkstyle.stubs.MavenProjectWithExceptionsStub"/>
<consoleOutput>false</consoleOutput>
<linkXRef>true</linkXRef>
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=1782671&r1=1782670&r2=1782671&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
Sun Feb 12 14:51:16 2017
@@ -35,7 +35,9 @@ under the License.
<outputFile>${basedir}/target/test-harness/checkstyle/fail-on-error/checkstyle-result.xml</outputFile>
<outputFileFormat>xml</outputFileFormat>
<failsOnError>true</failsOnError>
- <sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
+ <sourceDirectories>
+ <sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
+ </sourceDirectories>
<project
implementation="org.apache.maven.plugins.checkstyle.stubs.MinMavenProjectStub"/>
<consoleOutput>false</consoleOutput>
<linkXRef>true</linkXRef>
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=1782671&r1=1782670&r2=1782671&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
Sun Feb 12 14:51:16 2017
@@ -35,7 +35,9 @@ under the License.
<outputFile>${basedir}/target/test-harness/checkstyle/min/checkstyle-result.xml</outputFile>
<outputFileFormat>xml</outputFileFormat>
<failsOnError>false</failsOnError>
- <sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
+ <sourceDirectories>
+ <sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
+ </sourceDirectories>
<project
implementation="org.apache.maven.plugins.checkstyle.stubs.MinMavenProjectStub"/>
<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=1782671&r1=1782670&r2=1782671&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
Sun Feb 12 14:51:16 2017
@@ -35,7 +35,9 @@ under the License.
<outputFile>${basedir}/target/test-harness/checkstyle/no-files/checkstyle-result.xml</outputFile>
<outputFileFormat>xml</outputFileFormat>
<failsOnError>false</failsOnError>
- <sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
+ <sourceDirectories>
+ <sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
+ </sourceDirectories>
<project
implementation="org.apache.maven.plugins.checkstyle.stubs.MinMavenProjectStub"/>
<consoleOutput>false</consoleOutput>
<linkXRef>true</linkXRef>
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=1782671&r1=1782670&r2=1782671&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
Sun Feb 12 14:51:16 2017
@@ -35,7 +35,9 @@ under the License.
<outputFile>${basedir}/target/test-harness/checkstyle/no-rules/checkstyle-result.xml</outputFile>
<outputFileFormat>xml</outputFileFormat>
<failsOnError>false</failsOnError>
- <sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
+ <sourceDirectories>
+ <sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
+ </sourceDirectories>
<project
implementation="org.apache.maven.plugins.checkstyle.stubs.MinMavenProjectStub"/>
<consoleOutput>false</consoleOutput>
<linkXRef>true</linkXRef>
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=1782671&r1=1782670&r2=1782671&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
Sun Feb 12 14:51:16 2017
@@ -35,7 +35,9 @@ under the License.
<outputFile>${basedir}/target/test-harness/checkstyle/no-severity/checkstyle-result.xml</outputFile>
<outputFileFormat>xml</outputFileFormat>
<failsOnError>false</failsOnError>
- <sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
+ <sourceDirectories>
+ <sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
+ </sourceDirectories>
<project
implementation="org.apache.maven.plugins.checkstyle.stubs.MinMavenProjectStub"/>
<consoleOutput>false</consoleOutput>
<linkXRef>true</linkXRef>
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=1782671&r1=1782670&r2=1782671&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
Sun Feb 12 14:51:16 2017
@@ -35,7 +35,9 @@ under the License.
<outputFile>${basedir}/target/test-harness/checkstyle/no-source/checkstyle-result.xml</outputFile>
<outputFileFormat>xml</outputFileFormat>
<failsOnError>false</failsOnError>
- <sourceDirectory>${basedir}/src/test/no-sources</sourceDirectory>
+ <sourceDirectories>
+ <sourceDirectory>${basedir}/src/test/no-sources</sourceDirectory>
+ </sourceDirectories>
<project
implementation="org.apache.maven.plugins.checkstyle.stubs.MinMavenProjectStub"/>
<consoleOutput>false</consoleOutput>
<linkXRef>true</linkXRef>
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=1782671&r1=1782670&r2=1782671&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
Sun Feb 12 14:51:16 2017
@@ -35,8 +35,12 @@ under the License.
<outputFile>${basedir}/target/test-harness/checkstyle/no-source/checkstyle-result.xml</outputFile>
<outputFileFormat>xml</outputFileFormat>
<failsOnError>false</failsOnError>
- <sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
-
<testSourceDirectory>${basedir}/src/test/test-sources</testSourceDirectory>
+ <sourceDirectories>
+ <sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
+ </sourceDirectories>
+ <testSourceDirectories>
+
<testSourceDirectory>${basedir}/src/test/test-sources</testSourceDirectory>
+ </testSourceDirectories>
<project
implementation="org.apache.maven.plugins.checkstyle.stubs.MinMavenProjectStub"/>
<consoleOutput>false</consoleOutput>
<linkXRef>true</linkXRef>
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=1782671&r1=1782670&r2=1782671&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
Sun Feb 12 14:51:16 2017
@@ -35,7 +35,9 @@ under the License.
<outputFile>${basedir}/target/test-harness/checkstyle/useFile/checkstyle-result.xml</outputFile>
<outputFileFormat>xml</outputFileFormat>
<failsOnError>false</failsOnError>
- <sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
+ <sourceDirectories>
+ <sourceDirectory>${basedir}/src/test/test-sources</sourceDirectory>
+ </sourceDirectories>
<project
implementation="org.apache.maven.plugins.checkstyle.stubs.MinMavenProjectStub"/>
<consoleOutput>true</consoleOutput>
<linkXRef>true</linkXRef>
