You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by wi...@apache.org on 2012/09/13 16:29:13 UTC

[3/7] git commit: Depend on libvirt-java 0.4.9 due to license change

Depend on libvirt-java 0.4.9 due to license change

0.4.9 switched from GPL to MIT


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/b892ff66
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b892ff66
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b892ff66

Branch: refs/heads/master
Commit: b892ff663063a5ea67df5f10bc9994fd54c47677
Parents: e426ba2
Author: Wido den Hollander <wi...@widodh.nl>
Authored: Thu Sep 13 14:47:04 2012 +0200
Committer: Wido den Hollander <wi...@widodh.nl>
Committed: Thu Sep 13 16:29:01 2012 +0200

----------------------------------------------------------------------
 cloud.spec                      |    2 +-
 debian/cloud-agent-deps.install |    2 +-
 plugins/hypervisors/kvm/pom.xml |    2 +-
 wscript_build                   |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b892ff66/cloud.spec
----------------------------------------------------------------------
diff --git a/cloud.spec b/cloud.spec
index 02aa64f..761ff35 100644
--- a/cloud.spec
+++ b/cloud.spec
@@ -542,7 +542,7 @@ fi
 %defattr(0644,root,root,0755)
 %{_javadir}/%{name}-agent.jar
 %{_javadir}/%{name}-plugin-hypervisor-kvm.jar
-%{_javadir}/libvirt-0.4.8.jar
+%{_javadir}/libvirt-0.4.9.jar
 
 %files agent
 %defattr(0644,root,root,0755)

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b892ff66/debian/cloud-agent-deps.install
----------------------------------------------------------------------
diff --git a/debian/cloud-agent-deps.install b/debian/cloud-agent-deps.install
index da90a30..cd8db2a 100644
--- a/debian/cloud-agent-deps.install
+++ b/debian/cloud-agent-deps.install
@@ -16,4 +16,4 @@
 # under the License.
 
 /usr/share/java/gson-1.7.1.jar
-/usr/share/java/libvirt-0.4.8.jar
+/usr/share/java/libvirt-0.4.9.jar

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b892ff66/plugins/hypervisors/kvm/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml
index 2d1a001..4863085 100644
--- a/plugins/hypervisors/kvm/pom.xml
+++ b/plugins/hypervisors/kvm/pom.xml
@@ -42,7 +42,7 @@
     <dependency>
       <groupId>org.libvirt</groupId>
       <artifactId>libvirt</artifactId>
-      <version>0.4.8</version>
+      <version>0.4.9</version>
     </dependency>
   </dependencies>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/b892ff66/wscript_build
----------------------------------------------------------------------
diff --git a/wscript_build b/wscript_build
index 2de698c..19e5fe5 100644
--- a/wscript_build
+++ b/wscript_build
@@ -162,7 +162,7 @@ def build_dependences ():
 
 	start_path = bld.path.find_dir ("deps")
 
-        bld.install_files('${JAVADIR}',start_path.ant_glob(["CAStorSDK-*.jar", "javax.persistence-2.0.0.jar", "apache-log4j-extras-1.1.jar", "libvirt-0.4.8.jar", "axis2-1.5.1.jar", "jstl-1.2.jar", "commons-discovery-0.5.jar", "commons-codec-1.6.jar", "ejb-api-3.0.jar", "xmlrpc-client-3.1.3.jar", "commons-dbcp-1.4.jar", "commons-pool-1.6.jar", "gson-1.7.1.jar", 
+        bld.install_files('${JAVADIR}',start_path.ant_glob(["CAStorSDK-*.jar", "javax.persistence-2.0.0.jar", "apache-log4j-extras-1.1.jar", "libvirt-0.4.9.jar", "axis2-1.5.1.jar", "jstl-1.2.jar", "commons-discovery-0.5.jar", "commons-codec-1.6.jar", "ejb-api-3.0.jar", "xmlrpc-client-3.1.3.jar", "commons-dbcp-1.4.jar", "commons-pool-1.6.jar", "gson-1.7.1.jar", 
          "netscaler-1.0.jar", "netscaler-sdx-1.0.jar", "backport-util-concurrent-3.1.jar", "ehcache-1.5.0.jar", "httpcore-4.0.jar", "log4j-1.2.16.jar", "trilead-ssh2-build213-svnkit-1.3-patch.jar", "cglib-nodep-2.2.2.jar", "xmlrpc-common-3.*.jar", 
          "xmlrpc-client-3.*.jar", "axis-1.4.jar", "wsdl4j-1.6.2.jar", "bcprov-jdk16-1.45.jar", "jsch-0.1.42.jar", "jasypt-1.9.0.jar", "commons-configuration-1.8.jar", "commons-lang-2.6.jar",  "mail-1.4.jar", "activation-1.1.jar",  "xapi-5.6.100-1-SNAPSHOT.jar"], excl = excludes), cwd=start_path)