Merge branch 'renovate/codecov-codecov-action-2.x' of github.com:code…

…centric/spring-boot-admin into renovate/codecov-codecov-action-2.x * 'renovate/codecov-codecov-action-2.x' of github.com:codecentric/spring-boot-admin: (45 commits) chore(deps): update codecov/codecov-action action to v2 chore(deps): update dependency com.hazelcast:hazelcast to v4.2.4 (#1894) chore(deps): update dependency ch.qos.logback:logback-classic to v1.2.9 (#1892) chore(deps): update dependency ch.qos.logback:logback-core to v1.2.9 (#1893) chore(deps): update actions/cache action to v2.1.7 (#1891) fix(#1868): JavaScript error in startup view when using Spring Boot 2.6 fix(deps): update dependency core-js to v3.20.0 (#1715) fix(deps): update dependency vue-i18n to v8.26.7 (#1811) chore(deps): update dependency webpack-bundle-analyzer to v4 (#1825) chore(deps): update jest monorepo (major) (#1827) chore(deps): update dependency rxjs to v7 (#1836) chore(deps): update d3 chore(npm): update supported engines to node >= 15 and npm >= 7 chore(deps): remove unused dependency css-loader (#1818) fix: value maybe null (#1873) fix: bean.aliases maybe null (#1874) fix(CVE-2021-43466): bump thymeleaf to 3.0.14.RELEASE (#1884) chore(deps): update java docker tag to v9 (#1826) chore(deps): update dependency org.awaitility:awaitility to v4.1.1 (#1856) Fix toggle button for loggers when there are more than 1 instances. (#1880) ...
codecentric · Dec 22, 2021 · 8515989 · 8515989
2 parents 0a7546b + 7d2ccb5
commit 8515989
Show file tree

Hide file tree

Showing 72 changed files with 4,288 additions and 538 deletions.
diff --git a/.github/workflows/build-feature.yml b/.github/workflows/build-feature.yml
@@ -19,12 +19,13 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: 1.8
+          distribution: 'adopt'
+          java-version: '8'
 
       - name: Cache local Maven repository
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v2.1.7
         env:
           cache-name: cache-mvn
         with:
@@ -35,6 +36,16 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
 
+      - name: Cache node modules
+        uses: actions/cache@v2
+        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 }}-
+
       # since we also build on Windows Powershell, we need to add a space between -D maven.javadoc.skip=true
       # otherwise the build will fail https://stackoverflow.com/questions/38051787/maven-javadoc-skip-true-throws-an-error
       - name: Build with Maven

diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
@@ -19,12 +19,13 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: 1.8
+          distribution: 'adopt'
+          java-version: '8'
 
       - name: Cache local Maven repository
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v2.1.7
         env:
           cache-name: cache-mvn
         with:
@@ -35,6 +36,16 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
 
+      - name: Cache node modules
+        uses: actions/cache@v2
+        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 }}-
+
       # since we also build on Windows Powershell, we need to add a space between -D maven.javadoc.skip=true
       # otherwise the build will fail https://stackoverflow.com/questions/38051787/maven-javadoc-skip-true-throws-an-error
       - name: Build with Maven
@@ -54,12 +65,13 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up settings.xml for GitHub Packages
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: 1.8
+          distribution: 'adopt'
+          java-version: '8'
 
       - name: Cache local Maven repository
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v2.1.7
         env:
           cache-name: cache-mvn
         with:
@@ -70,6 +82,18 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
 
+      - name: Cache node modules
+        uses: actions/cache@v2
+        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: Publish SNAPSHOT version to GitHub Packages (we can skip tests, since we only deploy, if the build workflow succeeded)
         run: mvn -B --no-transfer-progress deploy -DskipTests
         env:
@@ -83,10 +107,9 @@ jobs:
         run: echo ${{ steps.project.outputs.version }}
 
       - name: Deploy Asciidoc docs output to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@3.7.1
+        uses: JamesIves/github-pages-deploy-action@4.1.5
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: gh-pages # The branch the action should deploy to.
-          FOLDER: spring-boot-admin-docs/target/generated-docs # The folder the action should deploy.
-          TARGET_FOLDER: ${{ steps.project.outputs.version }}
-          CLEAN: true # Automatically remove deleted files from the deploy branch
+          branch: gh-pages # The branch the action should deploy to.
+          folder: spring-boot-admin-docs/target/generated-docs # The folder the action should deploy.
+          target-folder: ${{ steps.project.outputs.version }}
+          clean: true # Automatically remove deleted files from the deploy branch
diff --git a/.github/workflows/build-pullrequest.yml b/.github/workflows/build-pullrequest.yml
@@ -15,12 +15,13 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: 1.8
+          distribution: 'adopt'
+          java-version: '8'
 
       - name: Cache local Maven repository
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v2.1.7
         env:
           cache-name: cache-mvn
         with:
@@ -31,6 +32,16 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
 
+      - name: Cache node modules
+        uses: actions/cache@v2
+        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 }}-
+
       # since we also build on Windows Powershell, we need to add a space between -D maven.javadoc.skip=true
       # otherwise the build will fail https://stackoverflow.com/questions/38051787/maven-javadoc-skip-true-throws-an-error
       - name: Build with Maven

diff --git a/.github/workflows/release-to-maven-central.yml b/.github/workflows/release-to-maven-central.yml
@@ -17,17 +17,18 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up settings.xml for Maven Central Repository
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v2
         with:
-          java-version: 8
+          distribution: 'adopt'
+          java-version: '8'
           server-id: oss.sonatype.org
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
           gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
           gpg-passphrase: MAVEN_GPG_PASSPHRASE
 
       - name: Cache local Maven repository
-        uses: actions/cache@v2.1.6
+        uses: actions/cache@v2.1.7
         env:
           cache-name: cache-mvn
         with:
@@ -38,6 +39,16 @@ jobs:
             ${{ runner.os }}-build-
             ${{ runner.os }}-
 
+      - name: Cache node modules
+        uses: actions/cache@v2
+        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 }}-
+
       - name: Set projects Maven version to GitHub Action GUI set version
         run: mvn versions:set "-DnewVersion=${{ github.event.inputs.releaseversion }}" --no-transfer-progress
 
@@ -49,13 +60,12 @@ jobs:
           MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
 
       - name: Deploy Asciidoc docs output to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@3.7.1
+        uses: JamesIves/github-pages-deploy-action@4.1.5
         with:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          BRANCH: gh-pages # The branch the action should deploy to.
-          FOLDER: spring-boot-admin-docs/target/generated-docs # The folder the action should deploy.
-          TARGET_FOLDER: ${{ github.event.inputs.releaseversion }}
-          CLEAN: true # Automatically remove deleted files from the deploy branch
+          branch: gh-pages # The branch the action should deploy to.
+          folder: spring-boot-admin-docs/target/generated-docs # The folder the action should deploy.
+          target-folder: ${{ github.event.inputs.releaseversion }}
+          clean: true # Automatically remove deleted files from the deploy branch
 
 
   publish-github-release:

diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 codecentric's Spring Boot Admin
 ===============================
 [![Apache License 2](https://img.shields.io/badge/license-ASF2-blue.svg)](https://www.apache.org/licenses/LICENSE-2.0.txt)
-[![Build Status](https://github.com/codecentric/spring-boot-admin/workflows/build/badge.svg)](https://github.com/codecentric/spring-boot-admin/actions)
+![Build Status](https://github.com/codecentric/spring-boot-admin/actions/workflows/build-main.yml/badge.svg?branch=master)
 [![codecov](https://codecov.io/gh/codecentric/spring-boot-admin/branch/master/graph/badge.svg?token=u5SWsZpj5S)](https://codecov.io/gh/codecentric/spring-boot-admin)
 [![Maven Central](https://maven-badges.herokuapp.com/maven-central/de.codecentric/spring-boot-admin/badge.svg)](https://maven-badges.herokuapp.com/maven-central/de.codecentric/spring-boot-admin/)
 [![Gitter](https://badges.gitter.im/codecentric/spring-boot-admin.svg)](https://gitter.im/codecentric/spring-boot-admin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)

diff --git a/pom.xml b/pom.xml
@@ -26,22 +26,25 @@
     <description>Spring Boot Admin</description>
     <url>https://github.com/codecentric/spring-boot-admin/</url>
     <properties>
-        <revision>2.5.2-SNAPSHOT</revision>
+        <revision>2.5.6-SNAPSHOT</revision>
         <java.version>1.8</java.version>
+
         <maven.compiler.source>${java.version}</maven.compiler.source>
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <resource.delimiter>@</resource.delimiter>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
         <!-- used dependencies versions -->
-        <spring-boot.version>2.5.4</spring-boot.version>
-        <spring-cloud.version>2020.0.3</spring-cloud.version>
+        <spring-boot.version>2.5.6</spring-boot.version>
+        <spring-cloud.version>2020.0.4</spring-cloud.version>
         <wiremock.version>2.31.0</wiremock.version>
-        <hazelcast-tests.version>4.2.2</hazelcast-tests.version>
+        <hazelcast-tests.version>4.2.4</hazelcast-tests.version>
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
-        <awaitility.version>4.1.0</awaitility.version>
-        <testcontainers.version>1.15.3</testcontainers.version>
+        <awaitility.version>4.1.1</awaitility.version>
+        <testcontainers.version>1.16.0</testcontainers.version>
+        <jetty.version>9.4.44.v20210927</jetty.version>
+
 
         <!-- plugin versions -->
         <build-helper-maven-plugin.version>3.2.0</build-helper-maven-plugin.version>
@@ -66,9 +69,11 @@
         <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
         <flatten-maven-plugin.version>1.2.7</flatten-maven-plugin.version>
         <maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
-        <checkstyle.version>8.45.1</checkstyle.version>
+        <checkstyle.version>9.0</checkstyle.version>
         <spring-javaformat-checkstyle.version>0.0.28</spring-javaformat-checkstyle.version>
         <nexus-staging-maven-plugin.version>1.6.8</nexus-staging-maven-plugin.version>
+        <node.version>v15.14.0</node.version>
+        <npm.version>7.20.3</npm.version>
     </properties>
     <modules>
         <module>spring-boot-admin-server</module>

diff --git a/spring-boot-admin-build/pom.xml b/spring-boot-admin-build/pom.xml
@@ -30,6 +30,38 @@
     </parent>
     <dependencyManagement>
         <dependencies>
+            <!-- REMOVE WHEN UPDATING TO SPRING BOOT -->
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>1.2.9</version>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-core</artifactId>
+                <version>1.2.9</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-to-slf4j</artifactId>
+                <version>2.16.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.logging.log4j</groupId>
+                <artifactId>log4j-api</artifactId>
+                <version>2.16.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.thymeleaf</groupId>
+                <artifactId>thymeleaf</artifactId>
+                <version>3.0.14.RELEASE</version>
+            </dependency>
+            <dependency>
+                <groupId>org.thymeleaf</groupId>
+                <artifactId>thymeleaf-spring5</artifactId>
+                <version>3.0.14.RELEASE</version>
+            </dependency>
+            <!-- REMOVE END -->
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-dependencies</artifactId>
@@ -42,6 +74,11 @@
                 <artifactId>wiremock-jre8-standalone</artifactId>
                 <version>${wiremock.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.github.tomakehurst</groupId>
+                <artifactId>wiremock-jre8</artifactId>
+                <version>${wiremock.version}</version>
+            </dependency>
             <dependency>
                 <groupId>com.hazelcast</groupId>
                 <artifactId>hazelcast</artifactId>

diff --git a/spring-boot-admin-dependencies/pom.xml b/spring-boot-admin-dependencies/pom.xml
@@ -26,7 +26,7 @@
         <groupId>de.codecentric</groupId>
         <artifactId>spring-boot-admin</artifactId>
         <version>${revision}</version>
-        <relativePath>..</relativePath>
+        <relativePath>../pom.xml</relativePath>
     </parent>
     <dependencyManagement>
         <dependencies>

diff --git a/spring-boot-admin-docs/src/main/asciidoc/client.adoc b/spring-boot-admin-docs/src/main/asciidoc/client.adoc
@@ -29,6 +29,15 @@ For *non-Spring Boot* applications you can either add a `version` or `build.vers
 </build>
 ----
 
+To generate the build-info in a gradle project, add the following snippet to your `build.gradle`:
+[source,groovy]
+.build.gradle
+----
+springBoot {
+	buildInfo()
+}
+----
+
 [[jmx-bean-management]]
 === JMX-Bean Management ===
 

diff --git a/spring-boot-admin-docs/src/main/asciidoc/server-notifications.adoc b/spring-boot-admin-docs/src/main/asciidoc/server-notifications.adoc
@@ -7,7 +7,7 @@ Mail notifications will be delivered as HTML emails rendered using https://www.t
 To enable Mail notifications, configure a `JavaMailSender` using `spring-boot-starter-mail` and set a recipient.
 
 .Sample Mail Notification
-image::mail-notification-sample.png[Sample Mail Notification]
+image::images/mail-notification-sample.png[Sample Mail Notification]
 
 NOTE: To prevent disclosure of sensitive information, the default mail template doesn't show any metadata of
 the instance. If you want to you show some of the metadata you can use a custom template.

diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-custom-ui/package-lock.json b/spring-boot-admin-samples/spring-boot-admin-sample-custom-ui/package-lock.json
diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-custom-ui/package.json b/spring-boot-admin-samples/spring-boot-admin-sample-custom-ui/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "babel-eslint": "10.1.0",
-    "core-js": "3.17.3",
+    "core-js": "3.20.0",
     "eslint-plugin-vue": "6.2.2"
   },
   "devDependencies": {