DSND-2942: Update pom dependencies

pom.xml

@@ -6,7 +6,7 @@
   <parent>
     <groupId>uk.gov.companieshouse</groupId>
     <artifactId>companies-house-parent</artifactId>
-    <version>2.1.5</version>
+    <version>2.1.6</version>
   </parent>
 
   <name>acsp-profile-data-api</name>
@@ -18,24 +18,20 @@
   <properties>
     <maven.compiler.source>21</maven.compiler.source>
     <maven.compiler.target>21</maven.compiler.target>
-    <spring.boot.version>3.2.4</spring.boot.version>
+    <spring.boot.version>3.3.2</spring.boot.version>
     <jib-maven-plugin.version>3.4.2</jib-maven-plugin.version>
-    <structured-logging.version>3.0.5</structured-logging.version>
+    <structured-logging.version>3.0.13</structured-logging.version>
     <api-sdk-manager-java-library.version>3.0.5</api-sdk-manager-java-library.version>
-    <private-api-sdk-java.version>4.0.108</private-api-sdk-java.version>
-    <maven-surefire-plugin.version>3.2.3</maven-surefire-plugin.version>
-    <maven-build-helper-plugin.version>3.5.0</maven-build-helper-plugin.version>
-    <maven-failsafe-plugin.version>3.2.3</maven-failsafe-plugin.version>
+    <private-api-sdk-java.version>4.0.187</private-api-sdk-java.version>
+    <maven-surefire-plugin.version>3.4.0</maven-surefire-plugin.version>
+    <maven-failsafe-plugin.version>3.4.0</maven-failsafe-plugin.version>
     <maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
-    <test-containers.version>1.19.7</test-containers.version>
-    <wiremock.version>3.5.2</wiremock.version>
+    <test-containers.version>1.20.1</test-containers.version>
+    <wiremock.version>3.9.1</wiremock.version>
 
     <skip.unit.tests>false</skip.unit.tests>
     <skip.integration.tests>false</skip.integration.tests>
 
-    <!--explicit versions of transitive dependencies with vulnerabilities in previous versions-->
-    <json-path.version>2.9.0</json-path.version>
-
     <!--sonar configuration-->
     <sonar.coverage.jacoco.xmlReportPaths>
       ${project.build.directory}/site/jacoco/jacoco.xml
@@ -64,14 +60,6 @@
   </dependencyManagement>
 
   <dependencies>
-    <!--the following transitive dependencies are added specifically to avoid vulnerabilities-->
-    <dependency>
-      <groupId>com.jayway.jsonpath</groupId>
-      <artifactId>json-path</artifactId>
-      <version>${json-path.version}</version>
-    </dependency>
-    <!--end transitive dependencies-->
-
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter</artifactId>
@@ -219,42 +207,6 @@
           </to>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>${maven-build-helper-plugin.version}</version>
-        <executions>
-          <execution>
-            <id>add-test-source</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>add-test-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>src/itest/java</source>
-              </sources>
-            </configuration>
-          </execution>
-          <execution>
-            <id>add-test-resources</id>
-            <phase>generate-test-resources</phase>
-            <goals>
-              <goal>add-test-resource</goal>
-            </goals>
-            <configuration>
-              <resources>
-                <resource>
-                  <directory>src/itest/resources</directory>
-                  <includes>
-                    <include>**/*</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.jacoco</groupId>
         <artifactId>jacoco-maven-plugin</artifactId>
@@ -340,32 +292,6 @@
           <skipITs>${skip.integration.tests}</skipITs>
         </configuration>
       </plugin>
-
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>${maven-resources-plugin.version}</version>
-        <executions>
-          <execution>
-            <id>copy-resources</id>
-            <phase>process-resources</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${basedir}/target/test-classes</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${basedir}/src/itest/resources</directory>
-                  <includes>
-                    <include>**/*.*</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>

src/main/java/uk/gov/companieshouse/acspprofile/api/ACSPProfileApplication.java → src/main/java/uk/gov/companieshouse/acspprofile/api/AcspProfileApplication.java

@@ -4,11 +4,11 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class ACSPProfileApplication {
+public class AcspProfileApplication {
 
     public static final String NAMESPACE = "acsp-profile-data-api";
 
     public static void main(String[] args) {
-        SpringApplication.run(ACSPProfileApplication.class, args);
+        SpringApplication.run(AcspProfileApplication.class, args);
     }
 }

src/main/java/uk/gov/companieshouse/acspprofile/api/auth/AuthenticationInterceptor.java

@@ -1,8 +1,17 @@
 package uk.gov.companieshouse.acspprofile.api.auth;
 
+import static uk.gov.companieshouse.acspprofile.api.AcspProfileApplication.NAMESPACE;
+import static uk.gov.companieshouse.acspprofile.api.auth.AuthenticationConstants.API_KEY_IDENTITY_TYPE;
+import static uk.gov.companieshouse.acspprofile.api.auth.AuthenticationConstants.ERIC_AUTHORISED_KEY_PRIVILEGES_HEADER;
+import static uk.gov.companieshouse.acspprofile.api.auth.AuthenticationConstants.ERIC_IDENTITY;
+import static uk.gov.companieshouse.acspprofile.api.auth.AuthenticationConstants.ERIC_IDENTITY_TYPE;
+import static uk.gov.companieshouse.acspprofile.api.auth.AuthenticationConstants.INTERNAL_APP_PRIVILEGE;
+import static uk.gov.companieshouse.acspprofile.api.auth.AuthenticationConstants.OAUTH2_IDENTITY_TYPE;
+
 import jakarta.annotation.Nonnull;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import java.util.Optional;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.http.HttpMethod;
@@ -12,11 +21,6 @@
 import uk.gov.companieshouse.logging.Logger;
 import uk.gov.companieshouse.logging.LoggerFactory;
 
-import java.util.Optional;
-
-import static uk.gov.companieshouse.acspprofile.api.ACSPProfileApplication.NAMESPACE;
-import static uk.gov.companieshouse.acspprofile.api.auth.AuthenticationConstants.*;
-
 public class AuthenticationInterceptor implements HandlerInterceptor {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(NAMESPACE);

src/main/java/uk/gov/companieshouse/acspprofile/api/config/AppConfig.java

@@ -6,6 +6,9 @@
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.util.function.Supplier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -14,10 +17,6 @@
 import uk.gov.companieshouse.api.InternalApiClient;
 import uk.gov.companieshouse.api.http.ApiKeyHttpClient;
 
-import java.text.SimpleDateFormat;
-import java.time.Instant;
-import java.util.function.Supplier;
-
 @Configuration
 public class AppConfig {
 

src/main/java/uk/gov/companieshouse/acspprofile/api/logging/DataMapHolder.java

@@ -1,8 +1,7 @@
 package uk.gov.companieshouse.acspprofile.api.logging;
 
-import uk.gov.companieshouse.logging.util.DataMap.Builder;
-
 import java.util.Map;
+import uk.gov.companieshouse.logging.util.DataMap.Builder;
 
 public class DataMapHolder {
 

src/main/java/uk/gov/companieshouse/acspprofile/api/logging/RequestLoggingFilter.java

@@ -1,26 +1,25 @@
 package uk.gov.companieshouse.acspprofile.api.logging;
 
 
+import static org.springframework.core.Ordered.HIGHEST_PRECEDENCE;
+import static uk.gov.companieshouse.acspprofile.api.AcspProfileApplication.NAMESPACE;
+import static uk.gov.companieshouse.logging.util.LogContextProperties.REQUEST_ID;
+
 import jakarta.annotation.Nonnull;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.Optional;
+import java.util.UUID;
 import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.springframework.web.filter.OncePerRequestFilter;
 import uk.gov.companieshouse.logging.Logger;
 import uk.gov.companieshouse.logging.LoggerFactory;
 import uk.gov.companieshouse.logging.util.RequestLogger;
 
-import java.io.IOException;
-import java.util.Optional;
-import java.util.UUID;
-
-import static org.springframework.core.Ordered.HIGHEST_PRECEDENCE;
-import static uk.gov.companieshouse.acspprofile.api.ACSPProfileApplication.NAMESPACE;
-import static uk.gov.companieshouse.logging.util.LogContextProperties.REQUEST_ID;
-
 @Component
 @Order(value = HIGHEST_PRECEDENCE)
 public class RequestLoggingFilter extends OncePerRequestFilter implements RequestLogger {

src/main/java/uk/gov/companieshouse/acspprofile/api/serdes/EmptyFieldDeserializer.java

@@ -4,7 +4,6 @@
 import com.fasterxml.jackson.databind.DeserializationContext;
 import com.fasterxml.jackson.databind.JsonDeserializer;
 import com.fasterxml.jackson.databind.JsonNode;
-
 import java.io.IOException;
 
 public class EmptyFieldDeserializer extends JsonDeserializer<String> {

src/test/java/uk/gov/companieshouse/acspprofile/api/ACSPProfileApplicationIT.java → src/test/java/uk/gov/companieshouse/acspprofile/api/AcspProfileApplicationIT.java

@@ -1,5 +1,11 @@
 package uk.gov.companieshouse.acspprofile.api;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.function.Executable;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -8,22 +14,16 @@
 import org.springframework.boot.test.context.SpringBootTest.WebEnvironment;
 import org.springframework.test.web.servlet.MockMvc;
 
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 @AutoConfigureMockMvc
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
-class ACSPProfileApplicationIT {
+class AcspProfileApplicationIT {
 
     @Autowired
     private MockMvc mockMvc;
 
     @Test
     void shouldStartApplication() {
-        Executable executable = () -> ACSPProfileApplication.main(new String[0]);
+        Executable executable = () -> AcspProfileApplication.main(new String[0]);
         assertDoesNotThrow(executable);
     }
 

src/test/java/uk/gov/companieshouse/acspprofile/api/auth/AuthenticationInterceptorIT.java

@@ -1,16 +1,16 @@
 package uk.gov.companieshouse.acspprofile.api.auth;
 
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.web.servlet.MockMvc;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-
 @SpringBootTest
 @AutoConfigureMockMvc
 class AuthenticationInterceptorIT {

src/test/java/uk/gov/companieshouse/acspprofile/api/auth/AuthenticationInterceptorTest.java

@@ -1,5 +1,11 @@
 package uk.gov.companieshouse.acspprofile.api.auth;
 
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import org.junit.jupiter.api.Test;
@@ -10,10 +16,6 @@
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
 
-import static org.junit.jupiter.api.Assertions.assertFalse;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Mockito.*;
-
 @ExtendWith(MockitoExtension.class)
 class AuthenticationInterceptorTest {
 

src/test/java/uk/gov/companieshouse/acspprofile/api/logging/DataMapHolderTest.java

@@ -1,13 +1,13 @@
 package uk.gov.companieshouse.acspprofile.api.logging;
 
 
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import uk.gov.companieshouse.logging.util.DataMap;
 
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
 class DataMapHolderTest {
 
     @BeforeEach

src/test/java/uk/gov/companieshouse/acspprofile/api/serdes/EmptyFieldDeserializerTest.java

@@ -1,12 +1,12 @@
 package uk.gov.companieshouse.acspprofile.api.serdes;
 
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.Test;
 import uk.gov.companieshouse.acspprofile.api.config.AppConfig;
 
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-
 class EmptyFieldDeserializerTest {
 
     private static final String JSON = """