From 2d5ae769abdabb3ef5fa6ccd57d354bba387bd14 Mon Sep 17 00:00:00 2001
From: Keith Wall <kwall@apache.org>
Date: Tue, 14 Aug 2012 22:51:00 +0000
Subject: QPID-4231: Update optional BDB store to use version 5.0.58 of BDB

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1373155 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/doc/book/src/java-broker/HA-Guide.xml |  2 +-
 qpid/java/build.deps                       |  2 +-
 qpid/java/ivy.retrieve.xml                 |  2 +-
 qpid/java/lib/poms/je-5.0.55.xml           | 22 ----------------------
 qpid/java/lib/poms/je-5.0.58.xml           | 22 ++++++++++++++++++++++
 5 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 qpid/java/lib/poms/je-5.0.55.xml
 create mode 100644 qpid/java/lib/poms/je-5.0.58.xml

diff --git a/qpid/doc/book/src/java-broker/HA-Guide.xml b/qpid/doc/book/src/java-broker/HA-Guide.xml
index d3ee43ce1b..041309d711 100644
--- a/qpid/doc/book/src/java-broker/HA-Guide.xml
+++ b/qpid/doc/book/src/java-broker/HA-Guide.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE urls [
 <!ENTITY oracleBdbProductOverviewUrl "http://www.oracle.com/technetwork/products/berkeleydb/overview/index-093405.html">
-<!ENTITY oracleBdbProductVersion "5.0.48">
+<!ENTITY oracleBdbProductVersion "5.0.58">
 <!ENTITY oracleBdbRepGuideUrl "http://oracle.com/cd/E17277_02/html/ReplicationGuide/">
 <!ENTITY oracleBdbJavaDocUrl "http://docs.oracle.com/cd/E17277_02/html/java/">
 <!ENTITY oracleJdkDocUrl "http://oracle.com/javase/6/docs/api/">
diff --git a/qpid/java/build.deps b/qpid/java/build.deps
index 52ae277ce4..4742ec1a8c 100644
--- a/qpid/java/build.deps
+++ b/qpid/java/build.deps
@@ -106,7 +106,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.55.jar
+bdb-je=lib/bdbstore/je-5.0.58.jar
 bdbstore.libs=${bdb-je}
 bdbstore.test.libs=${test.libs}
 
diff --git a/qpid/java/ivy.retrieve.xml b/qpid/java/ivy.retrieve.xml
index 98d3d3785d..3af847a48a 100644
--- a/qpid/java/ivy.retrieve.xml
+++ b/qpid/java/ivy.retrieve.xml
@@ -74,7 +74,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.55" transitive="false" conf="bdbje"/>
+    <dependency org="com.sleepycat" name="je" rev="5.0.58" 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"/>
diff --git a/qpid/java/lib/poms/je-5.0.55.xml b/qpid/java/lib/poms/je-5.0.55.xml
deleted file mode 100644
index 0c40ea541a..0000000000
--- a/qpid/java/lib/poms/je-5.0.55.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<dep>
-  <groupId>com.sleepycat</groupId>
-  <artifactId>je</artifactId>
-  <version>5.0.55</version>
-</dep>
diff --git a/qpid/java/lib/poms/je-5.0.58.xml b/qpid/java/lib/poms/je-5.0.58.xml
new file mode 100644
index 0000000000..d71a935dff
--- /dev/null
+++ b/qpid/java/lib/poms/je-5.0.58.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<!--
+   Licensed to the Apache Software Foundation (ASF) under one or more
+   contributor license agreements.  See the NOTICE file distributed with
+   this work for additional information regarding copyright ownership.
+   The ASF licenses this file to You under the Apache License, Version 2.0
+   (the "License"); you may not use this file except in compliance with
+   the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+-->
+<dep>
+  <groupId>com.sleepycat</groupId>
+  <artifactId>je</artifactId>
+  <version>5.0.58</version>
+</dep>
-- 
cgit v1.2.1