From 5fad36aa59042a95dfb9d8d15a2d43924318ffa6 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Mon, 14 May 2012 08:43:50 +0000
Subject: QPID-3994: add property for bnd jar location

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1338060 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/build.deps | 2 ++
 qpid/java/module.xml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'qpid/java')

diff --git a/qpid/java/build.deps b/qpid/java/build.deps
index 518d3e2ce9..6c765bf726 100644
--- a/qpid/java/build.deps
+++ b/qpid/java/build.deps
@@ -54,6 +54,8 @@ felix.libs=${felix-main}
 jackson-core=lib/required/jackson-core-asl-1.9.0.jar
 jackson-mapper=lib/required/jackson-mapper-asl-1.9.0.jar
 
+bnd=lib/required/bnd-0.0.384.jar
+
 commons-configuration.libs = ${commons-beanutils-core} ${commons-digester} \
   ${commons-codec} ${commons-lang} ${commons-collections} ${commons-configuration}
 
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index b07a9cc35e..68a2fac9c3 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -599,7 +599,7 @@
   <target name="bundle" description="Build module osgi artifact. Override and depend on bundle-tasks to use"/>
 
   <target name="bundle-tasks" depends="jar">
-   <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${project.root}/lib/required/bnd-0.0.384.jar"/>
+   <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${project.root}/${bnd}"/>
    <echo message="Bundling ${build}/lib/${module.namever}.jar with ${module.src}/${module.name}.bnd"/>
    <bnd 
       classpath="${build}/lib/${module.namever}.jar"
-- 
cgit v1.2.1