Skip to content

Commit 0330e64

Browse files
yadvrAlex Huang
yadvr
authored and
Alex Huang
committed
Maven: Fix POM in test
Fixes and adds dependencies for building submodule test Signed-off-by: Rohit Yadav <rohit.yadav@citrix.com>
1 parent 67d3d9d commit 0330e64

3 files changed

Lines changed: 29 additions & 9 deletions

File tree

‎deps/pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,11 @@
102102
<groupId>org.apache.cloudstack</groupId>
103103
<artifactId>cloud-awsapi</artifactId>
104104
<version>${project.version}</version>
105+
</dependency>
106+
<dependency>
107+
<groupId>org.apache.cloudstack</groupId>
108+
<artifactId>cloud-testclient</artifactId>
109+
<version>${project.version}</version>
105110
</dependency>
106111
<dependency>
107112
<groupId>mysql</groupId>
@@ -136,7 +141,7 @@
136141
<overWriteReleases>false</overWriteReleases>
137142
<overWriteSnapshots>false</overWriteSnapshots>
138143
<overWriteIfNewer>true</overWriteIfNewer>
139-
<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>
144+
<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>
140145
</configuration>
141146
</execution>
142147
</executions>

‎pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@
7979
<cs.neethi.version>2.0.4</cs.neethi.version>
8080
<cs.servlet.version>2.4</cs.servlet.version>
8181
<cs.jstl.version>1.2</cs.jstl.version>
82-
<cs.selenium.java.version>2.24.1</cs.selenium.java.version>
83-
82+
<cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
8483
<skipTests>true</skipTests>
8584

8685
</properties>
@@ -158,6 +157,7 @@
158157
<module>plugins</module>
159158
<module>awsapi</module>
160159
<module>patches</module>
160+
<module>test</module>
161161
</modules>
162162

163163
<dependencies>

‎test/pom.xml‎

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,27 @@
1919
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2020
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
2121
<modelVersion>4.0.0</modelVersion>
22-
<artifactId>cloud-test</artifactId>
22+
<artifactId>cloud-testclient</artifactId>
2323
<name>Apache CloudStack Test</name>
2424
<parent>
2525
<groupId>org.apache.cloudstack</groupId>
2626
<artifactId>cloudstack</artifactId>
2727
<version>4.0.0-SNAPSHOT</version>
2828
</parent>
2929
<dependencies>
30+
<dependency>
31+
<groupId>org.apache.cloudstack</groupId>
32+
<artifactId>cloud-utils</artifactId>
33+
<version>${project.version}</version>
34+
</dependency>
3035
<dependency>
3136
<groupId>log4j</groupId>
3237
<artifactId>log4j</artifactId>
3338
<version>${cs.log4j.version}</version>
3439
</dependency>
3540
<dependency>
3641
<groupId>junit</groupId>
37-
<artifactId>org.junit</artifactId>
42+
<artifactId>junit</artifactId>
3843
<version>${cs.junit.version}</version>
3944
</dependency>
4045
<dependency>
@@ -54,13 +59,23 @@
5459
</exclusions>
5560
</dependency>
5661
<dependency>
57-
<groupId>org.seleniumhq.selenium</groupId>
58-
<artifactId>selenium-java</artifactId>
59-
<version>${cs.selenium.java.version}</version>
62+
<groupId>org.openqa.selenium.server</groupId>
63+
<artifactId>selenium-server</artifactId>
64+
<version>${cs.selenium.server.version}</version>
65+
</dependency>
66+
<dependency>
67+
<groupId>org.seleniumhq.selenium.client-drivers</groupId>
68+
<artifactId>selenium-java-client-driver</artifactId>
69+
<version>1.0.1</version>
70+
</dependency>
71+
<dependency>
72+
<groupId>commons-httpclient</groupId>
73+
<artifactId>commons-httpclient</artifactId>
74+
<version>${cs.httpclient.version}</version>
6075
</dependency>
6176
</dependencies>
6277
<build>
63-
<defaultGoal>install</defaultGoal>
78+
<defaultGoal>compile</defaultGoal>
6479
<sourceDirectory>src</sourceDirectory>
6580
<testSourceDirectory>test</testSourceDirectory>
6681
<plugins>

0 commit comments

Comments
 (0)