chore: merge master

Author: SteKoe

.editorconfig

@@ -4,6 +4,9 @@ root = true
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+[*.md]
+trim_trailing_whitespace = false
+
 [*.java]
 indent_style = tab
 indent_size = 4

.github/release.yml

@@ -0,0 +1,20 @@
+changelog:
+  categories:
+    - title: Features
+      labels:
+        - '*'
+      exclude:
+        labels:
+          - fix
+          - breaking-change
+          - dependencies
+          - bot
+    - title: Bug Fixes
+      labels:
+        - fix
+    - title: Breaking Changes
+      labels:
+        - breaking-change
+    - title: Dependencies
+      labels:
+        - dependencies

.github/workflows/build-feature.yml

@@ -52,6 +52,6 @@ jobs:
         run: |
           mvn -B verify -P coverage --no-transfer-progress -D maven.javadoc.skip=true
 
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           files: "'*/jacoco.xml'"

.github/workflows/build-main.yml

@@ -41,7 +41,7 @@ jobs:
         run: |
           mvn -B verify -P coverage --no-transfer-progress -D maven.javadoc.skip=true
 
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           files: "'*/jacoco.xml'"
 
@@ -84,7 +84,7 @@ jobs:
         run: echo ${{ steps.project.outputs.version }}
 
       - name: Deploy Asciidoc docs output to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@v4.6.8
+        uses: JamesIves/github-pages-deploy-action@v4.7.3
         with:
           branch: gh-pages # The branch the action should deploy to.
           folder: spring-boot-admin-docs/target/generated-docs # The folder the action should deploy.

.github/workflows/deploy-documentation.yml

@@ -0,0 +1,76 @@
+name: 📖 Deploy Documentation
+
+on:
+  workflow_dispatch:
+    inputs:
+      releaseversion:
+        description: 'Release version'
+        required: true
+        default: '3.0.0'
+      copyDocsToCurrent:
+        description: "Should the docs be published at https://docs.spring-boot-admin.com? Otherwise they will be accessible by version number only."
+        required: true
+        type: boolean
+        default: false
+env:
+  VERSION: ${{ github.event.inputs.releaseversion }}
+
+jobs:
+  deploy-documentation:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '17'
+          cache: 'maven'
+
+      - name: Cache node modules
+        uses: actions/cache@v4
+        env:
+          cache-name: cache-node-modules
+        with:
+          path: ~/.npm
+          key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-build-${{ env.cache-name }}-
+            ${{ runner.os }}-build-
+            ${{ runner.os }}-
+
+      - name: Set projects Maven version to GitHub Action GUI set version
+        run: mvn versions:set "-DnewVersion=${{ github.event.inputs.releaseversion }}" --no-transfer-progress
+
+      - name: Build with Maven
+        run: mvn -B --no-transfer-progress install -DskipTests
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Deploy documentation to GitHub Pages for version ${{ github.event.inputs.releaseversion }}
+        uses: JamesIves/[email protected]
+        with:
+          branch: gh-pages
+          folder: spring-boot-admin-docs/target/generated-docs
+          target-folder: ${{ github.event.inputs.releaseversion }}
+          clean: true
+
+      - name: Deploy redirect for /current to /${{ github.event.inputs.releaseversion }}
+        uses: JamesIves/[email protected]
+        if: github.event.inputs.copyDocsToCurrent == 'true'
+        with:
+          branch: gh-pages
+          folder: spring-boot-admin-docs/target/generated-docs/current
+          target-folder: /current
+          clean: true
+
+      - name: Deploy deeplink redirect for /current/* to /${{ github.event.inputs.releaseversion }}/*
+        uses: JamesIves/[email protected]
+        if: github.event.inputs.copyDocsToCurrent == 'true'
+        with:
+          branch: gh-pages
+          folder: spring-boot-admin-docs/target/generated-docs/current
+          target-folder: /
+          clean: false

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

@@ -1,4 +1,4 @@
-name: release-to-maven-central
+name: Release To Maven Central
 
 on:
   workflow_dispatch:
@@ -13,6 +13,9 @@ on:
         type: boolean
         default: false
 
+env:
+  VERSION: ${{ github.event.inputs.releaseversion }}
+
 jobs:
   publish-central-and-pages:
     runs-on: ubuntu-latest
@@ -36,12 +39,16 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: '17'
-          server-id: oss.sonatype.org
+          server-id: central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
           gpg-passphrase: MAVEN_GPG_PASSPHRASE
           cache: 'maven'
+        env:
+          MAVEN_USERNAME: ${{ secrets.OSS_SONATYPE_USERNAME }}
+          MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
+          MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
 
       - name: Cache node modules
         uses: actions/cache@v4
@@ -65,23 +72,31 @@ jobs:
           MAVEN_PASSWORD: ${{ secrets.OSS_SONATYPE_PASSWORD }}
           MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
 
-      - name: Deploy Asciidoc docs output to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@v4.6.8
+      - name: Deploy documentation to GitHub Pages for version ${{ github.event.inputs.releaseversion }}
+        uses: JamesIves/github-pages-deploy-action@v4.7.3
         with:
-          branch: gh-pages # The branch the action should deploy to.
-          folder: spring-boot-admin-docs/target/generated-docs # The folder the action should deploy.
+          branch: gh-pages
+          folder: spring-boot-admin-docs/target/generated-docs
           target-folder: ${{ github.event.inputs.releaseversion }}
-          clean: true # Automatically remove deleted files from the deploy branch
+          clean: true
 
-      - name: Deploy Asciidoc docs output to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@v4.6.8
+      - name: Deploy redirect for /current to /${{ github.event.inputs.releaseversion }}
+        uses: JamesIves/github-pages-deploy-action@v4.7.3
         if: github.event.inputs.copyDocsToCurrent == 'true'
         with:
-          branch: gh-pages # The branch the action should deploy to.
-          folder: spring-boot-admin-docs/target/generated-docs # The folder the action should deploy.
+          branch: gh-pages
+          folder: spring-boot-admin-docs/target/generated-docs/current
           target-folder: /current
-          clean: true # Automatically remove deleted files from the deploy branch
+          clean: true
 
+      - name: Deploy deeplink redirect for /current/* to /${{ github.event.inputs.releaseversion }}/*
+        uses: JamesIves/[email protected]
+        if: github.event.inputs.copyDocsToCurrent == 'true'
+        with:
+          branch: gh-pages
+          folder: spring-boot-admin-docs/target/generated-docs/current
+          target-folder: /
+          clean: false
 
   publish-github-release:
     needs: publish-central-and-pages
@@ -108,46 +123,11 @@ jobs:
 
       - name: Create GitHub Release
         id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ github.event.inputs.releaseversion }}
-          release_name: ${{ github.event.inputs.releaseversion }}
-          body: |
-            Grab the new version from Maven central https://repo1.maven.org/maven2/de/codecentric/
-
-            Current docs at https://codecentric.github.io/spring-boot-admin/${{ github.event.inputs.releaseversion }}/
-
-            ### Things that changed in this release
-            ${{ steps.changelog.outputs.changelog }}
+          token: ${{ secrets.GITHUB_TOKEN }}
           draft: false
           prerelease: ${{ contains(github.event.inputs.releaseversion, '-') }}
 
-  set-next-snapshot-version:
-    needs: publish-github-release
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: write
-
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set new SNAPSHOT version
-        run: >
-          mvn versions:set "-DnewVersion=${{ github.event.inputs.releaseversion }}" && \
-            mvn  versions:set -DnextSnapshot && \
-            VERSION=$(mvn exec:exec -Dexec.executable='echo' -Dexec.args='${project.version}' --non-recursive -q) && \
-            mvn versions:revert && \
-            mvn versions:set-property -Dproperty=revision  -DnewVersion="$VERSION" &&
-            mvn versions:commit
-
-      - name: Commit new SNAPSHOT version
-        uses: stefanzweifel/git-auto-commit-action@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          commit_message: "chore: update to next SNAPSHOT version"
-
 

README.md

@@ -24,7 +24,7 @@ Hence, it is possible to run Spring Boot Admin Server version 2.6 and monitor a
 
 ## Getting Started
 
-[A quick guide](https://docs.spring-boot-admin.com/current/getting-started.html) to get started can be found in our docs.
+[A quick guide](https://docs.spring-boot-admin.com/current) to get started can be found in our docs.
 
 There are introductory talks available on YouTube: