summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org>2014-08-11 10:56:47 +0000
committerRobert Gemmell <robbie@apache.org>2014-08-11 10:56:47 +0000
commitfcd00d3f0e7ee9d00b2f0c8887583b08d5e80295 (patch)
treeba69be4451aa7dc87f5832ef074b580a1cc76f69
parent7352d3c99a48bb9b7224d8cf2eab448106afd8d2 (diff)
downloadqpid-python-fcd00d3f0e7ee9d00b2f0c8887583b08d5e80295.tar.gz
QPID-5610: update qpid-qmf2-tools assembly descriptor filename to match its output like all the others do
merge from trunk r1617250 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.30@1617251 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/tools/src/java/qpid-qmf2-tools/pom.xml2
-rw-r--r--qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf2-tools-bin.xml (renamed from qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf-tools-bin.xml)0
2 files changed, 1 insertions, 1 deletions
diff --git a/qpid/tools/src/java/qpid-qmf2-tools/pom.xml b/qpid/tools/src/java/qpid-qmf2-tools/pom.xml
index 4b0a111e1b..d82ac612a5 100644
--- a/qpid/tools/src/java/qpid-qmf2-tools/pom.xml
+++ b/qpid/tools/src/java/qpid-qmf2-tools/pom.xml
@@ -76,7 +76,7 @@
<!--version specified in qpid-parent pluginManagement -->
<configuration>
<descriptors>
- <descriptor>src/main/assembly/qpid-qmf-tools-bin.xml</descriptor>
+ <descriptor>src/main/assembly/qpid-qmf2-tools-bin.xml</descriptor>
</descriptors>
</configuration>
<executions>
diff --git a/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf-tools-bin.xml b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf2-tools-bin.xml
index cce56c0725..cce56c0725 100644
--- a/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf-tools-bin.xml
+++ b/qpid/tools/src/java/qpid-qmf2-tools/src/main/assembly/qpid-qmf2-tools-bin.xml