Author: rgodfrey
Date: Tue Aug 6 17:03:37 2013
New Revision: 1511034
URL: http://svn.apache.org/r1511034
Log:
Merged revisions 1511002,1511026,1511030 from trunk to 0.24
Modified:
qpid/branches/0.24/qpid/bin/release.sh
qpid/branches/0.24/qpid/java/ivy.nexus.xml
Modified: qpid/branches/0.24/qpid/bin/release.sh
URL:
http://svn.apache.org/viewvc/qpid/branches/0.24/qpid/bin/release.sh?rev=1511034&r1=1511033&r2=1511034&view=diff
==============================================================================
--- qpid/branches/0.24/qpid/bin/release.sh (original)
+++ qpid/branches/0.24/qpid/bin/release.sh Tue Aug 6 17:03:37 2013
@@ -249,7 +249,7 @@ 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" -Dmaven.snapshot=false
+ ant release-mvn -Dsvnversion.output=${REV}
-Dmodules.opt="bdbstore,bdbstore/jmx,broker-plugins/jdbc-provider-bone"
-Ddownload-bonecp=true -Dmaven.snapshot=false
popd
cp qpid-${VER}/java/broker/release/*.tar.gz
artifacts/qpid-java-broker-${VER}.tar.gz
@@ -268,8 +268,18 @@ if [ "JAVA" == "$JAVA" ] ; then
cp -a qpid-${VER}/java/management/common/release/maven artifacts/
cp -a qpid-${VER}/java/amqp-1-0-common/release/maven artifacts/
cp -a qpid-${VER}/java/broker-plugins/access-control/release/maven artifacts/
- cp -a qpid-${VER}/java/broker-plugins/management-jmx/release/maven artifacts/
+ cp -a qpid-${VER}/java/broker-plugins/amqp-0-8-protocol/release/maven
artifacts/
+ cp -a qpid-${VER}/java/broker-plugins/amqp-0-10-protocol/release/maven
artifacts/
+ cp -a qpid-${VER}/java/broker-plugins/amqp-1-0-protocol/release/maven
artifacts/
+ cp -a
qpid-${VER}/java/broker-plugins/amqp-msg-conv-0-8-to-0-10/release/maven
artifacts/
+ cp -a qpid-${VER}/java/broker-plugins/amqp-msg-conv-0-8-to-1-0/release/maven
artifacts/
+ cp -a
qpid-${VER}/java/broker-plugins/amqp-msg-conv-0-10-to-1-0/release/maven
artifacts/
+ cp -a qpid-${VER}/java/broker-plugins/derby-store/release/maven artifacts/
+ cp -a qpid-${VER}/java/broker-plugins/jdbc-provider-bone/release/maven
artifacts/
+ cp -a qpid-${VER}/java/broker-plugins/jdbc-store/release/maven artifacts/
cp -a qpid-${VER}/java/broker-plugins/management-http/release/maven
artifacts/
+ cp -a qpid-${VER}/java/broker-plugins/management-jmx/release/maven artifacts/
+ cp -a qpid-${VER}/java/broker-plugins/memory-store/release/maven artifacts/
cp -a qpid-${VER}/java/bdbstore/jmx/release/maven artifacts/
fi
Modified: qpid/branches/0.24/qpid/java/ivy.nexus.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/0.24/qpid/java/ivy.nexus.xml?rev=1511034&r1=1511033&r2=1511034&view=diff
==============================================================================
--- qpid/branches/0.24/qpid/java/ivy.nexus.xml (original)
+++ qpid/branches/0.24/qpid/java/ivy.nexus.xml Tue Aug 6 17:03:37 2013
@@ -111,6 +111,12 @@
<artifact name="qpid-broker-plugins-memory-store" type="jar.asc"
ext="jar.asc"/>
<artifact name="qpid-broker-plugins-memory-store" type="source" ext="jar"
e:classifier="sources"/>
<artifact name="qpid-broker-plugins-memory-store" type="source.asc"
ext="jar.asc" e:classifier="sources"/>
+ <artifact name="qpid-broker-plugins-jdbc-provider-bone" type="pom"
ext="pom"/>
+ <artifact name="qpid-broker-plugins-jdbc-provider-bone" type="pom.asc"
ext="pom.asc"/>
+ <artifact name="qpid-broker-plugins-jdbc-provider-bone" type="jar"
ext="jar"/>
+ <artifact name="qpid-broker-plugins-jdbc-provider-bone" type="jar.asc"
ext="jar.asc"/>
+ <artifact name="qpid-broker-plugins-jdbc-provider-bone" type="source"
ext="jar" e:classifier="sources"/>
+ <artifact name="qpid-broker-plugins-jdbc-provider-bone" type="source.asc"
ext="jar.asc" e:classifier="sources"/>
<artifact name="qpid-amqp-1-0-common" type="pom" ext="pom"/>
<artifact name="qpid-amqp-1-0-common" type="pom.asc" ext="pom.asc"/>
<artifact name="qpid-amqp-1-0-common" type="jar" ext="jar"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
