Updated Branches: refs/heads/master c6986efda -> 335f5943f
JCLOUDS-149: Reuse checkstyle configuration Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/335f5943 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/335f5943 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/335f5943 Branch: refs/heads/master Commit: 335f5943f40f2e368b5bfdad3e425ba437130092 Parents: c6986ef Author: Ignasi Barrera <[email protected]> Authored: Sun Jun 30 18:34:18 2013 +0200 Committer: Ignasi Barrera <[email protected]> Committed: Tue Jul 2 18:02:03 2013 +0200 ---------------------------------------------------------------------- project/pom.xml | 20 ++++++++++++++++++-- resources/checkstyle.xml | 3 --- resources/checkstyle_suppressions.xml | 27 --------------------------- resources/pom.xml | 7 +++++++ 4 files changed, 25 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/335f5943/project/pom.xml ---------------------------------------------------------------------- diff --git a/project/pom.xml b/project/pom.xml index 339ce33..6fd8293 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -652,11 +652,18 @@ </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> <version>2.9.1</version> + <dependencies> + <dependency> + <groupId>org.apache.jclouds</groupId> + <artifactId>jclouds-resources</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> <configuration> - <configLocation>../resources/checkstyle.xml</configLocation> + <!-- jclouds-resources has the checkstyle config in the classpath --> + <configLocation>resources/checkstyle.xml</configLocation> <violationSeverity>warning</violationSeverity> </configuration> </plugin> @@ -1017,6 +1024,15 @@ </execution> </executions> </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> </build> </profile> http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/335f5943/resources/checkstyle.xml ---------------------------------------------------------------------- diff --git a/resources/checkstyle.xml b/resources/checkstyle.xml index de81e0f..008f4ba 100644 --- a/resources/checkstyle.xml +++ b/resources/checkstyle.xml @@ -22,9 +22,6 @@ <module name="Checker"> <property name="severity" value="warning"/> <module name="NewlineAtEndOfFile"/> - <module name="SuppressionFilter"> - <property name="file" value="resources/checkstyle_suppressions.xml"/> - </module> <module name="TreeWalker"> <module name="AvoidStarImport"/> <module name="EmptyStatement"/> http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/335f5943/resources/checkstyle_suppressions.xml ---------------------------------------------------------------------- diff --git a/resources/checkstyle_suppressions.xml b/resources/checkstyle_suppressions.xml deleted file mode 100644 index 54c6850..0000000 --- a/resources/checkstyle_suppressions.xml +++ /dev/null @@ -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> http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/335f5943/resources/pom.xml ---------------------------------------------------------------------- diff --git a/resources/pom.xml b/resources/pom.xml index b1fd20e..b6092b2 100644 --- a/resources/pom.xml +++ b/resources/pom.xml @@ -40,6 +40,13 @@ <include>NOTICE.txt</include> </includes> </resource> + <resource> + <targetPath>resources</targetPath> + <directory>${project.basedir}</directory> + <includes> + <include>checkstyle.xml</include> + </includes> + </resource> </resources> <plugins> <plugin>
