summaryrefslogtreecommitdiff
path: root/qpid/java/module.xml
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2012-05-11 15:36:49 +0000
committerRobert Gemmell <robbie@apache.org>2012-05-11 15:36:49 +0000
commited95fde2dc61790686a98106ad1fbd8ff15a510a (patch)
treef226507c5002ec0da3660f1ffc52d9c42867b915 /qpid/java/module.xml
parent627984e1ae185bfeae12ad8c1d5f5e2024f7f414 (diff)
downloadqpid-python-ed95fde2dc61790686a98106ad1fbd8ff15a510a.tar.gz
QPID-3994: use Ivy to download the main component dependencies during the build, and the optional bdb-je dependency on request, enabling removal of the main component dependencies from the repository and the 'source release' artifacts.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1337211 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/module.xml')
-rw-r--r--qpid/java/module.xml6
1 files changed, 3 insertions, 3 deletions
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 1aea77b488..b07a9cc35e 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -22,7 +22,7 @@
<import file="common.xml"/>
- <path id="maven-ant-tasks.classpath" path="${project.root}/lib/maven-ant-tasks-2.1.1.jar" />
+ <path id="maven-ant-tasks.classpath" path="${project.root}/lib/required/maven-ant-tasks-2.1.1.jar" />
<typedef resource="org/apache/maven/artifact/ant/antlib.xml"
uri="antlib:org.apache.maven.artifact.ant"
classpathref="maven-ant-tasks.classpath" />
@@ -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/bnd-0.0.384.jar"/>
+ <taskdef resource="aQute/bnd/ant/taskdef.properties" classpath="${project.root}/lib/required/bnd-0.0.384.jar"/>
<echo message="Bundling ${build}/lib/${module.namever}.jar with ${module.src}/${module.name}.bnd"/>
<bnd
classpath="${build}/lib/${module.namever}.jar"
@@ -809,7 +809,7 @@ qpid.name=${project.name}
<classpath>
<pathelement path="${module.src}"/>
<pathelement path="${velocity.compile.dir}" />
- <fileset dir="${project.root}/lib">
+ <fileset dir="${project.root}/lib/required">
<include name="**/*.jar"/>
</fileset>
<pathelement path="${gentools.home}/lib/velocity-1.4.jar" />