From 70f1537e504b377376799b53770e71dcabdacfcd Mon Sep 17 00:00:00 2001
From: Robert Godfrey <rgodfrey@apache.org>
Date: Tue, 15 May 2012 20:32:21 +0000
Subject: QPID-3996 : [Java Broker] update BDB depency to latest version

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1338878 13f79535-47bb-0310-9956-ffa450edef68
---
 java/bdbstore/build.xml | 6 +-----
 java/build.deps         | 2 +-
 java/ivy.retrieve.xml   | 2 +-
 3 files changed, 3 insertions(+), 7 deletions(-)

(limited to 'java')

diff --git a/java/bdbstore/build.xml b/java/bdbstore/build.xml
index 7a95dde8a7..7c305c7c2f 100644
--- a/java/bdbstore/build.xml
+++ b/java/bdbstore/build.xml
@@ -23,10 +23,6 @@
 
     <import file="../module.xml" />
 
-    <property name="bdb.lib.dir" value="${project.root}/lib/bdbstore" />
-    <property name="bdb.version" value="5.0.34" />
-    <property name="bdb.jar.file" value="${bdb.lib.dir}/je-${bdb.version}.jar" />
-
     <condition property="download.bdb.jar">
       <or>
         <istrue value="${download-bdb}"/>
@@ -37,7 +33,7 @@
 
     <!--check whether the BDB jar is present, possibly after download-->
     <target name="check-bdb-jar">
-        <available file="${bdb.jar.file}" type="file" property="bdb.jar.available"/>
+        <available file="${project.root}/${bdb-je}" type="file" property="bdb.jar.available"/>
     </target>
 
     <!--echo that BDB is required if it isnt present, with associated licencing note-->
diff --git a/java/build.deps b/java/build.deps
index 4601b9eca1..53af550849 100644
--- a/java/build.deps
+++ b/java/build.deps
@@ -150,7 +150,7 @@ jca.libs=${geronimo-j2ee} ${geronimo-jta} ${geronimo-jms} ${test.libs} ${geronim
 jca.test.libs=${test.libs}
 
 # optional bdbstore module deps
-bdb-je=lib/bdbstore/je-5.0.34.jar
+bdb-je=lib/bdbstore/je-5.0.48.jar
 bdbstore.libs=${bdb-je}
 bdbstore.test.libs=${test.libs}
 
diff --git a/java/ivy.retrieve.xml b/java/ivy.retrieve.xml
index 57543be07a..096c39bf8d 100644
--- a/java/ivy.retrieve.xml
+++ b/java/ivy.retrieve.xml
@@ -65,7 +65,7 @@
     <!-- The following are optional dependencies, for modules providing optional functionlity or
     for use in optional build/test steps. Their optional status is usually indicative of licences
     which are not compatible with the Apache Licence -->
-    <dependency org="com.sleepycat" name="je" rev="5.0.34" transitive="false" conf="bdbje"/>
+    <dependency org="com.sleepycat" name="je" rev="5.0.48" transitive="false" conf="bdbje"/>
     <dependency org="jfree" name="jfreechart" rev="1.0.13" transitive="false" conf="jfree"/>
     <dependency org="jfree" name="jcommon" rev="1.0.16" transitive="false" conf="jfree"/>
     <dependency org="net.sourceforge.csvjdbc" name="csvjdbc" rev="1.0.8" transitive="false" conf="csvjdbc"/>
-- 
cgit v1.2.1