diff options
| author | Robert Gemmell <robbie@apache.org> | 2013-08-16 11:07:04 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2013-08-16 11:07:04 +0000 |
| commit | a037dbf505ed39472c1ce436faf1bece22334be1 (patch) | |
| tree | 3f53235e3893d3afdf747ce751c873be306bb562 /qpid/java/broker-plugins | |
| parent | 2bc8d87a2fe3e8b1140b7c3499a85527aa3a63d7 (diff) | |
| download | qpid-python-a037dbf505ed39472c1ce436faf1bece22334be1.tar.gz | |
QPID-5074: update broker binary release tar process to handle plugins with dependencies, fix issues with generated poms
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1514654 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins')
| -rw-r--r-- | qpid/java/broker-plugins/amqp-1-0-protocol/build.xml | 9 | ||||
| -rw-r--r-- | qpid/java/broker-plugins/jdbc-provider-bone/build.xml | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml b/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml index 191af5c04f..b83e3eeae1 100644 --- a/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml +++ b/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml @@ -21,7 +21,7 @@ <property name="module.test.depends" value="common/tests broker/tests" /> <property name="module.genpom" value="true"/> - <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided -Sqpid-amqp-1-0-common=provided"/> + <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided"/> <property name="broker-plugins-amqp-1-0-protocol.libs" value="" /> <property name="broker.plugin" value="true"/> @@ -30,4 +30,11 @@ <target name="bundle" depends="bundle-tasks"/> + <!-- Overrides, but depends on, target in module.xml --> + <target name="copy-broker-plugin-jars-deps" depends="module.copy-broker-plugin-jars-deps" if="broker.plugin" description="copy broker plugins dependencies for use in release packaging"> + <copy todir="${build.scratch.broker.plugins.lib}" failonerror="true" flatten="true"> + <fileset file="${build.lib}/${project.name}-amqp-1-0-common-${project.version}.jar"/> + </copy> + </target> + </project> diff --git a/qpid/java/broker-plugins/jdbc-provider-bone/build.xml b/qpid/java/broker-plugins/jdbc-provider-bone/build.xml index df21d3ed38..eb3f40734f 100644 --- a/qpid/java/broker-plugins/jdbc-provider-bone/build.xml +++ b/qpid/java/broker-plugins/jdbc-provider-bone/build.xml @@ -21,6 +21,8 @@ <property name="module.genpom" value="true"/> <property name="module.genpom.args" value="-Sqpid-common=provided -Sqpid-broker=provided"/> + <property name="broker.plugin" value="true"/> + <import file="../../module.xml" /> <condition property="download.bonecp.jar"> |