From b892ff663063a5ea67df5f10bc9994fd54c47677 Mon Sep 17 00:00:00 2001 From: Wido den Hollander Date: Thu, 13 Sep 2012 14:47:04 +0200 Subject: [PATCH] Depend on libvirt-java 0.4.9 due to license change 0.4.9 switched from GPL to MIT --- 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(-) diff --git a/cloud.spec b/cloud.spec index 02aa64f8eef..761ff35b766 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) diff --git a/debian/cloud-agent-deps.install b/debian/cloud-agent-deps.install index da90a30a835..cd8db2aba69 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 diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml index 2d1a001c5d0..48630856769 100644 --- a/plugins/hypervisors/kvm/pom.xml +++ b/plugins/hypervisors/kvm/pom.xml @@ -42,7 +42,7 @@ org.libvirt libvirt - 0.4.8 + 0.4.9 diff --git a/wscript_build b/wscript_build index 2de698ca28e..19e5fe54b70 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)