summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--qpid/java/management/tools/qpid-cli/build.xml2
-rw-r--r--qpid/java/module.xml9
2 files changed, 8 insertions, 3 deletions
diff --git a/qpid/java/management/tools/qpid-cli/build.xml b/qpid/java/management/tools/qpid-cli/build.xml
index f943c7f7e0..244e3b6e5f 100644
--- a/qpid/java/management/tools/qpid-cli/build.xml
+++ b/qpid/java/management/tools/qpid-cli/build.xml
@@ -20,7 +20,7 @@
-->
<project name="qpid-cli">
- <property name="module.depends" value="common management-common" />
+ <property name="module.depends" value="common management/common" />
<property name="module.test.depends" value="common client" />
<property name="module.src" value="src" />
<!-- Disable tests as per QPID-1342 -->
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index d46bf7cebe..66fb92683b 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -335,11 +335,16 @@
</copy>
</target>
- <map property="module.depends.jars" value="${module.depends}" join=",">
+ <map property="module.name.depends" value="${module.depends}">
+ <filtermapper>
+ <replacestring from="${file.separator}" to="-"/>
+ </filtermapper>
+ </map>
+
+ <map property="module.depends.jars" value="${module.name.depends}" join=",">
<globmapper from="*" to="${project.name}-*-${project.version}.jar"/>
</map>
-
<target name="libs-release" description="copy dependencies into module release">
<!-- Copy the module dependencies -->
<copy todir="${module.release}" failonerror="true">