You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2012/10/15 13:17:30 UTC
git commit: CLOUDSTACK-346: Replace vmware-lib-jaxrpc with axis-jaxrpc
Updated Branches:
refs/heads/master a4a319489 -> 9b1b14519
CLOUDSTACK-346: Replace vmware-lib-jaxrpc with axis-jaxrpc
vmware-lib-jaxrpc is now provided by axis-jaxrpc-1.4.jar, the former is
the same as latter (bit by bit) and only difference is the file name.
- Fix dependency in vmware-base's pom.xml
- Fix dependency in hypervisor-plugin-vmware's pom.xml
- Fix install-non-oss.sh by reverting commit:
2e6ddc6c36f4ce79e67ad223647071bccfc41c52.
Signed-off-by: Rohit Yadav <bh...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/9b1b1451
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/9b1b1451
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/9b1b1451
Branch: refs/heads/master
Commit: 9b1b145192645633311da5e3727d5f0484f5d037
Parents: a4a3194
Author: Rohit Yadav <bh...@apache.org>
Authored: Mon Oct 15 14:28:27 2012 +0530
Committer: Rohit Yadav <bh...@apache.org>
Committed: Mon Oct 15 16:44:30 2012 +0530
----------------------------------------------------------------------
deps/install-non-oss.sh | 1 -
plugins/hypervisors/vmware/pom.xml | 11 +++++------
vmware-base/pom.xml | 6 ------
3 files changed, 5 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9b1b1451/deps/install-non-oss.sh
----------------------------------------------------------------------
diff --git a/deps/install-non-oss.sh b/deps/install-non-oss.sh
index 827f59b..9c65a31 100755
--- a/deps/install-non-oss.sh
+++ b/deps/install-non-oss.sh
@@ -23,4 +23,3 @@ mvn install:install-file -Dfile=cloud-manageontap.jar -DgroupId=com.cloud.com.
mvn install:install-file -Dfile=vmware-vim.jar -DgroupId=com.cloud.com.vmware -DartifactId=vmware-vim -Dversion=1.0 -Dpackaging=jar
mvn install:install-file -Dfile=vmware-vim25.jar -DgroupId=com.cloud.com.vmware -DartifactId=vmware-vim25 -Dversion=1.0 -Dpackaging=jar
mvn install:install-file -Dfile=vmware-apputils.jar -DgroupId=com.cloud.com.vmware -DartifactId=vmware-apputils -Dversion=1.0 -Dpackaging=jar
-mvn install:install-file -Dfile=vmware-lib-jaxrpc.jar -DgroupId=com.cloud.com.vmware -DartifactId=vmware-lib-jaxrpc -Dversion=1.0 -Dpackaging=jar
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9b1b1451/plugins/hypervisors/vmware/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml
index 9f1939c..0354e58 100644
--- a/plugins/hypervisors/vmware/pom.xml
+++ b/plugins/hypervisors/vmware/pom.xml
@@ -49,12 +49,11 @@
<artifactId>vmware-apputils</artifactId>
<version>1.0</version>
<scope>compile</scope>
- </dependency>
+ </dependency>
<dependency>
- <groupId>com.cloud.com.vmware</groupId>
- <artifactId>vmware-lib-jaxrpc</artifactId>
- <version>1.0</version>
- <scope>runtime</scope>
- </dependency>
+ <groupId>org.apache.axis</groupId>
+ <artifactId>axis-jaxrpc</artifactId>
+ <version>${cs.axis.version}</version>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/9b1b1451/vmware-base/pom.xml
----------------------------------------------------------------------
diff --git a/vmware-base/pom.xml b/vmware-base/pom.xml
index e2bba78..32f9d3f 100644
--- a/vmware-base/pom.xml
+++ b/vmware-base/pom.xml
@@ -56,12 +56,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>com.cloud.com.vmware</groupId>
- <artifactId>vmware-lib-jaxrpc</artifactId>
- <version>1.0</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
<groupId>org.apache.axis</groupId>
<artifactId>axis</artifactId>
<version>${cs.axis.version}</version>