You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2015/01/27 02:05:19 UTC

svn commit: r1654924 - in /maven/plugins/trunk/maven-checkstyle-plugin/src: main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java site/apt/index.apt.vm

Author: hboutemy
Date: Tue Jan 27 01:05:19 2015
New Revision: 1654924

URL: http://svn.apache.org/r1654924
Log:
updated documentation: maven_checks.xml is not there any more

Modified:
    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/CheckstyleViolationCheckMojo.java
    maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm

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=1654924&r1=1654923&r2=1654924&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 Tue Jan 27 01:05:19 2015
@@ -102,12 +102,11 @@ 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>
      */
     @Parameter( property = "checkstyle.config.location", defaultValue = "config/sun_checks.xml" )

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=1654924&r1=1654923&r2=1654924&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 Tue Jan 27 01:05:19 2015
@@ -190,13 +190,12 @@ 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>
      *
      * @since 2.5

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=1654924&r1=1654923&r2=1654924&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 Tue Jan 27 01:05:19 2015
@@ -36,9 +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>>>}},
-  {{{./config/turbine_checks.html}<<<turbine_checks.xml>>>}} and
-  {{{./config/maven_checks.html}<<<maven_checks.xml>>>}}. You can also use a custom ruleset by
+  {{{./config/sun_checks.html}<<<sun_checks.xml>>>}} and
+  {{{./config/turbine_checks.html}<<<turbine_checks.xml>>>}}. You can also use a custom ruleset by
   specifying it in the plugin configuration.
 
 * Goals Overview



Re: svn commit: r1654924 - in /maven/plugins/trunk/maven-checkstyle-plugin/src: main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java site/apt/index.apt.vm

Posted by Hervé BOUTEMY <he...@free.fr>.
sorry, I did overlook that
I'll revert

Regards,

Hervé

Le jeudi 29 janvier 2015 20:47:05 Dennis Lundberg a écrit :
> Hi Hervé,
> 
> Actually maven_checks.xml is still there. All I have done is move the
> configuration files to another location in svn. The plugin now has a
> new dependency on maven-shared-resources, which is the new home for
> maven_checks.xml. So from a user perspective nothing has happened. A
> user can still reference maven_checks.xml in exactly the same way as
> they did with the earlier versions.
> 
> The motivation for moving maven_checks.xml elsewhere was to enable us,
> the Maven project, to continue to use maven-checkstyle-plugin 2.14 and
> still be able to alter our Checkstyle configuration.
> 
> If we want to we can remove the dependency on maven-shared-resources
> in a later version of maven-checkstyle-plugin.
> 
> On Tue, Jan 27, 2015 at 2:05 AM,  <hb...@apache.org> wrote:
> > Author: hboutemy
> > Date: Tue Jan 27 01:05:19 2015
> > New Revision: 1654924
> > 
> > URL: http://svn.apache.org/r1654924
> > Log:
> > updated documentation: maven_checks.xml is not there any more
> > 
> > Modified:
> >     maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/m
> >     aven/plugin/checkstyle/AbstractCheckstyleReport.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/index.apt.vm> 
> > Modified:
> > maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/mave
> > n/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=1654924&r1=1654923&r2=1654924&view=diff
> > =========================================================================
> > ===== ---
> > maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/mave
> > n/plugin/checkstyle/AbstractCheckstyleReport.java (original) +++
> > maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/mave
> > n/plugin/checkstyle/AbstractCheckstyleReport.java Tue Jan 27 01:05:19 2015
> > @@ -102,12 +102,11 @@ 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>
> >       */
> >      
> >      @Parameter( property = "checkstyle.config.location", defaultValue =
> >      "config/sun_checks.xml" )> 
> > Modified:
> > maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/mave
> > n/plugin/checkstyle/CheckstyleViolationCheckMojo.java URL:
> > http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/
> > src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckM
> > ojo.java?rev=1654924&r1=1654923&r2=1654924&view=diff
> > =========================================================================
> > ===== ---
> > maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/mave
> > n/plugin/checkstyle/CheckstyleViolationCheckMojo.java (original) +++
> > maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/mave
> > n/plugin/checkstyle/CheckstyleViolationCheckMojo.java Tue Jan 27 01:05:19
> > 2015 @@ -190,13 +190,12 @@ 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>
> >       *
> >       * @since 2.5
> > 
> > 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=1654924&r1=1654923&r2=1654924&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 Tue
> > Jan 27 01:05:19 2015 @@ -36,9 +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>>>}},
> > -  {{{./config/turbine_checks.html}<<<turbine_checks.xml>>>}} and
> > -  {{{./config/maven_checks.html}<<<maven_checks.xml>>>}}. You can also
> > use a custom ruleset by + 
> > {{{./config/sun_checks.html}<<<sun_checks.xml>>>}} and
> > +  {{{./config/turbine_checks.html}<<<turbine_checks.xml>>>}}. You can
> > also use a custom ruleset by> 
> >    specifying it in the plugin configuration.
> >  
> >  * Goals Overview


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org


Re: svn commit: r1654924 - in /maven/plugins/trunk/maven-checkstyle-plugin/src: main/java/org/apache/maven/plugin/checkstyle/AbstractCheckstyleReport.java main/java/org/apache/maven/plugin/checkstyle/CheckstyleViolationCheckMojo.java site/apt/index.apt.vm

Posted by Dennis Lundberg <de...@apache.org>.
Hi Hervé,

Actually maven_checks.xml is still there. All I have done is move the
configuration files to another location in svn. The plugin now has a
new dependency on maven-shared-resources, which is the new home for
maven_checks.xml. So from a user perspective nothing has happened. A
user can still reference maven_checks.xml in exactly the same way as
they did with the earlier versions.

The motivation for moving maven_checks.xml elsewhere was to enable us,
the Maven project, to continue to use maven-checkstyle-plugin 2.14 and
still be able to alter our Checkstyle configuration.

If we want to we can remove the dependency on maven-shared-resources
in a later version of maven-checkstyle-plugin.


On Tue, Jan 27, 2015 at 2:05 AM,  <hb...@apache.org> wrote:
> Author: hboutemy
> Date: Tue Jan 27 01:05:19 2015
> New Revision: 1654924
>
> URL: http://svn.apache.org/r1654924
> Log:
> updated documentation: maven_checks.xml is not there any more
>
> Modified:
>     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/CheckstyleViolationCheckMojo.java
>     maven/plugins/trunk/maven-checkstyle-plugin/src/site/apt/index.apt.vm
>
> 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=1654924&r1=1654923&r2=1654924&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 Tue Jan 27 01:05:19 2015
> @@ -102,12 +102,11 @@ 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>
>       */
>      @Parameter( property = "checkstyle.config.location", defaultValue = "config/sun_checks.xml" )
>
> 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=1654924&r1=1654923&r2=1654924&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 Tue Jan 27 01:05:19 2015
> @@ -190,13 +190,12 @@ 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>
>       *
>       * @since 2.5
>
> 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=1654924&r1=1654923&r2=1654924&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 Tue Jan 27 01:05:19 2015
> @@ -36,9 +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>>>}},
> -  {{{./config/turbine_checks.html}<<<turbine_checks.xml>>>}} and
> -  {{{./config/maven_checks.html}<<<maven_checks.xml>>>}}. You can also use a custom ruleset by
> +  {{{./config/sun_checks.html}<<<sun_checks.xml>>>}} and
> +  {{{./config/turbine_checks.html}<<<turbine_checks.xml>>>}}. You can also use a custom ruleset by
>    specifying it in the plugin configuration.
>
>  * Goals Overview
>
>



-- 
Dennis Lundberg

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org