Merging changes from 6.7.0 into master (#1002)

* [maven-release-plugin] prepare release 6.7.0-RC1 * [maven-release-plugin] prepare for next development iteration * Added about box to what's new section * [maven-release-plugin] prepare release droid-6.7.0-RC2 * [maven-release-plugin] prepare for next development iteration * Logging update for slf4j 2.0 (#992) * swing-ui logger version updated * logger version updated across the project * [maven-release-plugin] prepare release droid-6.7.0-RC3 * [maven-release-plugin] prepare for next development iteration * #993 Made the toolbar non-floatable * removed issue number as the issue mentioned with that ID is slightly different to the work done * [maven-release-plugin] prepare release droid-6.7.0-RC4 * [maven-release-plugin] prepare for next development iteration * Added latest pronom signature files and associated skeleton suite. (#998) * [maven-release-plugin] prepare release droid-6.7.0-RC5 * [maven-release-plugin] prepare for next development iteration * [maven-release-plugin] prepare release droid-6.7.0 * [maven-release-plugin] prepare for next development iteration
digital-preservation · Oct 4, 2023 · 85bdb9c · 85bdb9c
1 parent ff76682
commit 85bdb9c
Show file tree

Hide file tree

Showing 95 changed files with 7,298 additions and 366 deletions.
diff --git a/droid-api/pom.xml b/droid-api/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>droid-parent</artifactId>
 		<groupId>uk.gov.nationalarchives</groupId>
-		<version>6.6.2-SNAPSHOT</version>
+		<version>6.7.1-SNAPSHOT</version>
 		<relativePath>../droid-parent</relativePath>
 	</parent>
 
@@ -22,7 +22,6 @@
 
 	<properties>
 		<jta.version>1.1</jta.version>
-		<slf4j.version>1.7.25</slf4j.version>
 	</properties>
 
 	<build>

diff --git a/droid-api/src/test/java/uk/gov/nationalarchives/droid/internal/api/DroidAPISkeletonTest.java b/droid-api/src/test/java/uk/gov/nationalarchives/droid/internal/api/DroidAPISkeletonTest.java
@@ -97,7 +97,7 @@ public static Collection<Object[]> data() throws IOException, SignatureParseExce
      * from the API for the test skeleton suite.
      * Following table describes the current puids that are ignored because the identification using current
      * signature file does not match the indicated puid in filename
-     * ---------------- Current signature file V112 ----------------
+     * ---------------- Current signature file V114 ----------------
      * fmt-1062-signature-id-1435.3fr			fmt/353		Signature
      * fmt-1157-signature-id-1539.nfo
      * fmt-1739-signature-id-2077.toast		    fmt/468		Signature

diff --git a/droid-api/src/test/java/uk/gov/nationalarchives/droid/internal/api/DroidAPITest.java b/droid-api/src/test/java/uk/gov/nationalarchives/droid/internal/api/DroidAPITest.java
@@ -133,9 +133,9 @@ public void should_report_when_there_is_an_extension_mismatch() throws IOExcepti
 
     @Test
     public void should_report_correct_version_for_the_binary_and_container_signature() {
-        assertThat(api.getContainerSignatureVersion(), is("20230510"));
+        assertThat(api.getContainerSignatureVersion(), is("20230822"));
         assertThat(api.getDroidVersion(), is(ResourceBundle.getBundle("options").getString("version_no")));
-        assertThat(api.getBinarySignatureVersion(), is("112"));
+        assertThat(api.getBinarySignatureVersion(), is("114"));
     }
 
     @Test

diff --git a/droid-api/src/test/java/uk/gov/nationalarchives/droid/internal/api/DroidAPITestUtils.java b/droid-api/src/test/java/uk/gov/nationalarchives/droid/internal/api/DroidAPITestUtils.java
@@ -42,8 +42,8 @@
  */
 public class DroidAPITestUtils {
     public static DroidAPI createApi() throws SignatureParseException {
-        Path signaturePath = Paths.get("../droid-results/custom_home/signature_files/DROID_SignatureFile_V112.xml");
-        Path containerPath = Paths.get("../droid-results/custom_home/container_sigs/container-signature-20230510.xml");
+        Path signaturePath = Paths.get("../droid-results/custom_home/signature_files/DROID_SignatureFile_V114.xml");
+        Path containerPath = Paths.get("../droid-results/custom_home/container_sigs/container-signature-20230822.xml");
         return DroidAPI.getInstance(signaturePath, containerPath);  //Create only once instance of Droid.
     }
 }
diff --git a/droid-binary/bin/ChangeLog b/droid-binary/bin/ChangeLog
@@ -3,7 +3,8 @@ Version 6.7.0
 * #938 Improvement: Internal API result includes whether there is an extension mismatch in identification
 * #861 Improvement: CSV export has column headers when there is more than one PUID per file
 * #952 Improvement: SHA512 is available as an option for checksums
-* #232 Improvement: Moved to using a different zip library for opening the zip archives
+* #977 Improvement: Added an `About Droid` dialog to the GUI
+* Improvement: Moved to using a different zip library for opening the zip archives
 * #953 Bugfix: On CLI, -At and -Wt options without any arguments do not analyse archives or web archives
 
 Version 6.6.1

diff --git a/droid-binary/bin/Using sigtool.txt b/droid-binary/bin/Using sigtool.txt
@@ -89,7 +89,7 @@ You can read an existing binary or container signature file, and output a new si
 
 For example, if you ran:
 ```
-sigtool --file "DROID_SignatureFile_V112.xml"
+sigtool --file "DROID_SignatureFile_V114.xml"
 ```
 It would write a new XML file to the console.  You can pipe this into a new file using your shell.  The signature file will be transformed to use the new syntax, e.g.:
 ```
@@ -106,7 +106,7 @@ It would write a new XML file to the console.  You can pipe this into a new file
 ```
 You can see that it's transformed a binary signature file using container syntax (the default).  If we wanted to use the older binary syntax for this transformation, we could write:
 ```
-sigtool --binary --file "DROID_SignatureFile_V112.xml"
+sigtool --binary --file "DROID_SignatureFile_V114.xml"
 ```
 It would give this output (snippet):
 ```
@@ -125,7 +125,7 @@ It would give this output (snippet):
 ## Summarise all signatures in a syntax file.
 You can obtain a summary of all signatures in a signature file into a tab-delimited format, by specifying the --expression option.  For example, running:
 ```
-sigtool --expression --file "DROID_SignatureFile_V112.xml"
+sigtool --expression --file "DROID_SignatureFile_V114.xml"
 ```
 Would give the following output (snippet):
 
@@ -143,7 +143,7 @@ Would give the following output (snippet):
 
 You can also specify --binary signature syntax or use --container syntax (the default).  This also works for container files, where you get a little more metadata:
 ```
-sigtool --expression --file "container-signature-20230510.xml"
+sigtool --expression --file "container-signature-20230822.xml"
 ```
 Gives the following output (snippet):
 

diff --git a/droid-binary/pom.xml b/droid-binary/pom.xml
@@ -1,14 +1,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.6.2-SNAPSHOT</version>
-        <relativePath>../droid-parent</relativePath>
+        <version>6.7.1-SNAPSHOT</version>
+  	    <relativePath>../droid-parent</relativePath>
     </parent>
+
     <artifactId>droid-binary</artifactId>
     <packaging>pom</packaging>
+
     <name>droid-binaries</name>
+
     <scm>
         <connection>scm:git:https://github.com/digital-preservation/droid.git</connection>
         <developerConnection>scm:git:https://github.com/digital-preservation/droid.git</developerConnection>
@@ -51,14 +55,14 @@
                         <configuration>
                             <target>
                                 <!-- Update binary from https://adoptopenjdk.net/releases.html -->
-                                <unzip dest="${project.build.directory}/jre_tmp/" src="${project.build.directory}/OpenJDK11U-jre_x86-32_windows_hotspot_11.0.18_10.zip"/>
+                                <unzip dest="${project.build.directory}/jre_tmp/" src="${project.build.directory}/OpenJDK11U-jre_x86-32_windows_hotspot_11.0.18_10.zip" />
                                 <move todir="${project.build.directory}/jre-windows/">
                                     <fileset dir="${project.build.directory}/jre_tmp/jdk-11.0.18+10-jre/">
-                                        <include name="**/*"/>
+                                        <include name="**/*" />
                                     </fileset>
                                 </move>
                                 <delete includeemptydirs="true">
-                                    <fileset dir="${project.build.directory}/jre_tmp/"/>
+                                    <fileset dir="${project.build.directory}/jre_tmp/" />
                                 </delete>
                             </target>
                         </configuration>

diff --git a/droid-build-tools/pom.xml b/droid-build-tools/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.6.2-SNAPSHOT</version>
+        <version>6.7.1-SNAPSHOT</version>
         <relativePath>../droid-parent</relativePath>
     </parent>
 

diff --git a/droid-command-line/pom.xml b/droid-command-line/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.6.2-SNAPSHOT</version>
+        <version>6.7.1-SNAPSHOT</version>
         <relativePath>../droid-parent</relativePath>
     </parent>
 
@@ -71,7 +71,7 @@
                                 <ignoredUnusedDeclaredDependency>org.glassfish.jaxb:jaxb-runtime</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>javax.xml.bind:jaxb-api</ignoredUnusedDeclaredDependency>
                                 <ignoredUnusedDeclaredDependency>com.sun.activation:javax.activation</ignoredUnusedDeclaredDependency>
-                                <ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j-impl</ignoredUnusedDeclaredDependency>
+                                <ignoredUnusedDeclaredDependency>org.apache.logging.log4j:log4j-slf4j2-impl</ignoredUnusedDeclaredDependency>
                             </ignoredUnusedDeclaredDependencies>
                             <ignoredUsedUndeclaredDependencies>
                                 <ignoredUsedUndeclaredDependency>org.slf4j:slf4j-api</ignoredUsedUndeclaredDependency>
@@ -166,7 +166,8 @@
   	    </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-slf4j-impl</artifactId>
+            <artifactId>log4j-slf4j2-impl</artifactId>
+            <version>${log4j2.version}</version>
         </dependency>
         <dependency>
             <groupId>commons-cli</groupId>

diff --git a/droid-command-line/src/main/resources/options.properties b/droid-command-line/src/main/resources/options.properties
@@ -52,8 +52,8 @@ droid -Pr "profile.maxBytesToScan=32768" -a "C:\\Files\\A Folder" -p "C:\\Result
 Properties which can be overridden are those prefixed by "profile" in the droid.properties file contained in the droid home folder, \
  normally found in the .droid6 home folder under the user's home folder. These currently include the following properties:\n \
 profile.defaultThrottle = 0 \n \
-profile.defaultBinarySigFileVersion = DROID_SignatureFile_V112 \n \
-profile.defaultContainerSigFileVersion = container-signature-20230510 \n \
+profile.defaultBinarySigFileVersion = DROID_SignatureFile_V114 \n \
+profile.defaultContainerSigFileVersion = container-signature-20230822 \n \
 profile.processTar = true \n \
 profile.processZip = true \n \
 profile.processGzip = true \n \