Author: dennisl
Date: Wed Mar 4 08:10:45 2015
New Revision: 1663881
URL: http://svn.apache.org/r1663881
Log:
[MCHECKSTYLE-273] Remove Turbine configuration since it is not used any more
I had to create a custom Checkstyle configuration for the IT
MCHECKSTYLE-219-no-license_failure, because it relied on turbine_checks.xml.
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-219-no-license_failure/checkstyle.xml
(with props)
Removed:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/turbine-checks/
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/config/turbine_checks.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/config/turbine_checks.apt.vm
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-219-no-license_failure/pom.xml
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
Added:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-219-no-license_failure/checkstyle.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-219-no-license_failure/checkstyle.xml?rev=1663881&view=auto
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-219-no-license_failure/checkstyle.xml
(added)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-219-no-license_failure/checkstyle.xml
Wed Mar 4 08:10:45 2015
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<!DOCTYPE module PUBLIC
+ "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
+ "http://www.puppycrawl.com/dtds/configuration_1_2.dtd";>
+
+<module name="Checker">
+
+ <!-- Checks for Headers -->
+ <!-- See http://checkstyle.sf.net/config_header.html -->
+ <module name="RegexpHeader">
+ <property name="fileExtensions" value="java"/>
+ <property name="headerFile" value="${checkstyle.header.file}"/>
+ <!-- The ignoreLines property no longer exists -->
+ </module>
+
+</module>
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-219-no-license_failure/checkstyle.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-219-no-license_failure/checkstyle.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision Author Id
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-219-no-license_failure/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-219-no-license_failure/pom.xml?rev=1663881&r1=1663880&r2=1663881&view=diff
==============================================================================
---
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-219-no-license_failure/pom.xml
(original)
+++
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-219-no-license_failure/pom.xml
Wed Mar 4 08:10:45 2015
@@ -31,6 +31,10 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
+ <description>
+ Uses a custom Checkstyle configuration that checks for headers, so it
matters if the LICENSE.txt couldn't be found.
+ </description>
+
<build>
<plugins>
<plugin>
@@ -46,7 +50,7 @@
</execution>
</executions>
<configuration>
- <configLocation>config/turbine_checks.xml</configLocation>
+ <configLocation>checkstyle.xml</configLocation>
</configuration>
</plugin>
</plugins>
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=1663881&r1=1663880&r2=1663881&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
Wed Mar 4 08:10:45 2015
@@ -102,11 +102,10 @@ public abstract class AbstractCheckstyle
* </p>
* <p/>
* <p>
- * There are 3 predefined rulesets included in Maven Checkstyle Plugin:
+ * There are 2 predefined rulesets included in Maven Checkstyle Plugin:
* </p>
* <ul>
* <li><code>config/sun_checks.xml</code>: Sun Checks.</li>
- * <li><code>config/turbine_checks.xml</code>: Turbine Checks.</li>
* <li><code>config/maven_checks.xml</code>: Maven Source Checks.</li>
* </ul>
*/
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=1663881&r1=1663880&r2=1663881&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
Wed Mar 4 08:10:45 2015
@@ -59,7 +59,6 @@ public class CheckstyleReport
Map<String, String> fmt2Cfg = new HashMap<String, String>();
fmt2Cfg.put( "sun", "config/sun_checks.xml" );
- fmt2Cfg.put( "turbine", "config/turbine_checks.xml" );
fmt2Cfg.put( "maven", "config/maven_checks.xml" );
FORMAT_TO_CONFIG_LOCATION = Collections.unmodifiableMap( fmt2Cfg );
@@ -67,7 +66,7 @@ public class CheckstyleReport
/**
* Specifies what predefined check set to use. Available sets are "sun"
(for
- * the Sun coding conventions), and "turbine".
+ * the Sun coding conventions), and "maven".
*
* @deprecated Use configLocation instead.
*/
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=1663881&r1=1663880&r2=1663881&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
Wed Mar 4 08:10:45 2015
@@ -190,12 +190,10 @@ public class CheckstyleViolationCheckMoj
* </p>
* <p/>
* <p>
- * There are 3 predefined rulesets.
+ * There are 2 predefined rulesets.
* </p>
- * <p/>
* <ul>
* <li><code>config/sun_checks.xml</code>: Sun Checks.</li>
- * <li><code>config/turbine_checks.xml</code>: Turbine Checks.</li>
* <li><code>config/maven_checks.xml</code>: Maven Source Checks.</li>
* </ul>
*
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=1663881&r1=1663880&r2=1663881&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
Wed Mar 4 08:10:45 2015
@@ -3,7 +3,7 @@
------
Hervé Boutemy
------
- 2015-01-18
+ 2015-03-04
------
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -29,14 +29,22 @@
Predefined Rulesets
- Maven Checkstyle Plugin contains these predefined rulesets:
+ Maven Checkstyle Plugin contains this predefined ruleset:
* {{{./sun_checks.html}<<<config/sun_checks.xml>>>}},
- * {{{./turbine_checks.html}<<<config/turbine_checks.xml>>>}}.
-
[]
In versions up to and including 2.13 the plugin also included the
<<<config/maven_checks.xml>>> predefined ruleset. In version 2.14 this was
- moved to {{{/shared/maven-shared-resources/}maven-shared-resources}}.
+ 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
+ <<<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
+ <<<config/turbine_checks.xml>>> predefined ruleset. This was removed in
+ version 2.15.
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=1663881&r1=1663880&r2=1663881&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
Wed Mar 4 08:10:45 2015
@@ -1,7 +1,7 @@
------
Using a Custom Checkstyle Checker Configuration
------
- 2006-07-21
+ 2015-03-04
------
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -55,11 +55,9 @@ Using a Custom Checkstyle Checker Config
resource named <<<checkstyle.xml>>> within the compile scope of the
dependencies or build extensions
classpath.
- There are 3 predefined Checkstyle configuration definitions that ship with
the Checkstyle Plugin,
+ 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).
* <<config/maven_checks.xml>> - Maven Development Definitions.
-
- * <<config/turbine_checks.xml>> - Turbine 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=1663881&r1=1663880&r2=1663881&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 Wed
Mar 4 08:10:45 2015
@@ -3,7 +3,7 @@
------
Maria Odea Ching
------
- 2013-07-22
+ 2015-03-04
------
~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -36,8 +36,7 @@ ${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>>>}},
- {{{./config/turbine_checks.html}<<<turbine_checks.xml>>>}} and
+ {{{./config/sun_checks.html}<<<sun_checks.xml>>>}} and
{{{./config/maven_checks.html}<<<maven_checks.xml>>>}}. You can also use a
custom ruleset by
specifying it in the plugin configuration.
