Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-feature.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down Expand Up @@ -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'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand Down
3 changes: 2 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
20 changes: 20 additions & 0 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
]
}
1 change: 1 addition & 0 deletions spring-boot-admin-docs/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
</goals>
<phase>pre-site</phase>
<configuration>
<npmVersion>${npm.version}</npmVersion>
<nodeVersion>${node.version}</nodeVersion>
</configuration>
</execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
<goal>install-node-and-npm</goal>
</goals>
<configuration>
<npmVersion>${npm.version}</npmVersion>
<nodeVersion>${node.version}</nodeVersion>
</configuration>
</execution>
Expand Down
1 change: 1 addition & 0 deletions spring-boot-admin-server-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
"> .5%, last 2 versions"
],
"engines": {
"npm": "11.12.0",
"node": "24.15.0"
},
"msw": {
Expand Down
1 change: 1 addition & 0 deletions spring-boot-admin-server-ui/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
<goal>install-node-and-npm</goal>
</goals>
<configuration>
<npmVersion>${npm.version}</npmVersion>
<nodeVersion>${node.version}</nodeVersion>
</configuration>
</execution>
Expand Down