Merge branch 'master' into bugfix/5286-health-info-events

Author: ulischulte

.github/workflows/build-feature.yml

@@ -42,7 +42,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v6
         with:
-          node-version: 'lts/*'
+          node-version: '24'
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
 

.github/workflows/build-main.yml

@@ -29,7 +29,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v6
         with:
-          node-version: 'lts/*'
+          node-version: '24'
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
 
@@ -71,7 +71,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v6
         with:
-          node-version: 'lts/*'
+          node-version: '24'
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
 

.github/workflows/deploy-documentation.yml

@@ -36,7 +36,7 @@ jobs:
       - name: Set up Node
         uses: actions/setup-node@v6
         with:
-          node-version: 'lts/*'
+          node-version: '24'
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
 

pom.xml

@@ -33,7 +33,8 @@
         <revision>4.1.0-SNAPSHOT</revision>
 
         <java.version>17</java.version>
-        <node.version>v22.12.0</node.version>
+        <npm.version>11.12.1</npm.version>
+        <node.version>v24.15.0</node.version>
 
         <require.maven.version>3.9</require.maven.version>
 
@@ -47,18 +48,18 @@
         <maven.site.skip>true</maven.site.skip>
 
         <!-- used dependencies versions -->
-        <spring-boot.version>4.0.5</spring-boot.version>
+        <spring-boot.version>4.0.6</spring-boot.version>
         <spring-cloud.version>2025.1.1</spring-cloud.version>
 
-        <jolokia-support-springboot.version>2.5.1</jolokia-support-springboot.version>
+        <jolokia-support-springboot.version>2.6.0</jolokia-support-springboot.version>
 
         <checkstyle.version>12.3.1</checkstyle.version>
         <findbugs-jsr305.version>3.0.2</findbugs-jsr305.version>
 
         <wiremock.version>3.13.2</wiremock.version>
         <hazelcast.version>5.6.0</hazelcast.version>
         <awaitility.version>4.3.0</awaitility.version>
-        <jetty.version>12.1.8</jetty.version>
+        <jetty.version>12.1.9</jetty.version>
 
         <!-- plugin versions -->
         <build-helper-maven-plugin.version>3.6.1</build-helper-maven-plugin.version>

renovate.json

@@ -8,6 +8,18 @@
   ],
   "minimumReleaseAge": "5 days",
   "internalChecksFilter": "strict",
+  "customManagers": [
+    {
+      "description": "Track Node.js version in frontend-maven-plugin <node.version> property",
+      "customType": "regex",
+      "managerFilePatterns": ["/(^|/)pom\\.xml$/"],
+      "matchStrings": ["<node\\.version>v(?<currentValue>[^<]+)</node\\.version>"],
+      "depNameTemplate": "node",
+      "datasourceTemplate": "node-version",
+      "versioningTemplate": "node",
+      "extractVersionTemplate": "^v?(?<version>.+)$"
+    }
+  ],
   "packageRules": [
     {
       "description": "Automatically merge minor and patch-level updates when checks pass, creates a PR otherwise",
@@ -33,6 +45,14 @@
         "com.puppycrawl.tools:checkstyle"
       ],
       "allowedVersions": "<13"
+    },
+    {
+      "description": "Group all Node.js and npm version updates (pom.xml, .nvmrc, package.json engines, GitHub Actions) into one PR",
+      "matchDepNames": ["node", "npm"],
+      "matchDatasources": ["node-version", "npm"],
+      "matchDepTypes": ["engines", "node"],
+      "groupName": "Node.js version",
+      "groupSlug": "nodejs-version"
     }
   ]
 }

spring-boot-admin-docs/pom.xml

@@ -53,6 +53,7 @@
                         </goals>
                         <phase>pre-site</phase>
                         <configuration>
+                            <npmVersion>${npm.version}</npmVersion>
                             <nodeVersion>${node.version}</nodeVersion>
                         </configuration>
                     </execution>

spring-boot-admin-docs/src/site/docs/11-upgrading/01-spring-boot-admin-4.md

@@ -165,16 +165,16 @@ spring:
 
 **Available Options:**
 
-| Value                 | Description                                          |
-|-----------------------|------------------------------------------------------|
-| `IP`                  | Use IP address (equivalent to old `prefer-ip: true`) |
-| `HOST_NAME`           | Use hostname (equivalent to old `prefer-ip: false`)  |
-| `CANONICAL_HOST_NAME` | Use canonical hostname                               |
+| Value                 | Description                                                    |
+|-----------------------|----------------------------------------------------------------|
+| `IP`                  | Use IP address (equivalent to old `prefer-ip: true`)           |
+| `HOST_NAME`           | Use hostname                                                   |
+| `CANONICAL_HOST_NAME` | Use canonical hostname (equivalent to old `prefer-ip: false`)  |
 
 **Action Required:**
 
 - Search your configuration files for `prefer-ip`
-- Replace with `service-host-type: IP` (if `prefer-ip: true`) or `service-host-type: HOST_NAME` (if `prefer-ip: false`)
+- Replace with `service-host-type: IP` (if `prefer-ip: true`) or `service-host-type: CANONICAL_HOST_NAME` (if `prefer-ip: false`)
 
 ### 4. Jolokia Compatibility