incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chipchild...@apache.org
Subject [1/50] [abbrv] git commit: CLOUDSTACK-346: Replace vmware-lib-jaxrpc with axis-jaxrpc
Date Mon, 15 Oct 2012 20:29:47 GMT
Updated Branches:
  refs/heads/junit-tests b3bf5b6cc -> 012c0d7f4


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 <bhaisaab@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/012c0d7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/012c0d7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/012c0d7f

Branch: refs/heads/junit-tests
Commit: 012c0d7f4d7e9d7bb76e051165cd12563354372e
Parents: dd01818
Author: Rohit Yadav <bhaisaab@apache.org>
Authored: Mon Oct 15 14:28:27 2012 +0530
Committer: Chip Childers <chip.childers@gmail.com>
Committed: Mon Oct 15 16:19:22 2012 -0400

----------------------------------------------------------------------
 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/012c0d7f/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/012c0d7f/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/012c0d7f/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>


Mime
View raw message