Skip to content

Commit 58e9a82

Browse files
jianmingtujianmingtu
authored
Merge pull request #2907 from bcgov/feature/FLA-1587
Feature/fla 1587
2 parents 052fb32 + 954c7b0 commit 58e9a82

File tree

16 files changed

+72
-69
lines changed

16 files changed

+72
-69
lines changed

‎.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: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
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.0</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>ca.bc.gov.open.jag</groupId>
1212
<artifactId>efiling-api</artifactId>
13-
<version>2.0.7</version>
13+
<version>2.0.8-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.7</version>
68+
<version>2.0.8-SNAPSHOT</version>
6969
</dependency>
7070

7171
<dependency>
@@ -129,8 +129,9 @@
129129
<artifactId>logback-core</artifactId>
130130
</dependency>
131131
<dependency>
132-
<groupId>ch.qos.logback</groupId>
133-
<artifactId>logback-access</artifactId>
132+
<groupId>ch.qos.logback.access</groupId>
133+
<artifactId>logback-access-common</artifactId>
134+
<version>2.0.6</version>
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>
@@ -256,7 +258,7 @@
256258
<dependency>
257259
<groupId>ca.bc.gov.open.jag</groupId>
258260
<artifactId>efiling-bom</artifactId>
259-
<version>2.0.7</version>
261+
<version>2.0.8-SNAPSHOT</version>
260262
<type>pom</type>
261263
<scope>import</scope>
262264
</dependency>
@@ -279,19 +281,19 @@
279281
<dependency>
280282
<groupId>ca.bc.gov.open.jag</groupId>
281283
<artifactId>efiling-cso-starter</artifactId>
282-
<version>2.0.7</version>
284+
<version>2.0.8-SNAPSHOT</version>
283285
</dependency>
284286

285287
<dependency>
286288
<groupId>ca.bc.gov.open.jag</groupId>
287289
<artifactId>efiling-bambora-api-client</artifactId>
288-
<version>2.0.7</version>
290+
<version>2.0.8-SNAPSHOT</version>
289291
</dependency>
290292

291293
<dependency>
292294
<groupId>ca.bc.gov.open.jag</groupId>
293295
<artifactId>efiling-ceis-api-client</artifactId>
294-
<version>2.0.7</version>
296+
<version>2.0.8-SNAPSHOT</version>
295297
</dependency>
296298

297299
<!-- https://mvnrepository.com/artifact/com.github.java-json-tools/jackson-coreutils -->
@@ -333,7 +335,7 @@
333335
<dependency>
334336
<groupId>ca.bc.gov.open.jag</groupId>
335337
<artifactId>efiling-demo-starter</artifactId>
336-
<version>2.0.7</version>
338+
<version>2.0.8-SNAPSHOT</version>
337339
</dependency>
338340
</dependencies>
339341
</profile>

‎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.8-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.7</version>
114+
<version>2.0.8-SNAPSHOT</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.8-SNAPSHOT</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.8-SNAPSHOT</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.17.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.1</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.7</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.8-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.7</version>
126+
<version>2.0.8-SNAPSHOT</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.8-SNAPSHOT</version>
144144
<type>pom</type>
145145
<scope>import</scope>
146146
</dependency>

‎src/backend/libs/efiling-commons/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-commons</artifactId>
7-
<version>2.0.7</version>
7+
<version>2.0.8-SNAPSHOT</version>
88
<name>efiling-commons</name>
99
<description>Contains common functionality to efiling</description>
1010

@@ -64,14 +64,14 @@
6464
<dependency>
6565
<groupId>org.springframework.boot</groupId>
6666
<artifactId>spring-boot-dependencies</artifactId>
67-
<version>3.3.7</version>
67+
<version>3.5.0</version>
6868
<type>pom</type>
6969
<scope>import</scope>
7070
</dependency>
7171
<dependency>
7272
<groupId>ca.bc.gov.open.jag</groupId>
7373
<artifactId>efiling-bom</artifactId>
74-
<version>2.0.7</version>
74+
<version>2.0.8-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.7</version>
8+
<version>2.0.8-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.7</version>
62+
<version>2.0.8-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.7</version>
93+
<version>2.0.8-SNAPSHOT</version>
9494
<type>pom</type>
9595
<scope>import</scope>
9696
</dependency>

0 commit comments

Comments
 (0)