Author: dennisl Date: Fri May 1 17:53:59 2015 New Revision: 1677195 URL: http://svn.apache.org/r1677195 Log: [MCHECKSTYLE-284] Remove config/sun_checks.xml and use the one built into Checkstyle 6.2+
Note that I had to remove the @SuppressionWarnings check in the IT check-pass, because Suppressions are not enabled in the version of sun_checks.xml that the Checkstyle project supplies. Removed: maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/ maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/sun_checks.apt.vm Modified: maven/plugins/trunk/maven-checkstyle-plugin/pom.xml maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-219-no-license_success/pom.xml maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-pass/src/main/java/org/MyClass.java 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/plugin/checkstyle/CheckstyleReport.java maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/index.apt maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-checker-config.apt.vm maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojoTest.java 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=1677195&r1=1677194&r2=1677195&view=diff ============================================================================== --- maven/plugins/trunk/maven-checkstyle-plugin/pom.xml (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/pom.xml Fri May 1 17:53:59 2015 @@ -265,10 +265,6 @@ under the License. <exclude>src/it/MCHECKSTYLE-225-customHeader/build-tools/src/main/resources/test/custom-header.txt</exclude> <exclude>src/it/MCHECKSTYLE-225-pluginManagement/build-tools/src/main/resources/test/custom-header.txt</exclude> <exclude>src/it/MCHECKSTYLE-225-LICENSE.txt/build-tools/src/main/resources/LICENSE.txt</exclude> - <!-- - File from the Checkstyle distribution - do not add our own license header. - --> - <exclude>src/main/resources/config/sun_checks.xml</exclude> </excludes> </configuration> </plugin> Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-219-no-license_success/pom.xml URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-219-no-license_success/pom.xml?rev=1677195&r1=1677194&r2=1677195&view=diff ============================================================================== --- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-219-no-license_success/pom.xml (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-219-no-license_success/pom.xml Fri May 1 17:53:59 2015 @@ -32,7 +32,7 @@ </properties> <description> - The default configLocation (i.e. config/sun_checks.xml ) doesn't check for headers, so it doesn't matter if the LICENSE.txt couldn't be found. + The default configLocation (i.e. sun_checks.xml ) doesn't check for headers, so it doesn't matter if the LICENSE.txt couldn't be found. </description> <build> Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-pass/src/main/java/org/MyClass.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-pass/src/main/java/org/MyClass.java?rev=1677195&r1=1677194&r2=1677195&view=diff ============================================================================== --- maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-pass/src/main/java/org/MyClass.java (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/check-pass/src/main/java/org/MyClass.java Fri May 1 17:53:59 2015 @@ -23,9 +23,6 @@ package org; * Yada yada yada. */ public class MyClass { - @SuppressWarnings("checkstyle:constantname") - private static final int testSuppressionFilter = 0; - public static void main(String[] args) { // no op } Modified: 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/plugin/checkstyle/AbstractCheckstyleReport.java?rev=1677195&r1=1677194&r2=1677195&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/plugin/checkstyle/AbstractCheckstyleReport.java Fri May 1 17:53:59 2015 @@ -105,11 +105,11 @@ public abstract class AbstractCheckstyle * There are 2 predefined rulesets included in Maven Checkstyle Plugin: * </p> * <ul> - * <li><code>config/sun_checks.xml</code>: Sun Checks.</li> + * <li><code>sun_checks.xml</code>: Sun Checks.</li> * <li><code>config/maven_checks.xml</code>: Maven Source Checks.</li> * </ul> */ - @Parameter( property = "checkstyle.config.location", defaultValue = "config/sun_checks.xml" ) + @Parameter( property = "checkstyle.config.location", defaultValue = "sun_checks.xml" ) protected String configLocation; /** Modified: 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/plugin/checkstyle/CheckstyleReport.java?rev=1677195&r1=1677194&r2=1677195&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/plugin/checkstyle/CheckstyleReport.java Fri May 1 17:53:59 2015 @@ -58,7 +58,7 @@ public class CheckstyleReport { Map<String, String> fmt2Cfg = new HashMap<String, String>(); - fmt2Cfg.put( "sun", "config/sun_checks.xml" ); + fmt2Cfg.put( "sun", "sun_checks.xml" ); fmt2Cfg.put( "maven", "config/maven_checks.xml" ); FORMAT_TO_CONFIG_LOCATION = Collections.unmodifiableMap( fmt2Cfg ); @@ -245,7 +245,7 @@ public class CheckstyleReport private void mergeDeprecatedInfo() throws MavenReportException { - if ( "config/sun_checks.xml".equals( configLocation ) && !"sun".equals( format ) ) + if ( "sun_checks.xml".equals( configLocation ) && !"sun".equals( format ) ) { configLocation = FORMAT_TO_CONFIG_LOCATION.get( format ); Modified: 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/plugin/checkstyle/CheckstyleViolationCheckMojo.java?rev=1677195&r1=1677194&r2=1677195&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/plugin/checkstyle/CheckstyleViolationCheckMojo.java Fri May 1 17:53:59 2015 @@ -193,13 +193,13 @@ public class CheckstyleViolationCheckMoj * There are 2 predefined rulesets. * </p> * <ul> - * <li><code>config/sun_checks.xml</code>: Sun Checks.</li> + * <li><code>sun_checks.xml</code>: Sun Checks.</li> * <li><code>config/maven_checks.xml</code>: Maven Source Checks.</li> * </ul> * * @since 2.5 */ - @Parameter( property = "checkstyle.config.location", defaultValue = "config/sun_checks.xml" ) + @Parameter( property = "checkstyle.config.location", defaultValue = "sun_checks.xml" ) private String configLocation; /** @@ -482,7 +482,7 @@ public class CheckstyleViolationCheckMoj { if ( checkstyleRules != null ) { - if ( !"config/sun_checks.xml".equals( configLocation ) ) + if ( !"sun_checks.xml".equals( configLocation ) ) { throw new MojoExecutionException( "If you use inline configuration for rules, don't specify " + "a configLocation" ); Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/index.apt URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/index.apt?rev=1677195&r1=1677194&r2=1677195&view=diff ============================================================================== --- maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/index.apt (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/index.apt Fri May 1 17:53:59 2015 @@ -3,7 +3,7 @@ ------ Hervé Boutemy ------ - 2015-03-04 + 2015-05-01 ------ ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -29,22 +29,30 @@ Predefined Rulesets - Maven Checkstyle Plugin contains this predefined ruleset: + Maven Checkstyle Plugin no longer contains any predefined rulesets. Instead it + references rulesets from other places: - * {{{./sun_checks.html}<<<config/sun_checks.xml>>>}}, + * {{{http://checkstyle.sourceforge.net/sun_style.html}<<<sun_checks.xml>>>}} + + * {{{/shared/maven-shared-resources/maven_checks.html}<<<config/maven_checks.xml>>>}} [] - In versions up to and including 2.13 the plugin also included the + In versions up to and including 2.13 the plugin included the <<<config/maven_checks.xml>>> predefined ruleset. In version 2.14 this was moved to {{{/shared/maven-shared-resources/}maven-shared-resources}}. It is still available to use, because maven-shared-resources has been added as a dependency to Maven Checkstyle Plugin - In versions up to and including 2.13 the plugin also included the + In versions up to and including 2.13 the plugin included the <<<config/avalon_checks.xml>>> predefined ruleset. This was removed in version 2.14. - In versions up to and including 2.14 the plugin also included the + In versions up to and including 2.14 the plugin included the <<<config/turbine_checks.xml>>> predefined ruleset. This was removed in version 2.15. + + In versions up to and including 2.15 the plugin included the + <<<config/sun_checks.xml>>> predefined ruleset. This was removed in + version 2.16 and the plugin instead references the original configuration + provided by the Checkstyle project. Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-checker-config.apt.vm URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-checker-config.apt.vm?rev=1677195&r1=1677194&r2=1677195&view=diff ============================================================================== --- maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-checker-config.apt.vm (original) +++ maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/examples/custom-checker-config.apt.vm Fri May 1 17:53:59 2015 @@ -1,7 +1,7 @@ ------ Using a Custom Checkstyle Checker Configuration ------ - 2015-03-04 + 2015-05-01 ------ ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -58,6 +58,6 @@ Using a Custom Checkstyle Checker Config There are 2 predefined Checkstyle configuration definitions that ship with the Checkstyle Plugin, the Sun Microsystems Definition is selected by default. - * <<config/sun_checks.xml>> - Sun Microsystems Definition (default). + * <<sun_checks.xml>> - Sun Microsystems Definition (default). * <<config/maven_checks.xml>> - Maven Development Definitions. 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=1677195&r1=1677194&r2=1677195&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 Fri May 1 17:53:59 2015 @@ -3,7 +3,7 @@ ------ Maria Odea Ching ------ - 2015-03-04 + 2015-05-01 ------ ~~ Licensed to the Apache Software Foundation (ASF) under one @@ -36,8 +36,8 @@ ${project.name} {{{./examples/upgrading-checkstyle.html}upgrade the version used at runtime}}. The plugin can be configured in the project's POM. Predefined rulesets are included with the plugin, these are: - {{{./config/sun_checks.html}<<<sun_checks.xml>>>}} and - {{{/shared/maven-shared-resources/maven_checks.html}<<<maven_checks.xml>>>}}. You can also use a custom ruleset by + {{{http://checkstyle.sourceforge.net/sun_style.html}<<<sun_checks.xml>>>}} and + {{{/shared/maven-shared-resources/maven_checks.html}<<<config/maven_checks.xml>>>}}. You can also use a custom ruleset by specifying it in the plugin configuration. * Goals Overview Modified: 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/plugin/checkstyle/CheckstyleViolationCheckMojoTest.java?rev=1677195&r1=1677194&r2=1677195&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/plugin/checkstyle/CheckstyleViolationCheckMojoTest.java Fri May 1 17:53:59 2015 @@ -146,7 +146,7 @@ public class CheckstyleViolationCheckMoj } ); - setVariableValueToObject( mojo, "configLocation", "config/sun_checks.xml" ); + 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, "encoding", "UTF-8" ); 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=1677195&r1=1677194&r2=1677195&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 Fri May 1 17:53:59 2015 @@ -29,7 +29,7 @@ under the License. <enableFilesSummary>true</enableFilesSummary> <enableRSS>true</enableRSS> <includes>**/*.java</includes> - <configLocation>config/sun_checks.xml</configLocation> + <configLocation>sun_checks.xml</configLocation> <format>sun</format> <headerLocation>${basedir}/src/test/test-sources/LICENSE.txt</headerLocation> <cacheFile>${basedir}/target/test-harness/checkstyle/dep-resolution/checkstyle-cachefile</cacheFile> 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=1677195&r1=1677194&r2=1677195&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 Fri May 1 17:53:59 2015 @@ -29,7 +29,7 @@ under the License. <enableFilesSummary>true</enableFilesSummary> <enableRSS>true</enableRSS> <includes>**/*.java</includes> - <configLocation>config/sun_checks.xml</configLocation> + <configLocation>sun_checks.xml</configLocation> <format>sun</format> <headerLocation>${basedir}/src/test/test-sources/LICENSE.txt</headerLocation> <cacheFile>${basedir}/target/test-harness/checkstyle/fail-on-error/checkstyle-cachefile</cacheFile> 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=1677195&r1=1677194&r2=1677195&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 Fri May 1 17:53:59 2015 @@ -29,7 +29,7 @@ under the License. <enableFilesSummary>true</enableFilesSummary> <enableRSS>true</enableRSS> <includes>**/*.java</includes> - <configLocation>config/sun_checks.xml</configLocation> + <configLocation>sun_checks.xml</configLocation> <format>sun</format> <headerLocation>${basedir}/src/test/test-sources/LICENSE.txt</headerLocation> <cacheFile>${basedir}/target/test-harness/checkstyle/min/checkstyle-cachefile</cacheFile> 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=1677195&r1=1677194&r2=1677195&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 Fri May 1 17:53:59 2015 @@ -29,7 +29,7 @@ under the License. <enableFilesSummary>true</enableFilesSummary> <enableRSS>true</enableRSS> <includes>**/*.java</includes> - <configLocation>config/sun_checks.xml</configLocation> + <configLocation>sun_checks.xml</configLocation> <headerLocation>${basedir}/src/test/test-sources/LICENSE.txt</headerLocation> <cacheFile>${basedir}/target/test-harness/checkstyle/multi/checkstyle-cachefile</cacheFile> <outputFile>${basedir}/target/test-harness/checkstyle/multi/checkstyle-result.xml</outputFile> 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=1677195&r1=1677194&r2=1677195&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 Fri May 1 17:53:59 2015 @@ -29,7 +29,7 @@ under the License. <enableFilesSummary>false</enableFilesSummary> <enableRSS>true</enableRSS> <includes>**/*.java</includes> - <configLocation>config/sun_checks.xml</configLocation> + <configLocation>sun_checks.xml</configLocation> <format>sun</format> <headerLocation>${basedir}/src/test/test-sources/LICENSE.txt</headerLocation> <cacheFile>${basedir}/target/test-harness/checkstyle/no-files/checkstyle-cachefile</cacheFile> 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=1677195&r1=1677194&r2=1677195&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 Fri May 1 17:53:59 2015 @@ -29,7 +29,7 @@ under the License. <enableFilesSummary>true</enableFilesSummary> <enableRSS>true</enableRSS> <includes>**/*.java</includes> - <configLocation>config/sun_checks.xml</configLocation> + <configLocation>sun_checks.xml</configLocation> <format>sun</format> <headerLocation>${basedir}/src/test/test-sources/LICENSE.txt</headerLocation> <cacheFile>${basedir}/target/test-harness/checkstyle/no-rules/checkstyle-cachefile</cacheFile> 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=1677195&r1=1677194&r2=1677195&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 Fri May 1 17:53:59 2015 @@ -29,7 +29,7 @@ under the License. <enableFilesSummary>true</enableFilesSummary> <enableRSS>true</enableRSS> <includes>**/*.java</includes> - <configLocation>config/sun_checks.xml</configLocation> + <configLocation>sun_checks.xml</configLocation> <format>sun</format> <headerLocation>${basedir}/src/test/test-sources/LICENSE.txt</headerLocation> <cacheFile>${basedir}/target/test-harness/checkstyle/no-severity/checkstyle-cachefile</cacheFile> 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=1677195&r1=1677194&r2=1677195&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 Fri May 1 17:53:59 2015 @@ -29,7 +29,7 @@ under the License. <enableFilesSummary>true</enableFilesSummary> <enableRSS>true</enableRSS> <includes>**/*.java</includes> - <configLocation>config/sun_checks.xml</configLocation> + <configLocation>sun_checks.xml</configLocation> <format>sun</format> <headerLocation>${basedir}/src/test/test-sources/LICENSE.txt</headerLocation> <cacheFile>${basedir}/target/test-harness/checkstyle/no-source/checkstyle-cachefile</cacheFile> 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=1677195&r1=1677194&r2=1677195&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 Fri May 1 17:53:59 2015 @@ -29,7 +29,7 @@ under the License. <enableFilesSummary>true</enableFilesSummary> <enableRSS>true</enableRSS> <includes>**/*.java</includes> - <configLocation>config/sun_checks.xml</configLocation> + <configLocation>sun_checks.xml</configLocation> <format>sun</format> <headerLocation>${basedir}/src/test/test-sources/LICENSE.txt</headerLocation> <cacheFile>${basedir}/target/test-harness/checkstyle/no-source/checkstyle-cachefile</cacheFile> 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=1677195&r1=1677194&r2=1677195&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 Fri May 1 17:53:59 2015 @@ -29,7 +29,7 @@ under the License. <enableFilesSummary>true</enableFilesSummary> <enableRSS>true</enableRSS> <includes>**/*.java</includes> - <configLocation>config/sun_checks.xml</configLocation> + <configLocation>sun_checks.xml</configLocation> <format>sun</format> <headerLocation>${basedir}/src/test/test-sources/LICENSE.txt</headerLocation> <cacheFile>${basedir}/target/test-harness/checkstyle/useFile/checkstyle-cachefile</cacheFile>