apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge some stuff from maven-waf branch into master

Browse Source
This commit is contained in:
Hugo Trippaers 2012-10-01 15:04:08 -07:00
parent 011281f93d
commit f16b5103d8
10 changed files with 172 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
awsapi/pom.xml
View File

@ -343,4 +343,5 @@
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
<packaging>war</packaging>
</project> </project>

82
client/pom.xml
View File

@ -213,4 +213,86 @@
</plugins> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
<profiles>
<profile>
<id>netapp</id>
<activation>
<property>
<name>nonoss</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-netapp</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>f5</id>
<activation>
<property>
<name>nonoss</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-network-f5</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>netscaler</id>
<activation>
<property>
<name>nonoss</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-network-netscaler</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>srx</id>
<activation>
<property>
<name>nonoss</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-network-srx</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
<profile>
<id>vmware</id>
<activation>
<property>
<name>nonoss</name>
</property>
</activation>
<dependencies>
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-plugin-hypervisor-vmware</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-vmware-base</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
</profile>
</profiles>
</project> </project>

19
console-proxy/pom.xml
View File

@ -137,7 +137,19 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<!--plugin> </plugins>
</build>
<profiles>
<profile>
<id>systemvm</id>
<activation>
<property>
<name>systemvm</name>
</property>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version> <version>1.2.1</version>
@ -162,7 +174,10 @@
<argument>authorized_keys</argument> <argument>authorized_keys</argument>
</arguments> </arguments>
</configuration> </configuration>
</plugin--> </plugin>
</plugins> </plugins>
</build> </build>
</profile>
</profiles>
</project> </project>

2
core/pom.xml
View File

@ -57,6 +57,6 @@
<build> <build>
<defaultGoal>install</defaultGoal> <defaultGoal>install</defaultGoal>
<sourceDirectory>src</sourceDirectory> <sourceDirectory>src</sourceDirectory>
<!-- <testSourceDirectory>test</testSourceDirectory> --> <testSourceDirectory>test</testSourceDirectory>
</build> </build>
</project> </project>

1
plugins/pom.xml
View File

@ -29,6 +29,7 @@
<build> <build>
<defaultGoal>install</defaultGoal> <defaultGoal>install</defaultGoal>
<sourceDirectory>src</sourceDirectory> <sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
</build> </build>
<modules> <modules>
<module>deployment-planners/user-concentrated-pod</module> <module>deployment-planners/user-concentrated-pod</module>

20
pom.xml
View File

@ -156,6 +156,7 @@
<module>plugins</module> <module>plugins</module>
<module>awsapi</module> <module>awsapi</module>
<module>patches</module> <module>patches</module>
<module>client</module>
<module>test</module> <module>test</module>
</modules> </modules>
@ -312,12 +313,7 @@
</build> </build>
<profiles> <profiles>
<profile>
<id>client</id>
<modules>
<module>client</module>
</modules>
</profile>
<profile> <profile>
<id>deps</id> <id>deps</id>
<modules> <modules>
@ -330,6 +326,18 @@
<module>developer</module> <module>developer</module>
</modules> </modules>
</profile> </profile>
<profile>
<id>vmware</id>
<activation>
<property>
<name>nonoss</name>
</property>
</activation>
<modules>
<module>vmware-base</module>
</modules>
</profile>
</profiles> </profiles>
</project> </project>

26
server/pom.xml
View File

@ -63,10 +63,34 @@
<artifactId>jstl</artifactId> <artifactId>jstl</artifactId>
<version>${cs.jstl.version}</version> <version>${cs.jstl.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.apache.cloudstack</groupId>
<artifactId>cloud-utils</artifactId>
<version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<defaultGoal>install</defaultGoal> <defaultGoal>install</defaultGoal>
<sourceDirectory>src</sourceDirectory> <sourceDirectory>src</sourceDirectory>
<!-- <testSourceDirectory>test</testSourceDirectory> --> <testSourceDirectory>test</testSourceDirectory>
<testResources>
<testResource>
<directory>test/resources</directory>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<exclude>com/cloud/upgrade/*</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build> </build>
</project> </project>

1
usage/pom.xml
View File

@ -35,5 +35,6 @@
<build> <build>
<defaultGoal>install</defaultGoal> <defaultGoal>install</defaultGoal>
<sourceDirectory>src</sourceDirectory> <sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
</build> </build>
</project> </project>

24
utils/pom.xml
View File

@ -123,11 +123,26 @@
<artifactId>commons-configuration</artifactId> <artifactId>commons-configuration</artifactId>
<version>${cs.configuration.version}</version> <version>${cs.configuration.version}</version>
</dependency> </dependency>
<!-- Test dependency in mysql for db tests -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<version>5.1.21</version>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<build> <build>
<defaultGoal>install</defaultGoal> <defaultGoal>install</defaultGoal>
<sourceDirectory>src</sourceDirectory> <sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory> <testSourceDirectory>test</testSourceDirectory>
<testResources>
<testResource>
<directory>test/resources</directory>
</testResource>
<testResource>
<directory>conf</directory>
</testResource>
</testResources>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
@ -140,6 +155,15 @@
</execution> </execution>
</executions> </executions>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<excludes>
<exclude>com/cloud/utils/testcase/*TestCase*</exclude>
</excludes>
</configuration>
</plugin>
</plugins> </plugins>
<resources> <resources>
<resource> <resource>

5
vmware-base/pom.xml
View File

@ -24,7 +24,7 @@
<parent> <parent>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack</artifactId> <artifactId>cloudstack</artifactId>
<version>4.0.0-SNAPSHOT</version> <version>4.1.0-SNAPSHOT</version>
</parent> </parent>
<dependencies> <dependencies>
<dependency> <dependency>
@ -41,16 +41,19 @@
<groupId>com.cloud.com.vmware</groupId> <groupId>com.cloud.com.vmware</groupId>
<artifactId>vmware-vim</artifactId> <artifactId>vmware-vim</artifactId>
<version>1.0</version> <version>1.0</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.cloud.com.vmware</groupId> <groupId>com.cloud.com.vmware</groupId>
<artifactId>vmware-vim25</artifactId> <artifactId>vmware-vim25</artifactId>
<version>1.0</version> <version>1.0</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.cloud.com.vmware</groupId> <groupId>com.cloud.com.vmware</groupId>
<artifactId>vmware-apputils</artifactId> <artifactId>vmware-apputils</artifactId>
<version>1.0</version> <version>1.0</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.axis</groupId> <groupId>org.apache.axis</groupId>