You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2012/10/23 11:49:18 UTC
[16/50] [abbrv] git commit: Fix runtime dependencies for vmware
modules
Fix runtime dependencies for vmware modules
The vmware modules should be listed as provided so they are never
packaged. However this also means that you have to put them in the
web-inf/lib directory by hand.
Set the version of the api in the central pom for easy reference.
Add wsdl4j as a runtime requirement. It is actually required by the
vmware implementation but it is easier to list it as a requirements for
the component here as vmware is not in any maven repo
put the dependency on vim back in the dependencies. It is not required
for compile, but is required as runtime by apputils.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6a208026
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6a208026
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6a208026
Branch: refs/heads/marvin-parallel
Commit: 6a20802640d702c41d342036634bde4cbc12b441
Parents: 2999d43
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Mon Oct 22 17:57:18 2012 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Mon Oct 22 17:58:36 2012 +0200
----------------------------------------------------------------------
deps/install-non-oss.sh | 1 +
plugins/hypervisors/vmware/pom.xml | 27 +++++++++++++++++++++++----
pom.xml | 1 +
vmware-base/pom.xml | 18 ++++++++++++++++--
4 files changed, 41 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6a208026/deps/install-non-oss.sh
----------------------------------------------------------------------
diff --git a/deps/install-non-oss.sh b/deps/install-non-oss.sh
index 4b6869e..28eb03e 100755
--- a/deps/install-non-oss.sh
+++ b/deps/install-non-oss.sh
@@ -28,3 +28,4 @@ mvn install:install-file -Dfile=manageontap.jar -DgroupId=com.cloud.com.netapp
# Version: 4.1, Release-date: 2010-07-13, Build: 257238
mvn install:install-file -Dfile=vim25.jar -DgroupId=com.cloud.com.vmware -DartifactId=vmware-vim25 -Dversion=4.1 -Dpackaging=jar
mvn install:install-file -Dfile=apputils.jar -DgroupId=com.cloud.com.vmware -DartifactId=vmware-apputils -Dversion=4.1 -Dpackaging=jar
+mvn install:install-file -Dfile=vim.jar -DgroupId=com.cloud.com.vmware -DartifactId=vmware-vim -Dversion=4.1 -Dpackaging=jar
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6a208026/plugins/hypervisors/vmware/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml
index 00cccf4..20ab9ab 100644
--- a/plugins/hypervisors/vmware/pom.xml
+++ b/plugins/hypervisors/vmware/pom.xml
@@ -35,19 +35,38 @@
<dependency>
<groupId>com.cloud.com.vmware</groupId>
<artifactId>vmware-vim25</artifactId>
- <version>4.1</version>
- <scope>compile</scope>
+ <version>${cs.vmware.api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.cloud.com.vmware</groupId>
+ <artifactId>vmware-vim</artifactId>
+ <version>${cs.vmware.api.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.cloud.com.vmware</groupId>
<artifactId>vmware-apputils</artifactId>
- <version>4.1</version>
- <scope>compile</scope>
+ <version>${cs.vmware.api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis</groupId>
+ <artifactId>axis</artifactId>
+ <version>${cs.axis.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis-jaxrpc</artifactId>
<version>${cs.axis.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>1.4</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6a208026/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index f1a21bb..12b4067 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,6 +80,7 @@
<cs.servlet.version>2.4</cs.servlet.version>
<cs.jstl.version>1.2</cs.jstl.version>
<cs.selenium.server.version>1.0-20081010.060147</cs.selenium.server.version>
+ <cs.vmware.api.version>4.1</cs.vmware.api.version>
<skipTests>true</skipTests>
</properties>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6a208026/vmware-base/pom.xml
----------------------------------------------------------------------
diff --git a/vmware-base/pom.xml b/vmware-base/pom.xml
index 6c304af..9721bbe 100644
--- a/vmware-base/pom.xml
+++ b/vmware-base/pom.xml
@@ -40,24 +40,38 @@
<dependency>
<groupId>com.cloud.com.vmware</groupId>
<artifactId>vmware-vim25</artifactId>
- <version>4.1</version>
+ <version>${cs.vmware.api.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.cloud.com.vmware</groupId>
+ <artifactId>vmware-vim</artifactId>
+ <version>${cs.vmware.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.cloud.com.vmware</groupId>
<artifactId>vmware-apputils</artifactId>
- <version>4.1</version>
+ <version>${cs.vmware.api.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis</artifactId>
<version>${cs.axis.version}</version>
+ <scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis-jaxrpc</artifactId>
<version>${cs.axis.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>1.4</version>
+ <scope>runtime</scope>
</dependency>
</dependencies>
<build>