Updated Branches: refs/heads/master 93aaa5f97 -> f16b5103d
Merge some stuff from maven-waf branch into master Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f16b5103 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f16b5103 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f16b5103 Branch: refs/heads/master Commit: f16b5103d8c5737d88e126f59283944521ff2baf Parents: 011281f Author: Hugo Trippaers <[email protected]> Authored: Mon Oct 1 15:04:08 2012 -0700 Committer: Hugo Trippaers <[email protected]> Committed: Mon Oct 1 15:04:08 2012 -0700 ---------------------------------------------------------------------- awsapi/pom.xml | 1 + client/pom.xml | 82 ++++++++++++++++++++++++++++++++++++++++++++ console-proxy/pom.xml | 23 ++++++++++-- core/pom.xml | 2 +- plugins/pom.xml | 1 + pom.xml | 20 +++++++--- server/pom.xml | 26 +++++++++++++- usage/pom.xml | 1 + utils/pom.xml | 24 +++++++++++++ vmware-base/pom.xml | 5 ++- 10 files changed, 172 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f16b5103/awsapi/pom.xml ---------------------------------------------------------------------- diff --git a/awsapi/pom.xml b/awsapi/pom.xml index f7db10a..5a6fd67 100644 --- a/awsapi/pom.xml +++ b/awsapi/pom.xml @@ -343,4 +343,5 @@ </plugins> </pluginManagement> </build> + <packaging>war</packaging> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f16b5103/client/pom.xml ---------------------------------------------------------------------- diff --git a/client/pom.xml b/client/pom.xml index 3929894..0a13876 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -213,4 +213,86 @@ </plugins> </pluginManagement> </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> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f16b5103/console-proxy/pom.xml ---------------------------------------------------------------------- diff --git a/console-proxy/pom.xml b/console-proxy/pom.xml index b69725f..a7fd1e5 100644 --- a/console-proxy/pom.xml +++ b/console-proxy/pom.xml @@ -137,7 +137,19 @@ </execution> </executions> </plugin> - <!--plugin> + </plugins> + </build> + <profiles> + <profile> + <id>systemvm</id> + <activation> + <property> + <name>systemvm</name> + </property> + </activation> + <build> + <plugins> + <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> <version>1.2.1</version> @@ -162,7 +174,10 @@ <argument>authorized_keys</argument> </arguments> </configuration> - </plugin--> - </plugins> - </build> + </plugin> + </plugins> + </build> + </profile> + </profiles> + </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f16b5103/core/pom.xml ---------------------------------------------------------------------- diff --git a/core/pom.xml b/core/pom.xml index 23bbee5..ac45233 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -57,6 +57,6 @@ <build> <defaultGoal>install</defaultGoal> <sourceDirectory>src</sourceDirectory> - <!-- <testSourceDirectory>test</testSourceDirectory> --> + <testSourceDirectory>test</testSourceDirectory> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f16b5103/plugins/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/pom.xml b/plugins/pom.xml index ffd1fe9..dbdea24 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -29,6 +29,7 @@ <build> <defaultGoal>install</defaultGoal> <sourceDirectory>src</sourceDirectory> + <testSourceDirectory>test</testSourceDirectory> </build> <modules> <module>deployment-planners/user-concentrated-pod</module> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f16b5103/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 67efdc2..1c553d1 100644 --- a/pom.xml +++ b/pom.xml @@ -156,6 +156,7 @@ <module>plugins</module> <module>awsapi</module> <module>patches</module> + <module>client</module> <module>test</module> </modules> @@ -312,12 +313,7 @@ </build> <profiles> - <profile> - <id>client</id> - <modules> - <module>client</module> - </modules> - </profile> + <profile> <id>deps</id> <modules> @@ -330,6 +326,18 @@ <module>developer</module> </modules> </profile> + <profile> + <id>vmware</id> + <activation> + <property> + <name>nonoss</name> + </property> + </activation> + <modules> + <module>vmware-base</module> + </modules> + </profile> + </profiles> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f16b5103/server/pom.xml ---------------------------------------------------------------------- diff --git a/server/pom.xml b/server/pom.xml index 4d38fb3..29922b6 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -63,10 +63,34 @@ <artifactId>jstl</artifactId> <version>${cs.jstl.version}</version> </dependency> + <dependency> + <groupId>org.apache.cloudstack</groupId> + <artifactId>cloud-utils</artifactId> + <version>${project.version}</version> + <classifier>tests</classifier> + <scope>test</scope> + </dependency> + </dependencies> <build> <defaultGoal>install</defaultGoal> <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> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f16b5103/usage/pom.xml ---------------------------------------------------------------------- diff --git a/usage/pom.xml b/usage/pom.xml index 258bf84..252e293 100644 --- a/usage/pom.xml +++ b/usage/pom.xml @@ -35,5 +35,6 @@ <build> <defaultGoal>install</defaultGoal> <sourceDirectory>src</sourceDirectory> + <testSourceDirectory>test</testSourceDirectory> </build> </project> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f16b5103/utils/pom.xml ---------------------------------------------------------------------- diff --git a/utils/pom.xml b/utils/pom.xml index 8309a64..47e20ed 100644 --- a/utils/pom.xml +++ b/utils/pom.xml @@ -123,11 +123,26 @@ <artifactId>commons-configuration</artifactId> <version>${cs.configuration.version}</version> </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> <build> <defaultGoal>install</defaultGoal> <sourceDirectory>src</sourceDirectory> <testSourceDirectory>test</testSourceDirectory> + <testResources> + <testResource> + <directory>test/resources</directory> + </testResource> + <testResource> + <directory>conf</directory> + </testResource> + </testResources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -140,6 +155,15 @@ </execution> </executions> </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> <resources> <resource> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f16b5103/vmware-base/pom.xml ---------------------------------------------------------------------- diff --git a/vmware-base/pom.xml b/vmware-base/pom.xml index 1dabe83..32f9d3f 100644 --- a/vmware-base/pom.xml +++ b/vmware-base/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.apache.cloudstack</groupId> <artifactId>cloudstack</artifactId> - <version>4.0.0-SNAPSHOT</version> + <version>4.1.0-SNAPSHOT</version> </parent> <dependencies> <dependency> @@ -41,16 +41,19 @@ <groupId>com.cloud.com.vmware</groupId> <artifactId>vmware-vim</artifactId> <version>1.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.cloud.com.vmware</groupId> <artifactId>vmware-vim25</artifactId> <version>1.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>com.cloud.com.vmware</groupId> <artifactId>vmware-apputils</artifactId> <version>1.0</version> + <scope>provided</scope> </dependency> <dependency> <groupId>org.apache.axis</groupId>
