JCLOUDS-149: Reuse checkstyle configuration

This commit is contained in:
Ignasi Barrera 2013-06-30 18:34:18 +02:00
parent bbe80c1e0b
commit a06aa07888
4 changed files with 25 additions and 32 deletions

View File

@ -653,11 +653,18 @@
</configuration> </configuration>
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<version>2.9.1</version> <version>2.9.1</version>
<dependencies>
<dependency>
<groupId>org.apache.jclouds</groupId>
<artifactId>jclouds-resources</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
<configuration> <configuration>
<configLocation>../resources/checkstyle.xml</configLocation> <!-- jclouds-resources has the checkstyle config in the classpath -->
<configLocation>resources/checkstyle.xml</configLocation>
<violationSeverity>warning</violationSeverity> <violationSeverity>warning</violationSeverity>
</configuration> </configuration>
</plugin> </plugin>
@ -1018,6 +1025,15 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<!-- When building jclouds-project, override the config to use the local file -->
<artifactId>maven-checkstyle-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<configLocation>../resources/checkstyle.xml</configLocation>
<violationSeverity>warning</violationSeverity>
</configuration>
</plugin>
</plugins> </plugins>
</build> </build>
</profile> </profile>

View File

@ -22,9 +22,6 @@
<module name="Checker"> <module name="Checker">
<property name="severity" value="warning"/> <property name="severity" value="warning"/>
<module name="NewlineAtEndOfFile"/> <module name="NewlineAtEndOfFile"/>
<module name="SuppressionFilter">
<property name="file" value="resources/checkstyle_suppressions.xml"/>
</module>
<module name="TreeWalker"> <module name="TreeWalker">
<module name="AvoidStarImport"/> <module name="AvoidStarImport"/>
<module name="EmptyStatement"/> <module name="EmptyStatement"/>

View File

@ -1,27 +0,0 @@
<?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 suppressions PUBLIC
"-//Puppy Crawl//DTD Suppressions 1.1//EN"
"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
<suppressions>
<suppress files="Base64\.java" checks="UnnecessaryParentheses"/>
</suppressions>

View File

@ -40,6 +40,13 @@
<include>NOTICE.txt</include> <include>NOTICE.txt</include>
</includes> </includes>
</resource> </resource>
<resource>
<targetPath>resources</targetPath>
<directory>${project.basedir}</directory>
<includes>
<include>checkstyle.xml</include>
</includes>
</resource>
</resources> </resources>
<plugins> <plugins>
<plugin> <plugin>