Author: robbie
Date: Mon Aug 19 09:39:31 2013
New Revision: 1515332
URL: http://svn.apache.org/r1515332
Log:
QPID-5074: update broker binary release tar process to handle plugins with
dependencies, fix issues with generated poms
merged from trunk r1514654
Modified:
qpid/branches/0.24/ (props changed)
qpid/branches/0.24/qpid/ (props changed)
qpid/branches/0.24/qpid/bin/release.sh
qpid/branches/0.24/qpid/java/ (props changed)
qpid/branches/0.24/qpid/java/bdbstore/build.xml
qpid/branches/0.24/qpid/java/bdbstore/jmx/build.xml
qpid/branches/0.24/qpid/java/broker/ (props changed)
qpid/branches/0.24/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml
qpid/branches/0.24/qpid/java/broker-plugins/jdbc-provider-bone/build.xml
qpid/branches/0.24/qpid/java/broker/build.xml
qpid/branches/0.24/qpid/java/lib/poms/bonecp-0.7.1.RELEASE.xml
qpid/branches/0.24/qpid/java/lib/poms/guava-14.0.1.xml
qpid/branches/0.24/qpid/java/module.xml
Propchange: qpid/branches/0.24/
------------------------------------------------------------------------------
Merged /qpid/trunk:r1514654
Propchange: qpid/branches/0.24/qpid/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid:r1514654
Modified: qpid/branches/0.24/qpid/bin/release.sh
URL:
http://svn.apache.org/viewvc/qpid/branches/0.24/qpid/bin/release.sh?rev=1515332&r1=1515331&r2=1515332&view=diff
==============================================================================
--- qpid/branches/0.24/qpid/bin/release.sh (original)
+++ qpid/branches/0.24/qpid/bin/release.sh Mon Aug 19 09:39:31 2013
@@ -248,8 +248,8 @@ if [ "JAVA" == "$JAVA" ] ; then
# now generate the binary packages, with the glue for optional features
pushd qpid-${VER}/java
- ant build release-bin -Dsvnversion.output=${REV}
-Dmodules.opt="bdbstore,bdbstore/jmx" -Ddownload-bdb=true
- ant release-mvn -Dsvnversion.output=${REV}
-Dmodules.opt="bdbstore,bdbstore/jmx,broker-plugins/jdbc-provider-bone"
-Ddownload-bonecp=true -Dmaven.snapshot=false
+ ant build release-bin -Dsvnversion.output=${REV} -Doptional=true
+ ant release-mvn -Dsvnversion.output=${REV} -Doptional=true
-Dmaven.snapshot=false
popd
cp qpid-${VER}/java/broker/release/*.tar.gz
artifacts/qpid-java-broker-${VER}.tar.gz
Propchange: qpid/branches/0.24/qpid/java/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java:r1514654
Modified: qpid/branches/0.24/qpid/java/bdbstore/build.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/0.24/qpid/java/bdbstore/build.xml?rev=1515332&r1=1515331&r2=1515332&view=diff
==============================================================================
--- qpid/branches/0.24/qpid/java/bdbstore/build.xml (original)
+++ qpid/branches/0.24/qpid/java/bdbstore/build.xml Mon Aug 19 09:39:31 2013
@@ -22,6 +22,8 @@
<property name="module.genpom" value="true"/>
<property name="module.genpom.args" value="-Sqpid-common=provided
-Sqpid-broker=provided -Sqpid-broker-plugins-amqp-0-8-protocol=provided
-Sje=provided"/>
+ <property name="broker.plugin" value="true"/>
+
<import file="../module.xml" />
<condition property="download.bdb.jar">
@@ -79,4 +81,9 @@ http://www.oracle.com/technetwork/databa
<target name="build" depends="check-request-props, bdb-jar-required,
module.build" />
+ <!-- Overrides, target in module.xml -->
+ <target name="copy-broker-plugin-jars-deps" if="broker.plugin"
description="copy broker plugins dependencies for use in release packaging">
+ <!-- NO-OP, we explicitly do not want to copy the dependencies for
this optional functionality as we can't distribute them -->
+ </target>
+
</project>
Modified: qpid/branches/0.24/qpid/java/bdbstore/jmx/build.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/0.24/qpid/java/bdbstore/jmx/build.xml?rev=1515332&r1=1515331&r2=1515332&view=diff
==============================================================================
--- qpid/branches/0.24/qpid/java/bdbstore/jmx/build.xml (original)
+++ qpid/branches/0.24/qpid/java/bdbstore/jmx/build.xml Mon Aug 19 09:39:31 2013
@@ -28,4 +28,9 @@
<import file="../../module.xml" />
<target name="bundle" depends="bundle-tasks" />
+
+ <!-- Overrides target in module.xml -->
+ <target name="copy-broker-plugin-jars-deps" if="broker.plugin"
description="copy broker plugins dependencies for use in release packaging">
+ <!-- NO-OP, we explicitly do not want to copy the dependencies for
this optional functionality as we can't distribute them -->
+ </target>
</project>
Propchange: qpid/branches/0.24/qpid/java/broker/
------------------------------------------------------------------------------
Merged /qpid/trunk/qpid/java/broker:r1514654
Modified:
qpid/branches/0.24/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/0.24/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml?rev=1515332&r1=1515331&r2=1515332&view=diff
==============================================================================
--- qpid/branches/0.24/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml
(original)
+++ qpid/branches/0.24/qpid/java/broker-plugins/amqp-1-0-protocol/build.xml Mon
Aug 19 09:39:31 2013
@@ -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>
Modified:
qpid/branches/0.24/qpid/java/broker-plugins/jdbc-provider-bone/build.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/0.24/qpid/java/broker-plugins/jdbc-provider-bone/build.xml?rev=1515332&r1=1515331&r2=1515332&view=diff
==============================================================================
--- qpid/branches/0.24/qpid/java/broker-plugins/jdbc-provider-bone/build.xml
(original)
+++ qpid/branches/0.24/qpid/java/broker-plugins/jdbc-provider-bone/build.xml
Mon Aug 19 09:39:31 2013
@@ -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">
Modified: qpid/branches/0.24/qpid/java/broker/build.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/0.24/qpid/java/broker/build.xml?rev=1515332&r1=1515331&r2=1515332&view=diff
==============================================================================
--- qpid/branches/0.24/qpid/java/broker/build.xml (original)
+++ qpid/branches/0.24/qpid/java/broker/build.xml Mon Aug 19 09:39:31 2013
@@ -25,9 +25,9 @@
<property name="module.genpom" value="true"/>
<!-- Add dependencies to the broker pom for the broker-plugins and
bdbstore modules -->
- <property name="module.maven.depends"
value="broker-plugins/management-http broker-plugins/management-jmx
broker-plugins/access-control broker-plugins/jdbc-provider-bone bdbstore
bdbstore/jmx broker-plugins/jdbc-store broker-plugins/derby-store
broker-plugins/amqp-1-0-protocol broker-plugins/amqp-msg-conv-0-8-to-1-0
broker-plugins/amqp-msg-conv-0-10-to-1-0 broker-plugins/amqp-0-8-protocol
broker-plugins/amqp-0-10-protocol broker-plugins/amqp-msg-conv-0-8-to-0-10"/>
+ <property name="module.maven.depends" value="broker-plugins/access-control
broker-plugins/amqp-0-8-protocol broker-plugins/amqp-0-10-protocol
broker-plugins/amqp-1-0-protocol broker-plugins/amqp-msg-conv-0-8-to-0-10
broker-plugins/amqp-msg-conv-0-8-to-1-0
broker-plugins/amqp-msg-conv-0-10-to-1-0 broker-plugins/derby-store
broker-plugins/jdbc-provider-bone broker-plugins/jdbc-store
broker-plugins/management-http broker-plugins/management-jmx
broker-plugins/memory-store bdbstore bdbstore/jmx"/>
<!-- Make them runtime dependencies, make bdbstore modules optional -->
- <property name="module.genpom.args"
value="-Sqpid-broker-plugins-management-http=runtime
-Sqpid-broker-plugins-management-jmx=runtime
-Sqpid-broker-plugins-access-control=runtime -Sqpid-bdbstore=runtime
-Oqpid-bdbstore -Sqpid-bdbstore-jmx=runtime -Oqpid-bdbstore-jmx
-Sqpid-broker-plugins-jdbc-provider-bone=runtime
-Oqpid-broker-plugins-jdbc-provider-bone
-Sqpid-broker-plugins-jdbc-store=runtime
-Sqpid-broker-plugins-derby-store=runtime
-Sqpid-broker-plugins-amqp-1-0-protocol=runtime
-Sqpid-broker-plugins-amqp-msg-conv-0-8-to-1-0=runtime
-Sqpid-broker-plugins-amqp-msg-conv-0-10-to-1-0=runtime
-Sqpid-broker-plugins-amqp-0-8-protocol=runtime
-Sqpid-broker-plugins-amqp-0-10-protocol=runtime
-Sqpid-broker-plugins-amqp-msg-conv-0-8-to-0-10=runtime"/>
+ <property name="module.genpom.args"
value="-Sqpid-broker-plugins-access-control=runtime
-Sqpid-broker-plugins-amqp-0-8-protocol=runtime
-Sqpid-broker-plugins-amqp-0-10-protocol=runtime
-Sqpid-broker-plugins-amqp-1-0-protocol=runtime
-Sqpid-broker-plugins-amqp-msg-conv-0-8-to-0-10=runtime
-Sqpid-broker-plugins-amqp-msg-conv-0-8-to-1-0=runtime
-Sqpid-broker-plugins-amqp-msg-conv-0-10-to-1-0=runtime
-Sqpid-broker-plugins-derby-store=runtime
-Sqpid-broker-plugins-jdbc-provider-bone=runtime
-Sqpid-broker-plugins-jdbc-store=runtime
-Sqpid-broker-plugins-management-http=runtime
-Sqpid-broker-plugins-management-jmx=runtime
-Sbroker-plugins-memory-store=runtime -Sqpid-bdbstore=runtime
-Sqpid-bdbstore-jmx=runtime -Oqpid-bdbstore -Oqpid-bdbstore-jmx"/>
<import file="../module.xml"/>
@@ -67,9 +67,6 @@
<target name="release-bin-other-bdbstore"
depends="check-bdbstore-requested" if="bdbstore-requested"
description="copy bdbstore items into
module release">
- <copy todir="${module.release}/lib/" failonerror="true">
- <fileset
file="${build.lib}/${project.name}-bdbstore-${project.version}.jar"/>
- </copy>
<copy todir="${module.release}/bin" failonerror="true" flatten="true">
<fileset dir="${basedir}/../bdbstore/bin"/>
</copy>
Modified: qpid/branches/0.24/qpid/java/lib/poms/bonecp-0.7.1.RELEASE.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/0.24/qpid/java/lib/poms/bonecp-0.7.1.RELEASE.xml?rev=1515332&r1=1515331&r2=1515332&view=diff
==============================================================================
--- qpid/branches/0.24/qpid/java/lib/poms/bonecp-0.7.1.RELEASE.xml (original)
+++ qpid/branches/0.24/qpid/java/lib/poms/bonecp-0.7.1.RELEASE.xml Mon Aug 19
09:39:31 2013
@@ -19,4 +19,10 @@
<groupId>com.jolbox</groupId>
<artifactId>bonecp</artifactId>
<version>0.7.1.RELEASE</version>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dep>
Modified: qpid/branches/0.24/qpid/java/lib/poms/guava-14.0.1.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/0.24/qpid/java/lib/poms/guava-14.0.1.xml?rev=1515332&r1=1515331&r2=1515332&view=diff
==============================================================================
--- qpid/branches/0.24/qpid/java/lib/poms/guava-14.0.1.xml (original)
+++ qpid/branches/0.24/qpid/java/lib/poms/guava-14.0.1.xml Mon Aug 19 09:39:31
2013
@@ -16,7 +16,7 @@
limitations under the License.
-->
<dep>
- <groupId>com.google</groupId>
+ <groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>14.0.1</version>
</dep>
Modified: qpid/branches/0.24/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/0.24/qpid/java/module.xml?rev=1515332&r1=1515331&r2=1515332&view=diff
==============================================================================
--- qpid/branches/0.24/qpid/java/module.xml (original)
+++ qpid/branches/0.24/qpid/java/module.xml Mon Aug 19 09:39:31 2013
@@ -521,10 +521,15 @@
</jar>
</target>
- <target name="copy-broker-plugin-jars" if="broker.plugin" description="copy
broker plugins for use in release packaging">
+ <target name="copy-broker-plugin-jars"
depends="copy-broker-plugin-jars-deps" if="broker.plugin" description="copy
broker plugins for use in release packaging">
<copy file="${module.jar}" todir="${build.scratch.broker.plugins.lib}"
failonerror="true"/>
</target>
+ <!-- Overridden in broker-plugins/amqp-1-0-protocol, bdbstore, and
bdbstore/jmx modules -->
+ <target name="copy-broker-plugin-jars-deps" if="broker.plugin"
description="copy broker plugins dependencies for use in release packaging">
+ <copylist todir="${build.scratch.broker.plugins.lib}"
dir="${project.root}" files="${module.libs}"/>
+ </target>
+
<target name="copy-files-to-module-metainf"
depends="copy-project-resources-metainf, copy-module-resources-metainf,
copy-module-src-resources-metainf"/>
<target name="copy-project-resources-metainf">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
