Skip to content

Commit 362644b

Browse files
TayGovTayGov
authored
Merge pull request #2892 from bcgov/feature/FLA-1586-vulnerability
Feature/fla 1586 vulnerability
2 parents 74ae98a + 9222fce commit 362644b

File tree

14 files changed

+41
-29
lines changed

14 files changed

+41
-29
lines changed

‎src/backend/Dockerfile.efiling-api

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ RUN mvn -B clean install \
4141
#############################################################################################
4242
FROM eclipse-temurin:17-jre-alpine
4343

44+
RUN apk update && apk add --upgrade --no-cache libexpat # fix CVE-2024-8176
45+
4446
# ARG MVN_PROFILES
4547
ARG SERVICE_NAME=efiling-api
4648

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
</parent>
1111
<groupId>ca.bc.gov.open.jag</groupId>
1212
<artifactId>efiling-api</artifactId>
13-
<version>2.0.6</version>
13+
<version>2.0.7-SNAPSHOT</version>
1414
<name>efiling-api</name>
1515
<description>Demo project for Spring Boot</description>
1616

@@ -65,7 +65,7 @@
6565
<dependency>
6666
<groupId>ca.bc.gov.open.jag</groupId>
6767
<artifactId>efiling-commons</artifactId>
68-
<version>2.0.6</version>
68+
<version>2.0.7-SNAPSHOT</version>
6969
</dependency>
7070

7171
<dependency>
@@ -208,6 +208,7 @@
208208
<dependency>
209209
<groupId>org.apache.tomcat.embed</groupId>
210210
<artifactId>tomcat-embed-core</artifactId>
211+
<version>10.1.39</version>
211212
</dependency>
212213
<dependency>
213214
<groupId>org.json</groupId>
@@ -243,14 +244,19 @@
243244
<artifactId>cxf-core</artifactId>
244245
<version>4.0.6</version>
245246
</dependency>
247+
<dependency>
248+
<groupId>org.springframework.security</groupId>
249+
<artifactId>spring-security-crypto</artifactId>
250+
<version>6.3.8</version>
251+
</dependency>
246252
</dependencies>
247253

248254
<dependencyManagement>
249255
<dependencies>
250256
<dependency>
251257
<groupId>ca.bc.gov.open.jag</groupId>
252258
<artifactId>efiling-bom</artifactId>
253-
<version>2.0.6</version>
259+
<version>2.0.7-SNAPSHOT</version>
254260
<type>pom</type>
255261
<scope>import</scope>
256262
</dependency>
@@ -273,19 +279,19 @@
273279
<dependency>
274280
<groupId>ca.bc.gov.open.jag</groupId>
275281
<artifactId>efiling-cso-starter</artifactId>
276-
<version>2.0.6</version>
282+
<version>2.0.7-SNAPSHOT</version>
277283
</dependency>
278284

279285
<dependency>
280286
<groupId>ca.bc.gov.open.jag</groupId>
281287
<artifactId>efiling-bambora-api-client</artifactId>
282-
<version>2.0.6</version>
288+
<version>2.0.7-SNAPSHOT</version>
283289
</dependency>
284290

285291
<dependency>
286292
<groupId>ca.bc.gov.open.jag</groupId>
287293
<artifactId>efiling-ceis-api-client</artifactId>
288-
<version>2.0.6</version>
294+
<version>2.0.7-SNAPSHOT</version>
289295
</dependency>
290296

291297
<!-- https://mvnrepository.com/artifact/com.github.java-json-tools/jackson-coreutils -->
@@ -327,7 +333,7 @@
327333
<dependency>
328334
<groupId>ca.bc.gov.open.jag</groupId>
329335
<artifactId>efiling-demo-starter</artifactId>
330-
<version>2.0.6</version>
336+
<version>2.0.7-SNAPSHOT</version>
331337
</dependency>
332338
</dependencies>
333339
</profile>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>ca.bc.gov.open.jag</groupId>
66
<artifactId>efiling-bambora-api-client</artifactId>
7-
<version>2.0.6</version>
7+
<version>2.0.7-SNAPSHOT</version>
88
<name>efiling-bambora-api-client</name>
99
<description>Client for Bambora</description>
1010

@@ -111,7 +111,7 @@
111111
<dependency>
112112
<groupId>ca.bc.gov.open.jag</groupId>
113113
<artifactId>efiling-commons</artifactId>
114-
<version>2.0.6</version>
114+
<version>2.0.7-SNAPSHOT</version>
115115
<scope>compile</scope>
116116
</dependency>
117117
</dependencies>
@@ -128,7 +128,7 @@
128128
<dependency>
129129
<groupId>ca.bc.gov.open.jag</groupId>
130130
<artifactId>efiling-bom</artifactId>
131-
<version>2.0.6</version>
131+
<version>2.0.7-SNAPSHOT</version>
132132
<type>pom</type>
133133
<scope>import</scope>
134134
</dependency>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>ca.bc.gov.open.jag</groupId>
77
<artifactId>efiling-bom</artifactId>
8-
<version>2.0.6</version>
8+
<version>2.0.7-SNAPSHOT</version>
99

1010
<properties>
1111
<log4j2.version>2.17.1</log4j2.version>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>ca.bc.gov.open.jag</groupId>
66
<artifactId>efiling-ceis-api-client</artifactId>
7-
<version>2.0.6</version>
7+
<version>2.0.7-SNAPSHOT</version>
88
<name>efiling-ceis-api-client</name>
99
<description>Client for CEIS ORDS</description>
1010

@@ -123,7 +123,7 @@
123123
<dependency>
124124
<groupId>ca.bc.gov.open.jag</groupId>
125125
<artifactId>efiling-commons</artifactId>
126-
<version>2.0.6</version>
126+
<version>2.0.7-SNAPSHOT</version>
127127
<scope>compile</scope>
128128
</dependency>
129129
</dependencies>
@@ -140,7 +140,7 @@
140140
<dependency>
141141
<groupId>ca.bc.gov.open.jag</groupId>
142142
<artifactId>efiling-bom</artifactId>
143-
<version>2.0.6</version>
143+
<version>2.0.7-SNAPSHOT</version>
144144
<type>pom</type>
145145
<scope>import</scope>
146146
</dependency>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<modelVersion>4.0.0</modelVersion>
55
<groupId>ca.bc.gov.open.jag</groupId>
66
<artifactId>efiling-commons</artifactId>
7-
<version>2.0.6</version>
7+
<version>2.0.7-SNAPSHOT</version>
88
<name>efiling-commons</name>
99
<description>Contains common functionality to efiling</description>
1010

@@ -71,7 +71,7 @@
7171
<dependency>
7272
<groupId>ca.bc.gov.open.jag</groupId>
7373
<artifactId>efiling-bom</artifactId>
74-
<version>2.0.6</version>
74+
<version>2.0.7-SNAPSHOT</version>
7575
<type>pom</type>
7676
<scope>import</scope>
7777
</dependency>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>ca.bc.gov.open.jag</groupId>
77
<artifactId>efiling-cso-client</artifactId>
8-
<version>2.0.6</version>
8+
<version>2.0.7-SNAPSHOT</version>
99

1010
<properties>
1111
<java.version>17</java.version>
@@ -59,7 +59,7 @@
5959
<dependency>
6060
<groupId>ca.bc.gov.open.jag</groupId>
6161
<artifactId>efiling-commons</artifactId>
62-
<version>2.0.6</version>
62+
<version>2.0.7-SNAPSHOT</version>
6363
</dependency>
6464

6565
<dependency>
@@ -90,7 +90,7 @@
9090
<dependency>
9191
<groupId>ca.bc.gov.open.jag</groupId>
9292
<artifactId>efiling-bom</artifactId>
93-
<version>2.0.6</version>
93+
<version>2.0.7-SNAPSHOT</version>
9494
<type>pom</type>
9595
<scope>import</scope>
9696
</dependency>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<groupId>ca.bc.gov.open.jag</groupId>
1515
<artifactId>efiling-cso-starter</artifactId>
16-
<version>2.0.6</version>
16+
<version>2.0.7-SNAPSHOT</version>
1717

1818
<properties>
1919
<java.version>17</java.version>
@@ -79,13 +79,13 @@
7979
<dependency>
8080
<groupId>ca.bc.gov.open.jag</groupId>
8181
<artifactId>efiling-commons</artifactId>
82-
<version>2.0.6</version>
82+
<version>2.0.7-SNAPSHOT</version>
8383
</dependency>
8484

8585
<dependency>
8686
<groupId>ca.bc.gov.open.jag</groupId>
8787
<artifactId>efiling-cso-client</artifactId>
88-
<version>2.0.6</version>
88+
<version>2.0.7-SNAPSHOT</version>
8989
</dependency>
9090

9191
</dependencies>
@@ -95,7 +95,7 @@
9595
<dependency>
9696
<groupId>ca.bc.gov.open.jag</groupId>
9797
<artifactId>efiling-bom</artifactId>
98-
<version>2.0.6</version>
98+
<version>2.0.7-SNAPSHOT</version>
9999
<type>pom</type>
100100
<scope>import</scope>
101101
</dependency>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>ca.bc.gov.open.jag</groupId>
88
<artifactId>efiling-demo-starter</artifactId>
9-
<version>2.0.6</version>
9+
<version>2.0.7-SNAPSHOT</version>
1010

1111
<properties>
1212
<java.version>17</java.version>
@@ -60,7 +60,7 @@
6060
<dependency>
6161
<groupId>ca.bc.gov.open.jag</groupId>
6262
<artifactId>efiling-commons</artifactId>
63-
<version>2.0.6</version>
63+
<version>2.0.7-SNAPSHOT</version>
6464
</dependency>
6565

6666
<dependency>
@@ -82,7 +82,7 @@
8282
<dependency>
8383
<groupId>ca.bc.gov.open.jag</groupId>
8484
<artifactId>efiling-bom</artifactId>
85-
<version>2.0.6</version>
85+
<version>2.0.7-SNAPSHOT</version>
8686
<type>pom</type>
8787
<scope>import</scope>
8888
</dependency>

‎src/backend/pom.xml

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

77
<groupId>ca.bc.gov.open</groupId>
88
<artifactId>jag-efiling-backend</artifactId>
9-
<version>2.0.6</version>
9+
<version>2.0.7-SNAPSHOT</version>
1010

1111
<description>EfilingHub Backend services</description>
1212

‎src/frontend/efiling-demo/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ RUN yarn build --production=true
1818
#############################################################################################
1919
FROM nginx:1.27.4-alpine
2020

21+
RUN apk update && apk add --upgrade --no-cache libexpat libxml2 libxslt
22+
2123
RUN rm -rf /usr/share/nginx/html/
2224
COPY --from=build /app/build /usr/share/nginx/html
2325
WORKDIR /usr/share/nginx/html

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"@babel/preset-react": "^7.13.13",
88
"@bcgov/bootstrap-theme": "github:bcgov/bootstrap-theme",
99
"@csstools/normalize.css": "csstools/normalize.css",
10-
"axios": "^0.25.0",
10+
"axios": "^0.30.0",
1111
"babel-plugin-transform-export-extensions": "^6.22.0",
1212
"bootstrap": "^4.5.3",
1313
"browserslist": "^4.19.1",

‎src/frontend/efiling-frontend/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ RUN yarn build
1919
#############################################################################################
2020
FROM nginx:1.27.4-alpine
2121

22+
RUN apk update && apk add --upgrade --no-cache libexpat libxml2 libxslt
23+
2224
RUN rm -rf /usr/share/nginx/html/
2325
COPY --from=build /app/build /etc/nginx/html/efilinghub
2426

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"@babel/preset-react": "^7.18.6",
99
"@bcgov/bootstrap-theme": "github:bcgov/bootstrap-theme",
1010
"assert": "^2.0.0",
11-
"axios": "^0.25.0",
11+
"axios": "^0.30.0",
1212
"axios-auth-refresh": "^2.2.8",
1313
"babel-plugin-transform-export-extensions": "^6.22.0",
1414
"bootstrap": "^4.5.3",

0 commit comments

Comments
 (0)