Skip to content

Commit 25dd8de

Browse files
committed
Fix dependencies for vmware hypervisor.
Remove unused imports from VmwareResource as they caused a dependency to xapi.
1 parent 7545fe4 commit 25dd8de

3 files changed

Lines changed: 38 additions & 3 deletions

File tree

console-proxy/pom.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,26 @@
140140
</plugins>
141141
</build>
142142
<profiles>
143+
<profile>
144+
<id>vmware</id>
145+
<activation>
146+
<property>
147+
<name>nonoss</name>
148+
</property>
149+
</activation>
150+
<dependencies>
151+
<dependency>
152+
<groupId>org.apache.cloudstack</groupId>
153+
<artifactId>cloud-plugin-hypervisor-vmware</artifactId>
154+
<version>${project.version}</version>
155+
</dependency>
156+
<dependency>
157+
<groupId>org.apache.cloudstack</groupId>
158+
<artifactId>cloud-vmware-base</artifactId>
159+
<version>${project.version}</version>
160+
</dependency>
161+
</dependencies>
162+
</profile>
143163
<profile>
144164
<id>systemvm</id>
145165
<activation>

plugins/hypervisors/vmware/pom.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,5 +32,23 @@
3232
<artifactId>cloud-vmware-base</artifactId>
3333
<version>${project.version}</version>
3434
</dependency>
35+
<dependency>
36+
<groupId>com.cloud.com.vmware</groupId>
37+
<artifactId>vmware-vim</artifactId>
38+
<version>1.0</version>
39+
<scope>provided</scope>
40+
</dependency>
41+
<dependency>
42+
<groupId>com.cloud.com.vmware</groupId>
43+
<artifactId>vmware-vim25</artifactId>
44+
<version>1.0</version>
45+
<scope>provided</scope>
46+
</dependency>
47+
<dependency>
48+
<groupId>com.cloud.com.vmware</groupId>
49+
<artifactId>vmware-apputils</artifactId>
50+
<version>1.0</version>
51+
<scope>provided</scope>
52+
</dependency>
3553
</dependencies>
3654
</project>

plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,6 @@
250250
import com.vmware.vim25.VirtualMachinePowerState;
251251
import com.vmware.vim25.VirtualMachineRuntimeInfo;
252252
import com.vmware.vim25.VirtualSCSISharing;
253-
import com.xensource.xenapi.Connection;
254-
import com.xensource.xenapi.VIF;
255-
import com.xensource.xenapi.VM;
256253

257254
public class VmwareResource implements StoragePoolResource, ServerResource, VmwareHostService {
258255
private static final Logger s_logger = Logger.getLogger(VmwareResource.class);

0 commit comments

Comments
 (0)