Skip to content

Commit 4ccf0e6

Browse files
author
Andreas Höhmann
committed
Merge branch 'feat/migrate-to-springboot-4' of github.com:ahoehma/spring-boot-admin into feat/migrate-to-springboot-4
2 parents eb5a20a + 3e6de72 commit 4ccf0e6

File tree

39 files changed

+1573
-914
lines changed

39 files changed

+1573
-914
lines changed

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@
5050
<spring-boot.version>4.0.0</spring-boot.version>
5151
<spring-cloud.version>2025.1.0</spring-cloud.version>
5252

53-
<jolokia-support-spring.version>2.4.1</jolokia-support-spring.version>
53+
<jolokia-support-spring.version>2.4.2</jolokia-support-spring.version>
5454

5555
<checkstyle.version>12.1.2</checkstyle.version>
5656
<findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
5757

58-
<wiremock.version>3.13.1</wiremock.version>
58+
<wiremock.version>3.13.2</wiremock.version>
5959
<hazelcast.version>5.6.0</hazelcast.version>
6060
<awaitility.version>4.3.0</awaitility.version>
6161
<testcontainers.version>1.21.3</testcontainers.version>
@@ -65,15 +65,15 @@
6565
<build-helper-maven-plugin.version>3.6.1</build-helper-maven-plugin.version>
6666
<maven-compiler-plugin.version>3.14.1</maven-compiler-plugin.version>
6767
<!-- because of https://github.com/mojohaus/versions/issues/855 -->
68-
<versions-maven-plugin.version>2.19.1</versions-maven-plugin.version>
68+
<versions-maven-plugin.version>2.20.1</versions-maven-plugin.version>
6969
<maven-clean-plugin.version>3.5.0</maven-clean-plugin.version>
7070
<maven-dependency-plugin.version>3.9.0</maven-dependency-plugin.version>
7171
<maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
7272
<maven-enforcer-plugin.version>3.6.2</maven-enforcer-plugin.version>
7373
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
7474
<maven-failsafe-plugin.version>3.5.4</maven-failsafe-plugin.version>
7575
<maven-install-plugin.version>3.1.4</maven-install-plugin.version>
76-
<maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
76+
<maven-jar-plugin.version>3.5.0</maven-jar-plugin.version>
7777
<maven-javadoc-plugin.version>3.12.0</maven-javadoc-plugin.version>
7878
<maven-resources-plugin.version>3.3.1</maven-resources-plugin.version>
7979
<maven-source-plugin.version>3.3.1</maven-source-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",
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
sidebar_custom_props:
3+
icon: 'notifications'
4+
---
5+
import metadata from "../../../../../../spring-boot-admin-server/target/classes/META-INF/spring-configuration-metadata.json";
6+
import { PropertyTable } from "../../../src/components/PropertyTable";
7+
8+
# Mattermost Notifications
9+
10+
To enable [Mattermost](https://mattermost.com/) notifications you need to add a bot account under integrations on your Mattermost server and configure it appropriately.
11+
12+
<PropertyTable
13+
title="Mattermost notifications configuration options"
14+
properties={metadata.properties}
15+
filter={['notify.mattermost']}
16+
exclusive={false}
17+
/>

spring-boot-admin-docs/src/site/package-lock.json

Lines changed: 10 additions & 180 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

spring-boot-admin-docs/src/site/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"asciidoctor": "^3.0.4",
2121
"clsx": "^2.1.1",
2222
"dotenv": "^17.0.0",
23-
"glob": "^11.0.0",
23+
"glob": "^13.0.0",
2424
"lodash.merge": "^4.6.2",
2525
"node-html-markdown": "^2.0.0",
2626
"prism-react-renderer": "^2.4.0",

0 commit comments

Comments
 (0)