Updated Branches: refs/heads/4.1 25eb2eb92 -> ac720c1cc refs/heads/master 1cbbc8556 -> 092d5e4cd
Use proper version parameters for libvirt and jna (as per widos commit is master) Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ac720c1c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ac720c1c Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ac720c1c Branch: refs/heads/4.1 Commit: ac720c1cc8177329f2790eb3732c6ee576b640ce Parents: 25eb2eb Author: Hugo Trippaers <[email protected]> Authored: Fri Mar 1 20:13:01 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Fri Mar 1 20:14:26 2013 +0100 ---------------------------------------------------------------------- plugins/hypervisors/kvm/pom.xml | 8 ++------ pom.xml | 4 ++++ 2 files changed, 6 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ac720c1c/plugins/hypervisors/kvm/pom.xml ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml index 41fa23c..0639f20 100644 --- a/plugins/hypervisors/kvm/pom.xml +++ b/plugins/hypervisors/kvm/pom.xml @@ -41,16 +41,12 @@ <dependency> <groupId>org.libvirt</groupId> <artifactId>libvirt</artifactId> - <version>0.4.9</version> + <version>${cs.libvirt-java.version}</version> </dependency> - <!-- jna is actually a dependency of libvirt, - so be careful when upgrading this or libvirt as - the versions should match - --> <dependency> <groupId>net.java.dev.jna</groupId> <artifactId>jna</artifactId> - <version>3.2.4</version> + <version>${cs.jna.version}</version> </dependency> </dependencies> <build> http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ac720c1c/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 16d9f8f..cfb48e2 100644 --- a/pom.xml +++ b/pom.xml @@ -91,6 +91,10 @@ <cs.reflections.version>0.9.8</cs.reflections.version> <cs.java-ipv6.version>0.10</cs.java-ipv6.version> <cs.replace.properties>build/replace.properties</cs.replace.properties> + <!-- jna is a dependecy of libvirt, check libvirt + version requirements before changing --> + <cs.jna.version>3.2.4</cs.jna.version> + <cs.libvirt-java.version>0.4.9</cs.libvirt-java.version> </properties> <distributionManagement>
