Skip to content

Commit 6d1f18b

Browse files
SteKoeSteKoe
authored
Merge branch 'master' into feat/migrate-to-maven-4-part-2
2 parents 69d13e4 + eb391c7 commit 6d1f18b

20 files changed

Lines changed: 1028 additions & 985 deletions

File tree

‎.github/workflows/build-feature.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
fi
3030
df -h
3131
32-
- uses: actions/checkout@v5
32+
- uses: actions/checkout@v6
3333

3434
- name: Set up JDK
3535
uses: actions/setup-java@v5

‎.github/workflows/build-main.yml‎

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

1717
runs-on: ${{ matrix.os }}
1818
steps:
19-
- uses: actions/checkout@v5
19+
- uses: actions/checkout@v6
2020

2121
- name: Set up JDK
2222
uses: actions/setup-java@v5
@@ -55,7 +55,7 @@ jobs:
5555
runs-on: ubuntu-latest
5656

5757
steps:
58-
- uses: actions/checkout@v5
58+
- uses: actions/checkout@v6
5959

6060
- name: Set up JDK
6161
uses: actions/setup-java@v5
@@ -88,7 +88,7 @@ jobs:
8888
run: ./mvnw -B --no-transfer-progress site
8989

9090
- name: Deploy documentation to GitHub Pages
91-
uses: JamesIves/github-pages-deploy-action@v4.7.4
91+
uses: JamesIves/github-pages-deploy-action@v4.7.6
9292
with:
9393
branch: gh-pages
9494
folder: spring-boot-admin-docs/target/generated-docs/build

‎.github/workflows/deploy-documentation.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222

2323
steps:
24-
- uses: actions/checkout@v5
24+
- uses: actions/checkout@v6
2525
with:
2626
ref: refs/tags/${{ github.event.inputs.releaseversion }}
2727

@@ -50,15 +50,15 @@ jobs:
5050
run: ./mvnw -B --no-transfer-progress -pl spring-boot-admin-docs site
5151

5252
- name: Deploy documentation to GitHub Pages
53-
uses: JamesIves/github-pages-deploy-action@v4.7.4
53+
uses: JamesIves/github-pages-deploy-action@v4.7.6
5454
with:
5555
branch: gh-pages
5656
folder: spring-boot-admin-docs/target/generated-docs/build
5757
target-folder: ${{ github.event.inputs.releaseversion }}
5858
clean: true
5959

6060
- name: Deploy redirect for /current to /${{ github.event.inputs.releaseversion }}
61-
uses: JamesIves/github-pages-deploy-action@v4.7.4
61+
uses: JamesIves/github-pages-deploy-action@v4.7.6
6262
if: github.event.inputs.copyDocsToCurrent == 'true'
6363
with:
6464
branch: gh-pages
@@ -67,7 +67,7 @@ jobs:
6767
clean: true
6868

6969
- name: Deploy deeplink redirect for /current/* to /${{ github.event.inputs.releaseversion }}/*
70-
uses: JamesIves/github-pages-deploy-action@v4.7.4
70+
uses: JamesIves/github-pages-deploy-action@v4.7.6
7171
if: github.event.inputs.copyDocsToCurrent == 'true'
7272
with:
7373
branch: gh-pages

‎.github/workflows/release-to-maven-central.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
fi
3535
df -h
3636
37-
- uses: actions/checkout@v5
37+
- uses: actions/checkout@v6
3838

3939
- name: Set up settings.xml for Maven Central Repository
4040
uses: actions/setup-java@v5
@@ -53,7 +53,7 @@ jobs:
5353
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
5454

5555
- name: Cache node modules
56-
uses: actions/cache@v4
56+
uses: actions/cache@v5
5757
env:
5858
cache-name: cache-node-modules
5959
with:
@@ -78,15 +78,15 @@ jobs:
7878
run: ./mvnw -B --no-transfer-progress -pl spring-boot-admin-docs site
7979

8080
- name: Deploy documentation to GitHub Pages for version ${{ github.event.inputs.releaseversion }}
81-
uses: JamesIves/github-pages-deploy-action@v4.7.4
81+
uses: JamesIves/github-pages-deploy-action@v4.7.6
8282
with:
8383
branch: gh-pages
8484
folder: spring-boot-admin-docs/target/generated-docs/build
8585
target-folder: ${{ github.event.inputs.releaseversion }}
8686
clean: true
8787

8888
- name: Deploy redirect for /current to /${{ github.event.inputs.releaseversion }}
89-
uses: JamesIves/github-pages-deploy-action@v4.7.4
89+
uses: JamesIves/github-pages-deploy-action@v4.7.6
9090
if: github.event.inputs.copyDocsToCurrent == 'true'
9191
with:
9292
branch: gh-pages
@@ -95,7 +95,7 @@ jobs:
9595
clean: true
9696

9797
- name: Deploy deeplink redirect for /current/* to /${{ github.event.inputs.releaseversion }}/*
98-
uses: JamesIves/github-pages-deploy-action@v4.7.4
98+
uses: JamesIves/github-pages-deploy-action@v4.7.6
9999
if: github.event.inputs.copyDocsToCurrent == 'true'
100100
with:
101101
branch: gh-pages
@@ -108,7 +108,7 @@ jobs:
108108
runs-on: ubuntu-latest
109109

110110
steps:
111-
- uses: actions/checkout@v5
111+
- uses: actions/checkout@v6
112112

113113
- name: free disk space
114114
continue-on-error: true

‎.github/workflows/vulnerability-scan.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
if: (github.actor != 'renovate')
1515

1616
steps:
17-
- uses: actions/checkout@v5
17+
- uses: actions/checkout@v6
1818
- run: semgrep ci
1919
env:
2020
SEMGREP_RULES: p/default

‎pom.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -50,25 +50,25 @@
5050
<argLine/>
5151

5252
<!-- used dependencies versions -->
53-
<spring-boot.version>3.5.7</spring-boot.version>
53+
<spring-boot.version>3.5.8</spring-boot.version>
5454
<spring-cloud.version>2025.0.0</spring-cloud.version>
5555

5656
<jolokia-support-spring.version>2.4.2</jolokia-support-spring.version>
5757

58-
<checkstyle.version>12.1.2</checkstyle.version>
58+
<checkstyle.version>12.2.0</checkstyle.version>
5959
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
6060

6161
<wiremock.version>3.13.2</wiremock.version>
6262
<hazelcast.version>5.6.0</hazelcast.version>
6363
<awaitility.version>4.3.0</awaitility.version>
6464
<testcontainers.version>1.21.3</testcontainers.version>
65-
<jetty.version>12.1.4</jetty.version>
65+
<jetty.version>12.1.5</jetty.version>
6666

6767
<!-- plugin versions -->
6868
<build-helper-maven-plugin.version>3.6.1</build-helper-maven-plugin.version>
6969
<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
7070
<!-- because of https://github.com/mojohaus/versions/issues/855 -->
71-
<versions-maven-plugin.version>2.19.1</versions-maven-plugin.version>
71+
<versions-maven-plugin.version>2.20.1</versions-maven-plugin.version>
7272
<maven-clean-plugin.version>3.5.0</maven-clean-plugin.version>
7373
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
7474
<maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
@@ -78,9 +78,9 @@
7878
<maven-install-plugin.version>3.1.4</maven-install-plugin.version>
7979
<maven-jar-plugin.version>3.5.0</maven-jar-plugin.version>
8080
<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
81-
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
82-
<maven-source-plugin.version>3.3.1</maven-source-plugin.version>
83-
<maven-war-plugin.version>3.5.0</maven-war-plugin.version>
81+
<maven-resources-plugin.version>3.4.0</maven-resources-plugin.version>
82+
<maven-source-plugin.version>3.4.0</maven-source-plugin.version>
83+
<maven-war-plugin.version>3.5.1</maven-war-plugin.version>
8484
<maven-gpg-plugin.version>3.2.8</maven-gpg-plugin.version>
8585
<frontend-maven-plugin.version>1.15.4</frontend-maven-plugin.version>
8686
<jacoco-maven-plugin.version>0.8.14</jacoco-maven-plugin.version>

‎renovate.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@
66
"bot",
77
"dependencies"
88
],
9-
9+
"npm": {
10+
"minimumReleaseAge": "5 days",
11+
"internalChecksFilter": "strict",
12+
"prCreation": "not-pending"
13+
},
1014
"packageRules": [
1115
{
1216
"description": "Automatically merge minor and patch-level updates when checks pass, creates a PR otherwise",

0 commit comments

Comments
 (0)