Merge remote-tracking branch 'origin/master' into renovate/sass-loade…

…r-12.x * origin/master: (28 commits) chore(deps): update jamesives/github-pages-deploy-action action to v4.1.8 (#1896) chore(deps): update dependency org.springframework.cloud:spring-cloud-dependencies to v2020.0.5 (#1895) chore(deps): update dependency org.apache.maven.plugins:maven-gpg-plugin to v3 (#1822) chore(deps): update codecov/codecov-action action to v2 (#1814) 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) ...
codecentric · Dec 22, 2021 · df1bc8a · df1bc8a
2 parents 67cd585 + 836812d
commit df1bc8a
Show file tree

Hide file tree

Showing 47 changed files with 3,279 additions and 253 deletions.
diff --git a/.github/workflows/build-feature.yml b/.github/workflows/build-feature.yml
@@ -25,7 +25,7 @@ jobs:
           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:
@@ -53,7 +53,6 @@ jobs:
           mvn -B spring-javaformat:apply --no-transfer-progress
           mvn -B verify -P coverage --no-transfer-progress -D maven.javadoc.skip=true
 
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v2
         with:
-          file: ./**/target/site/jacoco/jacoco.xml
-          name: codecov
+          files: "'*/jacoco.xml'"
diff --git a/.github/workflows/build-main.yml b/.github/workflows/build-main.yml
@@ -25,7 +25,7 @@ jobs:
           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:
@@ -53,10 +53,9 @@ jobs:
           mvn -B spring-javaformat:apply --no-transfer-progress
           mvn -B verify -P coverage --no-transfer-progress -D maven.javadoc.skip=true
 
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v2
         with:
-          file: ./**/target/site/jacoco/jacoco.xml
-          name: codecov
+          files: "'*/jacoco.xml'"
 
   publish-snapshot:
     needs: build
@@ -72,7 +71,7 @@ jobs:
           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:
@@ -108,7 +107,7 @@ jobs:
         run: echo ${{ steps.project.outputs.version }}
 
       - name: Deploy Asciidoc docs output to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@4.1.5
+        uses: JamesIves/github-pages-deploy-action@4.1.8
         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.

diff --git a/.github/workflows/build-pullrequest.yml b/.github/workflows/build-pullrequest.yml
@@ -21,7 +21,7 @@ jobs:
           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:
@@ -49,7 +49,6 @@ jobs:
           mvn -B spring-javaformat:apply --no-transfer-progress
           mvn -B verify -P coverage --no-transfer-progress -D maven.javadoc.skip=true
 
-      - uses: codecov/codecov-action@v1
+      - uses: codecov/codecov-action@v2
         with:
-          file: ./**/target/site/jacoco/jacoco.xml
-          name: codecov
+          files: "'*/jacoco.xml'"
diff --git a/.github/workflows/release-to-maven-central.yml b/.github/workflows/release-to-maven-central.yml
@@ -28,7 +28,7 @@ jobs:
           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:
@@ -60,7 +60,7 @@ jobs:
           MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
 
       - name: Deploy Asciidoc docs output to GitHub Pages
-        uses: JamesIves/github-pages-deploy-action@4.1.5
+        uses: JamesIves/github-pages-deploy-action@4.1.8
         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.

diff --git a/pom.xml b/pom.xml
@@ -26,8 +26,9 @@
     <description>Spring Boot Admin</description>
     <url>https://github.com/codecentric/spring-boot-admin/</url>
     <properties>
-        <revision>2.5.5-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>
@@ -36,14 +37,15 @@
 
         <!-- used dependencies versions -->
         <spring-boot.version>2.5.6</spring-boot.version>
-        <spring-cloud.version>2020.0.4</spring-cloud.version>
+        <spring-cloud.version>2020.0.5</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>
+        <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>
         <maven-compiler-plugin.version>3.8.1</maven-compiler-plugin.version>
@@ -60,7 +62,7 @@
         <maven-resources-plugin.version>3.2.0</maven-resources-plugin.version>
         <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
         <maven-war-plugin.version>3.3.2</maven-war-plugin.version>
-        <maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
+        <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
         <frontend-maven-plugin.version>1.12.0</frontend-maven-plugin.version>
         <jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
         <asciidoctor-maven-plugin.version>2.2.1</asciidoctor-maven-plugin.version>

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>

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-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": {

diff --git a/spring-boot-admin-samples/spring-boot-admin-sample-eureka/src/main/docker/Dockerfile b/spring-boot-admin-samples/spring-boot-admin-sample-eureka/src/main/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM java:7
+FROM java:9
 VOLUME /tmp
 ADD target/spring-boot-admin-sample-eureka.jar /app.jar
 RUN bash -c 'touch /app.jar'

diff --git a/spring-boot-admin-server-ui/.storybook/preview.js b/spring-boot-admin-server-ui/.storybook/preview.js
@@ -5,10 +5,17 @@ import Vue from "vue/dist/vue.js";
 import components from "@/components";
 import i18n from "@/i18n";
 import VueI18n from "vue-i18n";
+import mappingsEndpoint from '@/mocks/instance/mappings';
+
+import { initialize, mswDecorator } from 'msw-storybook-addon';
+
+// Initialize MSW
+initialize();
 
 Vue.use(VueI18n);
 Vue.use(components);
 
+
 export const parameters = {
   actions: {argTypesRegex: "^on[A-Z].*"},
   controls: {
@@ -17,6 +24,12 @@ export const parameters = {
       date: /Date$/,
     },
   },
+  msw: {
+    handlers: {
+      auth: null,
+      others: [...mappingsEndpoint]
+    }
+  }
 }
 
 export const decorators = [
@@ -25,7 +38,8 @@ export const decorators = [
     return Vue.extend({
       i18n,
       components: {wrapped},
-      template: `<wrapped/>`
+      template: `
+        <wrapped/>`
     })
-  },
+  }, mswDecorator
 ]