From 988221fa772fccb2d4962575b52876d4cd2cce38 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2026 12:14:37 +0000 Subject: [PATCH 1/8] Bump org.apache.maven.plugins:maven-site-plugin from 3.21.0 to 3.22.0 Bumps [org.apache.maven.plugins:maven-site-plugin](https://github.com/apache/maven-site-plugin) from 3.21.0 to 3.22.0. - [Release notes](https://github.com/apache/maven-site-plugin/releases) - [Commits](https://github.com/apache/maven-site-plugin/compare/maven-site-plugin-3.21.0...maven-site-plugin-3.22.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-site-plugin dependency-version: 3.22.0 dependency-type: direct:development 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 03cc60e1a..ccae5af14 100644 --- a/droid-parent/pom.xml +++ b/droid-parent/pom.xml @@ -225,7 +225,7 @@ org.apache.maven.plugins maven-site-plugin - 3.21.0 + 3.22.0 org.apache.maven.plugins From 9839c8929fdba6bc72d8d58f7f68adcff55e6718 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2026 12:14:44 +0000 Subject: [PATCH 2/8] Bump com.mycila:license-maven-plugin from 5.1.1 to 5.1.2 Bumps [com.mycila:license-maven-plugin](https://github.com/mathieucarbou/license-maven-plugin) from 5.1.1 to 5.1.2. - [Release notes](https://github.com/mathieucarbou/license-maven-plugin/releases) - [Changelog](https://github.com/mathieucarbou/license-maven-plugin/blob/master/docs/releases.md) - [Commits](https://github.com/mathieucarbou/license-maven-plugin/compare/v5.1.1...v5.1.2) --- updated-dependencies: - dependency-name: com.mycila:license-maven-plugin dependency-version: 5.1.2 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 03cc60e1a..51603d045 100644 --- a/droid-parent/pom.xml +++ b/droid-parent/pom.xml @@ -146,7 +146,7 @@ com.mycila license-maven-plugin - 5.1.1 + 5.1.2 org.apache.maven.plugins From 68e119454b740244ad9c375435491b48935a5ede Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2026 12:14:45 +0000 Subject: [PATCH 3/8] Bump org.apache.maven.shared:maven-dependency-analyzer Bumps [org.apache.maven.shared:maven-dependency-analyzer](https://github.com/apache/maven-dependency-analyzer) from 1.17.0 to 1.17.1. - [Release notes](https://github.com/apache/maven-dependency-analyzer/releases) - [Commits](https://github.com/apache/maven-dependency-analyzer/compare/maven-dependency-analyzer-1.17.0...maven-dependency-analyzer-1.17.1) --- updated-dependencies: - dependency-name: org.apache.maven.shared:maven-dependency-analyzer dependency-version: 1.17.1 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 03cc60e1a..8063945b8 100644 --- a/droid-parent/pom.xml +++ b/droid-parent/pom.xml @@ -124,7 +124,7 @@ org.apache.maven.shared maven-dependency-analyzer - 1.17.0 + 1.17.1 From a3a72fb0ebafb3d55bc446dabf1ddc3b5022fa7e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2026 12:14:49 +0000 Subject: [PATCH 4/8] Bump org.dbunit:dbunit from 3.3.0 to 3.5.1 Bumps [org.dbunit:dbunit](https://github.com/dbunit/dbunit-extension) from 3.3.0 to 3.5.1. - [Release notes](https://github.com/dbunit/dbunit-extension/releases) - [Commits](https://github.com/dbunit/dbunit-extension/compare/dbunit-3.3.0...dbunit-3.5.1) --- updated-dependencies: - dependency-name: org.dbunit:dbunit dependency-version: 3.5.1 dependency-type: direct:development 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 03cc60e1a..1c47e97a5 100644 --- a/droid-parent/pom.xml +++ b/droid-parent/pom.xml @@ -787,7 +787,7 @@ Copyright © ${project.inceptionYear}-{currentYear} Date: Tue, 1 Sep 2026 12:14:49 +0000 Subject: [PATCH 5/8] Bump jackson.version from 2.22.1 to 2.22.2 Bumps `jackson.version` from 2.22.1 to 2.22.2. Updates `com.fasterxml.jackson.core:jackson-core` from 2.22.1 to 2.22.2 - [Commits](https://github.com/FasterXML/jackson-core/compare/jackson-core-2.22.1...jackson-core-2.22.2) Updates `com.fasterxml.jackson.core:jackson-databind` from 2.22.1 to 2.22.2 - [Commits](https://github.com/FasterXML/jackson-databind/compare/jackson-databind-2.22.1...jackson-databind-2.22.2) Updates `com.fasterxml.jackson.dataformat:jackson-dataformat-yaml` from 2.22.1 to 2.22.2 - [Commits](https://github.com/FasterXML/jackson-dataformats-text/compare/jackson-dataformats-text-2.22.1...jackson-dataformats-text-2.22.2) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.core:jackson-core dependency-version: 2.22.2 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.core:jackson-databind dependency-version: 2.22.2 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml dependency-version: 2.22.2 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 03cc60e1a..dc59820a3 100644 --- a/droid-parent/pom.xml +++ b/droid-parent/pom.xml @@ -100,7 +100,7 @@ 2.1.0 4.0.5 4.0.5 - 2.22.1 + 2.22.2 9.7.2 0.14.0 1.2.1 From 138aa35fc3f4060d4340a5d09b748787fc35243f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2026 12:14:53 +0000 Subject: [PATCH 6/8] Bump org.apache.commons:commons-collections4 from 4.5.0 to 4.6.0 Bumps org.apache.commons:commons-collections4 from 4.5.0 to 4.6.0. --- updated-dependencies: - dependency-name: org.apache.commons:commons-collections4 dependency-version: 4.6.0 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 03cc60e1a..9d2266504 100644 --- a/droid-parent/pom.xml +++ b/droid-parent/pom.xml @@ -692,7 +692,7 @@ Copyright © ${project.inceptionYear}-{currentYear} Date: Tue, 1 Sep 2026 12:15:07 +0000 Subject: [PATCH 7/8] Bump spring.version from 7.0.8 to 7.0.9 Bumps `spring.version` from 7.0.8 to 7.0.9. Updates `org.springframework:spring-core` from 7.0.8 to 7.0.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v7.0.8...v7.0.9) Updates `org.springframework:spring-context` from 7.0.8 to 7.0.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v7.0.8...v7.0.9) Updates `org.springframework:spring-beans` from 7.0.8 to 7.0.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v7.0.8...v7.0.9) Updates `org.springframework:spring-test` from 7.0.8 to 7.0.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v7.0.8...v7.0.9) Updates `org.springframework:spring-tx` from 7.0.8 to 7.0.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v7.0.8...v7.0.9) Updates `org.springframework:spring-jdbc` from 7.0.8 to 7.0.9 - [Release notes](https://github.com/spring-projects/spring-framework/releases) - [Commits](https://github.com/spring-projects/spring-framework/compare/v7.0.8...v7.0.9) --- updated-dependencies: - dependency-name: org.springframework:spring-beans dependency-version: 7.0.9 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-context dependency-version: 7.0.9 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-core dependency-version: 7.0.9 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-jdbc dependency-version: 7.0.9 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-test dependency-version: 7.0.9 dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: org.springframework:spring-tx dependency-version: 7.0.9 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 03cc60e1a..581c4ccab 100644 --- a/droid-parent/pom.xml +++ b/droid-parent/pom.xml @@ -93,7 +93,7 @@ UTF-8 pronom@nationalarchives.gov.uk - 7.0.8 + 7.0.9 5.4.1.Final 10.17.1.0 4.2.3 From abcd238a4b7ed96963485494bd297a2b93d5e558 Mon Sep 17 00:00:00 2001 From: MancunianSam Date: Tue, 1 Sep 2026 16:02:35 +0100 Subject: [PATCH 8/8] Test fixes --- .../src/main/resources/META-INF/spring-results.xml | 2 +- .../droid/planet/xml/dao/JpaPlanetsXMLDaoTest.java | 6 +++++- .../nationalarchives/droid/profile/ItemWriterImplTest.java | 2 +- .../nationalarchives/droid/profile/JpaProfileDaoTest.java | 7 +++++-- .../droid/profile/JpaProfileFilterTest.java | 2 +- .../droid/report/dao/JpaReportDaoTest.java | 3 ++- .../droid/submitter/ProfileSpecWalkerImplTest.java | 3 ++- .../droid/submitter/S3EventHandlerTest.java | 2 +- droid-results/src/test/resources/jpa-test.properties | 3 ++- 9 files changed, 20 insertions(+), 10 deletions(-) diff --git a/droid-results/src/main/resources/META-INF/spring-results.xml b/droid-results/src/main/resources/META-INF/spring-results.xml index 4b9908711..ddc264f80 100644 --- a/droid-results/src/main/resources/META-INF/spring-results.xml +++ b/droid-results/src/main/resources/META-INF/spring-results.xml @@ -311,8 +311,8 @@ http://www.springframework.org/schema/context http://www.springframework.org/sch - + diff --git a/droid-results/src/test/java/uk/gov/nationalarchives/droid/planet/xml/dao/JpaPlanetsXMLDaoTest.java b/droid-results/src/test/java/uk/gov/nationalarchives/droid/planet/xml/dao/JpaPlanetsXMLDaoTest.java index abf1c79eb..0cdbe4754 100644 --- a/droid-results/src/test/java/uk/gov/nationalarchives/droid/planet/xml/dao/JpaPlanetsXMLDaoTest.java +++ b/droid-results/src/test/java/uk/gov/nationalarchives/droid/planet/xml/dao/JpaPlanetsXMLDaoTest.java @@ -43,6 +43,7 @@ import org.springframework.jdbc.datasource.DataSourceUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import uk.gov.nationalarchives.droid.core.interfaces.config.RuntimeConfig; import uk.gov.nationalarchives.droid.core.interfaces.filter.CriterionFieldEnum; import uk.gov.nationalarchives.droid.core.interfaces.filter.CriterionOperator; import uk.gov.nationalarchives.droid.profile.FilterCriterionImpl; @@ -83,8 +84,11 @@ public class JpaPlanetsXMLDaoTest { @BeforeClass public static void getTestData() throws Exception { - testData = new FlatXmlDataSetBuilder().build(JpaPlanetsXMLDaoTest.class + testData = new FlatXmlDataSetBuilder().setDtdMetadata(false).setColumnSensing(true) + .build(JpaPlanetsXMLDaoTest.class .getResource("planets-xml-test-data-sans-formats.xml")); + System.setProperty(RuntimeConfig.DROID_USER, "/tmp/droid"); + System.setProperty(RuntimeConfig.DROID_TEMP_DIR, "/tmp/droid"); } @Before diff --git a/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/ItemWriterImplTest.java b/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/ItemWriterImplTest.java index b5d46dedc..a0a0699de 100644 --- a/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/ItemWriterImplTest.java +++ b/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/ItemWriterImplTest.java @@ -185,7 +185,7 @@ public void should_write_node_file_name_with_space_at_the_end() throws IOExcepti final String expectedEntry = toCsvRow(new String[]{ "", "", isNotWindows() ? "file:/my/file1.txt%20%20" : "file:/C:/my/file1.txt%20%20", - isNotWindows() ? "/my/file1.txt " : "C:\\my\\file1.txt ", + isNotWindows() ? "/my/file1.txt" : "C:\\my\\file1.txt", "file1.txt", "Signature", "Done", diff --git a/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/JpaProfileDaoTest.java b/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/JpaProfileDaoTest.java index 5257acec8..ffe53e080 100644 --- a/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/JpaProfileDaoTest.java +++ b/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/JpaProfileDaoTest.java @@ -55,6 +55,7 @@ import org.springframework.jdbc.datasource.DataSourceUtils; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import uk.gov.nationalarchives.droid.core.interfaces.config.RuntimeConfig; /** @@ -83,11 +84,13 @@ public static void getTestData() throws Exception { // ole approach we would have had to find a way to load the test formats after the class had ben initialised, // tricky due to the way the whole fresh vs existing template behaviour works. See comments in init method // of JDBCBatchResultsHandler - testData = new FlatXmlDataSetBuilder().build( - JpaProfileDaoTest.class.getResource("results-test-data-sans-formats.xml")); + testData = new FlatXmlDataSetBuilder().setDtdMetadata(false).setColumnSensing(true) + .build(JpaProfileDaoTest.class.getResource("results-test-data-sans-formats.xml")); //System.setProperty("hibernate.generateDdl", "true"); System.setProperty("maxBytesToScan", "65536"); System.setProperty("matchAllExtensions", "false"); + System.setProperty(RuntimeConfig.DROID_USER, "/tmp/droid"); + System.setProperty(RuntimeConfig.DROID_TEMP_DIR, "/tmp/droid"); } @AfterClass diff --git a/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/JpaProfileFilterTest.java b/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/JpaProfileFilterTest.java index 8ee2ed0b8..80cf057cd 100644 --- a/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/JpaProfileFilterTest.java +++ b/droid-results/src/test/java/uk/gov/nationalarchives/droid/profile/JpaProfileFilterTest.java @@ -90,7 +90,7 @@ public static void getTestData() throws Exception { // old approach we would have had to find a way to load the test formats after the class had ben initialised, // tricky due to the way the whole fresh vs existing template behaviour works. See comments in init method // of JDBCBatchResultsHandler - testData = new FlatXmlDataSetBuilder().build( + testData = new FlatXmlDataSetBuilder().setDtdMetadata(false).setColumnSensing(true).build( JpaProfileDaoTest.class.getResource("results-test-data-sans-formats.xml")); //System.setProperty("hibernate.generateDdl", "true"); System.setProperty("maxBytesToScan", "65536"); diff --git a/droid-results/src/test/java/uk/gov/nationalarchives/droid/report/dao/JpaReportDaoTest.java b/droid-results/src/test/java/uk/gov/nationalarchives/droid/report/dao/JpaReportDaoTest.java index d8ca9a696..421356fed 100644 --- a/droid-results/src/test/java/uk/gov/nationalarchives/droid/report/dao/JpaReportDaoTest.java +++ b/droid-results/src/test/java/uk/gov/nationalarchives/droid/report/dao/JpaReportDaoTest.java @@ -92,7 +92,8 @@ public class JpaReportDaoTest { @BeforeClass public static void getTestData() throws Exception { - testData = new FlatXmlDataSetBuilder().build(JpaReportDaoTest.class.getResource("report-test-data-sans-formats.xml")); + testData = new FlatXmlDataSetBuilder().setDtdMetadata(false).setColumnSensing(true) + .build(JpaReportDaoTest.class.getResource("report-test-data-sans-formats.xml")); //System.setProperty("hibernate.generateDdl", "true"); System.setProperty("matchAllExtensions", "false"); conn = TestDatabase.getConnection(); diff --git a/droid-results/src/test/java/uk/gov/nationalarchives/droid/submitter/ProfileSpecWalkerImplTest.java b/droid-results/src/test/java/uk/gov/nationalarchives/droid/submitter/ProfileSpecWalkerImplTest.java index 0ebce8a42..5edd869eb 100644 --- a/droid-results/src/test/java/uk/gov/nationalarchives/droid/submitter/ProfileSpecWalkerImplTest.java +++ b/droid-results/src/test/java/uk/gov/nationalarchives/droid/submitter/ProfileSpecWalkerImplTest.java @@ -36,6 +36,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.time.Instant; import java.util.ArrayList; import java.util.List; @@ -182,7 +183,7 @@ private static S3EventHandler getS3EventHandler(List re for (AbstractProfileResource resource : s3Resources) { String key = resource.getName().startsWith("/") ? resource.getName().substring(1) : resource.getName(); - S3Object s3Object = S3Object.builder().key(key).build(); + S3Object s3Object = S3Object.builder().key(key).lastModified(Instant.now()).size(1L).build(); ArgumentMatcher requestArgumentMatcher = argument -> argument != null && resource.getName().equals(argument.prefix()); ListObjectsV2Response response = ListObjectsV2Response.builder().contents(List.of(s3Object)).build(); diff --git a/droid-results/src/test/java/uk/gov/nationalarchives/droid/submitter/S3EventHandlerTest.java b/droid-results/src/test/java/uk/gov/nationalarchives/droid/submitter/S3EventHandlerTest.java index 55a077031..005e884e4 100644 --- a/droid-results/src/test/java/uk/gov/nationalarchives/droid/submitter/S3EventHandlerTest.java +++ b/droid-results/src/test/java/uk/gov/nationalarchives/droid/submitter/S3EventHandlerTest.java @@ -68,7 +68,7 @@ public void testS3EventHandlerProvidesCorrectMetadata() { List> allValues = droidCoreCaptor.getAllValues(); RequestMetaData requestMetaData = allValues.getFirst().getRequestMetaData(); - assertEquals(Long.valueOf(1), requestMetaData.getSize()); + assertEquals(Long.valueOf(0), requestMetaData.getSize()); assertEquals(Long.valueOf(0), requestMetaData.getTime()); assertEquals("object", requestMetaData.getName()); } diff --git a/droid-results/src/test/resources/jpa-test.properties b/droid-results/src/test/resources/jpa-test.properties index 30eeeddea..05a4ce449 100644 --- a/droid-results/src/test/resources/jpa-test.properties +++ b/droid-results/src/test/resources/jpa-test.properties @@ -76,4 +76,5 @@ matchAllExtensions=false quoteAllFields=true columnsToWrite= -exportOptions=ONE_ROW_PER_FILE \ No newline at end of file +exportOptions=ONE_ROW_PER_FILE +exportOutputOptions=CSV_OUTPUT \ No newline at end of file