Bump org.apache.commons:commons-collections4 from 4.5.0 to 4.6.0

droid-parent/pom.xml

@@ -93,14 +93,14 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <project.email>pronom@nationalarchives.gov.uk</project.email>
-        <spring.version>7.0.8</spring.version>
+        <spring.version>7.0.9</spring.version>
         <hibernate.version>5.4.1.Final</hibernate.version>
         <derby.version>10.17.1.0</derby.version>
         <cxf.version>4.2.3</cxf.version>
         <java.iso-tools.version>2.1.0</java.iso-tools.version>
         <jaxb.version>4.0.5</jaxb.version>
         <jakarta.version>4.0.5</jakarta.version>
-        <jackson.version>2.22.1</jackson.version>
+        <jackson.version>2.22.2</jackson.version>
         <flying-saucer.version>9.7.2</flying-saucer.version>
         <truevfs.version>0.14.0</truevfs.version>
         <jwat.version>1.2.1</jwat.version>
@@ -124,7 +124,7 @@
                         <dependency>
                             <groupId>org.apache.maven.shared</groupId>
                             <artifactId>maven-dependency-analyzer</artifactId>
-                            <version>1.17.0</version>
+                            <version>1.17.1</version>
                         </dependency>
                     </dependencies>
                 </plugin>
@@ -146,7 +146,7 @@
                 <plugin>
                     <groupId>com.mycila</groupId>
                     <artifactId>license-maven-plugin</artifactId>
-                    <version>5.1.1</version>
+                    <version>5.1.2</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -225,7 +225,7 @@
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-site-plugin</artifactId>
-                    <version>3.21.0</version>
+                    <version>3.22.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -692,7 +692,7 @@ Copyright &copy; ${project.inceptionYear}-{currentYear} <a href="${project.organ
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-collections4</artifactId>
-                <version>4.5.0</version>
+                <version>4.6.0</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
@@ -787,7 +787,7 @@ Copyright &copy; ${project.inceptionYear}-{currentYear} <a href="${project.organ
             <dependency>
                 <groupId>org.dbunit</groupId>
                 <artifactId>dbunit</artifactId>
-                <version>3.3.0</version>
+                <version>3.5.1</version>
             </dependency>
             <dependency>
                 <groupId>com.github.stephenc.java-iso-tools</groupId>

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
     </bean>
 
     <bean id="s3EventHandler" class="uk.gov.nationalarchives.droid.submitter.S3EventHandler">
-        <property name="submissionThrottle" ref="submissionThrottle"/>
         <property name="droidCore" ref="submissionGateway"/>
+        <property name="submissionThrottle" ref="submissionThrottle"/>
         <property name="resultHandler" ref="databaseResultHandler"/>
         <property name="config" ref="globalConfig"/>
         <property name="s3ClientFactory" ref="s3ClientFactory"/>

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

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",

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

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");

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();

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<AbstractProfileResource> 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<ListObjectsV2Request> requestArgumentMatcher = argument ->
                     argument != null && resource.getName().equals(argument.prefix());
             ListObjectsV2Response response = ListObjectsV2Response.builder().contents(List.of(s3Object)).build();

droid-results/src/test/java/uk/gov/nationalarchives/droid/submitter/S3EventHandlerTest.java

@@ -68,7 +68,7 @@ public void testS3EventHandlerProvidesCorrectMetadata() {
         List<IdentificationRequest<S3Uri>> 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());
     }

droid-results/src/test/resources/jpa-test.properties

@@ -76,4 +76,5 @@ matchAllExtensions=false
 
 quoteAllFields=true
 columnsToWrite=
-exportOptions=ONE_ROW_PER_FILE
+exportOptions=ONE_ROW_PER_FILE
+exportOutputOptions=CSV_OUTPUT