From 973fb96e7abf08f940cdc777646268b3f93e7708 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Mon, 24 Oct 2011 20:35:41 +0000
Subject: QPID-3504: ensure the glue for the optional bdbstore feature is part
 of the broker binary package

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1188363 13f79535-47bb-0310-9956-ffa450edef68
---
 bin/release.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'bin')

diff --git a/bin/release.sh b/bin/release.sh
index 764119bd75..104fb077a0 100755
--- a/bin/release.sh
+++ b/bin/release.sh
@@ -203,14 +203,20 @@ if [ "CPP" == "$CPP" ] ; then
 fi
 
 if [ "JAVA" == "$JAVA" ] ; then
+  # generate the java 'release' archive seperately to ensure it doesnt have any optional feature dependencies in it
   pushd qpid-${VER}/java
-  ant build release release-bin release-mvn -Dsvnversion.output=${REV} -Dmaven.snapshot=false
+  ant build release -Dsvnversion.output=${REV}
   popd
 
   cp qpid-${VER}/java/release/*.tar.gz  artifacts/qpid-java-${VER}.tar.gz
+
+  # now generate the binary packages, with the glue for optional features
+  pushd qpid-${VER}/java
+  ant build release-bin release-mvn -Dsvnversion.output=${REV} -Dmaven.snapshot=false -Dmodules.opt=bdbstore -Ddownload-bdb=true
+  popd
+
   cp qpid-${VER}/java/broker/release/*.tar.gz artifacts/qpid-java-broker-${VER}.tar.gz
   cp qpid-${VER}/java/client/release/*.tar.gz artifacts/qpid-java-client-${VER}.tar.gz
-  #cp qpid-${VER}/java/client/example/release/*.tar.gz 
   cp qpid-${VER}/java/management/eclipse-plugin/release/*.tar.gz qpid-${VER}/java/management/eclipse-plugin/release/*.zip artifacts/
 
   # copy the Maven artifacts
-- 
cgit v1.2.1