Skip to content

Commit 5ce5099

Browse files
jamesfwoodCopilot
jamesfwood
and
Copilot
authored
Upgrade camunda 7.24 ee (#272)
* Initial update to camunda 7.24. * Updated to tomcat 11, spring 7, camunda 7.24.6-ee * Updated some dependency versions for security * Updated camunda_mods index.html pages * - Updated README.md - Fixed Integration Tests - Updated web.xml * Fixed labeling mariadb 10.11 * Update Github Actions, and skip one test for now * Updated slack workflow * Updated changelog * Apply suggestions from code review Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com> * Updated TODO --------- Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
1 parent 562f013 commit 5ce5099

32 files changed

Lines changed: 361 additions & 533 deletions

File tree

‎.github/workflows/camunda.yml‎

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
- cron: '0 12 * * 1'
99

1010
env:
11-
TEAM: ("jamesfwood" "jdrodjpl" "jl-0")
11+
TEAM: ("jamesfwood" "jl-0")
1212

1313
jobs:
1414

@@ -20,21 +20,21 @@ jobs:
2020
WORKERS: 1
2121

2222
services:
23-
mdb106:
23+
mdb1011:
2424
image: mariadb:10.11
2525
ports:
2626
- 3306:3306
2727
env:
2828
MYSQL_DATABASE: cws_dev
2929
MYSQL_ROOT_PASSWORD: adminpw
3030
options: >-
31-
--name mdb106
31+
--name mdb1011
3232
3333
steps:
34-
- uses: actions/checkout@v4
34+
- uses: actions/checkout@v6
3535

3636
- name: Set up JDK 17
37-
uses: actions/setup-java@v4
37+
uses: actions/setup-java@v5
3838
with:
3939
java-version: '17'
4040
distribution: 'temurin'
@@ -61,7 +61,7 @@ jobs:
6161
</settings>" > ~/.m2/settings.xml
6262
6363
- name: Cache Maven packages
64-
uses: actions/cache@v4
64+
uses: actions/cache@v5
6565
with:
6666
path: ~/.m2/repository
6767
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -117,7 +117,7 @@ jobs:
117117
docker ps -a
118118
119119
- name: Cache Dependency-Check data
120-
uses: actions/cache@v4
120+
uses: actions/cache@v5
121121
with:
122122
path: ~/.dependency-check-data
123123
key: ${{ runner.os }}-dependency-check
@@ -131,7 +131,7 @@ jobs:
131131
NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
132132

133133
- name: Upload Dependency Check Report
134-
uses: actions/upload-artifact@v4
134+
uses: actions/upload-artifact@v7
135135
with:
136136
name: dependency-check-report
137137
path: target/dependency-check-reports/dependency-check-report.html
@@ -146,7 +146,7 @@ jobs:
146146

147147
- name: List CWS Logs
148148
run: |
149-
cd "dist/console-only/cws/server/apache-tomcat-10.1.36/logs"
149+
cd "dist/console-only/cws/server/apache-tomcat-11.0.20/logs"
150150
ls -al
151151
152152
- name: Set up Google Chrome
@@ -168,39 +168,39 @@ jobs:
168168
shell: bash
169169

170170
- name: Upload Jacoco report
171-
uses: actions/upload-artifact@v4
171+
uses: actions/upload-artifact@v7
172172
with:
173173
name: jacoco-report
174174
path: jacoco-reports/aggregate/index.html
175175

176176
- name: Upload test screenshots
177177
if: ${{ always() && steps.build.outcome == 'success' }}
178-
uses: actions/upload-artifact@v4
178+
uses: actions/upload-artifact@v7
179179
with:
180180
name: test-screenshots
181181
path: test-screenshots/
182182

183183
- name: Show CWS Log for Console
184184
if: always()
185-
working-directory: dist/console-only/cws/server/apache-tomcat-10.1.36/logs
185+
working-directory: dist/console-only/cws/server/apache-tomcat-11.0.20/logs
186186
run: |
187187
cat cws.log
188188
189189
- name: Show Catalina Log for Console
190190
if: always()
191-
working-directory: dist/console-only/cws/server/apache-tomcat-10.1.36/logs
191+
working-directory: dist/console-only/cws/server/apache-tomcat-11.0.20/logs
192192
run: |
193193
cat catalina.out
194194
195195
- name: Show CWS Log for Worker1
196196
if: always()
197-
working-directory: dist/worker1/cws/server/apache-tomcat-10.1.36/logs
197+
working-directory: dist/worker1/cws/server/apache-tomcat-11.0.20/logs
198198
run: |
199199
cat cws.log
200200
201201
- name: Show Catalina Log for Worker1
202202
if: always()
203-
working-directory: dist/worker1/cws/server/apache-tomcat-10.1.36/logs
203+
working-directory: dist/worker1/cws/server/apache-tomcat-11.0.20/logs
204204
run: |
205205
cat catalina.out
206206
@@ -213,8 +213,10 @@ jobs:
213213
- name: Send custom JSON data to Slack workflow
214214
if: ${{ always() && contains(env.TEAM, github.actor) }}
215215
id: slack
216-
uses: slackapi/slack-github-action@v1.25.0
216+
uses: slackapi/slack-github-action@v3
217217
with:
218+
webhook-type: incoming-webhook
219+
webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
218220
# This data can be any valid JSON from a previous step in the GitHub Action
219221
payload: |
220222
{
@@ -229,8 +231,6 @@ jobs:
229231
}
230232
]
231233
}
232-
env:
233-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
234234
235235
236236
advanced-test:
@@ -241,21 +241,21 @@ jobs:
241241
WORKERS: 2
242242

243243
services:
244-
mdb106:
244+
mdb1011:
245245
image: mariadb:10.11
246246
ports:
247247
- 3306:3306
248248
env:
249249
MYSQL_DATABASE: cws_dev
250250
MYSQL_ROOT_PASSWORD: adminpw
251251
options: >-
252-
--name mdb106
252+
--name mdb1011
253253
254254
steps:
255-
- uses: actions/checkout@v4
255+
- uses: actions/checkout@v6
256256

257257
- name: Set up JDK 17
258-
uses: actions/setup-java@v4
258+
uses: actions/setup-java@v5
259259
with:
260260
java-version: '17'
261261
distribution: 'temurin'
@@ -282,7 +282,7 @@ jobs:
282282
</settings>" > ~/.m2/settings.xml
283283
284284
- name: Cache Maven packages
285-
uses: actions/cache@v4
285+
uses: actions/cache@v5
286286
with:
287287
path: ~/.m2/repository
288288
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
@@ -347,7 +347,7 @@ jobs:
347347

348348
- name: List CWS Logs
349349
run: |
350-
cd dist/console-only/cws/server/apache-tomcat-10.1.36/logs
350+
cd dist/console-only/cws/server/apache-tomcat-11.0.20/logs
351351
ls -al
352352
353353
- name: Set up Google Chrome
@@ -365,44 +365,44 @@ jobs:
365365

366366
- name: Upload test screenshots
367367
if: ${{ always() && steps.build.outcome == 'success' }}
368-
uses: actions/upload-artifact@v4
368+
uses: actions/upload-artifact@v7
369369
with:
370370
name: test-screenshots-advanced
371371
path: test-screenshots/
372372

373373
- name: Show CWS Log for Console
374374
if: always()
375-
working-directory: dist/console-only/cws/server/apache-tomcat-10.1.36/logs
375+
working-directory: dist/console-only/cws/server/apache-tomcat-11.0.20/logs
376376
run: |
377377
cat cws.log
378378
379379
- name: Show Catalina Log for Console
380380
if: always()
381-
working-directory: dist/console-only/cws/server/apache-tomcat-10.1.36/logs
381+
working-directory: dist/console-only/cws/server/apache-tomcat-11.0.20/logs
382382
run: |
383383
cat catalina.out
384384
385385
- name: Show CWS Log for Worker1
386386
if: always()
387-
working-directory: dist/worker1/cws/server/apache-tomcat-10.1.36/logs
387+
working-directory: dist/worker1/cws/server/apache-tomcat-11.0.20/logs
388388
run: |
389389
cat cws.log
390390
391391
- name: Show Catalina Log for Worker1
392392
if: always()
393-
working-directory: dist/worker1/cws/server/apache-tomcat-10.1.36/logs
393+
working-directory: dist/worker1/cws/server/apache-tomcat-11.0.20/logs
394394
run: |
395395
cat catalina.out
396396
397397
- name: Show CWS Log for Worker2
398398
if: always()
399-
working-directory: dist/worker2/cws/server/apache-tomcat-10.1.36/logs
399+
working-directory: dist/worker2/cws/server/apache-tomcat-11.0.20/logs
400400
run: |
401401
cat cws.log
402402
403403
- name: Show Catalina Log for Worker2
404404
if: always()
405-
working-directory: dist/worker2/cws/server/apache-tomcat-10.1.36/logs
405+
working-directory: dist/worker2/cws/server/apache-tomcat-11.0.20/logs
406406
run: |
407407
cat catalina.out
408408
@@ -415,8 +415,10 @@ jobs:
415415
- name: Send custom JSON data to Slack workflow
416416
if: ${{ always() && contains(env.TEAM, github.actor) }}
417417
id: slack
418-
uses: slackapi/slack-github-action@v1.25.0
418+
uses: slackapi/slack-github-action@v3
419419
with:
420+
webhook-type: incoming-webhook
421+
webhook: ${{ secrets.SLACK_WEBHOOK_URL }}
420422
# This data can be any valid JSON from a previous step in the GitHub Action
421423
payload: |
422424
{
@@ -431,8 +433,6 @@ jobs:
431433
}
432434
]
433435
}
434-
env:
435-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
436436
437437
438438
publish-cws-image:
@@ -443,17 +443,17 @@ jobs:
443443

444444
steps:
445445
- name: Check out the repo
446-
uses: actions/checkout@v4
446+
uses: actions/checkout@v6
447447

448448
- name: Set up JDK 17
449-
uses: actions/setup-java@v4
449+
uses: actions/setup-java@v5
450450
with:
451451
java-version: '17'
452452
distribution: 'temurin'
453453
cache: maven
454454

455455
- name: Log in to Docker Hub
456-
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
456+
uses: docker/login-action@v4
457457
with:
458458
username: ${{ secrets.DOCKER_USERNAME }}
459459
password: ${{ secrets.DOCKER_PASSWORD }}

‎.github/workflows/docker-release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,15 @@ jobs:
4343
echo "Building release: $RELEASE_TAG (source: manual/auto)"
4444
4545
- name: Checkout repository at release tag
46-
uses: actions/checkout@v4
46+
uses: actions/checkout@v6
4747
with:
4848
ref: ${{ steps.release_info.outputs.release_tag }}
4949

5050
- name: Set up Docker Buildx
51-
uses: docker/setup-buildx-action@v3
51+
uses: docker/setup-buildx-action@v4
5252

5353
- name: Log in to GitHub Container Registry
54-
uses: docker/login-action@v3
54+
uses: docker/login-action@v4
5555
with:
5656
registry: ghcr.io
5757
username: ${{ github.actor }}

‎.github/workflows/docker.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ jobs:
1616
runs-on: ubuntu-latest
1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v4
19+
uses: actions/checkout@v6
2020

2121
- name: Set up Docker Buildx
22-
uses: docker/setup-buildx-action@v3
22+
uses: docker/setup-buildx-action@v4
2323

2424
- name: Log in to GitHub Container Registry
25-
uses: docker/login-action@v3
25+
uses: docker/login-action@v4
2626
with:
2727
registry: ghcr.io
2828
username: ${{ github.actor }}
@@ -80,7 +80,7 @@ jobs:
8080
</settings>" > ~/.m2/settings.xml
8181
8282
- name: Cache Maven packages
83-
uses: actions/cache@v4
83+
uses: actions/cache@v5
8484
with:
8585
path: ~/.m2/repository
8686
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

0 commit comments

Comments
 (0)