Merge pull request #2260 from adamretter/feature/journal-binary-checksums-4.x.x

(4.x.x) Journal Binary Checksums

Author: dizzzz

.classpath

@@ -79,7 +79,7 @@
 	<classpathentry kind="lib" path="extensions/webdav/lib/mime-util-2.1.3.jar"/>
 	<classpathentry kind="lib" path="lib/optional/isorelax-20041111.jar"/>
 	<classpathentry kind="lib" path="lib/optional/xqjapi-1.0-fr.jar"/>
-	<classpathentry kind="lib" path="lib/core/gnu-crypto-2.0.1.jar"/>
+	<classpathentry kind="lib" path="lib/core/bcprov-jdk15on-1.60.jar"/>
 	<classpathentry kind="lib" path="tools/jetty/lib/existdb-favicon.jar"/>
 	<classpathentry kind="lib" path="tools/jetty/lib/asm-6.0.jar"/>
 	<classpathentry kind="lib" path="tools/jetty/lib/asm-commons-6.0.jar"/>

conf.xml.tmpl

@@ -169,7 +169,7 @@
 		<!--
 		    Trigger for registering the GNU Crypto JCE Provider with Java
 		-->
-		<trigger class="org.exist.security.GnuCryptoJceProviderStartupTrigger"/>
+		<trigger class="org.exist.security.BouncyCastleJceProviderStartupTrigger"/>
 
                 <!--
                     Trigger for registering eXists XML:DB URL handler with Java

extensions/indexes/ngram/src/org/exist/indexing/ngram/NGramIndex.java

@@ -42,6 +42,8 @@
  */
 public class NGramIndex extends AbstractIndex implements RawBackupSupport {
 
+    public static final short FILE_FORMAT_VERSION_ID = 13;
+
     public final static String ID = NGramIndex.class.getName();
 
     private final static Logger LOG = LogManager.getLogger(NGramIndex.class);
@@ -68,7 +70,7 @@ public void configure(BrokerPool pool, Path dataDir, Element config) throws Data
     @Override
     public void open() throws DatabaseConfigurationException {
         try {
-            db = new BFile(pool, (byte) 0, false, dataFile, pool.getCacheManager(), 1.4, 0.07);
+            db = new BFile(pool, (byte) 0, FILE_FORMAT_VERSION_ID, false, dataFile, pool.getCacheManager(), 1.4, 0.07);
         } catch (DBException e) {
             throw new DatabaseConfigurationException("Failed to create index file: " + dataFile.toAbsolutePath().toString() + ": " +
                 e.getMessage());

extensions/indexes/sort/src/org/exist/indexing/sort/SortIndex.java

@@ -34,6 +34,7 @@ public class SortIndex extends AbstractIndex implements RawBackupSupport {
 
     public static final String ID = SortIndex.class.getName();
     public static final String FILE_NAME = "sort.dbx";
+    public final static short FILE_FORMAT_VERSION_ID = 2;
     public static final byte SORT_INDEX_ID = 0x10;
     protected static final Logger LOG = LogManager.getLogger(SortIndex.class);
     protected BTreeStore btree;
@@ -43,7 +44,7 @@ public void open() throws DatabaseConfigurationException {
         final Path file = getDataDir().resolve(FILE_NAME);
         LOG.debug("Creating '" + FileUtils.fileName(file) + "'...");
         try {
-            btree = new BTreeStore(pool, SORT_INDEX_ID, false,
+            btree = new BTreeStore(pool, SORT_INDEX_ID, FILE_FORMAT_VERSION_ID, false,
                     file, pool.getCacheManager());
         } catch (final DBException e) {
             LOG.error("Failed to initialize structural index: " + e.getMessage(), e);

lib/core/bcprov-jdk15on-1.60.jar

@@ -0,0 +1,7 @@
+Copyright (c) 2000 - 2017 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

lib/core/bcprov-jdk15on-LICENSE.txt

@@ -24,7 +24,7 @@ file.reference.javax.transaction-api-1.2.jar=tools/jetty/lib/javax.transaction-a
 file.reference.jcip-annotations-1.0.jar=lib/core/jcip-annotations-1.0.jar
 file.reference.cglib-nodep-3.2.6.jar=lib/core/cglib-nodep-3.2.6.jar
 file.reference.easymock-3.6.jar=lib/test/easymock-3.6.jar
-file.reference.gnu-crypto-2.0.1.jar=lib/core/gnu-crypto-2.0.1.jar
+file.reference.bcprov-jdk15on-1.60.jar=lib/core/bcprov-jdk15on-1.60.jar
 file.reference.jetty-jndi-9.4.10.v20180503.jar=tools/jetty/lib/jetty-jndi-9.4.10.v20180503.jar
 file.reference.jna-4.5.0.jar=tools/yajsw/lib/core/jna/jna-4.5.0.jar
 file.reference.jna-platform-4.5.0.jar=tools/yajsw/lib/core/jna/jna-platform-4.5.0.jar
@@ -297,7 +297,7 @@ javac.classpath=\
     ${file.reference.xmlrpc-common-3.1.3.jar}:\
     ${file.reference.xmlrpc-server-3.1.3.jar}:\
     ${file.reference.jackson-core-2.9.5.jar}:\
-    ${file.reference.gnu-crypto-2.0.1.jar}:\
+    ${file.reference.bcprov-jdk15on-1.60.jar}:\
     ${file.reference.cglib-nodep-3.2.6.jar}:\
     ${file.reference.jcip-annotations-1.0.jar}:\
     ${file.reference.commons-compress-1.17.jar}:\