Skip to content

Commit 7835241

Browse files
SteKoeSteKoe
committed
chore: merge master
2 parents 6068c1c + 1cf556b commit 7835241

File tree

149 files changed

+30471
-12718
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+30471
-12718
lines changed

‎.editorconfig

+3
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ root = true
44
insert_final_newline = true
55
trim_trailing_whitespace = true
66

7+
[*.md]
8+
trim_trailing_whitespace = false
9+
710
[*.java]
811
indent_style = tab
912
indent_size = 4

‎.github/release.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
changelog:
2+
categories:
3+
- title: Features
4+
labels:
5+
- '*'
6+
exclude:
7+
labels:
8+
- fix
9+
- breaking-change
10+
- dependencies
11+
- bot
12+
- title: Bug Fixes
13+
labels:
14+
- fix
15+
- title: Breaking Changes
16+
labels:
17+
- breaking-change
18+
- title: Dependencies
19+
labels:
20+
- dependencies

‎.github/workflows/build-feature.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ jobs:
5252
run: |
5353
mvn -B verify -P coverage --no-transfer-progress -D maven.javadoc.skip=true
5454
55-
- uses: codecov/codecov-action@v4
55+
- uses: codecov/codecov-action@v5
5656
with:
5757
files: "'*/jacoco.xml'"

‎.github/workflows/build-main.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
run: |
4242
mvn -B verify -P coverage --no-transfer-progress -D maven.javadoc.skip=true
4343
44-
- uses: codecov/codecov-action@v4
44+
- uses: codecov/codecov-action@v5
4545
with:
4646
files: "'*/jacoco.xml'"
4747

@@ -84,7 +84,7 @@ jobs:
8484
run: echo ${{ steps.project.outputs.version }}
8585

8686
- name: Deploy Asciidoc docs output to GitHub Pages
87-
uses: JamesIves/github-pages-deploy-action@v4.6.8
87+
uses: JamesIves/github-pages-deploy-action@v4.7.3
8888
with:
8989
branch: gh-pages # The branch the action should deploy to.
9090
folder: spring-boot-admin-docs/target/generated-docs # The folder the action should deploy.

‎.github/workflows/deploy-documentation.yml

+76
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
name: 📖 Deploy Documentation
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
releaseversion:
7+
description: 'Release version'
8+
required: true
9+
default: '3.0.0'
10+
copyDocsToCurrent:
11+
description: "Should the docs be published at https://docs.spring-boot-admin.com? Otherwise they will be accessible by version number only."
12+
required: true
13+
type: boolean
14+
default: false
15+
env:
16+
VERSION: ${{ github.event.inputs.releaseversion }}
17+
18+
jobs:
19+
deploy-documentation:
20+
runs-on: ubuntu-latest
21+
22+
steps:
23+
- uses: actions/checkout@v4
24+
25+
- name: Set up JDK 17
26+
uses: actions/setup-java@v4
27+
with:
28+
distribution: 'temurin'
29+
java-version: '17'
30+
cache: 'maven'
31+
32+
- name: Cache node modules
33+
uses: actions/cache@v4
34+
env:
35+
cache-name: cache-node-modules
36+
with:
37+
path: ~/.npm
38+
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
39+
restore-keys: |
40+
${{ runner.os }}-build-${{ env.cache-name }}-
41+
${{ runner.os }}-build-
42+
${{ runner.os }}-
43+
44+
- name: Set projects Maven version to GitHub Action GUI set version
45+
run: mvn versions:set "-DnewVersion=${{ github.event.inputs.releaseversion }}" --no-transfer-progress
46+
47+
- name: Build with Maven
48+
run: mvn -B --no-transfer-progress install -DskipTests
49+
env:
50+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
51+
52+
- name: Deploy documentation to GitHub Pages for version ${{ github.event.inputs.releaseversion }}
53+
uses: JamesIves/[email protected]
54+
with:
55+
branch: gh-pages
56+
folder: spring-boot-admin-docs/target/generated-docs
57+
target-folder: ${{ github.event.inputs.releaseversion }}
58+
clean: true
59+
60+
- name: Deploy redirect for /current to /${{ github.event.inputs.releaseversion }}
61+
uses: JamesIves/[email protected]
62+
if: github.event.inputs.copyDocsToCurrent == 'true'
63+
with:
64+
branch: gh-pages
65+
folder: spring-boot-admin-docs/target/generated-docs/current
66+
target-folder: /current
67+
clean: true
68+
69+
- name: Deploy deeplink redirect for /current/* to /${{ github.event.inputs.releaseversion }}/*
70+
uses: JamesIves/[email protected]
71+
if: github.event.inputs.copyDocsToCurrent == 'true'
72+
with:
73+
branch: gh-pages
74+
folder: spring-boot-admin-docs/target/generated-docs/current
75+
target-folder: /
76+
clean: false

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

+29-49
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: release-to-maven-central
1+
name: Release To Maven Central
22

33
on:
44
workflow_dispatch:
@@ -13,6 +13,9 @@ on:
1313
type: boolean
1414
default: false
1515

16+
env:
17+
VERSION: ${{ github.event.inputs.releaseversion }}
18+
1619
jobs:
1720
publish-central-and-pages:
1821
runs-on: ubuntu-latest
@@ -36,12 +39,16 @@ jobs:
3639
with:
3740
distribution: 'temurin'
3841
java-version: '17'
39-
server-id: oss.sonatype.org
42+
server-id: central
4043
server-username: MAVEN_USERNAME
4144
server-password: MAVEN_PASSWORD
4245
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
4346
gpg-passphrase: MAVEN_GPG_PASSPHRASE
4447
cache: 'maven'
48+
env:
49+
MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
50+
MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
51+
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
4552

4653
- name: Cache node modules
4754
uses: actions/cache@v4
@@ -65,23 +72,31 @@ jobs:
6572
MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
6673
MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
6774

68-
- name: Deploy Asciidoc docs output to GitHub Pages
69-
uses: JamesIves/github-pages-deploy-action@v4.6.8
75+
- name: Deploy documentation to GitHub Pages for version ${{ github.event.inputs.releaseversion }}
76+
uses: JamesIves/github-pages-deploy-action@v4.7.3
7077
with:
71-
branch: gh-pages # The branch the action should deploy to.
72-
folder: spring-boot-admin-docs/target/generated-docs # The folder the action should deploy.
78+
branch: gh-pages
79+
folder: spring-boot-admin-docs/target/generated-docs
7380
target-folder: ${{ github.event.inputs.releaseversion }}
74-
clean: true # Automatically remove deleted files from the deploy branch
81+
clean: true
7582

76-
- name: Deploy Asciidoc docs output to GitHub Pages
77-
uses: JamesIves/github-pages-deploy-action@v4.6.8
83+
- name: Deploy redirect for /current to /${{ github.event.inputs.releaseversion }}
84+
uses: JamesIves/github-pages-deploy-action@v4.7.3
7885
if: github.event.inputs.copyDocsToCurrent == 'true'
7986
with:
80-
branch: gh-pages # The branch the action should deploy to.
81-
folder: spring-boot-admin-docs/target/generated-docs # The folder the action should deploy.
87+
branch: gh-pages
88+
folder: spring-boot-admin-docs/target/generated-docs/current
8289
target-folder: /current
83-
clean: true # Automatically remove deleted files from the deploy branch
90+
clean: true
8491

92+
- name: Deploy deeplink redirect for /current/* to /${{ github.event.inputs.releaseversion }}/*
93+
uses: JamesIves/[email protected]
94+
if: github.event.inputs.copyDocsToCurrent == 'true'
95+
with:
96+
branch: gh-pages
97+
folder: spring-boot-admin-docs/target/generated-docs/current
98+
target-folder: /
99+
clean: false
85100

86101
publish-github-release:
87102
needs: publish-central-and-pages
@@ -108,46 +123,11 @@ jobs:
108123

109124
- name: Create GitHub Release
110125
id: create_release
111-
uses: actions/create-release@v1
112-
env:
113-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
126+
uses: softprops/action-gh-release@v2
114127
with:
115128
tag_name: ${{ github.event.inputs.releaseversion }}
116-
release_name: ${{ github.event.inputs.releaseversion }}
117-
body: |
118-
Grab the new version from Maven central https://repo1.maven.org/maven2/de/codecentric/
119-
120-
Current docs at https://codecentric.github.io/spring-boot-admin/${{ github.event.inputs.releaseversion }}/
121-
122-
### Things that changed in this release
123-
${{ steps.changelog.outputs.changelog }}
129+
token: ${{ secrets.GITHUB_TOKEN }}
124130
draft: false
125131
prerelease: ${{ contains(github.event.inputs.releaseversion, '-') }}
126132

127-
set-next-snapshot-version:
128-
needs: publish-github-release
129-
runs-on: ubuntu-latest
130-
131-
permissions:
132-
contents: write
133-
134-
steps:
135-
- uses: actions/checkout@v4
136-
137-
- name: Set new SNAPSHOT version
138-
run: >
139-
mvn versions:set "-DnewVersion=${{ github.event.inputs.releaseversion }}" && \
140-
mvn versions:set -DnextSnapshot && \
141-
VERSION=$(mvn exec:exec -Dexec.executable='echo' -Dexec.args='${project.version}' --non-recursive -q) && \
142-
mvn versions:revert && \
143-
mvn versions:set-property -Dproperty=revision -DnewVersion="$VERSION" &&
144-
mvn versions:commit
145-
146-
- name: Commit new SNAPSHOT version
147-
uses: stefanzweifel/git-auto-commit-action@v5
148-
env:
149-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
150-
with:
151-
commit_message: "chore: update to next SNAPSHOT version"
152-
153133

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Hence, it is possible to run Spring Boot Admin Server version 2.6 and monitor a
2424

2525
## Getting Started
2626

27-
[A quick guide](https://docs.spring-boot-admin.com/current/getting-started.html) to get started can be found in our docs.
27+
[A quick guide](https://docs.spring-boot-admin.com/current) to get started can be found in our docs.
2828

2929
There are introductory talks available on YouTube:
3030

0 commit comments

Comments
 (0)