Skip to content

Commit b844329

Browse files
Merge branch 'develop' into dependabot/maven/org.eclipse.microprofile.openapi-microprofile-openapi-api-3.1.1
2 parents b913af4 + 33abce5 commit b844329

File tree

5 files changed

+8
-18
lines changed

5 files changed

+8
-18
lines changed

.github/workflows/build-project.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,13 @@ jobs:
2121

2222
steps:
2323
- name: Checkout
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v4
2525

2626
- name: Cache Docker Register
2727
uses: actions/cache@v3
2828
with:
2929
path: /tmp/.buildx-cache
3030
key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}
31-
- name: Cache Maven packages
32-
uses: actions/cache@v3
33-
with:
34-
path: ~/.m2
35-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
36-
restore-keys: ${{ runner.os }}-m2
3731

3832
- name: Set up Docker Buildx
3933
id: buildx
@@ -43,6 +37,7 @@ jobs:
4337
with:
4438
distribution: 'zulu'
4539
java-version: '17'
40+
cache: 'maven'
4641

4742
- name: Create custom Maven Settings.xml
4843
uses: whelk-io/maven-settings-xml-action@v21

.github/workflows/release-project.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,13 @@ jobs:
1616

1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020

2121
- name: Cache Docker Register
2222
uses: actions/cache@v3
2323
with:
2424
path: /tmp/.buildx-cache
2525
key: ${{ runner.os }}-buildx-${{ hashFiles('**/Dockerfile') }}
26-
- name: Cache Maven packages
27-
uses: actions/cache@v3
28-
with:
29-
path: ~/.m2
30-
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
31-
restore-keys: ${{ runner.os }}-m2
3226

3327
- name: Extract tag name
3428
id: extract_tagname
@@ -41,6 +35,7 @@ jobs:
4135
with:
4236
distribution: 'zulu'
4337
java-version: '17'
38+
cache: 'maven'
4439
- name: Set up Docker Buildx
4540
id: buildx
4641
uses: docker/setup-buildx-action@v3

.github/workflows/reuse.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ jobs:
1111
runs-on: ubuntu-latest
1212
steps:
1313
- name: Checkout
14-
uses: actions/checkout@v3
14+
uses: actions/checkout@v4
1515
- name: REUSE Compliance Check
1616
uses: fsfe/reuse-action@v2

.github/workflows/sonarcloud-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
full_name: ${{ github.event.repository.full_name }}
4141
env:
4242
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
43-
- uses: actions/checkout@v3
43+
- uses: actions/checkout@v4
4444
with:
4545
repository: ${{ github.event.workflow_run.head_repository.full_name }}
4646
ref: ${{ github.event.workflow_run.head_branch }}
@@ -59,6 +59,7 @@ jobs:
5959
path: ~/.sonar/cache
6060
key: ${{ runner.os }}-sonar
6161
restore-keys: ${{ runner.os }}-sonar
62+
6263
- name: Cache Maven packages
6364
uses: actions/cache@v3
6465
with:
@@ -71,7 +72,6 @@ jobs:
7172
with:
7273
distribution: 'zulu'
7374
java-version: '17'
74-
7575
- name: Set Common Sonar Variables
7676
id: sonar_env
7777
run: |

.github/workflows/sonarcloud-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
if: ${{ (github.event_name != 'pull_request_target' && github.actor != 'dependabot[bot]') || (github.actor == 'dependabot[bot]' && github.event_name == 'pull_request_target') }}
2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@v3
29+
uses: actions/checkout@v4
3030
with:
3131
fetch-depth: 0
3232

0 commit comments

Comments
 (0)