Skip to content

Commit 73ef70e

Browse files
TayGovTayGov
authored
Merge pull request #2879 from bcgov/feature/FLA-1582
Feature/fla 1582
2 parents 348ff3d + ebd6d8f commit 73ef70e

File tree

20 files changed

+109
-214
lines changed

20 files changed

+109
-214
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.2
159+
ref: v1.0.3
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.2
36+
--build-arg STARTERS_V=v1.0.3
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.2
52+
--build-arg STARTERS_V=v1.0.3
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.2
30+
STARTERS_V: v1.0.3
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.2
21+
- STARTERS_V=v1.0.3
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,12 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>3.3.4</version>
8+
<version>3.3.7</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.5</version>
13+
<version>2.0.6-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.5</version>
68+
<version>2.0.6-SNAPSHOT</version>
6969
</dependency>
7070

7171
<dependency>
@@ -182,7 +182,6 @@
182182
<dependency>
183183
<groupId>org.springframework.boot</groupId>
184184
<artifactId>spring-boot-test</artifactId>
185-
<version>3.3.4</version>
186185
</dependency>
187186
<dependency>
188187
<groupId>org.testng</groupId>
@@ -198,7 +197,6 @@
198197
<dependency>
199198
<groupId>org.springframework.security</groupId>
200199
<artifactId>spring-security-test</artifactId>
201-
<version>5.5.3</version>
202200
<scope>test</scope>
203201
</dependency>
204202
<dependency>
@@ -210,7 +208,6 @@
210208
<dependency>
211209
<groupId>org.apache.tomcat.embed</groupId>
212210
<artifactId>tomcat-embed-core</artifactId>
213-
<version>10.1.34</version>
214211
</dependency>
215212
<dependency>
216213
<groupId>org.json</groupId>
@@ -223,7 +220,6 @@
223220
<dependency>
224221
<groupId>org.springframework.security</groupId>
225222
<artifactId>spring-security-web</artifactId>
226-
<version>6.3.4</version>
227223
</dependency>
228224
<dependency>
229225
<groupId>org.springframework</groupId>
@@ -232,12 +228,20 @@
232228
<dependency>
233229
<groupId>org.springframework</groupId>
234230
<artifactId>spring-webmvc</artifactId>
235-
<version>6.1.14</version>
236231
</dependency>
237232
<dependency>
238233
<groupId>io.netty</groupId>
239234
<artifactId>netty-common</artifactId>
240-
<version>4.1.115.Final</version>
235+
</dependency>
236+
<dependency>
237+
<groupId>io.netty</groupId>
238+
<artifactId>netty-handler</artifactId>
239+
<version>4.1.118.Final</version>
240+
</dependency>
241+
<dependency>
242+
<groupId>org.apache.cxf</groupId>
243+
<artifactId>cxf-core</artifactId>
244+
<version>4.0.6</version>
241245
</dependency>
242246
</dependencies>
243247

@@ -246,7 +250,7 @@
246250
<dependency>
247251
<groupId>ca.bc.gov.open.jag</groupId>
248252
<artifactId>efiling-bom</artifactId>
249-
<version>2.0.5</version>
253+
<version>2.0.6-SNAPSHOT</version>
250254
<type>pom</type>
251255
<scope>import</scope>
252256
</dependency>
@@ -269,19 +273,19 @@
269273
<dependency>
270274
<groupId>ca.bc.gov.open.jag</groupId>
271275
<artifactId>efiling-cso-starter</artifactId>
272-
<version>2.0.5</version>
276+
<version>2.0.6-SNAPSHOT</version>
273277
</dependency>
274278

275279
<dependency>
276280
<groupId>ca.bc.gov.open.jag</groupId>
277281
<artifactId>efiling-bambora-api-client</artifactId>
278-
<version>2.0.5</version>
282+
<version>2.0.6-SNAPSHOT</version>
279283
</dependency>
280284

281285
<dependency>
282286
<groupId>ca.bc.gov.open.jag</groupId>
283287
<artifactId>efiling-ceis-api-client</artifactId>
284-
<version>2.0.5</version>
288+
<version>2.0.6-SNAPSHOT</version>
285289
</dependency>
286290

287291
<!-- https://mvnrepository.com/artifact/com.github.java-json-tools/jackson-coreutils -->
@@ -323,7 +327,7 @@
323327
<dependency>
324328
<groupId>ca.bc.gov.open.jag</groupId>
325329
<artifactId>efiling-demo-starter</artifactId>
326-
<version>2.0.5</version>
330+
<version>2.0.6-SNAPSHOT</version>
327331
</dependency>
328332
</dependencies>
329333
</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.5</version>
7+
<version>2.0.6-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.5</version>
114+
<version>2.0.6-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.4</version>
124+
<version>3.3.7</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.5</version>
131+
<version>2.0.6-SNAPSHOT</version>
132132
<type>pom</type>
133133
<scope>import</scope>
134134
</dependency>

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

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

1010
<properties>
1111
<log4j2.version>2.17.1</log4j2.version>
12-
<ca.bc.gov.open.version>1.0.2</ca.bc.gov.open.version>
12+
<ca.bc.gov.open.version>1.0.3</ca.bc.gov.open.version>
1313
<com.brsanthu.version>2.2</com.brsanthu.version>
1414
<com.fasterxml.jackson.core.version>2.12.1</com.fasterxml.jackson.core.version>
1515
<com.github.joschi.jackson.version>2.12.1</com.github.joschi.jackson.version>
@@ -38,10 +38,10 @@
3838
<org.springdoc.version>1.7.0</org.springdoc.version>
3939
<org.threeten.version>1.5.1</org.threeten.version>
4040
<ch.qos.logback.version>1.5.8</ch.qos.logback.version>
41-
<org.apache.tomcat.embed.version>10.1.25</org.apache.tomcat.embed.version>
41+
<org.apache.tomcat.embed.version>10.1.34</org.apache.tomcat.embed.version>
4242
<org.json.version>20231013</org.json.version>
4343
<org.springframework.security.version>6.3.3</org.springframework.security.version>
44-
<org.springframework.version>6.1.13</org.springframework.version>
44+
<org.springframework.version>6.1.14</org.springframework.version>
4545
</properties>
4646

4747
<repositories>

‎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.5</version>
7+
<version>2.0.6-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.5</version>
126+
<version>2.0.6-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.4</version>
136+
<version>3.3.7</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.5</version>
143+
<version>2.0.6-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.5</version>
7+
<version>2.0.6-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.4</version>
67+
<version>3.3.7</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.5</version>
74+
<version>2.0.6-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.5</version>
8+
<version>2.0.6-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.5</version>
62+
<version>2.0.6-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.5</version>
93+
<version>2.0.6-SNAPSHOT</version>
9494
<type>pom</type>
9595
<scope>import</scope>
9696
</dependency>

0 commit comments

Comments
 (0)