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/30 00:20:53 UTC
svn commit: r1655882 - in /maven/plugins/trunk/maven-checkstyle-plugin/src:
it/MCHECKSTYLE-163/ it/MCHECKSTYLE-163/src/test/java/sample/
main/java/org/apache/maven/plugin/checkstyle/ site/apt/
test/java/org/apache/maven/plugin/checkstyle/stubs/
Author: hboutemy
Date: Thu Jan 29 23:20:52 2015
New Revision: 1655882
URL: http://svn.apache.org/r1655882
Log:
reverted r1654924
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-163/pom.xml
maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-163/src/test/java/sample/Example.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/CheckstyleViolationCheckMojo.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/plugin/checkstyle/stubs/ModuleMavenProjectStub.java
maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/stubs/MultiMavenProjectStub.java
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-163/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-163/pom.xml?rev=1655882&r1=1655881&r2=1655882&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-163/pom.xml (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-163/pom.xml Thu Jan 29 23:20:52 2015
@@ -1,76 +1,76 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>sample</groupId>
- <artifactId>sample</artifactId>
- <packaging>pom</packaging>
- <version>1.0-SNAPSHOT</version>
- <name>Example project</name>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-checkstyle-plugin</artifactId>
- <version>@pom.version@</version>
- <configuration>
- <includes>**/*.*</includes>
- <configLocation>sample.checkstyle</configLocation>
- <includeTestSourceDirectory>true</includeTestSourceDirectory>
- <consoleOutput>true</consoleOutput>
- <logViolationsToConsole>true</logViolationsToConsole>
- <failOnViolation>true</failOnViolation>
- <failsOnError>true</failsOnError>
- <violationSeverity>info</violationSeverity>
- <maxAllowedViolations>4</maxAllowedViolations>
- </configuration>
- <executions>
- <execution>
- <id>checkstyle-verify</id>
- <phase>verify</phase>
- <goals>
- <goal>checkstyle</goal>
- <goal>check</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>sample</groupId>
+ <artifactId>sample</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>Example project</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <version>@pom.version@</version>
+ <configuration>
+ <includes>**/*.*</includes>
+ <configLocation>sample.checkstyle</configLocation>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <consoleOutput>true</consoleOutput>
+ <logViolationsToConsole>true</logViolationsToConsole>
+ <failOnViolation>true</failOnViolation>
+ <failsOnError>true</failsOnError>
+ <violationSeverity>info</violationSeverity>
+ <maxAllowedViolations>4</maxAllowedViolations>
+ </configuration>
+ <executions>
+ <execution>
+ <id>checkstyle-verify</id>
+ <phase>verify</phase>
+ <goals>
+ <goal>checkstyle</goal>
+ <goal>check</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-163/src/test/java/sample/Example.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-163/src/test/java/sample/Example.java?rev=1655882&r1=1655881&r2=1655882&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-163/src/test/java/sample/Example.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/it/MCHECKSTYLE-163/src/test/java/sample/Example.java Thu Jan 29 23:20:52 2015
@@ -1,33 +1,33 @@
-package sample;
-
-/*
- * 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.
- */
-
-import org.junit.runners.model.InitializationError;
-
-public class Example {
-
- public void shouldTriggerRedundantThrows() throws InitializationError, Exception {}
-
- public void shouldNotTriggerRedundantThrows() throws InitializationError {}
-
- public void workingRedundantThrowsExample() throws IllegalArgumentException, Exception {}
-
- public void workingDoesNotTriggerRedundantThrowsExample() throws IllegalArgumentException {}
+package sample;
+
+/*
+ * 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.
+ */
+
+import org.junit.runners.model.InitializationError;
+
+public class Example {
+
+ public void shouldTriggerRedundantThrows() throws InitializationError, Exception {}
+
+ public void shouldNotTriggerRedundantThrows() throws InitializationError {}
+
+ public void workingRedundantThrowsExample() throws IllegalArgumentException, Exception {}
+
+ public void workingDoesNotTriggerRedundantThrowsExample() throws IllegalArgumentException {}
}
\ No newline at end of file
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=1655882&r1=1655881&r2=1655882&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 Thu Jan 29 23:20:52 2015
@@ -102,11 +102,12 @@ public abstract class AbstractCheckstyle
* </p>
* <p/>
* <p>
- * There are 2 predefined rulesets included in Maven Checkstyle Plugin:
+ * There are 3 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=1655882&r1=1655881&r2=1655882&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 Thu Jan 29 23:20:52 2015
@@ -190,12 +190,13 @@ public class CheckstyleViolationCheckMoj
* </p>
* <p/>
* <p>
- * There are 2 predefined rulesets.
+ * There are 3 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=1655882&r1=1655881&r2=1655882&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 Thu Jan 29 23:20:52 2015
@@ -36,8 +36,9 @@ ${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
- {{{./config/turbine_checks.html}<<<turbine_checks.xml>>>}}. You can also use a custom ruleset by
+ {{{./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
specifying it in the plugin configuration.
* Goals Overview
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/stubs/ModuleMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/stubs/ModuleMavenProjectStub.java?rev=1655882&r1=1655881&r2=1655882&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/stubs/ModuleMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/stubs/ModuleMavenProjectStub.java Thu Jan 29 23:20:52 2015
@@ -32,7 +32,7 @@ import java.io.File;
/**
* @author Edwin Punzalan
- * @version $Id: MinMavenProjectStub.java 942969 2010-05-11 00:32:30Z hboutemy $
+ * @version $Id$
*/
public class ModuleMavenProjectStub
extends org.apache.maven.plugin.testing.stubs.MavenProjectStub
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/stubs/MultiMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/stubs/MultiMavenProjectStub.java?rev=1655882&r1=1655881&r2=1655882&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/stubs/MultiMavenProjectStub.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/test/java/org/apache/maven/plugin/checkstyle/stubs/MultiMavenProjectStub.java Thu Jan 29 23:20:52 2015
@@ -31,7 +31,7 @@ import org.apache.maven.project.MavenPro
import org.codehaus.plexus.PlexusTestCase;
/**
- * @version $Id: MinMavenProjectStub.java 942969 2010-05-11 00:32:30Z hboutemy $
+ * @version $Id$
*/
public class MultiMavenProjectStub
extends org.apache.maven.plugin.testing.stubs.MavenProjectStub