Updated Branches: refs/heads/reformat 8d6274468 -> 023290670
Brought in Hugo's checkstyle Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/02329067 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/02329067 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/02329067 Branch: refs/heads/reformat Commit: 0232906708415e248542ebf443afaf877e78dff1 Parents: 8d62744 Author: Alex Huang <[email protected]> Authored: Thu Nov 21 03:09:07 2013 -0800 Committer: Alex Huang <[email protected]> Committed: Thu Nov 21 03:09:07 2013 -0800 ---------------------------------------------------------------------- pom.xml | 42 ++++++++++++++++++++++++++++++++++-------- 1 file changed, 34 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/02329067/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 961764f..80a572b 100644 --- a/pom.xml +++ b/pom.xml @@ -29,7 +29,7 @@ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/cloudstack.git</developerConnection> </scm> <issueManagement> - <system>jira</system> + <system>jira</system> <url>https://issues.apache.org/jira/browse/CLOUDSTACK</url> </issueManagement> @@ -86,7 +86,7 @@ <cs.target.dir>target</cs.target.dir> <cs.daemon.version>1.0.10</cs.daemon.version> <cs.jna.version>4.0.0</cs.jna.version> - <cs.checkstyle.version>2.10</cs.checkstyle.version> + <cs.checkstyle.version>2.11</cs.checkstyle.version> </properties> <distributionManagement> @@ -445,18 +445,44 @@ <outputDirectory>${basedir}/${cs.target.dir}/classes</outputDirectory> <testOutputDirectory>${basedir}/${cs.target.dir}/test-classes</testOutputDirectory> <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.11</version> - </plugin> + <!-- + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-checkstyle-plugin</artifactId> + <version>${cs.checkstyle.version}</version> + <dependencies> + <dependency> + <groupId>org.apache.cloudstack</groupId> + <artifactId>checkstyle</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + <executions> + <execution> + <phase>process-classes</phase> + <goals> + <goal>check</goal> + </goals> + </execution> + </executions> + <configuration> + <failsOnError>true</failsOnError> + <configLocation>tooling/checkstyle.xml</configLocation> + <consoleOutput>true</consoleOutput> + <includeTestSourceDirectory>true</includeTestSourceDirectory> + <sourceDirectory>${project.basedir}</sourceDirectory> + <includes>**\/*.java</includes> + <excludes>**\/target\/,**\/bin\/,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat</excludes> + </configuration> + </plugin> + --> </plugins> <pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-checkstyle-plugin</artifactId> - <version>2.11</version> + <version>${cs.checkstyle.version}</version> </plugin> <plugin> <artifactId>maven-clean-plugin</artifactId>
