diff options
| author | Robert Godfrey <rgodfrey@apache.org> | 2012-01-11 11:07:52 +0000 |
|---|---|---|
| committer | Robert Godfrey <rgodfrey@apache.org> | 2012-01-11 11:07:52 +0000 |
| commit | a05d9b8d3d95f579870719c9671be2ad614a17f1 (patch) | |
| tree | 552c4639904e3abba92cd0f2e0d6ad49d4b7ac07 /qpid/java | |
| parent | 0f81a00b5cb061780b1aac0d2ff216e2c16de0ec (diff) | |
| download | qpid-python-a05d9b8d3d95f579870719c9671be2ad614a17f1.tar.gz | |
QPID-3736 : Upgrade to BDB version 5.0.34
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1229957 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java')
| -rw-r--r-- | qpid/java/bdbstore/build.xml | 2 | ||||
| -rw-r--r-- | qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java | 3 | ||||
| -rw-r--r-- | qpid/java/build.deps | 2 | ||||
| -rw-r--r-- | qpid/java/lib/poms/je-5.0.34.xml (renamed from qpid/java/lib/poms/je-4.0.117.xml) | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/qpid/java/bdbstore/build.xml b/qpid/java/bdbstore/build.xml index 9513e7cc5b..af7c108aa9 100644 --- a/qpid/java/bdbstore/build.xml +++ b/qpid/java/bdbstore/build.xml @@ -24,7 +24,7 @@ <import file="../module.xml" /> <property name="bdb.lib.dir" value="${project.root}/lib/bdbstore" /> - <property name="bdb.version" value="4.0.117" /> + <property name="bdb.version" value="5.0.34" /> <property name="bdb.download.url" value="http://download.oracle.com/maven/com/sleepycat/je/${bdb.version}/je-${bdb.version}.jar" /> <property name="bdb.jar.file" value="${bdb.lib.dir}/je-${bdb.version}.jar" /> diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java index 81b5c8599f..2e2d2f0b11 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBMessageStore.java @@ -2093,8 +2093,7 @@ public class BDBMessageStore implements MessageStore, DurableConfigurationStore try { - //TODO - upgrade to BDB 5.0, then use: _environment.flushLog(true); - _environment.sync(); + _environment.flushLog(true); for(int i = 0; i < size; i++) { diff --git a/qpid/java/build.deps b/qpid/java/build.deps index 20c6008a04..dd3853cb73 100644 --- a/qpid/java/build.deps +++ b/qpid/java/build.deps @@ -144,7 +144,7 @@ management-common.test.libs=${test.libs} ra.libs=${geronimo-j2ee} ${geronimo-jta} ${geronimo-jms} ${slf4j-api} ${geronimo-kernel} ${geronimo-openejb} # optional bdbstore module deps -bdb-je=lib/bdbstore/je-4.0.117.jar +bdb-je=lib/bdbstore/je-5.0.34.jar bdbstore.libs=${bdb-je} bdbstore.test.libs=${test.libs} diff --git a/qpid/java/lib/poms/je-4.0.117.xml b/qpid/java/lib/poms/je-5.0.34.xml index 85573a99f9..1e4688019b 100644 --- a/qpid/java/lib/poms/je-4.0.117.xml +++ b/qpid/java/lib/poms/je-5.0.34.xml @@ -18,5 +18,5 @@ <dep> <groupId>com.sleepycat</groupId> <artifactId>je</artifactId> - <version>4.0.117</version> + <version>5.0.34</version> </dep> |