svn commit: r1706715 - in /maven/plugins/trunk/maven-checkstyle-plugin/src: it/MCHECKSTYLE-295/ it/inlinerules/ main/java/org/apache/maven/plugin/checkstyle/ site/apt/examples/

[dennisl]

Author: dennisl
Date: Sun Oct  4 19:06:12 2015
New Revision: 1706715

URL: http://svn.apache.org/viewvc?rev=1706715&view=rev
Log:
[MCHECKSTYLE-302] Using inline configuration does not work with Maven 2.2.1
- Document the behavior
- Do not run ITs that uses inline configuration unless the Maven version is 3+

Modified:
    
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-295/invoker.properties
    
maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/invoker.properties
    
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/examples/inline-checker-config.apt.vm

Modified: 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-295/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-295/invoker.properties?rev=1706715&r1=1706714&r2=1706715&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-295/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-295/invoker.properties
 Sun Oct  4 19:06:12 2015
@@ -17,3 +17,5 @@
 
 invoker.goals=verify
 invoker.buildResult=failure
+# checkstyleRules requires Maven 3+
+invoker.maven.version = 3.0+

Modified: 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/invoker.properties
URL: 
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/invoker.properties?rev=1706715&r1=1706714&r2=1706715&view=diff
==============================================================================
--- 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/invoker.properties
 (original)
+++ 
maven/plugins/trunk/maven-checkstyle-plugin/src/it/inlinerules/invoker.properties
 Sun Oct  4 19:06:12 2015
@@ -18,3 +18,5 @@
 invoker.goals=clean checkstyle:checkstyle checkstyle:check
 # we forced 1 failure
 invoker.buildResult=failure
+# checkstyleRules requires Maven 3+
+invoker.maven.version = 3.0+

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=1706715&r1=1706714&r2=1706715&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
 Sun Oct  4 19:06:12 2015
@@ -443,7 +443,7 @@ public class CheckstyleViolationCheckMoj
 
     /**
      * By using this property, you can specify the whole Checkstyle rules
-     * inline directly inside this pom.
+     * inline directly inside this pom. This feature requires Maven 3+.
      *
      * <pre>
      * &lt;plugin&gt;

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=1706715&r1=1706714&r2=1706715&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
 Sun Oct  4 19:06:12 2015
@@ -1,7 +1,7 @@
  ------
  Using an 'inlined' Checkstyle Checker Configuration
  ------
- 2014-02-14
+ 2015-10-04
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -28,7 +28,8 @@
 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>>>.
+  be defined directly in the <<<configuration>>> section of the plugin itself 
inside your <<<pom.xml>>>. This feature
+  requires Maven 3+.
 
   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