You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kw...@apache.org on 2017/05/31 07:50:37 UTC
qpid-broker-j git commit: QPID-7724: Upgrade Berkeley DB JE from
5.0.14 to 7.3.7.
Repository: qpid-broker-j
Updated Branches:
refs/heads/master b5e769d81 -> dd6b280df
QPID-7724: Upgrade Berkeley DB JE from 5.0.14 to 7.3.7.
Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/dd6b280d
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/dd6b280d
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/dd6b280d
Branch: refs/heads/master
Commit: dd6b280df20ac2a95e8c4ab6984a684867e1f196
Parents: b5e769d
Author: Keith Wall <kw...@apache.org>
Authored: Tue May 30 14:32:06 2017 +0100
Committer: Keith Wall <kw...@apache.org>
Committed: Wed May 31 08:48:11 2017 +0100
----------------------------------------------------------------------
bdbstore/pom.xml | 1 -
.../store/berkeleydb/EnvironmentFacade.java | 3 ---
bdbstore/systests/pom.xml | 6 -----
broker-plugins/amqp-1-0-bdb-store/pom.xml | 6 -----
.../DEPENDENCIES_REFERENCE | 2 ++
.../Java-Broker-Appendix-Miscellaneous.xml | 27 --------------------
.../docbkx/Java-Broker-High-Availability.xml | 3 +--
.../src/docbkx/Java-Broker-Installation.xml | 4 +--
...ker-Management-Managing-VirtualhostNodes.xml | 7 ++---
...-Broker-Management-Managing-Virtualhosts.xml | 4 +--
pom.xml | 5 ++--
qpid-perftests-systests/pom.xml | 6 -----
qpid-systests-parent/pom.xml | 20 ---------------
systests/pom.xml | 7 -----
systests/protocol-tests-amqp-1-0/pom.xml | 7 -----
systests/qpid-systests-jms_2.0/pom.xml | 7 -----
16 files changed, 11 insertions(+), 104 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dd6b280d/bdbstore/pom.xml
----------------------------------------------------------------------
diff --git a/bdbstore/pom.xml b/bdbstore/pom.xml
index 79e6fb5..946858d 100644
--- a/bdbstore/pom.xml
+++ b/bdbstore/pom.xml
@@ -52,7 +52,6 @@
<dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
- <scope>provided</scope>
</dependency>
<!-- test dependencies -->
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dd6b280d/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java
----------------------------------------------------------------------
diff --git a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java
index 8afb551..7a54b8b 100644
--- a/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java
+++ b/bdbstore/src/main/java/org/apache/qpid/server/store/berkeleydb/EnvironmentFacade.java
@@ -48,9 +48,6 @@ public interface EnvironmentFacade
put(EnvironmentConfig.FILE_LOGGING_LEVEL, "OFF");
put(EnvironmentConfig.CONSOLE_LOGGING_LEVEL, "OFF");
put(EnvironmentConfig.CLEANER_UPGRADE_TO_LOG_VERSION, "-1");
- // Automatic cleaner adjustment has been seen to stop the cleaner working at all, disable it
- // Newer versions of BDB JE 6.3 ignore this setting.
- put(EnvironmentConfig.CLEANER_ADJUST_UTILIZATION, "false");
}});
String CACHE_MODE_PROPERTY_NAME = "qpid.bdb.cache_mode";
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dd6b280d/bdbstore/systests/pom.xml
----------------------------------------------------------------------
diff --git a/bdbstore/systests/pom.xml b/bdbstore/systests/pom.xml
index 78dcaa0..bc76dc4 100644
--- a/bdbstore/systests/pom.xml
+++ b/bdbstore/systests/pom.xml
@@ -50,12 +50,6 @@
</dependency>
<dependency>
- <groupId>com.sleepycat</groupId>
- <artifactId>je</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
<groupId>org.apache.qpid</groupId>
<artifactId>qpid-bdbstore</artifactId>
<version>${project.version}</version>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dd6b280d/broker-plugins/amqp-1-0-bdb-store/pom.xml
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-1-0-bdb-store/pom.xml b/broker-plugins/amqp-1-0-bdb-store/pom.xml
index 850c3ca..2dfba63 100644
--- a/broker-plugins/amqp-1-0-bdb-store/pom.xml
+++ b/broker-plugins/amqp-1-0-bdb-store/pom.xml
@@ -60,12 +60,6 @@
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>com.sleepycat</groupId>
- <artifactId>je</artifactId>
- <scope>provided</scope>
- </dependency>
-
<!-- test dependencies -->
<dependency>
<groupId>org.apache.qpid</groupId>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dd6b280d/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
----------------------------------------------------------------------
diff --git a/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE b/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
index 3bbc8e9..cc7e45a 100644
--- a/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
+++ b/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
@@ -136,6 +136,8 @@ From: 'Webtide' (https://webtide.com)
- Jetty :: Websocket :: Servlet Interface (http://www.eclipse.org/jetty/websocket-servlet) org.eclipse.jetty.websocket:websocket-servlet:jar:9.4.3.v20170317
License: Apache Software License - Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) License: Eclipse Public License - Version 1.0 (http://www.eclipse.org/org/documents/epl-v10.php)
+From: 'Oracle Corporation' (http://www.oracle.com/)
+ - je com.sleepycat:je:jar:7.3.7
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dd6b280d/doc/java-broker/src/docbkx/Java-Broker-Appendix-Miscellaneous.xml
----------------------------------------------------------------------
diff --git a/doc/java-broker/src/docbkx/Java-Broker-Appendix-Miscellaneous.xml b/doc/java-broker/src/docbkx/Java-Broker-Appendix-Miscellaneous.xml
index ad8dbd5..d389291 100644
--- a/doc/java-broker/src/docbkx/Java-Broker-Appendix-Miscellaneous.xml
+++ b/doc/java-broker/src/docbkx/Java-Broker-Appendix-Miscellaneous.xml
@@ -68,31 +68,4 @@ cp <literal>driver</literal>.jar qpid-broker-${project.version}/lib</programlist
<programlisting>Windows:
copy <literal>driver</literal>.jar qpid-broker-${project.version}\lib</programlisting>
</section>
-
- <section role="h2" xml:id="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE">
- <title>Installing Oracle BDB JE</title>
- <para> The Oracle BDB JE is not distributed with Apache Qpid owing to license considerations.. </para>
- <para>If you wish to use a BDB Virtualhost Node, BDB Virtualhost, or BDB HA Virtualhost Node you
- must make the BDB JE's JAR available on the Broker's classpath. </para>
- <para> Download the Oracle BDB JE ${bdb-version} release <link xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="${oracleJeDownloadUrl}">from the Oracle website.</link>
- </para>
- <para> The download has a name in the form je-${bdb-version}.tar.gz. It is
- recommended that you confirm the integrity of the download by verifying the MD5. </para>
- <para>Copy the je-${bdb-version}.jar from within the release into
- <literal>\${QPID_HOME}/lib</literal> folder.</para>
-
- <programlisting>Unix:
-cp je-${bdb-version}.jar qpid-broker-${project.version}/lib</programlisting>
-
- <programlisting>Windows:
-copy je-${bdb-version}.jar qpid-broker-${project.version}\lib</programlisting>
-
- </section>
-
-
-
-
-
-
-
</appendix>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dd6b280d/doc/java-broker/src/docbkx/Java-Broker-High-Availability.xml
----------------------------------------------------------------------
diff --git a/doc/java-broker/src/docbkx/Java-Broker-High-Availability.xml b/doc/java-broker/src/docbkx/Java-Broker-High-Availability.xml
index 241a0e8..b87bbc5 100644
--- a/doc/java-broker/src/docbkx/Java-Broker-High-Availability.xml
+++ b/doc/java-broker/src/docbkx/Java-Broker-High-Availability.xml
@@ -84,8 +84,7 @@
</mediaobject>
</figure>
<para>Currently, the only virtualhost/virtualhost node type offering HA is BDB HA. Internally,
- this leverages the HA capabilities of the Berkeley DB JE edition. BDB JE is an <link linkend="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE">optional dependency</link> of
- the Broker.</para>
+ this leverages the HA capabilities of the Berkeley DB JE edition.</para>
<note>
<para>The HA solution from the Apache Qpid Broker for Java is incompatible with the HA solution offered by the CPP
Broker. It is not possible to co-locate Broker for Java and CPP Brokers within the same group.</para>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dd6b280d/doc/java-broker/src/docbkx/Java-Broker-Installation.xml
----------------------------------------------------------------------
diff --git a/doc/java-broker/src/docbkx/Java-Broker-Installation.xml b/doc/java-broker/src/docbkx/Java-Broker-Installation.xml
index 06f0c16..ab23a6b 100644
--- a/doc/java-broker/src/docbkx/Java-Broker-Installation.xml
+++ b/doc/java-broker/src/docbkx/Java-Broker-Installation.xml
@@ -164,8 +164,8 @@ drwxrwxr-x. 2 alex alex 4096 Nov 25 11:43 lib
</section>
<section role="h2" xml:id="Java-Broker-Installation-OptionalDependencies">
<title>Optional Dependencies</title>
- <para>If you wish to utilise storage options using Oracle BDB JE or an External Database, see
- <xref linkend="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE"/> and <xref linkend="Java-Broker-Miscellaneous-Installing-External-JDBC-Driver"/> for details of
+ <para>If you wish to utilise a storage option using an External Database, see
+ <xref linkend="Java-Broker-Miscellaneous-Installing-External-JDBC-Driver"/> for details of
installing their dependencies.</para>
</section>
</chapter>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dd6b280d/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-VirtualhostNodes.xml
----------------------------------------------------------------------
diff --git a/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-VirtualhostNodes.xml b/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-VirtualhostNodes.xml
index c50c218..6271b4a 100644
--- a/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-VirtualhostNodes.xml
+++ b/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-VirtualhostNodes.xml
@@ -26,11 +26,8 @@
<section xml:id="Java-Broker-Management-Managing-Virtualhost-Nodes-Types">
<title>Types</title>
<para> The following virtualhost nodes types are supported. <itemizedlist>
- <listitem><para>BDB - Node backed with Oracle BDB <footnote>
- <para>Oracle BDB JE is optional. See <xref linkend="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE"/>.</para>
- </footnote></para></listitem>
- <listitem><para>BDB HA - Node backed with Oracle BDB utilising High
- Availability</para></listitem>
+ <listitem><para>BDB - Node backed with Oracle Berkeley DB JE</para></listitem>
+ <listitem><para>BDB HA - Node backed with Oracle Berkeley DB JE utilising High Availability</para></listitem>
<listitem><para>DERBY - Node backed with Apache Derby</para></listitem>
<listitem><para>JDBC - Node backed with an external database <footnote>
<para>JDBC 4.0 compatible drivers must be available. See <xref linkend="Java-Broker-Miscellaneous-Installing-External-JDBC-Driver"/></para>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dd6b280d/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Virtualhosts.xml
----------------------------------------------------------------------
diff --git a/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Virtualhosts.xml b/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Virtualhosts.xml
index c40e998..7b25425 100644
--- a/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Virtualhosts.xml
+++ b/doc/java-broker/src/docbkx/management/managing/Java-Broker-Management-Managing-Virtualhosts.xml
@@ -29,9 +29,7 @@
<title>Types</title>
<para>The following virtualhost types are supported. <itemizedlist>
<listitem>
- <para>BDB - Virtualhost backed with Oracle BDB <footnote>
- <para>Oracle BDB JE is optional. See <xref linkend="Java-Broker-Miscellaneous-Installing-Oracle-BDB-JE"/>.</para>
- </footnote></para>
+ <para>BDB - Virtualhost backed with Oracle Berkeley DB JE</para>
</listitem>
<listitem>
<para>BDB HA - Virtualhost backed with Oracle BDB utilising High Availability</para>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dd6b280d/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9cb53fc..8b997cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -116,7 +116,7 @@
<dollar.sign>$</dollar.sign>
<at.sign>@</at.sign>
- <bdb-version>5.0.104</bdb-version>
+ <bdb-version>7.3.7</bdb-version>
<derby-version>10.13.1.1</derby-version>
<logback-version>1.2.2</logback-version>
<guava-version>18.0</guava-version>
@@ -1179,7 +1179,8 @@
<outputDirectory>${license-maven-plugin-output-dir}</outputDirectory>
<!-- Exclude logback from being checked, it is dual licensed and lists both licenses in META-INF Bundle-License -->
<!-- Exclude BCEL from being checked, it is ALv2 but doesnt have the necessary metadata -->
- <excludedGroups>org.apache.bcel|ch.qos.logback</excludedGroups>
+ <!-- Exclude BDB JE from being checked, it is ALv2 but doesnt have the necessary metadata -->
+ <excludedGroups>org.apache.bcel|ch.qos.logback|com.sleepycat</excludedGroups>
<includedLicenses>
<includedLicense>Apache Software License, Version 2.0</includedLicense>
<includedLicense>The MIT License</includedLicense>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dd6b280d/qpid-perftests-systests/pom.xml
----------------------------------------------------------------------
diff --git a/qpid-perftests-systests/pom.xml b/qpid-perftests-systests/pom.xml
index bc25af2..acf976a 100644
--- a/qpid-perftests-systests/pom.xml
+++ b/qpid-perftests-systests/pom.xml
@@ -69,12 +69,6 @@
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>com.sleepycat</groupId>
- <artifactId>je</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dd6b280d/qpid-systests-parent/pom.xml
----------------------------------------------------------------------
diff --git a/qpid-systests-parent/pom.xml b/qpid-systests-parent/pom.xml
index 1824df4..2bed322 100644
--- a/qpid-systests-parent/pom.xml
+++ b/qpid-systests-parent/pom.xml
@@ -172,26 +172,6 @@
</artifactItems>
</configuration>
</execution>
- <!-- work around to make sure bdb jar available for bdb profiles -->
- <execution>
- <id>copy-sleepycat-jar-for-bdb-tests</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>copy</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>com.sleepycat</groupId>
- <artifactId>je</artifactId>
- <version>${bdb-version}</version>
- <type>jar</type>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/qpid-broker/${project.version}/lib</outputDirectory>
- </configuration>
- </execution>
-
</executions>
</plugin>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dd6b280d/systests/pom.xml
----------------------------------------------------------------------
diff --git a/systests/pom.xml b/systests/pom.xml
index 5f3a9fc..49615c8 100644
--- a/systests/pom.xml
+++ b/systests/pom.xml
@@ -156,13 +156,6 @@
<optional>true</optional>
</dependency>
- <dependency>
- <groupId>com.sleepycat</groupId>
- <artifactId>je</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
-
</dependencies>
<build>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dd6b280d/systests/protocol-tests-amqp-1-0/pom.xml
----------------------------------------------------------------------
diff --git a/systests/protocol-tests-amqp-1-0/pom.xml b/systests/protocol-tests-amqp-1-0/pom.xml
index f407a68..ef33da3 100644
--- a/systests/protocol-tests-amqp-1-0/pom.xml
+++ b/systests/protocol-tests-amqp-1-0/pom.xml
@@ -98,13 +98,6 @@
</dependency>
<dependency>
- <groupId>com.sleepycat</groupId>
- <artifactId>je</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
-
- <dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/dd6b280d/systests/qpid-systests-jms_2.0/pom.xml
----------------------------------------------------------------------
diff --git a/systests/qpid-systests-jms_2.0/pom.xml b/systests/qpid-systests-jms_2.0/pom.xml
index 7d02926..4d828f0 100644
--- a/systests/qpid-systests-jms_2.0/pom.xml
+++ b/systests/qpid-systests-jms_2.0/pom.xml
@@ -62,13 +62,6 @@
</dependency>
<dependency>
- <groupId>com.sleepycat</groupId>
- <artifactId>je</artifactId>
- <scope>provided</scope>
- <optional>true</optional>
- </dependency>
-
- <dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jms_2.0_spec</artifactId>
</dependency>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org