Skip to content

Commit 67920f2

Browse files
committed
verifying build and dependency-check
1 parent 4f172ef commit 67920f2

File tree

3 files changed

+36
-9
lines changed

3 files changed

+36
-9
lines changed

pom.xml

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<properties>
1616
<java.version>21</java.version>
1717
<start-class>uk.gov.companieshouse.pscdataapi.PscDataApiApplication</start-class>
18-
<spring-boot-dependencies.version>3.4.5</spring-boot-dependencies.version>
19-
<spring-boot-maven-plugin.version>3.4.5</spring-boot-maven-plugin.version>
18+
<spring-boot-dependencies.version>3.4.9</spring-boot-dependencies.version>
19+
<spring-boot-maven-plugin.version>3.4.9</spring-boot-maven-plugin.version>
2020
<maven.compiler.source>${java.version}</maven.compiler.source>
2121
<maven.compiler.target>${java.version}</maven.compiler.target>
2222
<maven-compiler-plugin.version>3.14.0</maven-compiler-plugin.version>
@@ -28,15 +28,15 @@
2828
<jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
2929
<commons.io.version>2.19.0</commons.io.version>
3030
<org.mapstruct.version>1.6.3</org.mapstruct.version>
31-
<tomcat-embed-core.version>11.0.8</tomcat-embed-core.version>
31+
<tomcat-embed-core.version>11.0.10</tomcat-embed-core.version>
3232
<spring-web.version>6.2.8</spring-web.version>
3333
<spring-security-core.version>6.5.1</spring-security-core.version>
34-
34+
<gson.version>2.13.1</gson.version>
3535
<!-- Internal -->
36-
<structured-logging.version>3.0.20</structured-logging.version>
37-
<private-api-sdk-java.version>4.0.347</private-api-sdk-java.version>
36+
<structured-logging.version>3.0.40</structured-logging.version>
37+
<private-api-sdk-java.version>4.0.350</private-api-sdk-java.version>
3838
<api-sdk-java.version>6.4.4</api-sdk-java.version>
39-
<api-security-java.version>2.0.8</api-security-java.version>
39+
<api-security-java.version>2.0.13</api-security-java.version>
4040

4141
<!-- tests -->
4242
<io-cucumber.version>7.22.0</io-cucumber.version>
@@ -107,12 +107,30 @@
107107
<groupId>uk.gov.companieshouse</groupId>
108108
<artifactId>structured-logging</artifactId>
109109
<version>${structured-logging.version}</version>
110+
<exclusions>
111+
<exclusion>
112+
<groupId>org.apache.commons</groupId>
113+
<artifactId>commons-lang3</artifactId>
114+
</exclusion>
115+
</exclusions>
116+
</dependency>
117+
<dependency>
118+
<groupId>org.apache.commons</groupId>
119+
<artifactId>commons-lang3</artifactId>
120+
<version>3.18.0</version>
110121
</dependency>
111122
<dependency>
112123
<groupId>uk.gov.companieshouse</groupId>
113124
<artifactId>private-api-sdk-java</artifactId>
114125
<version>${private-api-sdk-java.version}</version>
126+
<exclusions>
127+
<exclusion>
128+
<groupId>org.apache.tomcat.embed</groupId>
129+
<artifactId>tomcat-embed-core</artifactId>
130+
</exclusion>
131+
</exclusions>
115132
</dependency>
133+
116134
<dependency>
117135
<groupId>uk.gov.companieshouse</groupId>
118136
<artifactId>api-sdk-java</artifactId>
@@ -127,8 +145,17 @@
127145
<groupId>org.xmlunit</groupId>
128146
<artifactId>xmlunit-core</artifactId>
129147
</exclusion>
148+
<exclusion>
149+
<groupId>com.google.code.gson</groupId>
150+
<artifactId>gson</artifactId>
151+
</exclusion>
130152
</exclusions>
131153
</dependency>
154+
<dependency>
155+
<groupId>com.google.code.gson</groupId>
156+
<artifactId>gson</artifactId>
157+
<version>${gson.version}</version>
158+
</dependency>
132159
<dependency>
133160
<groupId>uk.gov.companieshouse</groupId>
134161
<artifactId>api-security-java</artifactId>

src/main/java/uk/gov/companieshouse/pscdataapi/interceptor/AuthenticationHelperImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.util.List;
77
import java.util.Map;
88
import java.util.Optional;
9-
import org.apache.commons.lang.ArrayUtils;
9+
import org.apache.commons.lang3.ArrayUtils;
1010
import org.springframework.stereotype.Component;
1111

1212
/**

src/main/java/uk/gov/companieshouse/pscdataapi/util/DateUtils.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
import java.time.OffsetDateTime;
66
import java.time.format.DateTimeFormatter;
7-
import org.apache.commons.lang.StringUtils;
7+
import org.apache.commons.lang3.StringUtils;
88

99
public final class DateUtils {
1010

0 commit comments

Comments
 (0)