summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Gemmell <robbie@apache.org = robbie = Robert Gemmell robbie@apache.org@apache.org>2014-04-13 14:12:32 +0000
committerRobert Gemmell <robbie@apache.org = robbie = Robert Gemmell robbie@apache.org@apache.org>2014-04-13 14:12:32 +0000
commit66ae5ca004bfe0d3a56065e003aa92437f9f7342 (patch)
treee433859c006e5149258dd379851626141f0e5ebd
parent5a522b41140445735db6b0e2dd0f20501ac56a88 (diff)
downloadqpid-python-66ae5ca004bfe0d3a56065e003aa92437f9f7342.tar.gz
QPID-5677: stop including extra files within the qpid-all.jar manifest jars
merge from trunk r1586156 git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/0.28@1586996 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--qpid/java/build.xml2
-rw-r--r--qpid/java/module.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/qpid/java/build.xml b/qpid/java/build.xml
index 189680578c..f73c5b3588 100644
--- a/qpid/java/build.xml
+++ b/qpid/java/build.xml
@@ -163,7 +163,7 @@
<manifest>
<attribute name="Class-Path" value="${qpid.jar.classpath}"/>
</manifest>
- <metainf dir="${project.root}/resources/"/>
+ <metainf dir="${project.root}/resources/jar"/>
</jar>
<touch file="${qpid.jar}"/>
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index b7302b3a89..1f744d3079 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -687,7 +687,7 @@
<manifest>
<attribute name="Class-Path" value="${qpid.jar.classpath}"/>
</manifest>
- <metainf dir="${project.root}/resources/"/>
+ <metainf dir="${project.root}/resources/jar"/>
</jar>
<touch file="${module.qpid.jar}"/>