Merge pull request #1578 from digital-preservation/develop

DROID release 6.9.11

Author: MancunianSam

.github/workflows/ci.yml

@@ -10,6 +10,10 @@ on:
   pull_request:
 
 jobs:
+  check-dependencies:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 #v4.8.2
   build:
     name: Build and Test
     strategy:

cli-tests/test/cli-test.bats

@@ -64,14 +64,14 @@ setup() {
 
 @test "list signature files" {
   run $DROID_BIN -X
-  assert_output -p "Type: Binary Version:  121  File name: DROID_SignatureFile_V121.xml"
-  assert_output -p "Type: Container Version:  20250925  File name: container-signature-20250925.xml"
+  assert_output -p "Type: Binary Version:  122  File name: DROID_SignatureFile_V122.xml"
+  assert_output -p "Type: Container Version:  20260119  File name: container-signature-20260119.xml"
 }
 
 @test "display signature file" {
   run $DROID_BIN -x
-  assert_output -p "Type: Container Version:  20250925  File name: container-signature-20250925.xml"
-  assert_output -p "Type: Binary Version:  121  File name: DROID_SignatureFile_V121.xml"
+  assert_output -p "Type: Container Version:  20260119  File name: container-signature-20260119.xml"
+  assert_output -p "Type: Binary Version:  122  File name: DROID_SignatureFile_V122.xml"
 }
 
 @test "set signature file" {

droid-api/pom.xml

@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>droid-parent</artifactId>
 		<groupId>uk.gov.nationalarchives</groupId>
-		<version>6.9.10-SNAPSHOT</version>
+		<version>6.9.11-SNAPSHOT</version>
 		<relativePath>../droid-parent</relativePath>
 	</parent>
 
@@ -181,7 +181,7 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-lang3</artifactId>
-			<version>3.19.0</version>
+			<version>3.20.0</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.httpcomponents</groupId>
@@ -201,7 +201,7 @@
 		<dependency>
 			<groupId>org.apache.poi</groupId>
 			<artifactId>poi</artifactId>
-			<version>5.4.1</version>
+			<version>5.5.1</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

droid-api/src/main/java/uk/gov/nationalarchives/droid/internal/api/DroidAPI.java

@@ -362,6 +362,7 @@ private List<APIResult> submitS3Identification(final URI uri, String extension)
 
             final RequestIdentifier id = getRequestIdentifier(s3Uri.uri());
             RequestMetaData metaData = new RequestMetaData(s3Object.size(), s3Object.lastModified().toEpochMilli(), s3Uri.uri().toString());
+
             try (final S3IdentificationRequest request = new S3IdentificationRequest(metaData, id, s3Client, DEFAULT_WINDOW_SIZE)) {
                 request.setExtension(extension);
                 request.open(s3Uri);

droid-api/src/test/java/uk/gov/nationalarchives/droid/internal/api/DroidAPITest.java

@@ -357,9 +357,9 @@ public void should_return_multiple_results_if_a_directory_is_passed_for_file_or_
 
     @Test
     public void should_report_correct_version_for_the_binary_and_container_signature() {
-        assertThat(api.getContainerSignatureVersion(), is("20250925"));
+        assertThat(api.getContainerSignatureVersion(), is("20260119"));
         assertThat(api.getDroidVersion(), is(ResourceBundle.getBundle("options").getString("version_no")));
-        assertThat(api.getBinarySignatureVersion(), is("121"));
+        assertThat(api.getBinarySignatureVersion(), is("122"));
     }
 
     static Stream<URI> emptyFileUris() {

droid-api/src/test/java/uk/gov/nationalarchives/droid/internal/api/DroidAPITestUtils.java

@@ -77,8 +77,8 @@
  */
 public class DroidAPITestUtils {
 
-    static Path signaturePath = Paths.get("../droid-results/custom_home/signature_files/DROID_SignatureFile_V121.xml");
-    static Path containerPath = Paths.get("../droid-results/custom_home/container_sigs/container-signature-20250925.xml");
+    static Path signaturePath = Paths.get("../droid-results/custom_home/signature_files/DROID_SignatureFile_V122.xml");
+    static Path containerPath = Paths.get("../droid-results/custom_home/container_sigs/container-signature-20260119.xml");
 
     public static DroidAPI createApi(URI endpointOverride) throws SignatureParseException {
         return createApi(endpointOverride, signaturePath, containerPath, null);

droid-binary/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.10-SNAPSHOT</version>
+        <version>6.9.11-SNAPSHOT</version>
   	    <relativePath>../droid-parent</relativePath>
     </parent>
 
@@ -44,7 +44,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
-                <version>3.1.0</version>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <id>prepare-files-windows</id>

droid-build-tools/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.10-SNAPSHOT</version>
+        <version>6.9.11-SNAPSHOT</version>
         <relativePath>../droid-parent</relativePath>
     </parent>
 

droid-command-line/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <artifactId>droid-parent</artifactId>
         <groupId>uk.gov.nationalarchives</groupId>
-        <version>6.9.10-SNAPSHOT</version>
+        <version>6.9.11-SNAPSHOT</version>
         <relativePath>../droid-parent</relativePath>
     </parent>
 
@@ -171,7 +171,7 @@
         <dependency>
             <groupId>commons-cli</groupId>
             <artifactId>commons-cli</artifactId>
-            <version>1.10.0</version>
+            <version>1.11.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>

droid-command-line/src/main/java/uk/gov/nationalarchives/droid/command/action/DownloadSignatureUpdateCommand.java

@@ -60,7 +60,7 @@ public void execute() throws CommandExecutionException {
                 printWriter.println(I18N.getResource(I18N.CHECK_SIGNATURE_UPDATE_UNAVAILABLE));
             } else {
                 for (SignatureFileInfo sigFileInfo : signatureFileInfos.values()) {
-                    signatureManager.downloadLatest(sigFileInfo.getType());
+                    signatureManager.downloadLatest(sigFileInfo.getType(), sigFileInfo.getVersion());
                     printWriter.println(I18N.getResource(I18N.DOWNLOAD_SIGNATURE_UPDATE_SUCCESS, 
                             sigFileInfo.getVersion()));
                 }