Fixed problem with checkstyle

This commit is contained in:
Alex Huang 2013-12-12 16:57:22 -08:00
parent eb9147f709
commit f1eadc09e6

17
pom.xml
View File

@ -160,6 +160,7 @@
</organization> </organization>
<modules> <modules>
<module>build/checkstyle</module>
<module>api</module> <module>api</module>
<module>agent</module> <module>agent</module>
<module>core</module> <module>core</module>
@ -175,7 +176,6 @@
<module>services</module> <module>services</module>
<module>maven-standard</module> <module>maven-standard</module>
<module>quickcloud</module> <module>quickcloud</module>
<module>build/checkstyle</module>
</modules> </modules>
<dependencyManagement> <dependencyManagement>
@ -448,6 +448,7 @@
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<!--
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
@ -455,9 +456,11 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
-->
<inherited>false</inherited>
<executions> <executions>
<execution> <execution>
<phase>process-classes</phase> <phase>install</phase>
<goals> <goals>
<goal>check</goal> <goal>check</goal>
</goals> </goals>
@ -465,7 +468,7 @@
</executions> </executions>
<configuration> <configuration>
<failsOnError>true</failsOnError> <failsOnError>true</failsOnError>
<configLocation>tooling/checkstyle.xml</configLocation> <configLocation>${project.basedir}/build/checkstyle/src/main/resources/tooling/checkstyle.xml</configLocation>
<consoleOutput>true</consoleOutput> <consoleOutput>true</consoleOutput>
<includeTestSourceDirectory>true</includeTestSourceDirectory> <includeTestSourceDirectory>true</includeTestSourceDirectory>
<sourceDirectory>${project.basedir}</sourceDirectory> <sourceDirectory>${project.basedir}</sourceDirectory>
@ -757,14 +760,18 @@
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<configuration> <configuration>
<failsOnError>true</failsOnError>
<configLocation>tooling/checkstyle.xml</configLocation> <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> </configuration>
</plugin> </plugin>
</plugins> </plugins>
</reporting> </reporting>
--> -->
<profiles> <profiles>
<profile> <profile>
<id>awsapi</id> <id>awsapi</id>