You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/12/13 02:02:47 UTC
git commit: updated refs/heads/master to f1eadc0
Updated Branches:
refs/heads/master eb9147f70 -> f1eadc09e
Fixed problem with checkstyle
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f1eadc09
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f1eadc09
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f1eadc09
Branch: refs/heads/master
Commit: f1eadc09e669829417d0cd1624b2b5a4a25c2818
Parents: eb9147f
Author: Alex Huang <al...@citrix.com>
Authored: Thu Dec 12 16:57:22 2013 -0800
Committer: Alex Huang <al...@citrix.com>
Committed: Thu Dec 12 16:57:38 2013 -0800
----------------------------------------------------------------------
pom.xml | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f1eadc09/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 13e6a33..31966d6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -160,6 +160,7 @@
</organization>
<modules>
+ <module>build/checkstyle</module>
<module>api</module>
<module>agent</module>
<module>core</module>
@@ -175,7 +176,6 @@
<module>services</module>
<module>maven-standard</module>
<module>quickcloud</module>
- <module>build/checkstyle</module>
</modules>
<dependencyManagement>
@@ -448,6 +448,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
+ <!--
<dependencies>
<dependency>
<groupId>org.apache.cloudstack</groupId>
@@ -455,9 +456,11 @@
<version>${project.version}</version>
</dependency>
</dependencies>
+ -->
+ <inherited>false</inherited>
<executions>
<execution>
- <phase>process-classes</phase>
+ <phase>install</phase>
<goals>
<goal>check</goal>
</goals>
@@ -465,7 +468,7 @@
</executions>
<configuration>
<failsOnError>true</failsOnError>
- <configLocation>tooling/checkstyle.xml</configLocation>
+ <configLocation>${project.basedir}/build/checkstyle/src/main/resources/tooling/checkstyle.xml</configLocation>
<consoleOutput>true</consoleOutput>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<sourceDirectory>${project.basedir}</sourceDirectory>
@@ -757,14 +760,18 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
+ <failsOnError>true</failsOnError>
<configLocation>tooling/checkstyle.xml</configLocation>
- <headerLocation>tooling/LICENSE.txt</headerLocation>
+ <consoleOutput>true</consoleOutput>
+ <includeTestSourceDirectory>true</includeTestSourceDirectory>
+ <sourceDirectory>${project.basedir}</sourceDirectory>
+ <includes>**\/*.java</includes>
+ <excludes>**\/deps\/,**\/test\/,**\/target\/,**\/bin\/,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/awsapi\/,**\/XenServerJava\/,**\/apidoc\/</excludes>
</configuration>
</plugin>
</plugins>
</reporting>
-->
-
<profiles>
<profile>
<id>awsapi</id>