Skip to content

Commit c2baed6

Browse files
author
Alex Huang
committed
Moved the check-style.xml into the tools directory given that we're not using the project to reference the style any longer. Fixed problems with eclipse complaining about copy-dependencies
1 parent 6b62a04 commit c2baed6

11 files changed

Lines changed: 25 additions & 233 deletions

File tree

‎agent/pom.xml‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -115,38 +115,5 @@
115115
</executions>
116116
</plugin>
117117
</plugins>
118-
<pluginManagement>
119-
<plugins>
120-
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
121-
<plugin>
122-
<groupId>org.eclipse.m2e</groupId>
123-
<artifactId>lifecycle-mapping</artifactId>
124-
<version>1.0.0</version>
125-
<configuration>
126-
<lifecycleMappingMetadata>
127-
<pluginExecutions>
128-
<pluginExecution>
129-
<pluginExecutionFilter>
130-
<groupId>
131-
org.apache.maven.plugins
132-
</groupId>
133-
<artifactId>
134-
maven-antrun-plugin
135-
</artifactId>
136-
<versionRange>[1.7,)</versionRange>
137-
<goals>
138-
<goal>run</goal>
139-
</goals>
140-
</pluginExecutionFilter>
141-
<action>
142-
<ignore></ignore>
143-
</action>
144-
</pluginExecution>
145-
</pluginExecutions>
146-
</lifecycleMappingMetadata>
147-
</configuration>
148-
</plugin>
149-
</plugins>
150-
</pluginManagement>
151118
</build>
152119
</project>

‎awsapi/pom.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,7 @@
408408
</executions>
409409
</plugin>
410410
</plugins>
411+
<!--
411412
<pluginManagement>
412413
<plugins>
413414
<plugin>
@@ -449,6 +450,7 @@
449450
</plugin>
450451
</plugins>
451452
</pluginManagement>
453+
-->
452454
</build>
453455
<profiles>
454456
<profile>

‎build/checkstyle/pom.xml‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎deps/XenServerJava/pom.xml‎

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -35,35 +35,4 @@
3535
<version>${cs.xmlrpc.version}</version>
3636
</dependency>
3737
</dependencies>
38-
<build>
39-
<plugins>
40-
<plugin>
41-
<groupId>org.apache.maven.plugins</groupId>
42-
<artifactId>maven-checkstyle-plugin</artifactId>
43-
<dependencies>
44-
<dependency>
45-
<groupId>org.apache.cloudstack</groupId>
46-
<artifactId>build-checkstyle</artifactId>
47-
<version>${parent.version}</version>
48-
</dependency>
49-
</dependencies>
50-
<executions>
51-
<execution>
52-
<phase>process-classes</phase>
53-
<goals>
54-
<goal>check</goal>
55-
</goals>
56-
</execution>
57-
</executions>
58-
<configuration>
59-
<failsOnError>true</failsOnError>
60-
<configLocation>tooling/checkstyle.xml</configLocation>
61-
<consoleOutput>true</consoleOutput>
62-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
63-
<sourceDirectory>${project.basedir}</sourceDirectory>
64-
<excludes>**\/*</excludes>
65-
</configuration>
66-
</plugin>
67-
</plugins>
68-
</build>
6938
</project>

‎engine/storage/integration-test/pom.xml‎

Lines changed: 0 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -185,38 +185,5 @@
185185
</executions>
186186
</plugin>
187187
</plugins>
188-
<pluginManagement>
189-
<plugins>
190-
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
191-
<plugin>
192-
<groupId>org.eclipse.m2e</groupId>
193-
<artifactId>lifecycle-mapping</artifactId>
194-
<version>1.0.0</version>
195-
<configuration>
196-
<lifecycleMappingMetadata>
197-
<pluginExecutions>
198-
<pluginExecution>
199-
<pluginExecutionFilter>
200-
<groupId>
201-
org.apache.maven.plugins
202-
</groupId>
203-
<artifactId>
204-
maven-antrun-plugin
205-
</artifactId>
206-
<versionRange>[1.7,)</versionRange>
207-
<goals>
208-
<goal>run</goal>
209-
</goals>
210-
</pluginExecutionFilter>
211-
<action>
212-
<ignore></ignore>
213-
</action>
214-
</pluginExecution>
215-
</pluginExecutions>
216-
</lifecycleMappingMetadata>
217-
</configuration>
218-
</plugin>
219-
</plugins>
220-
</pluginManagement>
221188
</build>
222189
</project>

‎engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
*/
1919
package org.apache.cloudstack.storage.test;
2020

21+
import java.util.Map;
2122
import java.util.UUID;
2223

2324
import org.apache.cloudstack.engine.subsystem.api.storage.ChapInfo;
@@ -106,4 +107,10 @@ public boolean canCopy(DataObject srcData, DataObject destData) {
106107
public void resize(DataObject data, AsyncCompletionCallback<CreateCmdResult> callback) {
107108
//To change body of implemented methods use File | Settings | File Templates.
108109
}
110+
111+
@Override
112+
public Map<String, String> getCapabilities() {
113+
// TODO Auto-generated method stub
114+
return null;
115+
}
109116
}

‎plugins/user-authenticators/ldap/pom.xml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,6 @@
9292
</plugins>
9393
<pluginManagement>
9494
<plugins>
95-
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
9695
<plugin>
9796
<groupId>org.eclipse.m2e</groupId>
9897
<artifactId>lifecycle-mapping</artifactId>
@@ -125,7 +124,6 @@
125124
</plugins>
126125
</pluginManagement>
127126
</build>
128-
129127
<dependencies>
130128
<!-- Mandatory dependencies for using Spock -->
131129
<dependency>

‎pom.xml‎

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@
160160
</organization>
161161

162162
<modules>
163-
<module>build/checkstyle</module>
164163
<module>api</module>
165164
<module>agent</module>
166165
<module>core</module>
@@ -448,27 +447,18 @@
448447
<plugin>
449448
<groupId>org.apache.maven.plugins</groupId>
450449
<artifactId>maven-checkstyle-plugin</artifactId>
451-
<!--
452-
<dependencies>
453-
<dependency>
454-
<groupId>org.apache.cloudstack</groupId>
455-
<artifactId>build-checkstyle</artifactId>
456-
<version>${project.version}</version>
457-
</dependency>
458-
</dependencies>
459-
-->
460-
<inherited>false</inherited>
450+
<inherited>false</inherited>
461451
<executions>
462452
<execution>
463453
<phase>validate</phase>
464454
<goals>
465455
<goal>check</goal>
466456
</goals>
467-
</execution>
457+
</execution>
468458
</executions>
469459
<configuration>
470460
<failsOnError>true</failsOnError>
471-
<configLocation>${project.basedir}/build/checkstyle/src/main/resources/tooling/checkstyle.xml</configLocation>
461+
<configLocation>${project.basedir}/tools/checkstyle/cloud-style.xml</configLocation>
472462
<consoleOutput>true</consoleOutput>
473463
<includeTestSourceDirectory>true</includeTestSourceDirectory>
474464
<sourceDirectory>${project.basedir}</sourceDirectory>
@@ -549,6 +539,19 @@
549539
<ignore />
550540
</action>
551541
</pluginExecution>
542+
<pluginExecution>
543+
<pluginExecutionFilter>
544+
<groupId>org.apache.maven.plugins</groupId>
545+
<artifactId>maven-dependency-plugin</artifactId>
546+
<versionRange>[2.0,)</versionRange>
547+
<goals>
548+
<goal>copy-dependencies</goal>
549+
</goals>
550+
</pluginExecutionFilter>
551+
<action>
552+
<ignore />
553+
</action>
554+
</pluginExecution>
552555
</pluginExecutions>
553556
</lifecycleMappingMetadata>
554557
</configuration>
@@ -653,7 +656,6 @@
653656
<exclude>ui/lib/qunit/qunit.js</exclude>
654657
<exclude>ui/lib/reset.css</exclude>
655658
<exclude>ui/lib/require.js</exclude>
656-
<exclude>waf</exclude>
657659
<exclude>systemvm/conf/agent.properties</exclude>
658660
<exclude>systemvm/conf/environment.properties</exclude>
659661
<exclude>systemvm/js/jquery.js</exclude>
@@ -753,25 +755,6 @@
753755
</plugins>
754756
</pluginManagement>
755757
</build>
756-
<!--
757-
<reporting>
758-
<plugins>
759-
<plugin>
760-
<groupId>org.apache.maven.plugins</groupId>
761-
<artifactId>maven-checkstyle-plugin</artifactId>
762-
<configuration>
763-
<failsOnError>true</failsOnError>
764-
<configLocation>tooling/checkstyle.xml</configLocation>
765-
<consoleOutput>true</consoleOutput>
766-
<includeTestSourceDirectory>true</includeTestSourceDirectory>
767-
<sourceDirectory>${project.basedir}</sourceDirectory>
768-
<includes>**\/*.java</includes>
769-
<excludes>**\/deps\/,**\/test\/,**\/target\/,**\/bin\/,**\/*.xml,**\/*.ini,**\/*.sh,**\/*.bat,**\/awsapi\/,**\/XenServerJava\/,**\/apidoc\/</excludes>
770-
</configuration>
771-
</plugin>
772-
</plugins>
773-
</reporting>
774-
-->
775758
<profiles>
776759
<profile>
777760
<id>awsapi</id>
@@ -813,7 +796,6 @@
813796
</properties>
814797
<modules>
815798
<module>developer</module>
816-
<!--module>tools/devcloud</module -->
817799
</modules>
818800
</profile>
819801
<profile>

‎server/pom.xml‎

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,6 @@
5050
<artifactId>cloud-framework-jobs</artifactId>
5151
<version>${project.version}</version>
5252
</dependency>
53-
<!--
54-
<dependency>
55-
<groupId>org.apache.cloudstack</groupId>
56-
<artifactId>cloud-engine-orchestration</artifactId>
57-
<version>${project.version}</version>
58-
</dependency>
59-
-->
6053
<dependency>
6154
<groupId>org.apache.httpcomponents</groupId>
6255
<artifactId>httpclient</artifactId>
@@ -137,11 +130,6 @@
137130
</dependency>
138131
</dependencies>
139132
<build>
140-
<resources>
141-
<resource>
142-
<directory>resources</directory>
143-
</resource>
144-
</resources>
145133
<testResources>
146134
<testResource>
147135
<directory>test/resources</directory>
@@ -228,38 +216,5 @@
228216
</executions>
229217
</plugin>
230218
</plugins>
231-
<pluginManagement>
232-
<plugins>
233-
<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
234-
<plugin>
235-
<groupId>org.eclipse.m2e</groupId>
236-
<artifactId>lifecycle-mapping</artifactId>
237-
<version>1.0.0</version>
238-
<configuration>
239-
<lifecycleMappingMetadata>
240-
<pluginExecutions>
241-
<pluginExecution>
242-
<pluginExecutionFilter>
243-
<groupId>
244-
org.apache.maven.plugins
245-
</groupId>
246-
<artifactId>
247-
maven-antrun-plugin
248-
</artifactId>
249-
<versionRange>[1.7,)</versionRange>
250-
<goals>
251-
<goal>run</goal>
252-
</goals>
253-
</pluginExecutionFilter>
254-
<action>
255-
<ignore></ignore>
256-
</action>
257-
</pluginExecution>
258-
</pluginExecutions>
259-
</lifecycleMappingMetadata>
260-
</configuration>
261-
</plugin>
262-
</plugins>
263-
</pluginManagement>
264219
</build>
265220
</project>

build/checkstyle/src/main/resources/tooling/checkstyle.xml renamed to tools/checkstyle/cloud-style.xml

File renamed without changes.

0 commit comments

Comments
 (0)