Skip to content

Commit 936fd88

Browse files
TayGovTayGov
authored
Merge branch 'master' into dependabot/npm_and_yarn/src/frontend/efiling-frontend/http-proxy-middleware-2.0.9
2 parents 0b0cd5c + 282a8ad commit 936fd88

File tree

23 files changed

+368
-136
lines changed

23 files changed

+368
-136
lines changed

‎.github/dependabot.yml‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,24 +3,18 @@ updates:
33
# Mvn dependencies
44
- package-ecosystem: "maven"
55
directory: "/src/backend"
6-
open-pull-requests-limit: 3
76
schedule:
8-
interval: "weekly"
9-
day: "monday"
7+
interval: "daily"
108
time: "05:00"
119
# npm dependencies - frontend
1210
- package-ecosystem: "npm"
1311
directory: "/src/frontend/efiling-frontend"
14-
open-pull-requests-limit: 4
1512
schedule:
16-
interval: "weekly"
17-
day: "monday"
13+
interval: "daily"
1814
time: "05:00"
1915
# npm dependencies - demo
2016
- package-ecosystem: "npm"
2117
directory: "/src/frontend/efiling-demo"
22-
open-pull-requests-limit: 4
2318
schedule:
24-
interval: "weekly"
25-
day: "monday"
19+
interval: "daily"
2620
time: "05:00"

‎.github/workflows/code-climate-coverage-aggregation.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ jobs:
156156
with:
157157
repository: bcgov/spring-boot-starters
158158
path: spring-boot-starters
159-
ref: v1.0.3
159+
ref: v1.0.4
160160

161161
# Setup Java Environment
162162
- name: Set up JDK 17

‎.github/workflows/cucumber-tests.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
-t efiling-api:builder
3434
--build-arg SERVICE_NAME=efiling-api
3535
--build-arg MVN_PROFILE=efiling-api-demo
36-
--build-arg STARTERS_V=v1.0.3
36+
--build-arg STARTERS_V=v1.0.4
3737
--cache-from=docker.pkg.github.com/$GITHUB_REPOSITORY/efiling-api:builder
3838

3939
- name: tag & push efiling-api to git container registry
@@ -49,7 +49,7 @@ jobs:
4949
-t efiling-api:demo
5050
--build-arg SERVICE_NAME=efiling-api
5151
--build-arg MVN_PROFILE=efiling-api-demo
52-
--build-arg STARTERS_V=v1.0.3
52+
--build-arg STARTERS_V=v1.0.4
5353
--cache-from=docker.pkg.github.com/$GITHUB_REPOSITORY/efiling-api:builder
5454
--cache-from=docker.pkg.github.com/$GITHUB_REPOSITORY/efiling-api:demo
5555

‎.github/workflows/dev-efiling-api-build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
- name: Build Image
2828
env:
2929
MVN_PROFILE: efiling-api,splunk
30-
STARTERS_V: v1.0.3
30+
STARTERS_V: v1.0.4
3131
run: |
3232
docker compose build efiling-api
3333
docker tag jag-file-submission-efiling-api artifacts.developer.gov.bc.ca/efc7-efiling-api/efiling-api:dev

‎docker-compose.override.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ services:
1818
args:
1919
- MVN_PROFILE=${MVN_PROFILE:-efiling-api-demo}
2020
- SKIP_TESTS=true
21-
- STARTERS_V=v1.0.3
21+
- STARTERS_V=v1.0.4
2222

2323
# #############################################################################################
2424
# ### KEYCLOAK Config ###

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

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.3.7</version>
8+
<version>3.5.4</version>
9+
910
<relativePath/> <!-- lookup parent from repository -->
1011
</parent>
1112
<groupId>ca.bc.gov.open.jag</groupId>
1213
<artifactId>efiling-api</artifactId>
13-
<version>2.0.7</version>
14+
<version>2.0.10</version>
1415
<name>efiling-api</name>
1516
<description>Demo project for Spring Boot</description>
1617

@@ -65,7 +66,7 @@
6566
<dependency>
6667
<groupId>ca.bc.gov.open.jag</groupId>
6768
<artifactId>efiling-commons</artifactId>
68-
<version>2.0.7</version>
69+
<version>2.0.10</version>
6970
</dependency>
7071

7172
<dependency>
@@ -129,8 +130,8 @@
129130
<artifactId>logback-core</artifactId>
130131
</dependency>
131132
<dependency>
132-
<groupId>ch.qos.logback</groupId>
133-
<artifactId>logback-access</artifactId>
133+
<groupId>ch.qos.logback.access</groupId>
134+
<artifactId>logback-access-common</artifactId>
134135
</dependency>
135136

136137
<dependency>
@@ -165,6 +166,7 @@
165166
<dependency>
166167
<groupId>redis.clients</groupId>
167168
<artifactId>jedis</artifactId>
169+
<version>6.0.0</version>
168170
</dependency>
169171

170172
<dependency>
@@ -208,7 +210,7 @@
208210
<dependency>
209211
<groupId>org.apache.tomcat.embed</groupId>
210212
<artifactId>tomcat-embed-core</artifactId>
211-
<version>10.1.39</version>
213+
<version>11.0.8</version>
212214
</dependency>
213215
<dependency>
214216
<groupId>org.json</groupId>
@@ -242,12 +244,13 @@
242244
<dependency>
243245
<groupId>org.apache.cxf</groupId>
244246
<artifactId>cxf-core</artifactId>
245-
<version>4.0.6</version>
247+
<version>4.1.3</version>
246248
</dependency>
247249
<dependency>
248250
<groupId>org.springframework.security</groupId>
249251
<artifactId>spring-security-crypto</artifactId>
250-
<version>6.3.8</version>
252+
<version>6.5.3</version>
253+
251254
</dependency>
252255
</dependencies>
253256

@@ -256,7 +259,7 @@
256259
<dependency>
257260
<groupId>ca.bc.gov.open.jag</groupId>
258261
<artifactId>efiling-bom</artifactId>
259-
<version>2.0.7</version>
262+
<version>2.0.10</version>
260263
<type>pom</type>
261264
<scope>import</scope>
262265
</dependency>
@@ -279,19 +282,19 @@
279282
<dependency>
280283
<groupId>ca.bc.gov.open.jag</groupId>
281284
<artifactId>efiling-cso-starter</artifactId>
282-
<version>2.0.7</version>
285+
<version>2.0.10</version>
283286
</dependency>
284287

285288
<dependency>
286289
<groupId>ca.bc.gov.open.jag</groupId>
287290
<artifactId>efiling-bambora-api-client</artifactId>
288-
<version>2.0.7</version>
291+
<version>2.0.10</version>
289292
</dependency>
290293

291294
<dependency>
292295
<groupId>ca.bc.gov.open.jag</groupId>
293296
<artifactId>efiling-ceis-api-client</artifactId>
294-
<version>2.0.7</version>
297+
<version>2.0.10</version>
295298
</dependency>
296299

297300
<!-- https://mvnrepository.com/artifact/com.github.java-json-tools/jackson-coreutils -->
@@ -321,7 +324,8 @@
321324
<dependency>
322325
<groupId>com.splunk.logging</groupId>
323326
<artifactId>splunk-library-javalogging</artifactId>
324-
<version>1.11.4</version>
327+
<version>1.11.8</version>
328+
325329
</dependency>
326330
</dependencies>
327331

@@ -333,7 +337,7 @@
333337
<dependency>
334338
<groupId>ca.bc.gov.open.jag</groupId>
335339
<artifactId>efiling-demo-starter</artifactId>
336-
<version>2.0.7</version>
340+
<version>2.0.10</version>
337341
</dependency>
338342
</dependencies>
339343
</profile>

‎src/backend/efiling-api/src/main/resources/application.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
server:
22
port: ${SERVER_PORT:8080}
3+
tomcat:
4+
max-part-count: ${MAX_FILE_COUNT:15}
5+
max-part-header-size: ${MAX_HEADER_SIZE:2048}
36
spring:
47
security:
58
oauth2:

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

Lines changed: 4 additions & 4 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.7</version>
7+
<version>2.0.10</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.7</version>
114+
<version>2.0.10</version>
115115
<scope>compile</scope>
116116
</dependency>
117117
</dependencies>
@@ -121,14 +121,14 @@
121121
<dependency>
122122
<groupId>org.springframework.boot</groupId>
123123
<artifactId>spring-boot-dependencies</artifactId>
124-
<version>3.3.7</version>
124+
<version>3.5.0</version>
125125
<type>pom</type>
126126
<scope>import</scope>
127127
</dependency>
128128
<dependency>
129129
<groupId>ca.bc.gov.open.jag</groupId>
130130
<artifactId>efiling-bom</artifactId>
131-
<version>2.0.7</version>
131+
<version>2.0.10</version>
132132
<type>pom</type>
133133
<scope>import</scope>
134134
</dependency>

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

Lines changed: 27 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,43 +5,44 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>ca.bc.gov.open.jag</groupId>
77
<artifactId>efiling-bom</artifactId>
8-
<version>2.0.7</version>
8+
<version>2.0.10</version>
99

1010
<properties>
1111
<log4j2.version>2.17.1</log4j2.version>
12-
<ca.bc.gov.open.version>1.0.3</ca.bc.gov.open.version>
12+
<ca.bc.gov.open.version>1.0.4</ca.bc.gov.open.version>
1313
<com.brsanthu.version>2.2</com.brsanthu.version>
14-
<com.fasterxml.jackson.core.version>2.12.1</com.fasterxml.jackson.core.version>
15-
<com.github.joschi.jackson.version>2.12.1</com.github.joschi.jackson.version>
14+
<com.fasterxml.jackson.core.version>2.19.0</com.fasterxml.jackson.core.version>
15+
<com.github.joschi.jackson.version>2.18.2</com.github.joschi.jackson.version>
1616
<com.google.code.findbugs.version>3.0.2</com.google.code.findbugs.version>
17-
<com.splunk.logging.version>1.11.2</com.splunk.logging.version>
18-
<commons-io.version>2.14.0</commons-io.version>
17+
<com.splunk.logging.version>1.11.8</com.splunk.logging.version>
18+
<commons-io.version>2.18.0</commons-io.version>
1919
<io.springfox.version>3.0.0</io.springfox.version>
20-
<io.swagger.version>2.2.9</io.swagger.version>
20+
<io.swagger.version>2.2.29</io.swagger.version>
2121
<java.version>17</java.version>
2222
<javax.validation.version>2.0.1.Final</javax.validation.version>
2323
<javax.xml.bind.version>2.3.1</javax.xml.bind.version>
24-
<joda-time.version>2.10.10</joda-time.version>
24+
<joda-time.version>2.13.0</joda-time.version>
2525
<net.rakugakibox.spring.boot.version>2.7.1</net.rakugakibox.spring.boot.version>
26-
<org.apache.commons.version>3.11</org.apache.commons.version>
27-
<org.apache.commons.collections.collections.version>4.2</org.apache.commons.collections.collections.version>
28-
<org.apache.cxf.version>4.0.5</org.apache.cxf.version>
26+
<org.apache.commons.version>3.18.0</org.apache.commons.version>
27+
<org.apache.commons.collections.collections.version>4.4</org.apache.commons.collections.collections.version>
28+
<org.apache.cxf.version>4.1.0</org.apache.cxf.version>
2929
<org.apache.tika.version>1.24.1</org.apache.tika.version>
30-
<org.apache.skywalking.version>8.4.0</org.apache.skywalking.version>
31-
<org.codehaus.janino>3.1.3</org.codehaus.janino>
32-
<org.glassfish.jersey.inject.version>3.1.3</org.glassfish.jersey.inject.version>
33-
<org.junit.jupiter.version>5.7.1</org.junit.jupiter.version>
34-
<org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
30+
<org.apache.skywalking.version>9.4.0</org.apache.skywalking.version>
31+
<org.codehaus.janino>3.1.12</org.codehaus.janino>
32+
<org.glassfish.jersey.inject.version>3.1.10</org.glassfish.jersey.inject.version>
33+
<org.junit.jupiter.version>5.12.2</org.junit.jupiter.version>
34+
<org.mapstruct.version>1.6.3</org.mapstruct.version>
3535
<org.mockito.mockito-all.version>1.10.19</org.mockito.mockito-all.version>
36-
<org.mockito.mockito-core.version>3.6.0</org.mockito.mockito-core.version>
36+
<org.mockito.mockito-core.version>5.17.0</org.mockito.mockito-core.version>
3737
<org.openapitools.version>0.2.6</org.openapitools.version>
3838
<org.springdoc.version>1.7.0</org.springdoc.version>
39-
<org.threeten.version>1.5.1</org.threeten.version>
40-
<ch.qos.logback.version>1.5.8</ch.qos.logback.version>
41-
<org.apache.tomcat.embed.version>10.1.39</org.apache.tomcat.embed.version>
42-
<org.json.version>20231013</org.json.version>
43-
<org.springframework.security.version>6.3.3</org.springframework.security.version>
44-
<org.springframework.version>6.1.14</org.springframework.version>
39+
<org.threeten.version>1.7.0</org.threeten.version>
40+
<ch.qos.logback.version>1.5.18</ch.qos.logback.version>
41+
<logback.access.common.version>2.0.6</logback.access.common.version>
42+
<org.apache.tomcat.embed.version>[11.0.8,)</org.apache.tomcat.embed.version>
43+
<org.json.version>20250517</org.json.version>
44+
<org.springframework.security.version>6.5.0</org.springframework.security.version>
45+
<org.springframework.version>6.2.10</org.springframework.version>
4546
</properties>
4647

4748
<repositories>
@@ -282,9 +283,9 @@
282283
<version>${ch.qos.logback.version}</version>
283284
</dependency>
284285
<dependency>
285-
<groupId>ch.qos.logback</groupId>
286-
<artifactId>logback-access</artifactId>
287-
<version>${ch.qos.logback.version}</version>
286+
<groupId>ch.qos.logback.access</groupId>
287+
<artifactId>logback-access-common</artifactId>
288+
<version>${logback.access.common.version}</version>
288289
</dependency>
289290

290291
<dependency>

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

Lines changed: 4 additions & 4 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.7</version>
7+
<version>2.0.10</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.7</version>
126+
<version>2.0.10</version>
127127
<scope>compile</scope>
128128
</dependency>
129129
</dependencies>
@@ -133,14 +133,14 @@
133133
<dependency>
134134
<groupId>org.springframework.boot</groupId>
135135
<artifactId>spring-boot-dependencies</artifactId>
136-
<version>3.3.7</version>
136+
<version>3.5.0</version>
137137
<type>pom</type>
138138
<scope>import</scope>
139139
</dependency>
140140
<dependency>
141141
<groupId>ca.bc.gov.open.jag</groupId>
142142
<artifactId>efiling-bom</artifactId>
143-
<version>2.0.7</version>
143+
<version>2.0.10</version>
144144
<type>pom</type>
145145
<scope>import</scope>
146146
</dependency>

0 commit comments

Comments
 (0)