Skip to content

Commit

Permalink
Moved the check-style.xml into the tools directory given that we're n…
Browse files Browse the repository at this point in the history 
…ot using the project to reference the style any longer. Fixed problems with eclipse complaining about copy-dependencies
  • Loading branch information
Alex Huang committed Dec 21, 2013
1 parent 6b62a04 commit c2baed6
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 233 deletions.
33 changes: 0 additions & 33 deletions agent/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,38 +115,5 @@
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-antrun-plugin
</artifactId>
<versionRange>[1.7,)</versionRange>
<goals>
<goal>run</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
2 changes: 2 additions & 0 deletions awsapi/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -408,6 +408,7 @@
</executions>
</plugin>
</plugins>
<!--
<pluginManagement>
<plugins>
<plugin>
Expand Down Expand Up @@ -449,6 +450,7 @@
</plugin>
</plugins>
</pluginManagement>
-->
</build>
<profiles>
<profile>
Expand Down
21 changes: 0 additions & 21 deletions build/checkstyle/pom.xml
View file

This file was deleted.

31 changes: 0 additions & 31 deletions deps/XenServerJava/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,35 +35,4 @@
<version>${cs.xmlrpc.version}</version>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>build-checkstyle</artifactId>
<version>${parent.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>
<excludes>**\/*</excludes>
</configuration>
</plugin>
</plugins>
</build>
</project>
33 changes: 0 additions & 33 deletions engine/storage/integration-test/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,38 +185,5 @@
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-antrun-plugin
</artifactId>
<versionRange>[1.7,)</versionRange>
<goals>
<goal>run</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
7 changes: 7 additions & 0 deletions .../integration-test/test/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
*/
package org.apache.cloudstack.storage.test;

import java.util.Map;
import java.util.UUID;

import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo;
Expand Down Expand Up @@ -106,4 +107,10 @@ public boolean canCopy(DataObject srcData, DataObject destData) {
public void resize(DataObject data, AsyncCompletionCallback<CreateCmdResult> callback) {
//To change body of implemented methods use File | Settings | File Templates.
}

@Override
public Map<String, String> getCapabilities() {
// TODO Auto-generated method stub
return null;
}
}
2 changes: 0 additions & 2 deletions plugins/user-authenticators/ldap/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@
</plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
Expand Down Expand Up @@ -125,7 +124,6 @@
</plugins>
</pluginManagement>
</build>

<dependencies>
<!-- Mandatory dependencies for using Spock -->
<dependency>
Expand Down
50 changes: 16 additions & 34 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@
</organization>

<modules>
<module>build/checkstyle</module>
<module>api</module>
<module>agent</module>
<module>core</module>
Expand Down Expand Up @@ -448,27 +447,18 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<!--
<dependencies>
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>build-checkstyle</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
-->
<inherited>false</inherited>
<inherited>false</inherited>
<executions>
<execution>
<phase>validate</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</execution>
</executions>
<configuration>
<failsOnError>true</failsOnError>
<configLocation>${project.basedir}/build/checkstyle/src/main/resources/tooling/checkstyle.xml</configLocation>
<configLocation>${project.basedir}/tools/checkstyle/cloud-style.xml</configLocation>
<consoleOutput>true</consoleOutput>
<includeTestSourceDirectory>true</includeTestSourceDirectory>
<sourceDirectory>${project.basedir}</sourceDirectory>
Expand Down Expand Up @@ -549,6 +539,19 @@
<ignore />
</action>
</pluginExecution>
<pluginExecution>
<pluginExecutionFilter>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<versionRange>[2.0,)</versionRange>
<goals>
<goal>copy-dependencies</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore />
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
Expand Down Expand Up @@ -653,7 +656,6 @@
<exclude>ui/lib/qunit/qunit.js</exclude>
<exclude>ui/lib/reset.css</exclude>
<exclude>ui/lib/require.js</exclude>
<exclude>waf</exclude>
<exclude>systemvm/conf/agent.properties</exclude>
<exclude>systemvm/conf/environment.properties</exclude>
<exclude>systemvm/js/jquery.js</exclude>
Expand Down Expand Up @@ -753,25 +755,6 @@
</plugins>
</pluginManagement>
</build>
<!--
<reporting>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
<configuration>
<failsOnError>true</failsOnError>
<configLocation>tooling/checkstyle.xml</configLocation>
<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>
Expand Down Expand Up @@ -813,7 +796,6 @@
</properties>
<modules>
<module>developer</module>
<!--module>tools/devcloud</module -->
</modules>
</profile>
<profile>
Expand Down
45 changes: 0 additions & 45 deletions server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,6 @@
<artifactId>cloud-framework-jobs</artifactId>
<version>${project.version}</version>
</dependency>
<!--
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-engine-orchestration</artifactId>
<version>${project.version}</version>
</dependency>
-->
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
Expand Down Expand Up @@ -137,11 +130,6 @@
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>resources</directory>
</resource>
</resources>
<testResources>
<testResource>
<directory>test/resources</directory>
Expand Down Expand Up @@ -228,38 +216,5 @@
</executions>
</plugin>
</plugins>
<pluginManagement>
<plugins>
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
<plugin>
<groupId>org.eclipse.m2e</groupId>
<artifactId>lifecycle-mapping</artifactId>
<version>1.0.0</version>
<configuration>
<lifecycleMappingMetadata>
<pluginExecutions>
<pluginExecution>
<pluginExecutionFilter>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-antrun-plugin
</artifactId>
<versionRange>[1.7,)</versionRange>
<goals>
<goal>run</goal>
</goals>
</pluginExecutionFilter>
<action>
<ignore></ignore>
</action>
</pluginExecution>
</pluginExecutions>
</lifecycleMappingMetadata>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>
</project>
0 ...src/main/resources/tooling/checkstyle.xml → tools/checkstyle/cloud-style.xml
View file
File renamed without changes.
Loading

0 comments on commit c2baed6

Please sign in to comment.