Skip to content

Commit 4bf85c3

Browse files
TayGovTayGov
authored
Merge pull request #2865 from bcgov/feature/vulnerabilities-334
update to spring 3.3.4
2 parents fdb5bb5 + 0579aa5 commit 4bf85c3

File tree

8 files changed

+580
-566
lines changed

8 files changed

+580
-566
lines changed

‎src/backend/efiling-api/pom.xml‎

Lines changed: 459 additions & 449 deletions
Large diffs are not rendered by default.

‎src/backend/libs/efiling-bambora-api-client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
<dependency>
122122
<groupId>org.springframework.boot</groupId>
123123
<artifactId>spring-boot-dependencies</artifactId>
124-
<version>3.1.3</version>
124+
<version>3.3.4</version>
125125
<type>pom</type>
126126
<scope>import</scope>
127127
</dependency>

‎src/backend/libs/efiling-bom/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737
<org.openapitools.version>0.2.6</org.openapitools.version>
3838
<org.springdoc.version>1.7.0</org.springdoc.version>
3939
<org.threeten.version>1.5.1</org.threeten.version>
40-
<ch.qos.logback.version>1.4.12</ch.qos.logback.version>
40+
<ch.qos.logback.version>1.5.8</ch.qos.logback.version>
4141
<org.apache.tomcat.embed.version>10.1.25</org.apache.tomcat.embed.version>
4242
<org.json.version>20231013</org.json.version>
43-
<org.springframework.security.version>6.1.8</org.springframework.security.version>
44-
<org.springframework.version>6.0.19</org.springframework.version>
43+
<org.springframework.security.version>6.3.3</org.springframework.security.version>
44+
<org.springframework.version>6.1.13</org.springframework.version>
4545
</properties>
4646

4747
<repositories>

‎src/backend/libs/efiling-ceis-api-client/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
<dependency>
144144
<groupId>org.springframework.boot</groupId>
145145
<artifactId>spring-boot-dependencies</artifactId>
146-
<version>3.1.3</version>
146+
<version>3.3.4</version>
147147
<type>pom</type>
148148
<scope>import</scope>
149149
</dependency>

‎src/backend/libs/efiling-commons/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
<dependency>
6565
<groupId>org.springframework.boot</groupId>
6666
<artifactId>spring-boot-dependencies</artifactId>
67-
<version>3.1.3</version>
67+
<version>3.3.4</version>
6868
<type>pom</type>
6969
<scope>import</scope>
7070
</dependency>

‎src/backend/libs/efiling-cso-starter/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>org.springframework.boot</groupId>
99
<artifactId>spring-boot-starter-parent</artifactId>
10-
<version>3.1.3</version>
10+
<version>3.3.4</version>
1111
<relativePath/>
1212
</parent>
1313

‎src/backend/libs/efiling-demo-starter/pom.xml‎

Lines changed: 113 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,113 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0"
3-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5-
<modelVersion>4.0.0</modelVersion>
6-
7-
<groupId>ca.bc.gov.open.jag</groupId>
8-
<artifactId>efiling-demo-starter</artifactId>
9-
<version>2.0.3</version>
10-
11-
<properties>
12-
<java.version>17</java.version>
13-
<org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
14-
<log4j2.version>2.17.1</log4j2.version>
15-
</properties>
16-
17-
<dependencies>
18-
19-
<dependency>
20-
<groupId>org.springframework.boot</groupId>
21-
<artifactId>spring-boot-starter</artifactId>
22-
</dependency>
23-
24-
<dependency>
25-
<groupId>org.springframework.boot</groupId>
26-
<artifactId>spring-boot-starter-test</artifactId>
27-
<scope>test</scope>
28-
<exclusions>
29-
<exclusion>
30-
<groupId>org.junit.vintage</groupId>
31-
<artifactId>junit-vintage-engine</artifactId>
32-
</exclusion>
33-
</exclusions>
34-
</dependency>
35-
36-
<dependency>
37-
<groupId>org.apache.commons</groupId>
38-
<artifactId>commons-lang3</artifactId>
39-
</dependency>
40-
41-
<dependency>
42-
<groupId>ca.bc.gov.open</groupId>
43-
<artifactId>spring-bceid-starter</artifactId>
44-
</dependency>
45-
46-
<!-- Redis -->
47-
<dependency>
48-
<groupId>org.springframework.boot</groupId>
49-
<artifactId>spring-boot-starter-data-redis</artifactId>
50-
</dependency>
51-
<dependency>
52-
<groupId>org.springframework.data</groupId>
53-
<artifactId>spring-data-redis</artifactId>
54-
</dependency>
55-
<dependency>
56-
<groupId>redis.clients</groupId>
57-
<artifactId>jedis</artifactId>
58-
</dependency>
59-
60-
<dependency>
61-
<groupId>ca.bc.gov.open.jag</groupId>
62-
<artifactId>efiling-commons</artifactId>
63-
<version>2.0.3</version>
64-
</dependency>
65-
66-
<dependency>
67-
<groupId>ca.bc.gov.open</groupId>
68-
<artifactId>spring-sftp-starter</artifactId>
69-
</dependency>
70-
71-
</dependencies>
72-
73-
<dependencyManagement>
74-
<dependencies>
75-
<dependency>
76-
<groupId>org.springframework.boot</groupId>
77-
<artifactId>spring-boot-dependencies</artifactId>
78-
<version>3.1.3</version>
79-
<type>pom</type>
80-
<scope>import</scope>
81-
</dependency>
82-
<dependency>
83-
<groupId>ca.bc.gov.open.jag</groupId>
84-
<artifactId>efiling-bom</artifactId>
85-
<version>2.0.3</version>
86-
<type>pom</type>
87-
<scope>import</scope>
88-
</dependency>
89-
</dependencies>
90-
</dependencyManagement>
91-
92-
<build>
93-
<plugins>
94-
95-
<!--mapstruct mapper autogen-->
96-
<plugin>
97-
<groupId>org.apache.maven.plugins</groupId>
98-
<artifactId>maven-compiler-plugin</artifactId>
99-
<configuration>
100-
<source>${java.version}</source>
101-
<target>${java.version}</target>
102-
</configuration>
103-
</plugin>
104-
105-
</plugins>
106-
107-
</build>
108-
109-
</project>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
5+
<modelVersion>4.0.0</modelVersion>
6+
7+
<groupId>ca.bc.gov.open.jag</groupId>
8+
<artifactId>efiling-demo-starter</artifactId>
9+
<version>2.0.3</version>
10+
11+
<properties>
12+
<java.version>17</java.version>
13+
<org.mapstruct.version>1.4.2.Final</org.mapstruct.version>
14+
<log4j2.version>2.17.1</log4j2.version>
15+
</properties>
16+
17+
<dependencies>
18+
19+
<dependency>
20+
<groupId>org.springframework.boot</groupId>
21+
<artifactId>spring-boot-starter</artifactId>
22+
</dependency>
23+
24+
<dependency>
25+
<groupId>org.springframework.boot</groupId>
26+
<artifactId>spring-boot-starter-test</artifactId>
27+
<scope>test</scope>
28+
<exclusions>
29+
<exclusion>
30+
<groupId>org.junit.vintage</groupId>
31+
<artifactId>junit-vintage-engine</artifactId>
32+
</exclusion>
33+
</exclusions>
34+
</dependency>
35+
36+
<dependency>
37+
<groupId>org.apache.commons</groupId>
38+
<artifactId>commons-lang3</artifactId>
39+
</dependency>
40+
41+
<dependency>
42+
<groupId>ca.bc.gov.open</groupId>
43+
<artifactId>spring-bceid-starter</artifactId>
44+
</dependency>
45+
46+
<!-- Redis -->
47+
<dependency>
48+
<groupId>org.springframework.boot</groupId>
49+
<artifactId>spring-boot-starter-data-redis</artifactId>
50+
</dependency>
51+
<dependency>
52+
<groupId>org.springframework.data</groupId>
53+
<artifactId>spring-data-redis</artifactId>
54+
</dependency>
55+
<dependency>
56+
<groupId>redis.clients</groupId>
57+
<artifactId>jedis</artifactId>
58+
</dependency>
59+
60+
<dependency>
61+
<groupId>ca.bc.gov.open.jag</groupId>
62+
<artifactId>efiling-commons</artifactId>
63+
<version>2.0.3</version>
64+
</dependency>
65+
66+
<dependency>
67+
<groupId>ca.bc.gov.open</groupId>
68+
<artifactId>spring-sftp-starter</artifactId>
69+
</dependency>
70+
71+
</dependencies>
72+
73+
<dependencyManagement>
74+
<dependencies>
75+
<dependency>
76+
<groupId>org.springframework.boot</groupId>
77+
<artifactId>spring-boot-dependencies</artifactId>
78+
<version>3.3.4</version>
79+
<type>pom</type>
80+
<scope>import</scope>
81+
</dependency>
82+
<dependency>
83+
<groupId>ca.bc.gov.open.jag</groupId>
84+
<artifactId>efiling-bom</artifactId>
85+
<version>2.0.3</version>
86+
<type>pom</type>
87+
<scope>import</scope>
88+
</dependency>
89+
</dependencies>
90+
</dependencyManagement>
91+
92+
<build>
93+
<plugins>
94+
95+
<!--mapstruct mapper autogen-->
96+
<plugin>
97+
<groupId>org.apache.maven.plugins</groupId>
98+
<artifactId>maven-compiler-plugin</artifactId>
99+
<configuration>
100+
<compilerArgs>
101+
<arg>-parameters</arg>
102+
</compilerArgs>
103+
<parameters>true</parameters>
104+
<source>${java.version}</source>
105+
<target>${java.version}</target>
106+
</configuration>
107+
</plugin>
108+
109+
</plugins>
110+
111+
</build>
112+
113+
</project>

‎src/backend/libs/efiling-demo-starter/src/main/java/ca/bc/gov/open/jag/efiling/demo/EfilingAccountServiceDemoImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public AccountDetails getAccountDetails(String userGuid) {
2424

2525
}
2626

27-
@CachePut(cacheNames = "account", key = "#createAccountRequest.universalId", cacheManager = "demoAccountCacheManager")
27+
@CachePut(cacheNames = "account", key = "#p0.universalId", cacheManager = "demoAccountCacheManager")
2828
public AccountDetails createAccount(CreateAccountRequest createAccountRequest) {
2929

3030
AccountDetails accountDetails = new AccountDetails.Builder()

0 commit comments

Comments
 (0)