You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2012/09/10 22:55:52 UTC
[18/50] [abbrv] git commit: Maven: Fix POM in test
Maven: Fix POM in test
Fixes and adds dependencies for building submodule test
Signed-off-by: Rohit Yadav <ro...@citrix.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/d9171208
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/d9171208
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/d9171208
Branch: refs/heads/4.0
Commit: d917120845331fc2a8d4dadad9dc44ccde9a444e
Parents: 42cc2eb
Author: Rohit Yadav <ro...@citrix.com>
Authored: Mon Sep 10 18:13:14 2012 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Mon Sep 10 18:18:28 2012 +0530
----------------------------------------------------------------------
deps/pom.xml | 7 ++++++-
pom.xml | 4 ++--
test/pom.xml | 27 +++++++++++++++++++++------
3 files changed, 29 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d9171208/deps/pom.xml
----------------------------------------------------------------------
diff --git a/deps/pom.xml b/deps/pom.xml
index 239e1f1..f99e7fe 100644
--- a/deps/pom.xml
+++ b/deps/pom.xml
@@ -103,6 +103,11 @@
<artifactId>cloud-awsapi</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-testclient</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
@@ -136,7 +141,7 @@
<overWriteReleases>false</overWriteReleases>
<overWriteSnapshots>false</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
- <excludeArtifactIds>cloud-core,cloud-server,cloud-api,cloud-utils,cloud-vmware-base,cloud-agent,cloud-plugin-host-allocator-random,cloud-plugin-hypervisor-kvm,cloud-plugin-hypervisor-ovm,cloud-plugin-hypervisor-vmware,cloud-plugin-hypervisor-xen,cloud-plugin-netapp,cloud-plugin-network-elb,cloud-plugin-network-f5,cloud-plugin-network-netscaler,cloud-plugin-network-nvp,cloud-plugin-network-ovs,cloud-plugin-network-srx,cloud-plugin-planner-user-concentrated-pod,cloud-plugin-planner-user-dispersing,cloud-plugin-storage-allocator-random,cloud-plugin-user-authenticator-ldap,cloud-plugin-user-authenticator-md5,cloud-plugin-user-authenticator-plaintext,cloud-utils,cloud-vmware-base,cloud-awsapi</excludeArtifactIds>
+ <excludeArtifactIds>cloud-core,cloud-server,cloud-api,cloud-vmware-base,cloud-agent,cloud-plugin-host-allocator-random,cloud-plugin-hypervisor-kvm,cloud-plugin-hypervisor-ovm,cloud-plugin-hypervisor-vmware,cloud-plugin-hypervisor-xen,cloud-plugin-netapp,cloud-plugin-network-elb,cloud-plugin-network-f5,cloud-plugin-network-netscaler,cloud-plugin-network-nvp,cloud-plugin-network-ovs,cloud-plugin-network-srx,cloud-plugin-planner-user-concentrated-pod,cloud-plugin-planner-user-dispersing,cloud-plugin-storage-allocator-random,cloud-plugin-user-authenticator-ldap,cloud-plugin-user-authenticator-md5,cloud-plugin-user-authenticator-plaintext,cloud-utils,cloud-vmware-base,cloud-awsapi,cloud-testclient</excludeArtifactIds>
</configuration>
</execution>
</executions>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d9171208/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index dc74335..332e775 100644
--- a/pom.xml
+++ b/pom.xml
@@ -79,8 +79,7 @@
<cs.neethi.version>2.0.4</cs.neethi.version>
<cs.servlet.version>2.4</cs.servlet.version>
<cs.jstl.version>1.2</cs.jstl.version>
- <cs.selenium.java.version>2.24.1</cs.selenium.java.version>
-
+ <cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
<skipTests>true</skipTests>
</properties>
@@ -158,6 +157,7 @@
<module>plugins</module>
<module>awsapi</module>
<module>patches</module>
+ <module>test</module>
</modules>
<dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/d9171208/test/pom.xml
----------------------------------------------------------------------
diff --git a/test/pom.xml b/test/pom.xml
index 53e0bcd..f70a89f 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -19,7 +19,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <artifactId>cloud-test</artifactId>
+ <artifactId>cloud-testclient</artifactId>
<name>Apache CloudStack Test</name>
<parent>
<groupId>org.apache.cloudstack</groupId>
@@ -28,13 +28,18 @@
</parent>
<dependencies>
<dependency>
+ <groupId>org.apache.cloudstack</groupId>
+ <artifactId>cloud-utils</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>${cs.log4j.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
- <artifactId>org.junit</artifactId>
+ <artifactId>junit</artifactId>
<version>${cs.junit.version}</version>
</dependency>
<dependency>
@@ -54,13 +59,23 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.seleniumhq.selenium</groupId>
- <artifactId>selenium-java</artifactId>
- <version>${cs.selenium.java.version}</version>
+ <groupId>org.openqa.selenium.server</groupId>
+ <artifactId>selenium-server</artifactId>
+ <version>${cs.selenium.server.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.seleniumhq.selenium.client-drivers</groupId>
+ <artifactId>selenium-java-client-driver</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>${cs.httpclient.version}</version>
</dependency>
</dependencies>
<build>
- <defaultGoal>install</defaultGoal>
+ <defaultGoal>compile</defaultGoal>
<sourceDirectory>src</sourceDirectory>
<testSourceDirectory>test</testSourceDirectory>
<plugins>