Skip to content

Commit 220f953

Browse files
TayGovTayGov
authored
Merge pull request #2811 from bcgov/fix-vulnerabilities
Fix vulnerabilities
2 parents 6c0d3ab + 26840a3 commit 220f953

File tree

8 files changed

+309
-336
lines changed

8 files changed

+309
-336
lines changed

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

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,17 @@
123123
<dependency>
124124
<groupId>ch.qos.logback</groupId>
125125
<artifactId>logback-classic</artifactId>
126+
<version>1.4.12</version>
126127
</dependency>
127128
<dependency>
128129
<groupId>ch.qos.logback</groupId>
129130
<artifactId>logback-core</artifactId>
131+
<version>1.4.12</version>
130132
</dependency>
131133
<dependency>
132134
<groupId>ch.qos.logback</groupId>
133135
<artifactId>logback-access</artifactId>
136+
<version>1.4.12</version>
134137
</dependency>
135138

136139
<dependency>
@@ -171,14 +174,10 @@
171174
<groupId>org.mapstruct</groupId>
172175
<artifactId>mapstruct</artifactId>
173176
</dependency>
174-
175177
<dependency>
176178
<groupId>org.openapitools</groupId>
177179
<artifactId>jackson-databind-nullable</artifactId>
178180
</dependency>
179-
180-
181-
182181
<dependency>
183182
<groupId>org.apache.commons</groupId>
184183
<artifactId>commons-collections4</artifactId>
@@ -211,6 +210,27 @@
211210
<version>3.11.2</version>
212211
<scope>test</scope>
213212
</dependency>
213+
<dependency>
214+
<groupId>org.apache.tomcat.embed</groupId>
215+
<artifactId>tomcat-embed-core</artifactId>
216+
<version>10.1.16</version>
217+
</dependency>
218+
<dependency>
219+
<groupId>org.json</groupId>
220+
<artifactId>json</artifactId>
221+
</dependency>
222+
<dependency>
223+
<groupId>org.springframework.security</groupId>
224+
<artifactId>spring-security-core</artifactId>
225+
</dependency>
226+
<dependency>
227+
<groupId>org.springframework</groupId>
228+
<artifactId>spring-web</artifactId>
229+
</dependency>
230+
<dependency>
231+
<groupId>org.springframework</groupId>
232+
<artifactId>spring-webmvc</artifactId>
233+
</dependency>
214234
</dependencies>
215235

216236
<dependencyManagement>

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

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +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>
41+
<org.apache.tomcat.embed.version>10.1.16</org.apache.tomcat.embed.version>
42+
<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>
4045
</properties>
4146

4247
<repositories>
@@ -266,6 +271,48 @@
266271
<version>${org.springdoc.version}</version>
267272
</dependency>
268273

274+
<dependency>
275+
<groupId>ch.qos.logback</groupId>
276+
<artifactId>logback-classic</artifactId>
277+
<version>${ch.qos.logback.version}</version>
278+
</dependency>
279+
<dependency>
280+
<groupId>ch.qos.logback</groupId>
281+
<artifactId>logback-core</artifactId>
282+
<version>${ch.qos.logback.version}</version>
283+
</dependency>
284+
<dependency>
285+
<groupId>ch.qos.logback</groupId>
286+
<artifactId>logback-access</artifactId>
287+
<version>${ch.qos.logback.version}</version>
288+
</dependency>
289+
290+
<dependency>
291+
<groupId>org.apache.tomcat.embed</groupId>
292+
<artifactId>tomcat-embed-core</artifactId>
293+
<version>${org.apache.tomcat.embed.version}</version>
294+
</dependency>
295+
296+
<dependency>
297+
<groupId>org.json</groupId>
298+
<artifactId>json</artifactId>
299+
<version>${org.json.version}</version>
300+
</dependency>
301+
<dependency>
302+
<groupId>org.springframework.security</groupId>
303+
<artifactId>spring-security-core</artifactId>
304+
<version>${org.springframework.security.version}</version>
305+
</dependency>
306+
<dependency>
307+
<groupId>org.springframework</groupId>
308+
<artifactId>spring-web</artifactId>
309+
<version>${org.springframework.version}</version>
310+
</dependency>
311+
<dependency>
312+
<groupId>org.springframework</groupId>
313+
<artifactId>spring-webmvc</artifactId>
314+
<version>${org.springframework.version}</version>
315+
</dependency>
269316
</dependencies>
270317
</dependencyManagement>
271318

‎src/frontend/efiling-demo/Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# pull official base image
2-
FROM node:16-alpine as build
2+
FROM node:18-alpine as build
33

44
WORKDIR /app
55

@@ -16,7 +16,7 @@ RUN yarn build --production=true
1616
#############################################################################################
1717
### PRODUCTION IMAGE ###
1818
#############################################################################################
19-
FROM nginx:1.19-alpine
19+
FROM nginx:1.26.0-alpine
2020

2121
RUN rm -rf /usr/share/nginx/html/
2222
COPY --from=build /app/build /usr/share/nginx/html

‎src/frontend/efiling-demo/package.json‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"react-router-dom": "^6.1.1",
3030
"react-scripts": "^5.0.1",
3131
"regenerator-runtime": "^0.13.5",
32-
"shared-components": "https://github.com/bcgov/react-shared-components/releases/download/v1.2.7/shared-components-v1.2.7.tgz",
32+
"shared-components": "https://github.com/bcgov/react-shared-components/releases/download/v1.2.8/shared-components-1.2.8.tgz",
3333
"uuid": "^8.3.1"
3434
},
3535
"scripts": {
@@ -53,7 +53,11 @@
5353
"terser": "^5.14.2",
5454
"json5": "^2.2.2",
5555
"minimatch": "^3.0.5",
56-
"webpack": "^5.76.0"
56+
"webpack": "^5.76.0",
57+
"braces": "^3.0.3",
58+
"webpack-dev-middleware": "^5.3.4",
59+
"browserify-sign": "4.2.2",
60+
"ws": "^8.17.1"
5761
},
5862
"eslintConfig": {
5963
"extends": "react-app"

0 commit comments

Comments
 (0)