Skip to content

Commit 5d89610

Browse files
TayGovTayGov
authored
Merge branch 'master' into dependabot/maven/src/backend/org.apache.skywalking.version-9.2.0
2 parents 4c43ba6 + 62533ca commit 5d89610

File tree

13 files changed

+52
-52
lines changed

13 files changed

+52
-52
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137

138138
# Upload JSON for debugging purposes
139139
- name: Upload JSON for debugging purposes
140-
uses: actions/upload-artifact@v2
140+
uses: actions/upload-artifact@v4
141141
with:
142142
name: summed-yarn-coverage-report
143143
path: coverage/total-codeclimate.json
@@ -263,7 +263,7 @@ jobs:
263263

264264
# Upload JSON for debugging purposes
265265
- name: Upload JSON for debugging purposes
266-
uses: actions/upload-artifact@v2
266+
uses: actions/upload-artifact@v4
267267
with:
268268
name: summed-java-coverage-report
269269
path: coverage/total-codeclimate.json
@@ -318,35 +318,35 @@ jobs:
318318

319319
# Download Spring-boot coverage report
320320
- name: Download spring-boot coverage report
321-
uses: actions/download-artifact@v1
321+
uses: actions/download-artifact@v4
322322
with:
323323
name: summed-java-coverage-report
324324

325325
# See what is inside
326326
- name: List items inside java coverage report object
327327
run: |
328-
ls summed-java-coverage-report
328+
ls
329329
330330
# Copy total java to outside directory
331331
- name: Copy Java Coverage to directory
332332
run: |
333-
cp summed-java-coverage-report/total-codeclimate.json coverage-reports/total-java-codeclimate.json
333+
cp total-codeclimate.json coverage-reports/total-java-codeclimate.json
334334
335335
# Download Yarn coverage report
336336
- name: Download javascript coverage report
337-
uses: actions/download-artifact@v1
337+
uses: actions/download-artifact@v4
338338
with:
339339
name: summed-yarn-coverage-report
340340

341341
# See what is inside
342-
- name: List items inside java coverage report object
342+
- name: List items inside javascript coverage report object
343343
run: |
344-
ls summed-yarn-coverage-report
344+
ls
345345
346346
# Copy total Yarn to outside directory
347347
- name: Copy Yarn Coverage to directory
348348
run: |
349-
cp summed-yarn-coverage-report/total-codeclimate.json coverage-reports/total-yarn-codeclimate.json
349+
cp total-codeclimate.json coverage-reports/total-yarn-codeclimate.json
350350
351351
# See what is inside coverage
352352
- name: List items inside java coverage report object
@@ -359,7 +359,7 @@ jobs:
359359

360360
# Upload JSON for debugging purposes
361361
- name: Upload JSON for debugging purposes
362-
uses: actions/upload-artifact@v2
362+
uses: actions/upload-artifact@v4
363363
with:
364364
name: summed-total-coverage-report
365365
path: coverage-reports/total-codeclimate.json

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -135,10 +135,10 @@ jobs:
135135

136136
# pulling images is faster than caching in most of the case
137137
- name: pull available docker images first
138-
run: docker-compose pull -q --parallel redis clamav keycloak
138+
run: docker compose pull -q --parallel redis clamav keycloak
139139

140140
- name: Standup Infra
141-
run: docker-compose up -d redis clamav keycloak
141+
run: docker compose up -d redis clamav keycloak
142142

143143
- name: Login to Docker Hub
144144
uses: docker/login-action@v1
@@ -157,26 +157,26 @@ jobs:
157157
158158
- name: Pull images (Local REPO only)
159159
if: github.event.pull_request.head.repo.full_name == github.repository
160-
run: docker-compose -f docker-compose.yml -f tests/docker-compose-integration.yml pull --parallel -q efiling-api efiling-frontend keycloak-config
160+
run: docker compose -f docker-compose.yml -f tests/docker-compose-integration.yml pull --parallel -q efiling-api efiling-frontend keycloak-config
161161

162162
- name: Standup Docker Pods (Local REPO only)
163163
if: github.event.pull_request.head.repo.full_name == github.repository
164-
run: docker-compose -f docker-compose.yml -f tests/docker-compose-integration.yml up -d efiling-api efiling-frontend
164+
run: docker compose -f docker-compose.yml -f tests/docker-compose-integration.yml up -d efiling-api efiling-frontend
165165

166166

167167
- name: Standup Docker Pods (FORK only)
168168
if: github.event.pull_request.head.repo.full_name != github.repository
169-
run: docker-compose up -d efiling-api efiling-frontend
169+
run: docker compose up -d efiling-api efiling-frontend
170170

171171
- name: Configure keycloak (Local REPO only)
172172
if: github.event.pull_request.head.repo.full_name == github.repository
173173
run: |
174-
docker-compose -f docker-compose.yml -f tests/docker-compose-integration.yml up keycloak-config
174+
docker compose -f docker-compose.yml -f tests/docker-compose-integration.yml up keycloak-config
175175
176176
- name: Configure keycloak (FORK only)
177177
if: github.event.pull_request.head.repo.full_name != github.repository
178178
run: |
179-
docker-compose up keycloak-config
179+
docker compose up keycloak-config
180180
181181
- name: Running Integration Tests
182182
env:
@@ -198,14 +198,14 @@ jobs:
198198
199199
# Upload Spark report for debugging purposes
200200
- name: Upload Spark report for debugging purposes
201-
uses: actions/upload-artifact@v2
201+
uses: actions/upload-artifact@v4
202202
with:
203203
name: cucumber-spark-report
204204
path: ./tests/test-output/extent/Spark/Index.html
205205

206206
# Upload Cucumber JSON for debugging purposes
207207
- name: Upload Cucumber JSON for debugging purposes
208-
uses: actions/upload-artifact@v2
208+
uses: actions/upload-artifact@v4
209209
with:
210210
name: cucumber-json-report
211211
path: ./tests/target/cucumber-reports/CucumberTestReport.json

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ jobs:
4343
MVN_PROFILE: efiling-api,splunk
4444
run: |
4545
46-
docker-compose build efiling-api
46+
docker compose build efiling-api
4747
4848
docker image ls
4949
50-
docker tag jag-file-submission_efiling-api ${{ secrets.OPENSHIFT4_EXTERNAL_REPOSITORY }}/${{ secrets.OPENSHIFT4_TOOLS_NAMESPACE }}/efiling-api:latest
50+
docker tag jag-file-submission-efiling-api ${{ secrets.OPENSHIFT4_EXTERNAL_REPOSITORY }}/${{ secrets.OPENSHIFT4_TOOLS_NAMESPACE }}/efiling-api:latest
5151
docker push ${{ secrets.OPENSHIFT4_EXTERNAL_REPOSITORY }}/${{ secrets.OPENSHIFT4_TOOLS_NAMESPACE }}/efiling-api:latest

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
MVN_PROFILE: efiling-api,splunk
4141
run: |
4242
43-
docker-compose build efiling-api
43+
docker compose build efiling-api
4444
4545
docker tag jag-file-submission_efiling-api ${{ secrets.OPENSHIFT4_EXTERNAL_REPOSITORY }}/${{ secrets.OPENSHIFT4_TOOLS_NAMESPACE }}/efiling-api-dark-launch:latest
4646
docker push ${{ secrets.OPENSHIFT4_EXTERNAL_REPOSITORY }}/${{ secrets.OPENSHIFT4_TOOLS_NAMESPACE }}/efiling-api-dark-launch:latest

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

Lines changed: 8 additions & 8 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.2-SNAPSHOT</version>
13+
<version>2.0.2</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.2-SNAPSHOT</version>
68+
<version>2.0.2</version>
6969
</dependency>
7070

7171
<dependency>
@@ -213,7 +213,7 @@
213213
<dependency>
214214
<groupId>org.apache.tomcat.embed</groupId>
215215
<artifactId>tomcat-embed-core</artifactId>
216-
<version>10.1.16</version>
216+
<version>10.1.25</version>
217217
</dependency>
218218
<dependency>
219219
<groupId>org.json</groupId>
@@ -238,7 +238,7 @@
238238
<dependency>
239239
<groupId>ca.bc.gov.open.jag</groupId>
240240
<artifactId>efiling-bom</artifactId>
241-
<version>2.0.2-SNAPSHOT</version>
241+
<version>2.0.2</version>
242242
<type>pom</type>
243243
<scope>import</scope>
244244
</dependency>
@@ -261,19 +261,19 @@
261261
<dependency>
262262
<groupId>ca.bc.gov.open.jag</groupId>
263263
<artifactId>efiling-cso-starter</artifactId>
264-
<version>2.0.2-SNAPSHOT</version>
264+
<version>2.0.2</version>
265265
</dependency>
266266

267267
<dependency>
268268
<groupId>ca.bc.gov.open.jag</groupId>
269269
<artifactId>efiling-bambora-api-client</artifactId>
270-
<version>2.0.2-SNAPSHOT</version>
270+
<version>2.0.2</version>
271271
</dependency>
272272

273273
<dependency>
274274
<groupId>ca.bc.gov.open.jag</groupId>
275275
<artifactId>efiling-ceis-api-client</artifactId>
276-
<version>2.0.2-SNAPSHOT</version>
276+
<version>2.0.2</version>
277277
</dependency>
278278

279279
<!-- https://mvnrepository.com/artifact/com.github.java-json-tools/jackson-coreutils -->
@@ -315,7 +315,7 @@
315315
<dependency>
316316
<groupId>ca.bc.gov.open.jag</groupId>
317317
<artifactId>efiling-demo-starter</artifactId>
318-
<version>2.0.2-SNAPSHOT</version>
318+
<version>2.0.2</version>
319319
</dependency>
320320
</dependencies>
321321
</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.2-SNAPSHOT</version>
7+
<version>2.0.2</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.2-SNAPSHOT</version>
114+
<version>2.0.2</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.2-SNAPSHOT</version>
131+
<version>2.0.2</version>
132132
<type>pom</type>
133133
<scope>import</scope>
134134
</dependency>

‎src/backend/libs/efiling-bom/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-bom</artifactId>
8-
<version>2.0.2-SNAPSHOT</version>
8+
<version>2.0.2</version>
99

1010
<properties>
1111
<log4j2.version>2.17.1</log4j2.version>
@@ -15,7 +15,7 @@
1515
<com.github.joschi.jackson.version>2.12.1</com.github.joschi.jackson.version>
1616
<com.google.code.findbugs.version>3.0.2</com.google.code.findbugs.version>
1717
<com.splunk.logging.version>1.11.2</com.splunk.logging.version>
18-
<commons-io.version>2.13.0</commons-io.version>
18+
<commons-io.version>2.14.0</commons-io.version>
1919
<io.springfox.version>3.0.0</io.springfox.version>
2020
<io.swagger.version>2.2.9</io.swagger.version>
2121
<java.version>17</java.version>
@@ -25,7 +25,7 @@
2525
<net.rakugakibox.spring.boot.version>2.7.1</net.rakugakibox.spring.boot.version>
2626
<org.apache.commons.version>3.11</org.apache.commons.version>
2727
<org.apache.commons.collections.collections.version>4.2</org.apache.commons.collections.collections.version>
28-
<org.apache.cxf.version>4.0.1</org.apache.cxf.version>
28+
<org.apache.cxf.version>4.0.5</org.apache.cxf.version>
2929
<org.apache.tika.version>1.24.1</org.apache.tika.version>
3030
<org.apache.skywalking.version>9.2.0</org.apache.skywalking.version>
3131
<org.codehaus.janino>3.1.3</org.codehaus.janino>

‎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.2-SNAPSHOT</version>
7+
<version>2.0.2</version>
88
<name>efiling-ceis-api-client</name>
99
<description>Client for CEIS ORDS</description>
1010

@@ -133,7 +133,7 @@
133133
<dependency>
134134
<groupId>ca.bc.gov.open.jag</groupId>
135135
<artifactId>efiling-commons</artifactId>
136-
<version>2.0.2-SNAPSHOT</version>
136+
<version>2.0.2</version>
137137
<scope>compile</scope>
138138
</dependency>
139139
</dependencies>
@@ -150,7 +150,7 @@
150150
<dependency>
151151
<groupId>ca.bc.gov.open.jag</groupId>
152152
<artifactId>efiling-bom</artifactId>
153-
<version>2.0.2-SNAPSHOT</version>
153+
<version>2.0.2</version>
154154
<type>pom</type>
155155
<scope>import</scope>
156156
</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.2-SNAPSHOT</version>
7+
<version>2.0.2</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.2-SNAPSHOT</version>
74+
<version>2.0.2</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.2-SNAPSHOT</version>
8+
<version>2.0.2</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.2-SNAPSHOT</version>
62+
<version>2.0.2</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.2-SNAPSHOT</version>
93+
<version>2.0.2</version>
9494
<type>pom</type>
9595
<scope>import</scope>
9696
</dependency>

0 commit comments

Comments
 (0)