From d77752cf306d5954c54d0cba1c162a69c563525d Mon Sep 17 00:00:00 2001 From: tna-da-bot <181243999+tna-da-bot@users.noreply.github.com> Date: Mon, 29 Sep 2025 13:42:57 +0000 Subject: [PATCH 01/12] [maven-release-plugin] prepare release droid-6.9.6 --- droid-api/pom.xml | 4 ++-- droid-binary/pom.xml | 4 ++-- droid-build-tools/pom.xml | 4 ++-- droid-command-line/pom.xml | 4 ++-- droid-container/pom.xml | 4 ++-- droid-core-interfaces/pom.xml | 4 ++-- droid-core/pom.xml | 4 ++-- droid-export-interfaces/pom.xml | 4 ++-- droid-export/pom.xml | 4 ++-- droid-help/pom.xml | 4 ++-- droid-parent/pom.xml | 4 ++-- droid-report-interfaces/pom.xml | 4 ++-- droid-report/pom.xml | 4 ++-- droid-results/pom.xml | 4 ++-- droid-swing-ui/pom.xml | 4 ++-- droid-tools/pom.xml | 4 ++-- pom.xml | 4 ++-- 17 files changed, 34 insertions(+), 34 deletions(-) diff --git a/droid-api/pom.xml b/droid-api/pom.xml index e9d2c08d4..01b335c75 100644 --- a/droid-api/pom.xml +++ b/droid-api/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6-SNAPSHOT + 6.9.6 ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - HEAD + droid-6.9.6 diff --git a/droid-binary/pom.xml b/droid-binary/pom.xml index 0601d764d..b1e67c84e 100644 --- a/droid-binary/pom.xml +++ b/droid-binary/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6-SNAPSHOT + 6.9.6 ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - HEAD + droid-6.9.6 diff --git a/droid-build-tools/pom.xml b/droid-build-tools/pom.xml index db149abf2..005281ec2 100644 --- a/droid-build-tools/pom.xml +++ b/droid-build-tools/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6-SNAPSHOT + 6.9.6 ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - HEAD + droid-6.9.6 diff --git a/droid-command-line/pom.xml b/droid-command-line/pom.xml index ea99ee09e..90a808346 100644 --- a/droid-command-line/pom.xml +++ b/droid-command-line/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6-SNAPSHOT + 6.9.6 ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - HEAD + droid-6.9.6 diff --git a/droid-container/pom.xml b/droid-container/pom.xml index 7264f0cbd..e13ee5399 100644 --- a/droid-container/pom.xml +++ b/droid-container/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6-SNAPSHOT + 6.9.6 ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - HEAD + droid-6.9.6 diff --git a/droid-core-interfaces/pom.xml b/droid-core-interfaces/pom.xml index d6e537f22..3cd99be66 100644 --- a/droid-core-interfaces/pom.xml +++ b/droid-core-interfaces/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6-SNAPSHOT + 6.9.6 ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - HEAD + droid-6.9.6 diff --git a/droid-core/pom.xml b/droid-core/pom.xml index af79798fb..c20ab0383 100644 --- a/droid-core/pom.xml +++ b/droid-core/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6-SNAPSHOT + 6.9.6 ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - HEAD + droid-6.9.6 diff --git a/droid-export-interfaces/pom.xml b/droid-export-interfaces/pom.xml index 60310076c..a8a22ab25 100644 --- a/droid-export-interfaces/pom.xml +++ b/droid-export-interfaces/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6-SNAPSHOT + 6.9.6 ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - HEAD + droid-6.9.6 diff --git a/droid-export/pom.xml b/droid-export/pom.xml index eda8b210f..2614a5423 100644 --- a/droid-export/pom.xml +++ b/droid-export/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6-SNAPSHOT + 6.9.6 ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - HEAD + droid-6.9.6 diff --git a/droid-help/pom.xml b/droid-help/pom.xml index 270d87646..e28a5693a 100644 --- a/droid-help/pom.xml +++ b/droid-help/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6-SNAPSHOT + 6.9.6 ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - HEAD + droid-6.9.6 diff --git a/droid-parent/pom.xml b/droid-parent/pom.xml index f571d6a57..9ccb7b505 100644 --- a/droid-parent/pom.xml +++ b/droid-parent/pom.xml @@ -4,7 +4,7 @@ uk.gov.nationalarchives droid-parent - 6.9.6-SNAPSHOT + 6.9.6 pom droid-parent @@ -77,7 +77,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - HEAD + droid-6.9.6 diff --git a/droid-report-interfaces/pom.xml b/droid-report-interfaces/pom.xml index aa9979797..4cbf98bf1 100644 --- a/droid-report-interfaces/pom.xml +++ b/droid-report-interfaces/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6-SNAPSHOT + 6.9.6 ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - HEAD + droid-6.9.6 diff --git a/droid-report/pom.xml b/droid-report/pom.xml index 2059b8a16..d4f46397b 100644 --- a/droid-report/pom.xml +++ b/droid-report/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6-SNAPSHOT + 6.9.6 ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - HEAD + droid-6.9.6 diff --git a/droid-results/pom.xml b/droid-results/pom.xml index 016d3698d..5ec039eee 100644 --- a/droid-results/pom.xml +++ b/droid-results/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6-SNAPSHOT + 6.9.6 ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - HEAD + droid-6.9.6 diff --git a/droid-swing-ui/pom.xml b/droid-swing-ui/pom.xml index c27199629..671dc552c 100644 --- a/droid-swing-ui/pom.xml +++ b/droid-swing-ui/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6-SNAPSHOT + 6.9.6 ../droid-parent @@ -22,7 +22,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - HEAD + droid-6.9.6 diff --git a/droid-tools/pom.xml b/droid-tools/pom.xml index 0e9fdce3c..c50864b7a 100644 --- a/droid-tools/pom.xml +++ b/droid-tools/pom.xml @@ -5,7 +5,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6-SNAPSHOT + 6.9.6 ../droid-parent @@ -18,7 +18,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - HEAD + droid-6.9.6 diff --git a/pom.xml b/pom.xml index a5ac98d82..417c3a029 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6-SNAPSHOT + 6.9.6 droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - HEAD + droid-6.9.6 From d9719c0b8fe210fbddfbf0ed5272c53dd4a0e78c Mon Sep 17 00:00:00 2001 From: tna-da-bot <181243999+tna-da-bot@users.noreply.github.com> Date: Mon, 29 Sep 2025 13:42:58 +0000 Subject: [PATCH 02/12] [maven-release-plugin] prepare for next development iteration --- droid-api/pom.xml | 4 ++-- droid-binary/pom.xml | 4 ++-- droid-build-tools/pom.xml | 4 ++-- droid-command-line/pom.xml | 4 ++-- droid-container/pom.xml | 4 ++-- droid-core-interfaces/pom.xml | 4 ++-- droid-core/pom.xml | 4 ++-- droid-export-interfaces/pom.xml | 4 ++-- droid-export/pom.xml | 4 ++-- droid-help/pom.xml | 4 ++-- droid-parent/pom.xml | 4 ++-- droid-report-interfaces/pom.xml | 4 ++-- droid-report/pom.xml | 4 ++-- droid-results/pom.xml | 4 ++-- droid-swing-ui/pom.xml | 4 ++-- droid-tools/pom.xml | 4 ++-- pom.xml | 4 ++-- 17 files changed, 34 insertions(+), 34 deletions(-) diff --git a/droid-api/pom.xml b/droid-api/pom.xml index 01b335c75..bead71d45 100644 --- a/droid-api/pom.xml +++ b/droid-api/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6 + 6.9.7-SNAPSHOT ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - droid-6.9.6 + HEAD diff --git a/droid-binary/pom.xml b/droid-binary/pom.xml index b1e67c84e..35eaae08d 100644 --- a/droid-binary/pom.xml +++ b/droid-binary/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6 + 6.9.7-SNAPSHOT ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - droid-6.9.6 + HEAD diff --git a/droid-build-tools/pom.xml b/droid-build-tools/pom.xml index 005281ec2..f0c7ff466 100644 --- a/droid-build-tools/pom.xml +++ b/droid-build-tools/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6 + 6.9.7-SNAPSHOT ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - droid-6.9.6 + HEAD diff --git a/droid-command-line/pom.xml b/droid-command-line/pom.xml index 90a808346..43abd9336 100644 --- a/droid-command-line/pom.xml +++ b/droid-command-line/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6 + 6.9.7-SNAPSHOT ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - droid-6.9.6 + HEAD diff --git a/droid-container/pom.xml b/droid-container/pom.xml index e13ee5399..bc374114f 100644 --- a/droid-container/pom.xml +++ b/droid-container/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6 + 6.9.7-SNAPSHOT ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - droid-6.9.6 + HEAD diff --git a/droid-core-interfaces/pom.xml b/droid-core-interfaces/pom.xml index 3cd99be66..922268601 100644 --- a/droid-core-interfaces/pom.xml +++ b/droid-core-interfaces/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6 + 6.9.7-SNAPSHOT ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - droid-6.9.6 + HEAD diff --git a/droid-core/pom.xml b/droid-core/pom.xml index c20ab0383..ad0526997 100644 --- a/droid-core/pom.xml +++ b/droid-core/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6 + 6.9.7-SNAPSHOT ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - droid-6.9.6 + HEAD diff --git a/droid-export-interfaces/pom.xml b/droid-export-interfaces/pom.xml index a8a22ab25..316497baf 100644 --- a/droid-export-interfaces/pom.xml +++ b/droid-export-interfaces/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6 + 6.9.7-SNAPSHOT ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - droid-6.9.6 + HEAD diff --git a/droid-export/pom.xml b/droid-export/pom.xml index 2614a5423..fc5d5efe2 100644 --- a/droid-export/pom.xml +++ b/droid-export/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6 + 6.9.7-SNAPSHOT ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - droid-6.9.6 + HEAD diff --git a/droid-help/pom.xml b/droid-help/pom.xml index e28a5693a..66fd831f5 100644 --- a/droid-help/pom.xml +++ b/droid-help/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6 + 6.9.7-SNAPSHOT ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - droid-6.9.6 + HEAD diff --git a/droid-parent/pom.xml b/droid-parent/pom.xml index 9ccb7b505..354f87b14 100644 --- a/droid-parent/pom.xml +++ b/droid-parent/pom.xml @@ -4,7 +4,7 @@ uk.gov.nationalarchives droid-parent - 6.9.6 + 6.9.7-SNAPSHOT pom droid-parent @@ -77,7 +77,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - droid-6.9.6 + HEAD diff --git a/droid-report-interfaces/pom.xml b/droid-report-interfaces/pom.xml index 4cbf98bf1..deb4295c3 100644 --- a/droid-report-interfaces/pom.xml +++ b/droid-report-interfaces/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6 + 6.9.7-SNAPSHOT ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - droid-6.9.6 + HEAD diff --git a/droid-report/pom.xml b/droid-report/pom.xml index d4f46397b..d9f1e0593 100644 --- a/droid-report/pom.xml +++ b/droid-report/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6 + 6.9.7-SNAPSHOT ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - droid-6.9.6 + HEAD diff --git a/droid-results/pom.xml b/droid-results/pom.xml index 5ec039eee..246ea7a95 100644 --- a/droid-results/pom.xml +++ b/droid-results/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6 + 6.9.7-SNAPSHOT ../droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - droid-6.9.6 + HEAD diff --git a/droid-swing-ui/pom.xml b/droid-swing-ui/pom.xml index 671dc552c..e1d4aff2a 100644 --- a/droid-swing-ui/pom.xml +++ b/droid-swing-ui/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6 + 6.9.7-SNAPSHOT ../droid-parent @@ -22,7 +22,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - droid-6.9.6 + HEAD diff --git a/droid-tools/pom.xml b/droid-tools/pom.xml index c50864b7a..798453de6 100644 --- a/droid-tools/pom.xml +++ b/droid-tools/pom.xml @@ -5,7 +5,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6 + 6.9.7-SNAPSHOT ../droid-parent @@ -18,7 +18,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - droid-6.9.6 + HEAD diff --git a/pom.xml b/pom.xml index 417c3a029..76626b216 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ droid-parent uk.gov.nationalarchives - 6.9.6 + 6.9.7-SNAPSHOT droid-parent @@ -17,7 +17,7 @@ scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git scm:git:https://github.com/digital-preservation/droid.git - droid-6.9.6 + HEAD From 07f5483e0a6cf98796fcf13fdf299e684117b6c3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Sep 2025 15:14:22 +0000 Subject: [PATCH 03/12] Bump org.apache.maven.scm:maven-scm-provider-gitexe from 2.1.0 to 2.2.1 Bumps org.apache.maven.scm:maven-scm-provider-gitexe from 2.1.0 to 2.2.1. --- updated-dependencies: - dependency-name: org.apache.maven.scm:maven-scm-provider-gitexe dependency-version: 2.2.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- droid-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/droid-parent/pom.xml b/droid-parent/pom.xml index 354f87b14..846b2c01d 100644 --- a/droid-parent/pom.xml +++ b/droid-parent/pom.xml @@ -203,7 +203,7 @@ org.apache.maven.scm maven-scm-provider-gitexe - 2.1.0 + 2.2.1 org.apache.maven.scm From 6a7913a7003b4f8a94a4a1d4539fe48daf673bde Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Sep 2025 15:17:16 +0000 Subject: [PATCH 04/12] Bump org.apache.maven.scm:maven-scm-api from 2.1.0 to 2.2.1 Bumps [org.apache.maven.scm:maven-scm-api](https://github.com/apache/maven-scm) from 2.1.0 to 2.2.1. - [Release notes](https://github.com/apache/maven-scm/releases) - [Commits](https://github.com/apache/maven-scm/compare/maven-scm-2.1.0...v2.2.1) --- updated-dependencies: - dependency-name: org.apache.maven.scm:maven-scm-api dependency-version: 2.2.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- droid-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/droid-parent/pom.xml b/droid-parent/pom.xml index 354f87b14..2f5dff5a2 100644 --- a/droid-parent/pom.xml +++ b/droid-parent/pom.xml @@ -208,7 +208,7 @@ org.apache.maven.scm maven-scm-api - 2.1.0 + 2.2.1 From db54bcdd590e40387fbaed8ad5db9489a8829830 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 Sep 2025 15:31:32 +0000 Subject: [PATCH 05/12] Bump org.apache.commons:commons-lang3 from 3.18.0 to 3.19.0 Bumps org.apache.commons:commons-lang3 from 3.18.0 to 3.19.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-lang3 dependency-version: 3.19.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- droid-api/pom.xml | 2 +- droid-parent/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/droid-api/pom.xml b/droid-api/pom.xml index bead71d45..c273e58aa 100644 --- a/droid-api/pom.xml +++ b/droid-api/pom.xml @@ -181,7 +181,7 @@ org.apache.commons commons-lang3 - 3.18.0 + 3.19.0 org.apache.httpcomponents diff --git a/droid-parent/pom.xml b/droid-parent/pom.xml index 354f87b14..3b19be76b 100644 --- a/droid-parent/pom.xml +++ b/droid-parent/pom.xml @@ -682,7 +682,7 @@ Copyright © ${project.inceptionYear}-{currentYear} Date: Tue, 30 Sep 2025 15:05:38 +0000 Subject: [PATCH 07/12] Bump junit.version from 5.13.4 to 6.0.0 Bumps `junit.version` from 5.13.4 to 6.0.0. Updates `org.junit.jupiter:junit-jupiter-params` from 5.13.4 to 6.0.0 - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.4...r6.0.0) Updates `org.junit.jupiter:junit-jupiter-api` from 5.13.4 to 6.0.0 - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.4...r6.0.0) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter-params dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major - dependency-name: org.junit.jupiter:junit-jupiter-api dependency-version: 6.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- droid-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/droid-parent/pom.xml b/droid-parent/pom.xml index 354f87b14..a055c230f 100644 --- a/droid-parent/pom.xml +++ b/droid-parent/pom.xml @@ -109,7 +109,7 @@ 2.25.2 10.21.2 2.34.1 - 5.13.4 + 6.0.0 2.20.0 From 199feda1c675e2eed378f1800e3e29cce1da92da Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Oct 2025 15:03:42 +0000 Subject: [PATCH 08/12] Bump aws.version from 2.34.1 to 2.34.7 Bumps `aws.version` from 2.34.1 to 2.34.7. Updates `software.amazon.awssdk:s3` from 2.34.1 to 2.34.7 Updates `software.amazon.awssdk:aws-core` from 2.34.1 to 2.34.7 Updates `software.amazon.awssdk:regions` from 2.34.1 to 2.34.7 Updates `software.amazon.awssdk:sdk-core` from 2.34.1 to 2.34.7 Updates `software.amazon.awssdk:sso` from 2.34.1 to 2.34.7 Updates `software.amazon.awssdk:ssooidc` from 2.34.1 to 2.34.7 Updates `software.amazon.awssdk:apache-client` from 2.34.1 to 2.34.7 Updates `software.amazon.awssdk:http-client-spi` from 2.34.1 to 2.34.7 --- updated-dependencies: - dependency-name: software.amazon.awssdk:s3 dependency-version: 2.34.7 dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:aws-core dependency-version: 2.34.7 dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:regions dependency-version: 2.34.7 dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:sdk-core dependency-version: 2.34.7 dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:sso dependency-version: 2.34.7 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:ssooidc dependency-version: 2.34.7 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:apache-client dependency-version: 2.34.7 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:http-client-spi dependency-version: 2.34.7 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- droid-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/droid-parent/pom.xml b/droid-parent/pom.xml index 354f87b14..0b8e6b6ca 100644 --- a/droid-parent/pom.xml +++ b/droid-parent/pom.xml @@ -108,7 +108,7 @@ 2.0.17 2.25.2 10.21.2 - 2.34.1 + 2.34.7 5.13.4 2.20.0 From c7c3abf14a7db78ff4e88ebca4c370b1a793e5f5 Mon Sep 17 00:00:00 2001 From: MancunianSam Date: Wed, 1 Oct 2025 21:19:27 +0100 Subject: [PATCH 09/12] Fix bug with DROID API. We were calling prepareForUse() on the sig file class which adds the file formats to a list for the signatures. The problem was that the call to droidCore.init() already calls this. This means that for every signature, we had the file format in there twice. This then meant that no signatures with corresponding container signatures were being removed from the file format list because there was always at least one signature left. This was mostly fine until now but the new signature file has a binary signature for an Android app bundle which seems to match most containers and so the API tests were failing. These tests are now passing. Sadly, the bug meant that the API skeleton suite tests were passing because none of the binary signatures were being removed for files with container signatures. This is now not happening so I've added a big list of exceptions to the tests. --- .../droid/internal/api/DroidAPI.java | 1 - .../internal/api/DroidAPISkeletonTest.java | 41 ++++++++++++++++++- 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/droid-api/src/main/java/uk/gov/nationalarchives/droid/internal/api/DroidAPI.java b/droid-api/src/main/java/uk/gov/nationalarchives/droid/internal/api/DroidAPI.java index 0fb16c0b5..bbaca30ab 100644 --- a/droid-api/src/main/java/uk/gov/nationalarchives/droid/internal/api/DroidAPI.java +++ b/droid-api/src/main/java/uk/gov/nationalarchives/droid/internal/api/DroidAPI.java @@ -227,7 +227,6 @@ public DroidAPI build() throws SignatureParseException { droidCore.setSignatureFile(binarySignature.toAbsolutePath().toString()); droidCore.init(); droidCore.setMaxBytesToScan(this.maxBytesToScan); - droidCore.getSigFile().prepareForUse(); String containerVersion = StringUtils.substringAfterLast(containerSignature.getFileName().toString(), "-").split("\\.")[0]; String droidVersion = ResourceBundle.getBundle("options").getString("version_no"); ContainerApi containerApi = new ContainerApi(droidCore, containerSignature); 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 index b3ebf8d6a..5e1e5af61 100644 --- 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 @@ -70,6 +70,45 @@ public class DroidAPISkeletonTest { private static DroidAPI api; + /** + * Unlike the skeleton suite test in droid-core, the DROID Api initialises the containers which remove signatures + * if they're in the container file with no other signatures. There was a bug that made these work originally which + * has now been fixed so we need to ignore these. + */ + private static final List FILES_WITH_REMOVED_PUIDS = List.of("fmt-137-signature-id-204.ods", + "fmt-39-signature-id-128.doc", + "fmt-292-signature-id-309.odp", + "fmt-294-signature-id-312.ods", + "fmt-295-signature-id-314.ods", + "fmt-296-signature-id-316.odg", + "fmt-483-signature-id-905.epub", + "fmt-430-signature-id-644.cdr", + "fmt-290-signature-id-306.odt", + "fmt-2042-signature-id-3408.aab", + "fmt-136-signature-id-203.odt", + "fmt-291-signature-id-308.odt", + "fmt-429-signature-id-642.cdr", + "fmt-2043-signature-id-3412.aar", + "fmt-126-signature-id-172.ppt", + "fmt-294-signature-id-313.ods", + "fmt-125-signature-id-171.ppt", + "fmt-296-signature-id-315.odg", + "fmt-161-signature-id-292.siard", + "fmt-140-signature-id-207.odb", + "fmt-482-signature-id-906.ibooks", + "fmt-292-signature-id-310.odp", + "fmt-297-signature-id-317.odg", + "fmt-290-signature-id-307.odt", + "fmt-61-signature-id-78.xls", + "fmt-293-signature-id-311.odp", + "fmt-40-signature-id-182.doc", + "fmt-139-signature-id-206.odg", + "fmt-138-signature-id-205.odp", + "x-fmt-412-signature-id-199.jar", + "x-fmt-88-signature-id-181.ppt", + "x-fmt-430-signature-id-208.msg"); + + @BeforeAll static void setup() throws IOException, SignatureParseException { s3Server = createS3Server(); @@ -85,7 +124,7 @@ public static Stream data() throws IOException { return Stream.concat( Files.list(Paths.get("../droid-core/test-skeletons/fmt")), Files.list(Paths.get("../droid-core/test-skeletons/x-fmt")) - ).flatMap(path -> { + ).filter(path -> !FILES_WITH_REMOVED_PUIDS.contains(path.getFileName().toString())).flatMap(path -> { Matcher matcher = FILENAME.matcher(path.getFileName().toString()); if (!matcher.matches()) { return null; From 9b3ba9b0c211987d6583bd0c0337d56f4c069cce Mon Sep 17 00:00:00 2001 From: MancunianSam Date: Wed, 1 Oct 2025 21:16:04 +0100 Subject: [PATCH 10/12] Update to use new sig files This is more of the same. New skeleton files, updated signature files in the resources directories and updated constants. I do keep meaning to find out which of these hard coded signature files are needed but I don't want to now. --- cli-tests/test/cli-test.bats | 6 +- .../droid/internal/api/DroidAPITest.java | 4 +- .../droid/internal/api/DroidAPITestUtils.java | 4 +- .../src/main/resources/options.properties | 4 +- ..._V120.xml => DROID_SignatureFile_V121.xml} | 975 ++++++++++++++++-- .../container-signature-20250925.xml | 327 +++++- .../container-signature-20250925.xml | 327 +++++- .../ContainerSignatureHttpServiceTest.java | 2 +- .../container/odf/OdfIdentifierTest.java | 2 +- .../container/ole2/Ole2RootFileTest.java | 2 +- .../container-signature-20250925.xml} | 327 +++++- .../interfaces/config/DroidGlobalConfig.java | 4 +- .../DebugFileSystemIdentificationRequest.java | 9 +- .../droid/core/SkeletonSuiteTest.java | 5 +- .../fmt/fmt-1311-signature-id-3404.json | Bin 0 -> 63 bytes .../fmt/fmt-1651-signature-id-1987.fit | Bin 12 -> 12 bytes .../fmt/fmt-1910-signature-id-3427.pdf | Bin 0 -> 23 bytes .../fmt/fmt-1911-signature-id-3428.pdf | Bin 0 -> 46 bytes .../fmt/fmt-1911-signature-id-3429.pdf | Bin 0 -> 46 bytes .../fmt/fmt-1912-signature-id-3430.pdf | Bin 0 -> 46 bytes .../fmt/fmt-1912-signature-id-3431.pdf | Bin 0 -> 46 bytes .../fmt/fmt-1915-signature-id-2265.mso | Bin 14 -> 14 bytes .../fmt/fmt-1968-signature-id-2317.aea | Bin 2898 -> 266 bytes .../fmt/fmt-2018-signature-id-3380.oma | Bin 2516 -> 3075 bytes .../fmt/fmt-2018-signature-id-3405.oma | Bin 0 -> 14 bytes .../fmt/fmt-2040-signature-id-3406.gml | Bin 0 -> 747 bytes .../fmt/fmt-2042-signature-id-3408.aab | 1 + .../fmt/fmt-2043-signature-id-3412.aar | 1 + .../fmt/fmt-2049-signature-id-3413.lyrx | 3 + .../fmt/fmt-2050-signature-id-3414.pdf | Bin 0 -> 58 bytes .../fmt/fmt-2051-signature-id-3416.cin | 1 + .../fmt/fmt-2052-signature-id-3415.pdf | Bin 0 -> 44 bytes .../fmt/fmt-2053-signature-id-3417.arrow | 1 + .../fmt/fmt-2055-signature-id-3418.emlx | 1 + .../fmt/fmt-2056-signature-id-3419.iamf | 1 + .../fmt/fmt-2057-signature-id-3420.a2r | 2 + .../fmt/fmt-2058-signature-id-3421.a2r | 2 + .../fmt/fmt-2059-signature-id-3422.woz | 2 + .../fmt/fmt-2060-signature-id-3423.woz | 2 + .../fmt/fmt-2061-signature-id-3424.moof | 2 + .../fmt/fmt-2062-signature-id-3425.avif | Bin 0 -> 12 bytes .../fmt/fmt-2068-signature-id-3426.mfs | Bin 0 -> 1048 bytes ..._V120.xml => DROID_SignatureFile_V121.xml} | 975 ++++++++++++++++-- .../container-signature-20250925.xml | 327 +++++- ..._V120.xml => DROID_SignatureFile_V121.xml} | 975 ++++++++++++++++-- ..._V120.xml => DROID_SignatureFile_V121.xml} | 975 ++++++++++++++++-- .../main/resources/default_droid.properties | 4 +- 47 files changed, 4917 insertions(+), 356 deletions(-) rename droid-command-line/src/test/resources/signatures/{DROID_SignatureFile_V120.xml => DROID_SignatureFile_V121.xml} (98%) rename droid-results/custom_home/container_sigs/container-signature-20240715.xml => droid-command-line/src/test/resources/signatures/container-signature-20250925.xml (93%) rename droid-command-line/src/test/resources/signatures/container-signature-20240715.xml => droid-container/src/main/resources/container-signature-20250925.xml (93%) rename droid-container/src/{main/resources/container-signature-20240715.xml => test/resources/container-signature-20250925.xml} (93%) create mode 100644 droid-core/test-skeletons/fmt/fmt-1311-signature-id-3404.json create mode 100644 droid-core/test-skeletons/fmt/fmt-1910-signature-id-3427.pdf create mode 100644 droid-core/test-skeletons/fmt/fmt-1911-signature-id-3428.pdf create mode 100644 droid-core/test-skeletons/fmt/fmt-1911-signature-id-3429.pdf create mode 100644 droid-core/test-skeletons/fmt/fmt-1912-signature-id-3430.pdf create mode 100644 droid-core/test-skeletons/fmt/fmt-1912-signature-id-3431.pdf create mode 100644 droid-core/test-skeletons/fmt/fmt-2018-signature-id-3405.oma create mode 100644 droid-core/test-skeletons/fmt/fmt-2040-signature-id-3406.gml create mode 100644 droid-core/test-skeletons/fmt/fmt-2042-signature-id-3408.aab create mode 100644 droid-core/test-skeletons/fmt/fmt-2043-signature-id-3412.aar create mode 100644 droid-core/test-skeletons/fmt/fmt-2049-signature-id-3413.lyrx create mode 100644 droid-core/test-skeletons/fmt/fmt-2050-signature-id-3414.pdf create mode 100644 droid-core/test-skeletons/fmt/fmt-2051-signature-id-3416.cin create mode 100644 droid-core/test-skeletons/fmt/fmt-2052-signature-id-3415.pdf create mode 100644 droid-core/test-skeletons/fmt/fmt-2053-signature-id-3417.arrow create mode 100644 droid-core/test-skeletons/fmt/fmt-2055-signature-id-3418.emlx create mode 100644 droid-core/test-skeletons/fmt/fmt-2056-signature-id-3419.iamf create mode 100644 droid-core/test-skeletons/fmt/fmt-2057-signature-id-3420.a2r create mode 100644 droid-core/test-skeletons/fmt/fmt-2058-signature-id-3421.a2r create mode 100644 droid-core/test-skeletons/fmt/fmt-2059-signature-id-3422.woz create mode 100644 droid-core/test-skeletons/fmt/fmt-2060-signature-id-3423.woz create mode 100644 droid-core/test-skeletons/fmt/fmt-2061-signature-id-3424.moof create mode 100644 droid-core/test-skeletons/fmt/fmt-2062-signature-id-3425.avif create mode 100644 droid-core/test-skeletons/fmt/fmt-2068-signature-id-3426.mfs rename droid-core/test_sig_files/{DROID_SignatureFile_V120.xml => DROID_SignatureFile_V121.xml} (98%) rename droid-container/src/test/resources/container-signature-20240715.xml => droid-results/custom_home/container_sigs/container-signature-20250925.xml (93%) rename droid-results/custom_home/signature_files/{DROID_SignatureFile_V120.xml => DROID_SignatureFile_V121.xml} (98%) rename droid-results/src/main/resources/{DROID_SignatureFile_V120.xml => DROID_SignatureFile_V121.xml} (98%) diff --git a/cli-tests/test/cli-test.bats b/cli-tests/test/cli-test.bats index 02a42d6f5..824f16ff9 100644 --- a/cli-tests/test/cli-test.bats +++ b/cli-tests/test/cli-test.bats @@ -54,14 +54,12 @@ setup() { @test "check for signature updates" { run $DROID_BIN -c - assert_output -p 'Container signature update Version 20250925 is available' - assert_output -p 'Binary signature update Version 121 is available' + assert_output 'No signature updates are available' } @test "download signature updates" { run $DROID_BIN -d - assert_output -p 'Signature update version 20,250,925 has been downloaded' - assert_output -p 'Signature update version 121 has been downloaded' + assert_output 'No signature updates are available' } @test "list signature files" { 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 index 368560d32..d89fe129e 100644 --- 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 @@ -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("20240715")); + assertThat(api.getContainerSignatureVersion(), is("20250925")); assertThat(api.getDroidVersion(), is(ResourceBundle.getBundle("options").getString("version_no"))); - assertThat(api.getBinarySignatureVersion(), is("120")); + assertThat(api.getBinarySignatureVersion(), is("121")); } static Stream emptyFileUris() { 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 index 41c6f3d75..c64d15ba0 100644 --- 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 @@ -77,8 +77,8 @@ */ public class DroidAPITestUtils { - static Path signaturePath = Paths.get("../droid-results/custom_home/signature_files/DROID_SignatureFile_V120.xml"); - static Path containerPath = Paths.get("../droid-results/custom_home/container_sigs/container-signature-20240715.xml"); + 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"); public static DroidAPI createApi(URI endpointOverride) throws SignatureParseException { return createApi(endpointOverride, signaturePath, containerPath, null); diff --git a/droid-command-line/src/main/resources/options.properties b/droid-command-line/src/main/resources/options.properties index 026321d5e..3e014a25f 100644 --- a/droid-command-line/src/main/resources/options.properties +++ b/droid-command-line/src/main/resources/options.properties @@ -59,8 +59,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_V120 \n \ -profile.defaultContainerSigFileVersion = container-signature-20240715 \n \ +profile.defaultBinarySigFileVersion = DROID_SignatureFile_V121 \n \ +profile.defaultContainerSigFileVersion = container-signature-20250925 \n \ profile.processTar = true \n \ profile.processZip = true \n \ profile.processGzip = true \n \ diff --git a/droid-command-line/src/test/resources/signatures/DROID_SignatureFile_V120.xml b/droid-command-line/src/test/resources/signatures/DROID_SignatureFile_V121.xml similarity index 98% rename from droid-command-line/src/test/resources/signatures/DROID_SignatureFile_V120.xml rename to droid-command-line/src/test/resources/signatures/DROID_SignatureFile_V121.xml index c98e65e3c..3c3e29331 100644 --- a/droid-command-line/src/test/resources/signatures/DROID_SignatureFile_V120.xml +++ b/droid-command-line/src/test/resources/signatures/DROID_SignatureFile_V121.xml @@ -1,5 +1,5 @@ - + @@ -44863,9 +44863,10 @@ - 464954 - 4 + SubSeqMaxOffset="8" SubSeqMinOffset="8"> + 2E464954 + 5 + 4 3 2 1 @@ -47825,38 +47826,39 @@ - 3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E - 39 - 19 - 3 - 5 - 22 - 21 - 23 - 4 - 38 - 10 - 1 - 2 - 6 - 7 - 8 - 16 - 14 - 18 - 11 - 13 - 34 - 35 - 12 - 15 - 30 - 29 - 32 - 36 - 3C646F63756D656E74 - 3C696E7465726C696E6561722D74657874 - 3C70617261677261706873 + 3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D22 + 31 + 11 + 1 + 14 + 13 + 15 + 30 + 2 + 29 + 8 + 6 + 10 + 3 + 5 + 26 + 27 + 4 + 7 + 22 + 21 + 24 + 28 + 55 + 75 + 54 + 74 + 46 + 66 + 2D38223F3E + 3C646F63756D656E74 + 3C696E7465726C696E6561722D74657874 + 3C70617261677261706873 @@ -50485,26 +50487,6 @@ - - - - 00424541303101 - 8 - 7 - 1 - 3 - 2 - 4 - 6 - 5 - 004E535230 - 32 - 33 - 01 - - - 2 8 6 - 010F + 01F0 @@ -51910,6 +51892,8 @@ 18 31 32 + 33 + 34 222C2267616D6556657273696F6E223A @@ -52012,15 +51996,18 @@ - AC - 2 - 1 + SubSeqMaxOffset="0" SubSeqMinOffset="0"> + 00080000 + 5 + 1 + 3 + 01 + 02 + SubSeqMaxOffset="1024" SubSeqMinOffset="0"> AC -2 -1 @@ -53200,17 +53187,14 @@ - - 00000000010F5000 - 9 - 1 - 4 - 3 - 2 - 0060 - 454133 - 65613303 + 656133 + 4 + 1 + 2 + 3 + 454133 @@ -53711,6 +53695,698 @@ + + + + 7B + 2 + 1 + + + 22726574776565746564223A + 13 + 2 + 1 + 3 + 4 + 11 + 5 + 8 + + + 2269645F737472223A + 10 + 2 + 1 + 6 + 7 + 8 + 3 + 5 + 4 + + + + + 7D + -2 + -1 + + + + + + + 6F70656E4D47 + 7 + 1 + 2 + 4 + 3 + 6 + 5 + + + + + + + 687474703A2F2F7777772E6F70656E6769732E6E65742F63697479676D6C2F312E30 + 35 + 2 + 4 + 1 + 3 + 30 + 11 + 14 + 7 + 34 + 10 + 5 + 6 + 15 + 23 + 22 + 17 + 9 + 25 + 8 + 22 + 27 + 3D + 786D6C6E73 + 436974794D6F64656C + 3A + 3C + 22 + 27 + 312E30 + 22 + 27 + 3C3F786D6C2076657273696F6E3D + 22 + 27 + + + + + + + 504B0304 + 5 + 2 + 1 + 3 + 4 + + + + + + + 5B436F6E74656E745F54797065735D2E786D6C20A2 + 22 + 2 + 6 + 20 + 12 + 21 + 7 + 13 + 9 + 3 + 4 + 15 + 19 + 10 + 8 + 14 + 5 + 11 + 1 + + + + + + + 0A2020227479706522203A202243494D4C61796572446F63756D656E74222C + 32 + 31 + 20 + 2 + 1 + 21 + 18 + 10 + 17 + 15 + 16 + 14 + 8 + 5 + 6 + 4 + 9 + 25 + 11 + 3 + 7 + 13 + 7B + 0A20202276657273696F6E22203A2022 + + + + + + + 255044462D312E37 + 9 + 8 + 4 + 2 + 3 + 1 + 6 + 5 + 7 + + + 3C706466756169643A706172743E313C2F706466756169643A706172743E + 31 + 14 + 16 + 6 + 15 + 1 + 4 + 7 + 11 + 8 + 5 + 3 + 2 + 10 + + + + + + + 255044462D322E30 + 9 + 8 + 4 + 2 + 1 + 3 + 6 + 5 + 7 + + + 706466756169643A706172743D223222 + 17 + 1 + 2 + 9 + 4 + 7 + 10 + 14 + 11 + 8 + 6 + 5 + 13 + + + + + + + 802A5FD7 + 5 + 3 + 2 + 4 + 1 + + + + + + + 4152524F5731 + 7 + 1 + 6 + 3 + 4 + 2 + + + + + 4152524F5731 + -7 + -6 + -1 + -4 + -2 + -5 + + + + + + + 3C2F706C6973743E + -9 + -2 + -1 + -8 + -5 + -4 + -3 + -6 + -7 + + + + + 657273696F6E3A20312E30 + 12 + 4 + 2 + 1 + 3 + 5 + 11 + 8 + 6 + 7 + 10 + 9 + 56 + 76 + 2D + 494D45 + 696D65 + 4D + + + + + 546F3A20 + 5 + 1 + 2 + 4 + 3 + + + + + 46726F6D3A20 + 7 + 1 + 2 + 6 + 3 + 4 + 5 + + + + + 446174653A20 + 7 + 1 + 2 + 6 + 5 + 3 + 4 + + + + + 436F6E74656E742D + 9 + 1 + 8 + 4 + 3 + 7 + 2 + 54 + 74 + 7970653A20 + + + + + + + 0669616D66 + 6 + 5 + 3 + 1 + 4 + 2 + F8 + FC + + + + + + + 41325232FF0A0D0A + 9 + 1 + 2 + 5 + 8 + 6 + 4 + + + + + + + 41325233FF0A0D0A + 9 + 1 + 2 + 7 + 5 + 8 + 6 + 4 + + + + + + + 574F5A31FF0A0D0A + 9 + 1 + 2 + 5 + 7 + 8 + 6 + 4 + + + + + + + 574F5A32FF0A0D0A + 9 + 1 + 2 + 5 + 7 + 8 + 6 + 4 + + + + + + + 4D4F4F46FF0A0D0A + 9 + 1 + 2 + 5 + 8 + 6 + 4 + + + + + + + 6674797061766966 + 9 + 4 + 1 + 2 + 5 + 7 + 3 + 6 + + + + + + + D2D7 + 3 + 2 + 1 + 0004 + [!&01]00 + + + + + + + 255044462D322E + 8 + 7 + 3 + 1 + 2 + 5 + 4 + 6 + [30:39] + + + + + 7064666169643A706172743D223422 + 16 + 1 + 2 + 9 + 4 + 7 + 10 + 13 + 11 + 8 + 6 + 5 + + + + + + + 255044462D322E + 8 + 7 + 3 + 1 + 2 + 5 + 4 + 6 + [30:39] + + + + + 7064666169643A706172743D223422207064666169643A636F6E666F726D616E63653D224522 + 39 + 23 + 1 + 25 + 16 + 4 + 2 + 8 + 6 + 17 + 5 + 12 + 18 + 9 + 7 + 11 + 22 + 10 + 28 + + + + + + + 255044462D322E + 8 + 7 + 3 + 1 + 2 + 5 + 4 + 6 + [30:39] + + + + + 7064666169643A636F6E666F726D616E63653D224522207064666169643A706172743D223422 + 39 + 16 + 1 + 2 + 9 + 4 + 18 + 7 + 22 + 10 + 21 + 13 + 11 + 25 + 23 + 27 + 8 + 6 + 5 + + + + + + + 255044462D322E + 8 + 7 + 3 + 1 + 2 + 5 + 4 + 6 + [30:39] + + + + + 7064666169643A706172743D223422207064666169643A636F6E666F726D616E63653D224622 + 39 + 23 + 1 + 25 + 16 + 4 + 2 + 8 + 6 + 17 + 5 + 12 + 18 + 9 + 7 + 11 + 22 + 10 + 28 + + + + + + + 255044462D322E + 8 + 7 + 3 + 1 + 2 + 5 + 4 + 6 + [30:39] + + + + + 7064666169643A636F6E666F726D616E63653D224622207064666169643A706172743D223422 + 39 + 16 + 1 + 2 + 9 + 4 + 18 + 7 + 22 + 10 + 21 + 13 + 11 + 25 + 23 + 27 + 8 + 6 + 5 + + + acb + Name="Adobe FrameMaker Document" PUID="x-fmt/302" Version="8.0"> 395 fm @@ -56518,7 +57194,7 @@ ods ots 778 - 1037 + 1033 1274 mif + miff 1275 @@ -61771,7 +62448,7 @@ 1404 1405 - + 1406 drc @@ -63104,6 +63781,7 @@ 1687 1688 1689 + 3404 json 1617 @@ -64859,7 +65537,7 @@ Name="Crystal Reports File" PUID="fmt/1648"> rpt - + 1986 ags @@ -66225,6 +66903,7 @@ Name="Acrobat PDF/A - Portable Document Format" PUID="fmt/1910" Version="4"> 2256 + 3427 pdf 1939 @@ -66233,6 +66912,8 @@ PUID="fmt/1911" Version="4e"> 2257 2258 + 3428 + 3429 pdf 1939 2766 @@ -66242,6 +66923,8 @@ PUID="fmt/1912" Version="4f"> 2261 2262 + 3430 + 3431 pdf 1939 2766 @@ -66808,6 +67491,7 @@ 3380 + 3405 oma @@ -66837,6 +67521,7 @@ PUID="fmt/2024" Version="4"> 3387 cdp + 2741 @@ -66848,7 +67533,7 @@ qdc + Name="Microsoft Project" PUID="fmt/2027" Version="1"> 3390 mpp @@ -66908,5 +67593,141 @@ 3403 hfe + + 3406 + gml + xml + 319 + + + apk + 382 + + + 3408 + aab + + + 3412 + aar + + + odt + 778 + + + ods + 778 + + + odp + 778 + 1035 + + + odb + 778 + 783 + + + odg + 778 + 1039 + + + 3413 + lyrx + + + 3414 + pdf + 1016 + + + 3415 + pdf + 1939 + + + 3416 + cin + + + 3417 + arrow + + + jsonl + + + 3418 + emlx + 645 + 1755 + + + 3419 + iamf + + + 3420 + a2r + + + 3421 + a2r + + + 3422 + woz + + + 3423 + woz + + + 3424 + moof + + + 3425 + avif + + + drt + + + drp + 3938 + + + toml + + + rs + + + xyz + + + 3426 + mfs + diff --git a/droid-results/custom_home/container_sigs/container-signature-20240715.xml b/droid-command-line/src/test/resources/signatures/container-signature-20250925.xml similarity index 93% rename from droid-results/custom_home/container_sigs/container-signature-20240715.xml rename to droid-command-line/src/test/resources/signatures/container-signature-20250925.xml index 301a7245b..35bad793e 100644 --- a/droid-results/custom_home/container_sigs/container-signature-20240715.xml +++ b/droid-command-line/src/test/resources/signatures/container-signature-20250925.xml @@ -1,6 +1,6 @@ - + Microsoft Word 6.0/95 OLE2 @@ -1679,6 +1679,46 @@ + + + Open Document Text 1.4 + + + META-INF/manifest.xml + + + + + + 'manifest:media-type="application/vnd.oasis.opendocument.text' + + + + + + + + content.xml + + + + + + 'office:document-content' + + + 'office:version=' (22|27) '1.4' (22|27) + + + + + + + + + + + Open Document Spreadsheet 1.0 @@ -1879,6 +1919,43 @@ + + Open Document Spreadsheet 1.4 + + + META-INF/manifest.xml + + + + + + 'manifest:media-type="application/vnd.oasis.opendocument.spreadsheet' + + + + + + + + content.xml + + + + + + 'office:document-content' + + + 'office:version=' (22|27) '1.4' (22|27) + + + + + + + + + Open Document Presentation 1.0 @@ -2041,6 +2118,44 @@ + + Open Document Presentation 1.4 + + + META-INF/manifest.xml + + + + + + 'manifest:media-type="application/vnd.oasis.opendocument.presentation' + + + + + + + + content.xml + + + + + + 'office:document-content' + + + 'office:version=' (22|27) '1.4' (22|27) + + + + + + + + + + Open Document Database 1.0 @@ -2201,6 +2316,44 @@ + + + Open Document Database 1.4 + + + META-INF/manifest.xml + + + + + + 'manifest:media-type="application/vnd.oasis.opendocument.base' + + + + + + + + content.xml + + + + + + 'office:document-content' + + + 'office:version=' (22|27) '1.4' (22|27) + + + + + + + + + Open Document Graphics 1.0 @@ -2362,6 +2515,44 @@ + + + Open Document Graphics 1.4 + + + META-INF/manifest.xml + + + + + + 'manifest:media-type="application/vnd.oasis.opendocument.graphics' + + + + + + + + content.xml + + + + + + 'office:document-content' + + + 'office:version=' (22|27) '1.4' (22|27) + + + + + + + + + Java Archive Format @@ -7074,14 +7265,115 @@ - - + + Android Package File + +classes.dex + + +AndroidManifest.xml + + + + + +03 00 08 00 + + + + + + + + + + Android App Bundle File + + + base/manifest/AndroidManifest.xml + + + + + + 61 6E 64 72 6F 69 64 + + + + + + + + + + + Android Archive File + + + AndroidManifest.xml + + + + + + 'manifest xmlns:android=' + + + + + + + + + + + DaVinci Resolve Timeline + + + project.xml + + + + + + 3C 53 4D 5F 50 72 6F 6A 65 63 74 + + + + + + + + + + + DaVinci Resolve Project + + + Gallery.xml + + + project.xml + + + + + + 3C 53 4D 5F 50 72 6F 6A 65 63 74 + + + + + + + + - + - + @@ -7221,6 +7513,8 @@ + + @@ -7232,6 +7526,9 @@ + + + @@ -7241,7 +7538,8 @@ - + + @@ -7250,7 +7548,8 @@ - + + @@ -7259,6 +7558,8 @@ + + @@ -7765,6 +8066,18 @@ + + + + + + + + + + + + diff --git a/droid-command-line/src/test/resources/signatures/container-signature-20240715.xml b/droid-container/src/main/resources/container-signature-20250925.xml similarity index 93% rename from droid-command-line/src/test/resources/signatures/container-signature-20240715.xml rename to droid-container/src/main/resources/container-signature-20250925.xml index 301a7245b..35bad793e 100644 --- a/droid-command-line/src/test/resources/signatures/container-signature-20240715.xml +++ b/droid-container/src/main/resources/container-signature-20250925.xml @@ -1,6 +1,6 @@ - + Microsoft Word 6.0/95 OLE2 @@ -1679,6 +1679,46 @@ + + + Open Document Text 1.4 + + + META-INF/manifest.xml + + + + + + 'manifest:media-type="application/vnd.oasis.opendocument.text' + + + + + + + + content.xml + + + + + + 'office:document-content' + + + 'office:version=' (22|27) '1.4' (22|27) + + + + + + + + + + + Open Document Spreadsheet 1.0 @@ -1879,6 +1919,43 @@ + + Open Document Spreadsheet 1.4 + + + META-INF/manifest.xml + + + + + + 'manifest:media-type="application/vnd.oasis.opendocument.spreadsheet' + + + + + + + + content.xml + + + + + + 'office:document-content' + + + 'office:version=' (22|27) '1.4' (22|27) + + + + + + + + + Open Document Presentation 1.0 @@ -2041,6 +2118,44 @@ + + Open Document Presentation 1.4 + + + META-INF/manifest.xml + + + + + + 'manifest:media-type="application/vnd.oasis.opendocument.presentation' + + + + + + + + content.xml + + + + + + 'office:document-content' + + + 'office:version=' (22|27) '1.4' (22|27) + + + + + + + + + + Open Document Database 1.0 @@ -2201,6 +2316,44 @@ + + + Open Document Database 1.4 + + + META-INF/manifest.xml + + + + + + 'manifest:media-type="application/vnd.oasis.opendocument.base' + + + + + + + + content.xml + + + + + + 'office:document-content' + + + 'office:version=' (22|27) '1.4' (22|27) + + + + + + + + + Open Document Graphics 1.0 @@ -2362,6 +2515,44 @@ + + + Open Document Graphics 1.4 + + + META-INF/manifest.xml + + + + + + 'manifest:media-type="application/vnd.oasis.opendocument.graphics' + + + + + + + + content.xml + + + + + + 'office:document-content' + + + 'office:version=' (22|27) '1.4' (22|27) + + + + + + + + + Java Archive Format @@ -7074,14 +7265,115 @@ - - + + Android Package File + +classes.dex + + +AndroidManifest.xml + + + + + +03 00 08 00 + + + + + + + + + + Android App Bundle File + + + base/manifest/AndroidManifest.xml + + + + + + 61 6E 64 72 6F 69 64 + + + + + + + + + + + Android Archive File + + + AndroidManifest.xml + + + + + + 'manifest xmlns:android=' + + + + + + + + + + + DaVinci Resolve Timeline + + + project.xml + + + + + + 3C 53 4D 5F 50 72 6F 6A 65 63 74 + + + + + + + + + + + DaVinci Resolve Project + + + Gallery.xml + + + project.xml + + + + + + 3C 53 4D 5F 50 72 6F 6A 65 63 74 + + + + + + + + - + - + @@ -7221,6 +7513,8 @@ + + @@ -7232,6 +7526,9 @@ + + + @@ -7241,7 +7538,8 @@ - + + @@ -7250,7 +7548,8 @@ - + + @@ -7259,6 +7558,8 @@ + + @@ -7765,6 +8066,18 @@ + + + + + + + + + + + + diff --git a/droid-container/src/test/java/uk/gov/nationalarchives/droid/container/httpservice/ContainerSignatureHttpServiceTest.java b/droid-container/src/test/java/uk/gov/nationalarchives/droid/container/httpservice/ContainerSignatureHttpServiceTest.java index d270dbda8..0205e0915 100644 --- a/droid-container/src/test/java/uk/gov/nationalarchives/droid/container/httpservice/ContainerSignatureHttpServiceTest.java +++ b/droid-container/src/test/java/uk/gov/nationalarchives/droid/container/httpservice/ContainerSignatureHttpServiceTest.java @@ -75,7 +75,7 @@ public void setup() throws IOException { .willReturn(aResponse() .withHeader("Content-Type", "text/xml") .withHeader("Last-Modified", "Tue, 22 Aug 2023 12:47:41 GMT") - .withBody(IOUtils.resourceToString("/container-signature-20240715.xml", StandardCharsets.UTF_8)) + .withBody(IOUtils.resourceToString("/container-signature-20250925.xml", StandardCharsets.UTF_8)) )); diff --git a/droid-container/src/test/java/uk/gov/nationalarchives/droid/container/odf/OdfIdentifierTest.java b/droid-container/src/test/java/uk/gov/nationalarchives/droid/container/odf/OdfIdentifierTest.java index 5536becfc..c785c6262 100644 --- a/droid-container/src/test/java/uk/gov/nationalarchives/droid/container/odf/OdfIdentifierTest.java +++ b/droid-container/src/test/java/uk/gov/nationalarchives/droid/container/odf/OdfIdentifierTest.java @@ -72,7 +72,7 @@ public class OdfIdentifierTest { private ZipIdentifier odfIdentifier; - public static final String CONTAINER_SIGNATUE_FILE = "container-signature-20240715.xml"; + public static final String CONTAINER_SIGNATUE_FILE = "container-signature-20250925.xml"; @Before diff --git a/droid-container/src/test/java/uk/gov/nationalarchives/droid/container/ole2/Ole2RootFileTest.java b/droid-container/src/test/java/uk/gov/nationalarchives/droid/container/ole2/Ole2RootFileTest.java index 5c57d7a97..574d44ced 100644 --- a/droid-container/src/test/java/uk/gov/nationalarchives/droid/container/ole2/Ole2RootFileTest.java +++ b/droid-container/src/test/java/uk/gov/nationalarchives/droid/container/ole2/Ole2RootFileTest.java @@ -71,7 +71,7 @@ */ public class Ole2RootFileTest { - public static final String CONTAINER_SIGNATURE_TEST_FILE = "container-signature-20240715.xml"; + public static final String CONTAINER_SIGNATURE_TEST_FILE = "container-signature-20250925.xml"; private Ole2Identifier ole2Identifier; diff --git a/droid-container/src/main/resources/container-signature-20240715.xml b/droid-container/src/test/resources/container-signature-20250925.xml similarity index 93% rename from droid-container/src/main/resources/container-signature-20240715.xml rename to droid-container/src/test/resources/container-signature-20250925.xml index 301a7245b..35bad793e 100644 --- a/droid-container/src/main/resources/container-signature-20240715.xml +++ b/droid-container/src/test/resources/container-signature-20250925.xml @@ -1,6 +1,6 @@ - + Microsoft Word 6.0/95 OLE2 @@ -1679,6 +1679,46 @@ + + + Open Document Text 1.4 + + + META-INF/manifest.xml + + + + + + 'manifest:media-type="application/vnd.oasis.opendocument.text' + + + + + + + + content.xml + + + + + + 'office:document-content' + + + 'office:version=' (22|27) '1.4' (22|27) + + + + + + + + + + + Open Document Spreadsheet 1.0 @@ -1879,6 +1919,43 @@ + + Open Document Spreadsheet 1.4 + + + META-INF/manifest.xml + + + + + + 'manifest:media-type="application/vnd.oasis.opendocument.spreadsheet' + + + + + + + + content.xml + + + + + + 'office:document-content' + + + 'office:version=' (22|27) '1.4' (22|27) + + + + + + + + + Open Document Presentation 1.0 @@ -2041,6 +2118,44 @@ + + Open Document Presentation 1.4 + + + META-INF/manifest.xml + + + + + + 'manifest:media-type="application/vnd.oasis.opendocument.presentation' + + + + + + + + content.xml + + + + + + 'office:document-content' + + + 'office:version=' (22|27) '1.4' (22|27) + + + + + + + + + + Open Document Database 1.0 @@ -2201,6 +2316,44 @@ + + + Open Document Database 1.4 + + + META-INF/manifest.xml + + + + + + 'manifest:media-type="application/vnd.oasis.opendocument.base' + + + + + + + + content.xml + + + + + + 'office:document-content' + + + 'office:version=' (22|27) '1.4' (22|27) + + + + + + + + + Open Document Graphics 1.0 @@ -2362,6 +2515,44 @@ + + + Open Document Graphics 1.4 + + + META-INF/manifest.xml + + + + + + 'manifest:media-type="application/vnd.oasis.opendocument.graphics' + + + + + + + + content.xml + + + + + + 'office:document-content' + + + 'office:version=' (22|27) '1.4' (22|27) + + + + + + + + + Java Archive Format @@ -7074,14 +7265,115 @@ - - + + Android Package File + +classes.dex + + +AndroidManifest.xml + + + + + +03 00 08 00 + + + + + + + + + + Android App Bundle File + + + base/manifest/AndroidManifest.xml + + + + + + 61 6E 64 72 6F 69 64 + + + + + + + + + + + Android Archive File + + + AndroidManifest.xml + + + + + + 'manifest xmlns:android=' + + + + + + + + + + + DaVinci Resolve Timeline + + + project.xml + + + + + + 3C 53 4D 5F 50 72 6F 6A 65 63 74 + + + + + + + + + + + DaVinci Resolve Project + + + Gallery.xml + + + project.xml + + + + + + 3C 53 4D 5F 50 72 6F 6A 65 63 74 + + + + + + + + - + - + @@ -7221,6 +7513,8 @@ + + @@ -7232,6 +7526,9 @@ + + + @@ -7241,7 +7538,8 @@ - + + @@ -7250,7 +7548,8 @@ - + + @@ -7259,6 +7558,8 @@ + + @@ -7765,6 +8066,18 @@ + + + + + + + + + + + + diff --git a/droid-core-interfaces/src/main/java/uk/gov/nationalarchives/droid/core/interfaces/config/DroidGlobalConfig.java b/droid-core-interfaces/src/main/java/uk/gov/nationalarchives/droid/core/interfaces/config/DroidGlobalConfig.java index 5b7bc8b14..8c7518019 100644 --- a/droid-core-interfaces/src/main/java/uk/gov/nationalarchives/droid/core/interfaces/config/DroidGlobalConfig.java +++ b/droid-core-interfaces/src/main/java/uk/gov/nationalarchives/droid/core/interfaces/config/DroidGlobalConfig.java @@ -74,8 +74,8 @@ public class DroidGlobalConfig { private static final String DEFAULT_DROID_PROPERTIES = "default_droid.properties"; //FIXME: update to latest signature file before release. - private static final String DROID_SIGNATURE_FILE = "DROID_SignatureFile_V120.xml"; - private static final String CONTAINER_SIGNATURE_FILE = "container-signature-20240715.xml"; + private static final String DROID_SIGNATURE_FILE = "DROID_SignatureFile_V121.xml"; + private static final String CONTAINER_SIGNATURE_FILE = "container-signature-20250925.xml"; private static final String TEXT_SIGNATURE_FILE = "text-signature-20101101.xml"; private static final String DATABASE_DURABILITY = "database.durability"; diff --git a/droid-core-interfaces/src/main/java/uk/gov/nationalarchives/droid/core/interfaces/resource/DebugFileSystemIdentificationRequest.java b/droid-core-interfaces/src/main/java/uk/gov/nationalarchives/droid/core/interfaces/resource/DebugFileSystemIdentificationRequest.java index 7cd43b783..65a6e80b2 100644 --- a/droid-core-interfaces/src/main/java/uk/gov/nationalarchives/droid/core/interfaces/resource/DebugFileSystemIdentificationRequest.java +++ b/droid-core-interfaces/src/main/java/uk/gov/nationalarchives/droid/core/interfaces/resource/DebugFileSystemIdentificationRequest.java @@ -42,6 +42,8 @@ public class DebugFileSystemIdentificationRequest extends FileSystemIdentificati private static final int TOP_TAIL_BUFFER_CAPACITY = 8 * 1024 * 1024; // buffer 8Mb on the top and tail of files. + private boolean debug; + /** * Constructs a new identification request. * @@ -50,6 +52,7 @@ public class DebugFileSystemIdentificationRequest extends FileSystemIdentificati */ public DebugFileSystemIdentificationRequest(RequestMetaData metaData, RequestIdentifier identifier) { super(metaData, identifier); + this.debug = true; } @Override @@ -61,6 +64,10 @@ public final void open(final Path theFile) throws IOException { @Override public boolean isDebug() { - return true; + return debug; + } + + public void setDebug(boolean debug) { + this.debug = debug; } } diff --git a/droid-core/src/test/java/uk/gov/nationalarchives/droid/core/SkeletonSuiteTest.java b/droid-core/src/test/java/uk/gov/nationalarchives/droid/core/SkeletonSuiteTest.java index a8a774439..df06f209a 100644 --- a/droid-core/src/test/java/uk/gov/nationalarchives/droid/core/SkeletonSuiteTest.java +++ b/droid-core/src/test/java/uk/gov/nationalarchives/droid/core/SkeletonSuiteTest.java @@ -86,7 +86,7 @@ public class SkeletonSuiteTest { private static final String TEST_FILES_DIR = "test-skeletons/"; //TODO: Read latest signature file by default where required in this and other tests. - private static final String SIGFILE = "test_sig_files/DROID_SignatureFile_V120.xml"; + private static final String SIGFILE = "test_sig_files/DROID_SignatureFile_V121.xml"; private static final Pattern PuidInFilenamePattern = Pattern.compile("^(x-)?fmt-\\d{1,4}"); private static final Pattern PuidPattern = Pattern.compile("^(x-)?fmt/\\d{1,4}"); @@ -187,6 +187,7 @@ public static Stream> identificationRequests() { RequestIdentifier httpIdentifier = new RequestIdentifier(httpUri); httpIdentifier.setParentId(1L); DebugFileSystemIdentificationRequest debugFileSystemIdentificationRequest = new DebugFileSystemIdentificationRequest(metaData, fileIdentifier); + debugFileSystemIdentificationRequest.setDebug(false); debugFileSystemIdentificationRequest.open(skeletonPath); builder.add(debugFileSystemIdentificationRequest); @@ -214,7 +215,7 @@ public static Stream> identificationRequests() { public void testBinarySkeletonMatch(IdentificationRequest request) throws Exception { int errorCount = 0; - //Go through all the skeleton files. Check if the PUID that DROId identifies for the file matches the beginning + //Go through all the skeleton files. Check if the PUID that DROID identifies for the file matches the beginning // of the file name. Or if not, that it is expected to return a different PUID, or none at all. String filename = request.getRequestMetaData().getName(); diff --git a/droid-core/test-skeletons/fmt/fmt-1311-signature-id-3404.json b/droid-core/test-skeletons/fmt/fmt-1311-signature-id-3404.json new file mode 100644 index 0000000000000000000000000000000000000000..54ac69b617dbb5fba5d95cb3c6cf003c3284a408 GIT binary patch literal 63 kcmbv}Dw!w&09%p{;s5{u literal 0 HcmV?d00001 diff --git a/droid-core/test-skeletons/fmt/fmt-1912-signature-id-3430.pdf b/droid-core/test-skeletons/fmt/fmt-1912-signature-id-3430.pdf new file mode 100644 index 0000000000000000000000000000000000000000..47adee09e6915d1f35774e40faa45932d5e7bd86 GIT binary patch literal 46 vcmY!laBv}Dw!w&09&LE;{X5v literal 0 HcmV?d00001 diff --git a/droid-core/test-skeletons/fmt/fmt-1915-signature-id-2265.mso b/droid-core/test-skeletons/fmt/fmt-1915-signature-id-2265.mso index e0b5a8c73ad96ed9331df437cf463391f9e54242..c6b476c4e890c39d41b39e8849146cb42ed2244d 100644 GIT binary patch literal 14 VcmZ=vF3BuQ_07ypWnf_Z001R_1l9lm literal 14 VcmZ=vF3BuQ_07ypWnf_B2LL3V1N8s^ diff --git a/droid-core/test-skeletons/fmt/fmt-1968-signature-id-2317.aea b/droid-core/test-skeletons/fmt/fmt-1968-signature-id-2317.aea index 415235536139523051b363cc5341454c25cad515..f3cf0d3c37be0ee436634a0935ae75ca2996522c 100644 GIT binary patch literal 266 QcmZSJU>F6!5MW#b015yAwg3PC literal 2898 lcmeIuu>b%700OZ5S%S==dqY@)0RsjM7%*VKfB^&VKsyaq0a*Y5 diff --git a/droid-core/test-skeletons/fmt/fmt-2018-signature-id-3380.oma b/droid-core/test-skeletons/fmt/fmt-2018-signature-id-3380.oma index e0a4741c5140571303c6676d4c625c36e684f2e1..52396b68d72a54756bb4fde8d19a520300e27370 100644 GIT binary patch delta 20 bcmca2+$_PInrOUHa5Lvd1urIMS4U$2MDGRG delta 30 icmZpcxFXDwnrO_tQSbn#fUBc1149A>7%=h&FaQ8^It7;i diff --git a/droid-core/test-skeletons/fmt/fmt-2018-signature-id-3405.oma b/droid-core/test-skeletons/fmt/fmt-2018-signature-id-3405.oma new file mode 100644 index 0000000000000000000000000000000000000000..e3dca5362c9ab98547c74a4ac3452fb3aa351352 GIT binary patch literal 14 QcmZQzfPnmh)I48z00@@?M*si- literal 0 HcmV?d00001 diff --git a/droid-core/test-skeletons/fmt/fmt-2040-signature-id-3406.gml b/droid-core/test-skeletons/fmt/fmt-2040-signature-id-3406.gml new file mode 100644 index 0000000000000000000000000000000000000000..57fb444c90a6f530d3e8e138f0d2636e420f626f GIT binary patch literal 747 zcmcDqugJ|&C`&CW&dkrVRWj5wP+}P5z{WYVq|!G(B{gS|J9N}}G!6k^(#+RSi%RSaZS+z2014d;vj6}9 literal 0 HcmV?d00001 diff --git a/droid-core/test-skeletons/fmt/fmt-2051-signature-id-3416.cin b/droid-core/test-skeletons/fmt/fmt-2051-signature-id-3416.cin new file mode 100644 index 000000000..6411d2bdc --- /dev/null +++ b/droid-core/test-skeletons/fmt/fmt-2051-signature-id-3416.cin @@ -0,0 +1 @@ +€*_× \ No newline at end of file diff --git a/droid-core/test-skeletons/fmt/fmt-2052-signature-id-3415.pdf b/droid-core/test-skeletons/fmt/fmt-2052-signature-id-3415.pdf new file mode 100644 index 0000000000000000000000000000000000000000..94a6e94b32f91af20f339234f086d14f8dbc7b75 GIT binary patch literal 44 hcmY!laB \ No newline at end of file diff --git a/droid-core/test-skeletons/fmt/fmt-2056-signature-id-3419.iamf b/droid-core/test-skeletons/fmt/fmt-2056-signature-id-3419.iamf new file mode 100644 index 000000000..78599d5c6 --- /dev/null +++ b/droid-core/test-skeletons/fmt/fmt-2056-signature-id-3419.iamf @@ -0,0 +1 @@ +øiamf \ No newline at end of file diff --git a/droid-core/test-skeletons/fmt/fmt-2057-signature-id-3420.a2r b/droid-core/test-skeletons/fmt/fmt-2057-signature-id-3420.a2r new file mode 100644 index 000000000..1de514fdc --- /dev/null +++ b/droid-core/test-skeletons/fmt/fmt-2057-signature-id-3420.a2r @@ -0,0 +1,2 @@ +A2R2ÿ + diff --git a/droid-core/test-skeletons/fmt/fmt-2058-signature-id-3421.a2r b/droid-core/test-skeletons/fmt/fmt-2058-signature-id-3421.a2r new file mode 100644 index 000000000..7984fe343 --- /dev/null +++ b/droid-core/test-skeletons/fmt/fmt-2058-signature-id-3421.a2r @@ -0,0 +1,2 @@ +A2R3ÿ + diff --git a/droid-core/test-skeletons/fmt/fmt-2059-signature-id-3422.woz b/droid-core/test-skeletons/fmt/fmt-2059-signature-id-3422.woz new file mode 100644 index 000000000..67fbee713 --- /dev/null +++ b/droid-core/test-skeletons/fmt/fmt-2059-signature-id-3422.woz @@ -0,0 +1,2 @@ +WOZ1ÿ + diff --git a/droid-core/test-skeletons/fmt/fmt-2060-signature-id-3423.woz b/droid-core/test-skeletons/fmt/fmt-2060-signature-id-3423.woz new file mode 100644 index 000000000..fe8154780 --- /dev/null +++ b/droid-core/test-skeletons/fmt/fmt-2060-signature-id-3423.woz @@ -0,0 +1,2 @@ +WOZ2ÿ + diff --git a/droid-core/test-skeletons/fmt/fmt-2061-signature-id-3424.moof b/droid-core/test-skeletons/fmt/fmt-2061-signature-id-3424.moof new file mode 100644 index 000000000..3f2715e95 --- /dev/null +++ b/droid-core/test-skeletons/fmt/fmt-2061-signature-id-3424.moof @@ -0,0 +1,2 @@ +MOOFÿ + diff --git a/droid-core/test-skeletons/fmt/fmt-2062-signature-id-3425.avif b/droid-core/test-skeletons/fmt/fmt-2062-signature-id-3425.avif new file mode 100644 index 0000000000000000000000000000000000000000..a694d52a48042e15e4c91bd4a43b2fd7929d02d6 GIT binary patch literal 12 TcmZQzU|>iqsVqn=%S;0R4~zq9 literal 0 HcmV?d00001 diff --git a/droid-core/test-skeletons/fmt/fmt-2068-signature-id-3426.mfs b/droid-core/test-skeletons/fmt/fmt-2068-signature-id-3426.mfs new file mode 100644 index 0000000000000000000000000000000000000000..cea14068af65fd1f15b36bdc845b8be2c4ce32f4 GIT binary patch literal 1048 acmZQz7zLvtFd70QH3TkQNAWoej0XTKJprx& literal 0 HcmV?d00001 diff --git a/droid-core/test_sig_files/DROID_SignatureFile_V120.xml b/droid-core/test_sig_files/DROID_SignatureFile_V121.xml similarity index 98% rename from droid-core/test_sig_files/DROID_SignatureFile_V120.xml rename to droid-core/test_sig_files/DROID_SignatureFile_V121.xml index c98e65e3c..3c3e29331 100644 --- a/droid-core/test_sig_files/DROID_SignatureFile_V120.xml +++ b/droid-core/test_sig_files/DROID_SignatureFile_V121.xml @@ -1,5 +1,5 @@ - + @@ -44863,9 +44863,10 @@ - 464954 - 4 + SubSeqMaxOffset="8" SubSeqMinOffset="8"> + 2E464954 + 5 + 4 3 2 1 @@ -47825,38 +47826,39 @@ - 3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E - 39 - 19 - 3 - 5 - 22 - 21 - 23 - 4 - 38 - 10 - 1 - 2 - 6 - 7 - 8 - 16 - 14 - 18 - 11 - 13 - 34 - 35 - 12 - 15 - 30 - 29 - 32 - 36 - 3C646F63756D656E74 - 3C696E7465726C696E6561722D74657874 - 3C70617261677261706873 + 3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D22 + 31 + 11 + 1 + 14 + 13 + 15 + 30 + 2 + 29 + 8 + 6 + 10 + 3 + 5 + 26 + 27 + 4 + 7 + 22 + 21 + 24 + 28 + 55 + 75 + 54 + 74 + 46 + 66 + 2D38223F3E + 3C646F63756D656E74 + 3C696E7465726C696E6561722D74657874 + 3C70617261677261706873 @@ -50485,26 +50487,6 @@ - - - - 00424541303101 - 8 - 7 - 1 - 3 - 2 - 4 - 6 - 5 - 004E535230 - 32 - 33 - 01 - - - 2 8 6 - 010F + 01F0 @@ -51910,6 +51892,8 @@ 18 31 32 + 33 + 34 222C2267616D6556657273696F6E223A @@ -52012,15 +51996,18 @@ - AC - 2 - 1 + SubSeqMaxOffset="0" SubSeqMinOffset="0"> + 00080000 + 5 + 1 + 3 + 01 + 02 + SubSeqMaxOffset="1024" SubSeqMinOffset="0"> AC -2 -1 @@ -53200,17 +53187,14 @@ - - 00000000010F5000 - 9 - 1 - 4 - 3 - 2 - 0060 - 454133 - 65613303 + 656133 + 4 + 1 + 2 + 3 + 454133 @@ -53711,6 +53695,698 @@ + + + + 7B + 2 + 1 + + + 22726574776565746564223A + 13 + 2 + 1 + 3 + 4 + 11 + 5 + 8 + + + 2269645F737472223A + 10 + 2 + 1 + 6 + 7 + 8 + 3 + 5 + 4 + + + + + 7D + -2 + -1 + + + + + + + 6F70656E4D47 + 7 + 1 + 2 + 4 + 3 + 6 + 5 + + + + + + + 687474703A2F2F7777772E6F70656E6769732E6E65742F63697479676D6C2F312E30 + 35 + 2 + 4 + 1 + 3 + 30 + 11 + 14 + 7 + 34 + 10 + 5 + 6 + 15 + 23 + 22 + 17 + 9 + 25 + 8 + 22 + 27 + 3D + 786D6C6E73 + 436974794D6F64656C + 3A + 3C + 22 + 27 + 312E30 + 22 + 27 + 3C3F786D6C2076657273696F6E3D + 22 + 27 + + + + + + + 504B0304 + 5 + 2 + 1 + 3 + 4 + + + + + + + 5B436F6E74656E745F54797065735D2E786D6C20A2 + 22 + 2 + 6 + 20 + 12 + 21 + 7 + 13 + 9 + 3 + 4 + 15 + 19 + 10 + 8 + 14 + 5 + 11 + 1 + + + + + + + 0A2020227479706522203A202243494D4C61796572446F63756D656E74222C + 32 + 31 + 20 + 2 + 1 + 21 + 18 + 10 + 17 + 15 + 16 + 14 + 8 + 5 + 6 + 4 + 9 + 25 + 11 + 3 + 7 + 13 + 7B + 0A20202276657273696F6E22203A2022 + + + + + + + 255044462D312E37 + 9 + 8 + 4 + 2 + 3 + 1 + 6 + 5 + 7 + + + 3C706466756169643A706172743E313C2F706466756169643A706172743E + 31 + 14 + 16 + 6 + 15 + 1 + 4 + 7 + 11 + 8 + 5 + 3 + 2 + 10 + + + + + + + 255044462D322E30 + 9 + 8 + 4 + 2 + 1 + 3 + 6 + 5 + 7 + + + 706466756169643A706172743D223222 + 17 + 1 + 2 + 9 + 4 + 7 + 10 + 14 + 11 + 8 + 6 + 5 + 13 + + + + + + + 802A5FD7 + 5 + 3 + 2 + 4 + 1 + + + + + + + 4152524F5731 + 7 + 1 + 6 + 3 + 4 + 2 + + + + + 4152524F5731 + -7 + -6 + -1 + -4 + -2 + -5 + + + + + + + 3C2F706C6973743E + -9 + -2 + -1 + -8 + -5 + -4 + -3 + -6 + -7 + + + + + 657273696F6E3A20312E30 + 12 + 4 + 2 + 1 + 3 + 5 + 11 + 8 + 6 + 7 + 10 + 9 + 56 + 76 + 2D + 494D45 + 696D65 + 4D + + + + + 546F3A20 + 5 + 1 + 2 + 4 + 3 + + + + + 46726F6D3A20 + 7 + 1 + 2 + 6 + 3 + 4 + 5 + + + + + 446174653A20 + 7 + 1 + 2 + 6 + 5 + 3 + 4 + + + + + 436F6E74656E742D + 9 + 1 + 8 + 4 + 3 + 7 + 2 + 54 + 74 + 7970653A20 + + + + + + + 0669616D66 + 6 + 5 + 3 + 1 + 4 + 2 + F8 + FC + + + + + + + 41325232FF0A0D0A + 9 + 1 + 2 + 5 + 8 + 6 + 4 + + + + + + + 41325233FF0A0D0A + 9 + 1 + 2 + 7 + 5 + 8 + 6 + 4 + + + + + + + 574F5A31FF0A0D0A + 9 + 1 + 2 + 5 + 7 + 8 + 6 + 4 + + + + + + + 574F5A32FF0A0D0A + 9 + 1 + 2 + 5 + 7 + 8 + 6 + 4 + + + + + + + 4D4F4F46FF0A0D0A + 9 + 1 + 2 + 5 + 8 + 6 + 4 + + + + + + + 6674797061766966 + 9 + 4 + 1 + 2 + 5 + 7 + 3 + 6 + + + + + + + D2D7 + 3 + 2 + 1 + 0004 + [!&01]00 + + + + + + + 255044462D322E + 8 + 7 + 3 + 1 + 2 + 5 + 4 + 6 + [30:39] + + + + + 7064666169643A706172743D223422 + 16 + 1 + 2 + 9 + 4 + 7 + 10 + 13 + 11 + 8 + 6 + 5 + + + + + + + 255044462D322E + 8 + 7 + 3 + 1 + 2 + 5 + 4 + 6 + [30:39] + + + + + 7064666169643A706172743D223422207064666169643A636F6E666F726D616E63653D224522 + 39 + 23 + 1 + 25 + 16 + 4 + 2 + 8 + 6 + 17 + 5 + 12 + 18 + 9 + 7 + 11 + 22 + 10 + 28 + + + + + + + 255044462D322E + 8 + 7 + 3 + 1 + 2 + 5 + 4 + 6 + [30:39] + + + + + 7064666169643A636F6E666F726D616E63653D224522207064666169643A706172743D223422 + 39 + 16 + 1 + 2 + 9 + 4 + 18 + 7 + 22 + 10 + 21 + 13 + 11 + 25 + 23 + 27 + 8 + 6 + 5 + + + + + + + 255044462D322E + 8 + 7 + 3 + 1 + 2 + 5 + 4 + 6 + [30:39] + + + + + 7064666169643A706172743D223422207064666169643A636F6E666F726D616E63653D224622 + 39 + 23 + 1 + 25 + 16 + 4 + 2 + 8 + 6 + 17 + 5 + 12 + 18 + 9 + 7 + 11 + 22 + 10 + 28 + + + + + + + 255044462D322E + 8 + 7 + 3 + 1 + 2 + 5 + 4 + 6 + [30:39] + + + + + 7064666169643A636F6E666F726D616E63653D224622207064666169643A706172743D223422 + 39 + 16 + 1 + 2 + 9 + 4 + 18 + 7 + 22 + 10 + 21 + 13 + 11 + 25 + 23 + 27 + 8 + 6 + 5 + + + acb + Name="Adobe FrameMaker Document" PUID="x-fmt/302" Version="8.0"> 395 fm @@ -56518,7 +57194,7 @@ ods ots 778 - 1037 + 1033 1274 mif + miff 1275 @@ -61771,7 +62448,7 @@ 1404 1405 - + 1406 drc @@ -63104,6 +63781,7 @@ 1687 1688 1689 + 3404 json 1617 @@ -64859,7 +65537,7 @@ Name="Crystal Reports File" PUID="fmt/1648"> rpt - + 1986 ags @@ -66225,6 +66903,7 @@ Name="Acrobat PDF/A - Portable Document Format" PUID="fmt/1910" Version="4"> 2256 + 3427 pdf 1939 @@ -66233,6 +66912,8 @@ PUID="fmt/1911" Version="4e"> 2257 2258 + 3428 + 3429 pdf 1939 2766 @@ -66242,6 +66923,8 @@ PUID="fmt/1912" Version="4f"> 2261 2262 + 3430 + 3431 pdf 1939 2766 @@ -66808,6 +67491,7 @@ 3380 + 3405 oma @@ -66837,6 +67521,7 @@ PUID="fmt/2024" Version="4"> 3387 cdp + 2741 @@ -66848,7 +67533,7 @@ qdc + Name="Microsoft Project" PUID="fmt/2027" Version="1"> 3390 mpp @@ -66908,5 +67593,141 @@ 3403 hfe + + 3406 + gml + xml + 319 + + + apk + 382 + + + 3408 + aab + + + 3412 + aar + + + odt + 778 + + + ods + 778 + + + odp + 778 + 1035 + + + odb + 778 + 783 + + + odg + 778 + 1039 + + + 3413 + lyrx + + + 3414 + pdf + 1016 + + + 3415 + pdf + 1939 + + + 3416 + cin + + + 3417 + arrow + + + jsonl + + + 3418 + emlx + 645 + 1755 + + + 3419 + iamf + + + 3420 + a2r + + + 3421 + a2r + + + 3422 + woz + + + 3423 + woz + + + 3424 + moof + + + 3425 + avif + + + drt + + + drp + 3938 + + + toml + + + rs + + + xyz + + + 3426 + mfs + diff --git a/droid-container/src/test/resources/container-signature-20240715.xml b/droid-results/custom_home/container_sigs/container-signature-20250925.xml similarity index 93% rename from droid-container/src/test/resources/container-signature-20240715.xml rename to droid-results/custom_home/container_sigs/container-signature-20250925.xml index 301a7245b..35bad793e 100644 --- a/droid-container/src/test/resources/container-signature-20240715.xml +++ b/droid-results/custom_home/container_sigs/container-signature-20250925.xml @@ -1,6 +1,6 @@ - + Microsoft Word 6.0/95 OLE2 @@ -1679,6 +1679,46 @@ + + + Open Document Text 1.4 + + + META-INF/manifest.xml + + + + + + 'manifest:media-type="application/vnd.oasis.opendocument.text' + + + + + + + + content.xml + + + + + + 'office:document-content' + + + 'office:version=' (22|27) '1.4' (22|27) + + + + + + + + + + + Open Document Spreadsheet 1.0 @@ -1879,6 +1919,43 @@ + + Open Document Spreadsheet 1.4 + + + META-INF/manifest.xml + + + + + + 'manifest:media-type="application/vnd.oasis.opendocument.spreadsheet' + + + + + + + + content.xml + + + + + + 'office:document-content' + + + 'office:version=' (22|27) '1.4' (22|27) + + + + + + + + + Open Document Presentation 1.0 @@ -2041,6 +2118,44 @@ + + Open Document Presentation 1.4 + + + META-INF/manifest.xml + + + + + + 'manifest:media-type="application/vnd.oasis.opendocument.presentation' + + + + + + + + content.xml + + + + + + 'office:document-content' + + + 'office:version=' (22|27) '1.4' (22|27) + + + + + + + + + + Open Document Database 1.0 @@ -2201,6 +2316,44 @@ + + + Open Document Database 1.4 + + + META-INF/manifest.xml + + + + + + 'manifest:media-type="application/vnd.oasis.opendocument.base' + + + + + + + + content.xml + + + + + + 'office:document-content' + + + 'office:version=' (22|27) '1.4' (22|27) + + + + + + + + + Open Document Graphics 1.0 @@ -2362,6 +2515,44 @@ + + + Open Document Graphics 1.4 + + + META-INF/manifest.xml + + + + + + 'manifest:media-type="application/vnd.oasis.opendocument.graphics' + + + + + + + + content.xml + + + + + + 'office:document-content' + + + 'office:version=' (22|27) '1.4' (22|27) + + + + + + + + + Java Archive Format @@ -7074,14 +7265,115 @@ - - + + Android Package File + +classes.dex + + +AndroidManifest.xml + + + + + +03 00 08 00 + + + + + + + + + + Android App Bundle File + + + base/manifest/AndroidManifest.xml + + + + + + 61 6E 64 72 6F 69 64 + + + + + + + + + + + Android Archive File + + + AndroidManifest.xml + + + + + + 'manifest xmlns:android=' + + + + + + + + + + + DaVinci Resolve Timeline + + + project.xml + + + + + + 3C 53 4D 5F 50 72 6F 6A 65 63 74 + + + + + + + + + + + DaVinci Resolve Project + + + Gallery.xml + + + project.xml + + + + + + 3C 53 4D 5F 50 72 6F 6A 65 63 74 + + + + + + + + - + - + @@ -7221,6 +7513,8 @@ + + @@ -7232,6 +7526,9 @@ + + + @@ -7241,7 +7538,8 @@ - + + @@ -7250,7 +7548,8 @@ - + + @@ -7259,6 +7558,8 @@ + + @@ -7765,6 +8066,18 @@ + + + + + + + + + + + + diff --git a/droid-results/custom_home/signature_files/DROID_SignatureFile_V120.xml b/droid-results/custom_home/signature_files/DROID_SignatureFile_V121.xml similarity index 98% rename from droid-results/custom_home/signature_files/DROID_SignatureFile_V120.xml rename to droid-results/custom_home/signature_files/DROID_SignatureFile_V121.xml index c98e65e3c..3c3e29331 100644 --- a/droid-results/custom_home/signature_files/DROID_SignatureFile_V120.xml +++ b/droid-results/custom_home/signature_files/DROID_SignatureFile_V121.xml @@ -1,5 +1,5 @@ - + @@ -44863,9 +44863,10 @@ - 464954 - 4 + SubSeqMaxOffset="8" SubSeqMinOffset="8"> + 2E464954 + 5 + 4 3 2 1 @@ -47825,38 +47826,39 @@ - 3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E - 39 - 19 - 3 - 5 - 22 - 21 - 23 - 4 - 38 - 10 - 1 - 2 - 6 - 7 - 8 - 16 - 14 - 18 - 11 - 13 - 34 - 35 - 12 - 15 - 30 - 29 - 32 - 36 - 3C646F63756D656E74 - 3C696E7465726C696E6561722D74657874 - 3C70617261677261706873 + 3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D22 + 31 + 11 + 1 + 14 + 13 + 15 + 30 + 2 + 29 + 8 + 6 + 10 + 3 + 5 + 26 + 27 + 4 + 7 + 22 + 21 + 24 + 28 + 55 + 75 + 54 + 74 + 46 + 66 + 2D38223F3E + 3C646F63756D656E74 + 3C696E7465726C696E6561722D74657874 + 3C70617261677261706873 @@ -50485,26 +50487,6 @@ - - - - 00424541303101 - 8 - 7 - 1 - 3 - 2 - 4 - 6 - 5 - 004E535230 - 32 - 33 - 01 - - - 2 8 6 - 010F + 01F0 @@ -51910,6 +51892,8 @@ 18 31 32 + 33 + 34 222C2267616D6556657273696F6E223A @@ -52012,15 +51996,18 @@ - AC - 2 - 1 + SubSeqMaxOffset="0" SubSeqMinOffset="0"> + 00080000 + 5 + 1 + 3 + 01 + 02 + SubSeqMaxOffset="1024" SubSeqMinOffset="0"> AC -2 -1 @@ -53200,17 +53187,14 @@ - - 00000000010F5000 - 9 - 1 - 4 - 3 - 2 - 0060 - 454133 - 65613303 + 656133 + 4 + 1 + 2 + 3 + 454133 @@ -53711,6 +53695,698 @@ + + + + 7B + 2 + 1 + + + 22726574776565746564223A + 13 + 2 + 1 + 3 + 4 + 11 + 5 + 8 + + + 2269645F737472223A + 10 + 2 + 1 + 6 + 7 + 8 + 3 + 5 + 4 + + + + + 7D + -2 + -1 + + + + + + + 6F70656E4D47 + 7 + 1 + 2 + 4 + 3 + 6 + 5 + + + + + + + 687474703A2F2F7777772E6F70656E6769732E6E65742F63697479676D6C2F312E30 + 35 + 2 + 4 + 1 + 3 + 30 + 11 + 14 + 7 + 34 + 10 + 5 + 6 + 15 + 23 + 22 + 17 + 9 + 25 + 8 + 22 + 27 + 3D + 786D6C6E73 + 436974794D6F64656C + 3A + 3C + 22 + 27 + 312E30 + 22 + 27 + 3C3F786D6C2076657273696F6E3D + 22 + 27 + + + + + + + 504B0304 + 5 + 2 + 1 + 3 + 4 + + + + + + + 5B436F6E74656E745F54797065735D2E786D6C20A2 + 22 + 2 + 6 + 20 + 12 + 21 + 7 + 13 + 9 + 3 + 4 + 15 + 19 + 10 + 8 + 14 + 5 + 11 + 1 + + + + + + + 0A2020227479706522203A202243494D4C61796572446F63756D656E74222C + 32 + 31 + 20 + 2 + 1 + 21 + 18 + 10 + 17 + 15 + 16 + 14 + 8 + 5 + 6 + 4 + 9 + 25 + 11 + 3 + 7 + 13 + 7B + 0A20202276657273696F6E22203A2022 + + + + + + + 255044462D312E37 + 9 + 8 + 4 + 2 + 3 + 1 + 6 + 5 + 7 + + + 3C706466756169643A706172743E313C2F706466756169643A706172743E + 31 + 14 + 16 + 6 + 15 + 1 + 4 + 7 + 11 + 8 + 5 + 3 + 2 + 10 + + + + + + + 255044462D322E30 + 9 + 8 + 4 + 2 + 1 + 3 + 6 + 5 + 7 + + + 706466756169643A706172743D223222 + 17 + 1 + 2 + 9 + 4 + 7 + 10 + 14 + 11 + 8 + 6 + 5 + 13 + + + + + + + 802A5FD7 + 5 + 3 + 2 + 4 + 1 + + + + + + + 4152524F5731 + 7 + 1 + 6 + 3 + 4 + 2 + + + + + 4152524F5731 + -7 + -6 + -1 + -4 + -2 + -5 + + + + + + + 3C2F706C6973743E + -9 + -2 + -1 + -8 + -5 + -4 + -3 + -6 + -7 + + + + + 657273696F6E3A20312E30 + 12 + 4 + 2 + 1 + 3 + 5 + 11 + 8 + 6 + 7 + 10 + 9 + 56 + 76 + 2D + 494D45 + 696D65 + 4D + + + + + 546F3A20 + 5 + 1 + 2 + 4 + 3 + + + + + 46726F6D3A20 + 7 + 1 + 2 + 6 + 3 + 4 + 5 + + + + + 446174653A20 + 7 + 1 + 2 + 6 + 5 + 3 + 4 + + + + + 436F6E74656E742D + 9 + 1 + 8 + 4 + 3 + 7 + 2 + 54 + 74 + 7970653A20 + + + + + + + 0669616D66 + 6 + 5 + 3 + 1 + 4 + 2 + F8 + FC + + + + + + + 41325232FF0A0D0A + 9 + 1 + 2 + 5 + 8 + 6 + 4 + + + + + + + 41325233FF0A0D0A + 9 + 1 + 2 + 7 + 5 + 8 + 6 + 4 + + + + + + + 574F5A31FF0A0D0A + 9 + 1 + 2 + 5 + 7 + 8 + 6 + 4 + + + + + + + 574F5A32FF0A0D0A + 9 + 1 + 2 + 5 + 7 + 8 + 6 + 4 + + + + + + + 4D4F4F46FF0A0D0A + 9 + 1 + 2 + 5 + 8 + 6 + 4 + + + + + + + 6674797061766966 + 9 + 4 + 1 + 2 + 5 + 7 + 3 + 6 + + + + + + + D2D7 + 3 + 2 + 1 + 0004 + [!&01]00 + + + + + + + 255044462D322E + 8 + 7 + 3 + 1 + 2 + 5 + 4 + 6 + [30:39] + + + + + 7064666169643A706172743D223422 + 16 + 1 + 2 + 9 + 4 + 7 + 10 + 13 + 11 + 8 + 6 + 5 + + + + + + + 255044462D322E + 8 + 7 + 3 + 1 + 2 + 5 + 4 + 6 + [30:39] + + + + + 7064666169643A706172743D223422207064666169643A636F6E666F726D616E63653D224522 + 39 + 23 + 1 + 25 + 16 + 4 + 2 + 8 + 6 + 17 + 5 + 12 + 18 + 9 + 7 + 11 + 22 + 10 + 28 + + + + + + + 255044462D322E + 8 + 7 + 3 + 1 + 2 + 5 + 4 + 6 + [30:39] + + + + + 7064666169643A636F6E666F726D616E63653D224522207064666169643A706172743D223422 + 39 + 16 + 1 + 2 + 9 + 4 + 18 + 7 + 22 + 10 + 21 + 13 + 11 + 25 + 23 + 27 + 8 + 6 + 5 + + + + + + + 255044462D322E + 8 + 7 + 3 + 1 + 2 + 5 + 4 + 6 + [30:39] + + + + + 7064666169643A706172743D223422207064666169643A636F6E666F726D616E63653D224622 + 39 + 23 + 1 + 25 + 16 + 4 + 2 + 8 + 6 + 17 + 5 + 12 + 18 + 9 + 7 + 11 + 22 + 10 + 28 + + + + + + + 255044462D322E + 8 + 7 + 3 + 1 + 2 + 5 + 4 + 6 + [30:39] + + + + + 7064666169643A636F6E666F726D616E63653D224622207064666169643A706172743D223422 + 39 + 16 + 1 + 2 + 9 + 4 + 18 + 7 + 22 + 10 + 21 + 13 + 11 + 25 + 23 + 27 + 8 + 6 + 5 + + + acb + Name="Adobe FrameMaker Document" PUID="x-fmt/302" Version="8.0"> 395 fm @@ -56518,7 +57194,7 @@ ods ots 778 - 1037 + 1033 1274 mif + miff 1275 @@ -61771,7 +62448,7 @@ 1404 1405 - + 1406 drc @@ -63104,6 +63781,7 @@ 1687 1688 1689 + 3404 json 1617 @@ -64859,7 +65537,7 @@ Name="Crystal Reports File" PUID="fmt/1648"> rpt - + 1986 ags @@ -66225,6 +66903,7 @@ Name="Acrobat PDF/A - Portable Document Format" PUID="fmt/1910" Version="4"> 2256 + 3427 pdf 1939 @@ -66233,6 +66912,8 @@ PUID="fmt/1911" Version="4e"> 2257 2258 + 3428 + 3429 pdf 1939 2766 @@ -66242,6 +66923,8 @@ PUID="fmt/1912" Version="4f"> 2261 2262 + 3430 + 3431 pdf 1939 2766 @@ -66808,6 +67491,7 @@ 3380 + 3405 oma @@ -66837,6 +67521,7 @@ PUID="fmt/2024" Version="4"> 3387 cdp + 2741 @@ -66848,7 +67533,7 @@ qdc + Name="Microsoft Project" PUID="fmt/2027" Version="1"> 3390 mpp @@ -66908,5 +67593,141 @@ 3403 hfe + + 3406 + gml + xml + 319 + + + apk + 382 + + + 3408 + aab + + + 3412 + aar + + + odt + 778 + + + ods + 778 + + + odp + 778 + 1035 + + + odb + 778 + 783 + + + odg + 778 + 1039 + + + 3413 + lyrx + + + 3414 + pdf + 1016 + + + 3415 + pdf + 1939 + + + 3416 + cin + + + 3417 + arrow + + + jsonl + + + 3418 + emlx + 645 + 1755 + + + 3419 + iamf + + + 3420 + a2r + + + 3421 + a2r + + + 3422 + woz + + + 3423 + woz + + + 3424 + moof + + + 3425 + avif + + + drt + + + drp + 3938 + + + toml + + + rs + + + xyz + + + 3426 + mfs + diff --git a/droid-results/src/main/resources/DROID_SignatureFile_V120.xml b/droid-results/src/main/resources/DROID_SignatureFile_V121.xml similarity index 98% rename from droid-results/src/main/resources/DROID_SignatureFile_V120.xml rename to droid-results/src/main/resources/DROID_SignatureFile_V121.xml index c98e65e3c..3c3e29331 100644 --- a/droid-results/src/main/resources/DROID_SignatureFile_V120.xml +++ b/droid-results/src/main/resources/DROID_SignatureFile_V121.xml @@ -1,5 +1,5 @@ - + @@ -44863,9 +44863,10 @@ - 464954 - 4 + SubSeqMaxOffset="8" SubSeqMinOffset="8"> + 2E464954 + 5 + 4 3 2 1 @@ -47825,38 +47826,39 @@ - 3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D225554462D38223F3E - 39 - 19 - 3 - 5 - 22 - 21 - 23 - 4 - 38 - 10 - 1 - 2 - 6 - 7 - 8 - 16 - 14 - 18 - 11 - 13 - 34 - 35 - 12 - 15 - 30 - 29 - 32 - 36 - 3C646F63756D656E74 - 3C696E7465726C696E6561722D74657874 - 3C70617261677261706873 + 3C3F786D6C2076657273696F6E3D22312E302220656E636F64696E673D22 + 31 + 11 + 1 + 14 + 13 + 15 + 30 + 2 + 29 + 8 + 6 + 10 + 3 + 5 + 26 + 27 + 4 + 7 + 22 + 21 + 24 + 28 + 55 + 75 + 54 + 74 + 46 + 66 + 2D38223F3E + 3C646F63756D656E74 + 3C696E7465726C696E6561722D74657874 + 3C70617261677261706873 @@ -50485,26 +50487,6 @@ - - - - 00424541303101 - 8 - 7 - 1 - 3 - 2 - 4 - 6 - 5 - 004E535230 - 32 - 33 - 01 - - - 2 8 6 - 010F + 01F0 @@ -51910,6 +51892,8 @@ 18 31 32 + 33 + 34 222C2267616D6556657273696F6E223A @@ -52012,15 +51996,18 @@ - AC - 2 - 1 + SubSeqMaxOffset="0" SubSeqMinOffset="0"> + 00080000 + 5 + 1 + 3 + 01 + 02 + SubSeqMaxOffset="1024" SubSeqMinOffset="0"> AC -2 -1 @@ -53200,17 +53187,14 @@ - - 00000000010F5000 - 9 - 1 - 4 - 3 - 2 - 0060 - 454133 - 65613303 + 656133 + 4 + 1 + 2 + 3 + 454133 @@ -53711,6 +53695,698 @@ + + + + 7B + 2 + 1 + + + 22726574776565746564223A + 13 + 2 + 1 + 3 + 4 + 11 + 5 + 8 + + + 2269645F737472223A + 10 + 2 + 1 + 6 + 7 + 8 + 3 + 5 + 4 + + + + + 7D + -2 + -1 + + + + + + + 6F70656E4D47 + 7 + 1 + 2 + 4 + 3 + 6 + 5 + + + + + + + 687474703A2F2F7777772E6F70656E6769732E6E65742F63697479676D6C2F312E30 + 35 + 2 + 4 + 1 + 3 + 30 + 11 + 14 + 7 + 34 + 10 + 5 + 6 + 15 + 23 + 22 + 17 + 9 + 25 + 8 + 22 + 27 + 3D + 786D6C6E73 + 436974794D6F64656C + 3A + 3C + 22 + 27 + 312E30 + 22 + 27 + 3C3F786D6C2076657273696F6E3D + 22 + 27 + + + + + + + 504B0304 + 5 + 2 + 1 + 3 + 4 + + + + + + + 5B436F6E74656E745F54797065735D2E786D6C20A2 + 22 + 2 + 6 + 20 + 12 + 21 + 7 + 13 + 9 + 3 + 4 + 15 + 19 + 10 + 8 + 14 + 5 + 11 + 1 + + + + + + + 0A2020227479706522203A202243494D4C61796572446F63756D656E74222C + 32 + 31 + 20 + 2 + 1 + 21 + 18 + 10 + 17 + 15 + 16 + 14 + 8 + 5 + 6 + 4 + 9 + 25 + 11 + 3 + 7 + 13 + 7B + 0A20202276657273696F6E22203A2022 + + + + + + + 255044462D312E37 + 9 + 8 + 4 + 2 + 3 + 1 + 6 + 5 + 7 + + + 3C706466756169643A706172743E313C2F706466756169643A706172743E + 31 + 14 + 16 + 6 + 15 + 1 + 4 + 7 + 11 + 8 + 5 + 3 + 2 + 10 + + + + + + + 255044462D322E30 + 9 + 8 + 4 + 2 + 1 + 3 + 6 + 5 + 7 + + + 706466756169643A706172743D223222 + 17 + 1 + 2 + 9 + 4 + 7 + 10 + 14 + 11 + 8 + 6 + 5 + 13 + + + + + + + 802A5FD7 + 5 + 3 + 2 + 4 + 1 + + + + + + + 4152524F5731 + 7 + 1 + 6 + 3 + 4 + 2 + + + + + 4152524F5731 + -7 + -6 + -1 + -4 + -2 + -5 + + + + + + + 3C2F706C6973743E + -9 + -2 + -1 + -8 + -5 + -4 + -3 + -6 + -7 + + + + + 657273696F6E3A20312E30 + 12 + 4 + 2 + 1 + 3 + 5 + 11 + 8 + 6 + 7 + 10 + 9 + 56 + 76 + 2D + 494D45 + 696D65 + 4D + + + + + 546F3A20 + 5 + 1 + 2 + 4 + 3 + + + + + 46726F6D3A20 + 7 + 1 + 2 + 6 + 3 + 4 + 5 + + + + + 446174653A20 + 7 + 1 + 2 + 6 + 5 + 3 + 4 + + + + + 436F6E74656E742D + 9 + 1 + 8 + 4 + 3 + 7 + 2 + 54 + 74 + 7970653A20 + + + + + + + 0669616D66 + 6 + 5 + 3 + 1 + 4 + 2 + F8 + FC + + + + + + + 41325232FF0A0D0A + 9 + 1 + 2 + 5 + 8 + 6 + 4 + + + + + + + 41325233FF0A0D0A + 9 + 1 + 2 + 7 + 5 + 8 + 6 + 4 + + + + + + + 574F5A31FF0A0D0A + 9 + 1 + 2 + 5 + 7 + 8 + 6 + 4 + + + + + + + 574F5A32FF0A0D0A + 9 + 1 + 2 + 5 + 7 + 8 + 6 + 4 + + + + + + + 4D4F4F46FF0A0D0A + 9 + 1 + 2 + 5 + 8 + 6 + 4 + + + + + + + 6674797061766966 + 9 + 4 + 1 + 2 + 5 + 7 + 3 + 6 + + + + + + + D2D7 + 3 + 2 + 1 + 0004 + [!&01]00 + + + + + + + 255044462D322E + 8 + 7 + 3 + 1 + 2 + 5 + 4 + 6 + [30:39] + + + + + 7064666169643A706172743D223422 + 16 + 1 + 2 + 9 + 4 + 7 + 10 + 13 + 11 + 8 + 6 + 5 + + + + + + + 255044462D322E + 8 + 7 + 3 + 1 + 2 + 5 + 4 + 6 + [30:39] + + + + + 7064666169643A706172743D223422207064666169643A636F6E666F726D616E63653D224522 + 39 + 23 + 1 + 25 + 16 + 4 + 2 + 8 + 6 + 17 + 5 + 12 + 18 + 9 + 7 + 11 + 22 + 10 + 28 + + + + + + + 255044462D322E + 8 + 7 + 3 + 1 + 2 + 5 + 4 + 6 + [30:39] + + + + + 7064666169643A636F6E666F726D616E63653D224522207064666169643A706172743D223422 + 39 + 16 + 1 + 2 + 9 + 4 + 18 + 7 + 22 + 10 + 21 + 13 + 11 + 25 + 23 + 27 + 8 + 6 + 5 + + + + + + + 255044462D322E + 8 + 7 + 3 + 1 + 2 + 5 + 4 + 6 + [30:39] + + + + + 7064666169643A706172743D223422207064666169643A636F6E666F726D616E63653D224622 + 39 + 23 + 1 + 25 + 16 + 4 + 2 + 8 + 6 + 17 + 5 + 12 + 18 + 9 + 7 + 11 + 22 + 10 + 28 + + + + + + + 255044462D322E + 8 + 7 + 3 + 1 + 2 + 5 + 4 + 6 + [30:39] + + + + + 7064666169643A636F6E666F726D616E63653D224622207064666169643A706172743D223422 + 39 + 16 + 1 + 2 + 9 + 4 + 18 + 7 + 22 + 10 + 21 + 13 + 11 + 25 + 23 + 27 + 8 + 6 + 5 + + + acb + Name="Adobe FrameMaker Document" PUID="x-fmt/302" Version="8.0"> 395 fm @@ -56518,7 +57194,7 @@ ods ots 778 - 1037 + 1033 1274 mif + miff 1275 @@ -61771,7 +62448,7 @@ 1404 1405 - + 1406 drc @@ -63104,6 +63781,7 @@ 1687 1688 1689 + 3404 json 1617 @@ -64859,7 +65537,7 @@ Name="Crystal Reports File" PUID="fmt/1648"> rpt - + 1986 ags @@ -66225,6 +66903,7 @@ Name="Acrobat PDF/A - Portable Document Format" PUID="fmt/1910" Version="4"> 2256 + 3427 pdf 1939 @@ -66233,6 +66912,8 @@ PUID="fmt/1911" Version="4e"> 2257 2258 + 3428 + 3429 pdf 1939 2766 @@ -66242,6 +66923,8 @@ PUID="fmt/1912" Version="4f"> 2261 2262 + 3430 + 3431 pdf 1939 2766 @@ -66808,6 +67491,7 @@ 3380 + 3405 oma @@ -66837,6 +67521,7 @@ PUID="fmt/2024" Version="4"> 3387 cdp + 2741 @@ -66848,7 +67533,7 @@ qdc + Name="Microsoft Project" PUID="fmt/2027" Version="1"> 3390 mpp @@ -66908,5 +67593,141 @@ 3403 hfe + + 3406 + gml + xml + 319 + + + apk + 382 + + + 3408 + aab + + + 3412 + aar + + + odt + 778 + + + ods + 778 + + + odp + 778 + 1035 + + + odb + 778 + 783 + + + odg + 778 + 1039 + + + 3413 + lyrx + + + 3414 + pdf + 1016 + + + 3415 + pdf + 1939 + + + 3416 + cin + + + 3417 + arrow + + + jsonl + + + 3418 + emlx + 645 + 1755 + + + 3419 + iamf + + + 3420 + a2r + + + 3421 + a2r + + + 3422 + woz + + + 3423 + woz + + + 3424 + moof + + + 3425 + avif + + + drt + + + drp + 3938 + + + toml + + + rs + + + xyz + + + 3426 + mfs + diff --git a/droid-results/src/main/resources/default_droid.properties b/droid-results/src/main/resources/default_droid.properties index 2b1871299..0f7c937da 100644 --- a/droid-results/src/main/resources/default_droid.properties +++ b/droid-results/src/main/resources/default_droid.properties @@ -69,10 +69,10 @@ update.lastCheck=1296238259142 update.downloadPrompt=true # The default binary signature file version to use in new profiles: -profile.defaultBinarySigFileVersion=DROID_SignatureFile_V120 +profile.defaultBinarySigFileVersion=DROID_SignatureFile_V121 # The default container signature file version to use in new profiles: -profile.defaultContainerSigFileVersion=container-signature-20240715 +profile.defaultContainerSigFileVersion=container-signature-20250925 # Whether to profile inside archival files profile.processTar=true From 2e192e9739b1a1b7de50d5866db3de79edd30bc3 Mon Sep 17 00:00:00 2001 From: Nigel Lutale Date: Thu, 2 Oct 2025 14:05:47 +0100 Subject: [PATCH 11/12] Change 'Java 8 to 21' to 'Java 21' --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e9daf30a8..7565e7c4b 100644 --- a/README.md +++ b/README.md @@ -110,7 +110,7 @@ Once the code is cloned into a folder (e.g. `droid`), executing `mvn clean insta ### Linux / macOS users -You will need JAVA 8 to 21 installed to run DROID. +You will need JAVA 21 installed to run DROID. Unpack the archive `droid-binary-${VERSION}-bin.zip`, then use the `droid.sh` script to run the application. @@ -118,7 +118,7 @@ Unpack the archive `droid-binary-${VERSION}-bin.zip`, then use the `droid.sh` sc Archive `droid-binary-${VERSION}-bin-win64-with-jre.zip` -You will need JAVA 8 to 21 installed to run DROID. For Windows users who might not be able to install JAVA, the provided bundle includes JAVA 21. +You will need JAVA 21 installed to run DROID. For Windows users who might not be able to install JAVA, the provided bundle includes JAVA 21. Unpack the archive `droid-binary-${VERSION}-bin-win64-with-jre.zip`, then use the `droid.bat` script to run the application. From b434fdf5dd1a84e2189fc492a626e60069a05a81 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Oct 2025 15:03:44 +0000 Subject: [PATCH 12/12] Bump aws.version from 2.34.7 to 2.34.8 Bumps `aws.version` from 2.34.7 to 2.34.8. Updates `software.amazon.awssdk:s3` from 2.34.7 to 2.34.8 Updates `software.amazon.awssdk:aws-core` from 2.34.7 to 2.34.8 Updates `software.amazon.awssdk:regions` from 2.34.7 to 2.34.8 Updates `software.amazon.awssdk:sdk-core` from 2.34.7 to 2.34.8 Updates `software.amazon.awssdk:sso` from 2.34.7 to 2.34.8 Updates `software.amazon.awssdk:ssooidc` from 2.34.7 to 2.34.8 Updates `software.amazon.awssdk:apache-client` from 2.34.7 to 2.34.8 Updates `software.amazon.awssdk:http-client-spi` from 2.34.7 to 2.34.8 --- updated-dependencies: - dependency-name: software.amazon.awssdk:s3 dependency-version: 2.34.8 dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:aws-core dependency-version: 2.34.8 dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:regions dependency-version: 2.34.8 dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:sdk-core dependency-version: 2.34.8 dependency-type: direct:development update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:sso dependency-version: 2.34.8 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:ssooidc dependency-version: 2.34.8 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:apache-client dependency-version: 2.34.8 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: software.amazon.awssdk:http-client-spi dependency-version: 2.34.8 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- droid-parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/droid-parent/pom.xml b/droid-parent/pom.xml index d1be945b4..5d2922804 100644 --- a/droid-parent/pom.xml +++ b/droid-parent/pom.xml @@ -108,7 +108,7 @@ 2.0.17 2.25.2 10.21.2 - 2.34.7 + 2.34.8 6.0.0 2.20.0