From 2d23b5ae234536cb10bb9a40b3717bb686df4da8 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Wed, 5 Feb 2025 00:00:17 -0500 Subject: [PATCH 01/46] add nx --- .gitignore | 4 + .nx/nxw.js | 116 +++ build.gradle | 18 + nx | 5 + nx.bat | 10 + nx.json | 27 + package-lock.json | 1952 +++++++++++++++++++++++++++++++++++++++++++++ package.json | 7 + settings.gradle | 1 + 9 files changed, 2140 insertions(+) create mode 100644 .nx/nxw.js create mode 100755 nx create mode 100644 nx.bat create mode 100644 nx.json create mode 100644 package-lock.json create mode 100644 package.json diff --git a/.gitignore b/.gitignore index 1198c2da875d..3581dcdde729 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,7 @@ secrets.yml .sts4-cache .git-hooks/ node_modules + +.nx/installation +.nx/cache +.nx/workspace-data \ No newline at end of file diff --git a/.nx/nxw.js b/.nx/nxw.js new file mode 100644 index 000000000000..73796bb315bf --- /dev/null +++ b/.nx/nxw.js @@ -0,0 +1,116 @@ +"use strict"; +// This file should be committed to your repository! It wraps Nx and ensures +// that your local installation matches nx.json. +// See: https://nx.dev/recipes/installation/install-non-javascript for more info. + + + + +Object.defineProperty(exports, "__esModule", { value: true }); +const fs = require('fs'); +const path = require('path'); +const cp = require('child_process'); +const installationPath = path.join(__dirname, 'installation', 'package.json'); +function matchesCurrentNxInstall(currentInstallation, nxJsonInstallation) { + if (!currentInstallation.devDependencies || + !Object.keys(currentInstallation.devDependencies).length) { + return false; + } + try { + if (currentInstallation.devDependencies['nx'] !== + nxJsonInstallation.version || + require(path.join(path.dirname(installationPath), 'node_modules', 'nx', 'package.json')).version !== nxJsonInstallation.version) { + return false; + } + for (const [plugin, desiredVersion] of Object.entries(nxJsonInstallation.plugins || {})) { + if (currentInstallation.devDependencies[plugin] !== desiredVersion) { + return false; + } + } + return true; + } + catch { + return false; + } +} +function ensureDir(p) { + if (!fs.existsSync(p)) { + fs.mkdirSync(p, { recursive: true }); + } +} +function getCurrentInstallation() { + try { + return require(installationPath); + } + catch { + return { + name: 'nx-installation', + version: '0.0.0', + devDependencies: {}, + }; + } +} +function performInstallation(currentInstallation, nxJson) { + fs.writeFileSync(installationPath, JSON.stringify({ + name: 'nx-installation', + devDependencies: { + nx: nxJson.installation.version, + ...nxJson.installation.plugins, + }, + })); + try { + cp.execSync('npm i', { + cwd: path.dirname(installationPath), + stdio: 'inherit', + windowsHide: false, + }); + } + catch (e) { + // revert possible changes to the current installation + fs.writeFileSync(installationPath, JSON.stringify(currentInstallation)); + // rethrow + throw e; + } +} +function ensureUpToDateInstallation() { + const nxJsonPath = path.join(__dirname, '..', 'nx.json'); + let nxJson; + try { + nxJson = require(nxJsonPath); + if (!nxJson.installation) { + console.error('[NX]: The "installation" entry in the "nx.json" file is required when running the nx wrapper. See https://nx.dev/recipes/installation/install-non-javascript'); + process.exit(1); + } + } + catch { + console.error('[NX]: The "nx.json" file is required when running the nx wrapper. See https://nx.dev/recipes/installation/install-non-javascript'); + process.exit(1); + } + try { + ensureDir(path.join(__dirname, 'installation')); + const currentInstallation = getCurrentInstallation(); + if (!matchesCurrentNxInstall(currentInstallation, nxJson.installation)) { + performInstallation(currentInstallation, nxJson); + } + } + catch (e) { + const messageLines = [ + '[NX]: Nx wrapper failed to synchronize installation.', + ]; + if (e instanceof Error) { + messageLines.push(''); + messageLines.push(e.message); + messageLines.push(e.stack); + } + else { + messageLines.push(e.toString()); + } + console.error(messageLines.join('\n')); + process.exit(1); + } +} +if (!process.env.NX_WRAPPER_SKIP_INSTALL) { + ensureUpToDateInstallation(); +} + +require('./installation/node_modules/nx/bin/nx'); diff --git a/build.gradle b/build.gradle index 095698453bbb..015a500f9ea4 100644 --- a/build.gradle +++ b/build.gradle @@ -1,4 +1,5 @@ plugins { + id "dev.nx.gradle.project-graph" version "+" id "base" id "org.jetbrains.kotlin.jvm" apply false // https://youtrack.jetbrains.com/issue/KT-30276 } @@ -9,12 +10,18 @@ defaultTasks 'build' allprojects { group = "org.springframework.boot" + apply { + plugin("project-report") + plugin("dev.nx.gradle.project-graph") + } } subprojects { apply plugin: "org.springframework.boot.conventions" + // apply plugin: "dev.nx.gradle.project-graph" repositories { + mavenLocal() mavenCentral() spring.mavenRepositories() } @@ -24,3 +31,14 @@ subprojects { } } +tasks.register("projectReportAll") { + // All project reports of subprojects + allprojects.forEach { + dependsOn(it.tasks.getAt("projectReport")) + } + + // All projectReportAll of included builds + gradle.includedBuilds.forEach { + dependsOn(it.task(":projectReportAll")) + } +} diff --git a/nx b/nx new file mode 100755 index 000000000000..e94326e36a56 --- /dev/null +++ b/nx @@ -0,0 +1,5 @@ +#!/bin/bash +command -v node >/dev/null 2>&1 || { echo >&2 "Nx requires NodeJS to be available. To install NodeJS and NPM, see: https://nodejs.org/en/download/ ."; exit 1; } +command -v npm >/dev/null 2>&1 || { echo >&2 "Nx requires npm to be available. To install NodeJS and NPM, see: https://nodejs.org/en/download/ ."; exit 1; } +path_to_root=$(dirname $BASH_SOURCE) +node $path_to_root/.nx/nxw.js $@ \ No newline at end of file diff --git a/nx.bat b/nx.bat new file mode 100644 index 000000000000..d6b09b76549a --- /dev/null +++ b/nx.bat @@ -0,0 +1,10 @@ +@ECHO OFF +SETLOCAL +SET path_to_root=%~dp0 +WHERE node >nul 2>nul +IF %ERRORLEVEL% NEQ 0 (ECHO Nx requires NodeJS to be available. To install NodeJS and NPM, see: https://nodejs.org/en/download/ . & GOTO exit) +WHERE npm >nul 2>nul +IF %ERRORLEVEL% NEQ 0 (ECHO Nx requires npm to be available. To install NodeJS and NPM, see: https://nodejs.org/en/download/ . & GOTO exit) +node %path_to_root%\.nx\nxw.js %* +:exit + cmd /c exit /b %ERRORLEVEL% \ No newline at end of file diff --git a/nx.json b/nx.json new file mode 100644 index 000000000000..f5c71cfaf68e --- /dev/null +++ b/nx.json @@ -0,0 +1,27 @@ +{ + "installation": { + "version": "0.0.0-pr-29464-f9a8c49", + "plugins": { + "@nx/gradle": "0.0.0-pr-29464-f9a8c49" + } + }, + "plugins": [ + { + "plugin": "@nx/gradle", + "options": { + "testTargetName": "test", + "classesTargetName": "classes", + "buildTargetName": "build" + } + } + ], + "namedInputs": { + "default": [ + "{projectRoot}/**/*" + ], + "production": [ + "default", + "!{projectRoot}/src/test/**/*" + ] + } +} diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 000000000000..e3cae5fcec31 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,1952 @@ +{ + "name": "spring-boot", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "spring-boot", + "dependencies": { + "@nx/gradle": "0.0.0-pr-30457-0563fbb", + "nx": "0.0.0-pr-30457-0563fbb" + } + }, + "node_modules/@emnapi/core": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.3.1.tgz", + "integrity": "sha512-pVGjBIt1Y6gg3EJN8jTcfpP/+uuRksIo055oE/OBkDNcjZqVbfkWCksG1Jp4yZnj3iKWyWX8fdG/j6UDYPbFog==", + "license": "MIT", + "dependencies": { + "@emnapi/wasi-threads": "1.0.1", + "tslib": "^2.4.0" + } + }, + "node_modules/@emnapi/runtime": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.3.1.tgz", + "integrity": "sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==", + "license": "MIT", + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@emnapi/wasi-threads": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.1.tgz", + "integrity": "sha512-iIBu7mwkq4UQGeMEM8bLwNK962nXdhodeScX4slfQnRhEMMzvYivHhutCIk8uojvmASXXPC2WNEjwxFWk72Oqw==", + "license": "MIT", + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", + "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "license": "MIT", + "dependencies": { + "@sinclair/typebox": "^0.27.8" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/@napi-rs/wasm-runtime": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.4.tgz", + "integrity": "sha512-9zESzOO5aDByvhIAsOy9TbpZ0Ur2AJbUI7UT73kcUTS2mxAMHOBaa1st/jAymNoCtvrit99kkzT1FZuXVcgfIQ==", + "license": "MIT", + "dependencies": { + "@emnapi/core": "^1.1.0", + "@emnapi/runtime": "^1.1.0", + "@tybys/wasm-util": "^0.9.0" + } + }, + "node_modules/@nx/gradle": { + "version": "0.0.0-pr-30457-0563fbb", + "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-0.0.0-pr-30457-0563fbb.tgz", + "integrity": "sha512-ajwb23QGdI74n5WownMKib0SEft8QY/KTBeERMP8HDLvjbL+41xK9AN/j936S5pOGTOMZRd/yUt1Qqt4AjqQqg==", + "license": "MIT", + "dependencies": { + "@nx/devkit": "0.0.0-pr-30457-0563fbb" + } + }, + "node_modules/@nx/gradle/node_modules/@nx/devkit": { + "version": "0.0.0-pr-30457-0563fbb", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-0.0.0-pr-30457-0563fbb.tgz", + "integrity": "sha512-K32nUI0Vo/RCB52H/CbpGZZBT7XE/WwNltsTOG4jldbkArTG3e7AXfpgkN8xUZ4c3ZKUImS+DDY9MLhQ/4I9cA==", + "license": "MIT", + "dependencies": { + "ejs": "^3.1.7", + "enquirer": "~2.3.6", + "ignore": "^5.0.4", + "minimatch": "9.0.3", + "semver": "^7.5.3", + "tmp": "~0.2.1", + "tslib": "^2.3.0", + "yargs-parser": "21.1.1" + }, + "peerDependencies": { + "nx": ">= 19 <= 21" + } + }, + "node_modules/@nx/gradle/node_modules/@nx/nx-darwin-arm64": { + "version": "20.7.1", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-20.7.1.tgz", + "integrity": "sha512-beTMrUA9x18/DXeIMn32Me/KFCLnc2L0cVxjjMMdztZrotVPdoLsQWWZHcaLyZSSk1SDjJ0As2AwIOiJLp2Q8w==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/gradle/node_modules/@nx/nx-darwin-x64": { + "version": "20.7.1", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-20.7.1.tgz", + "integrity": "sha512-I0M8JWwAF9wyNCL30oelXt1SCRVUTmS0FmtmWPxgcHlVd8tVyyuguURQuUO33w/xDhZzGJmvLZduown+OKihXw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/gradle/node_modules/@nx/nx-freebsd-x64": { + "version": "20.7.1", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-20.7.1.tgz", + "integrity": "sha512-j39YpihBWbLc2w/Hp3Q+ycPqFHNPSJZYTg6G4sC6qzyzMVlaWp1cI1m02FD1rscWT93ehoqHYcSytpDrMa6ZMQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/gradle/node_modules/@nx/nx-linux-arm-gnueabihf": { + "version": "20.7.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-20.7.1.tgz", + "integrity": "sha512-AJxU2OayRzLLu5xyWlrbzoTN63Gt0S9rEJL97IGGHXKY/NlbtkJt2n5q7KAtlkkUpr8TYXtxyZSL1R3LePd36w==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/gradle/node_modules/@nx/nx-linux-arm64-gnu": { + "version": "20.7.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-20.7.1.tgz", + "integrity": "sha512-bEHDh8ajs9ht5yIKyeZcB5vJt6wpwCHYGkZfSQs1xSUOqOFdQz2gjLDdlwyuJTwXI8+Syvb4gHKBSxCPOycInw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/gradle/node_modules/@nx/nx-linux-arm64-musl": { + "version": "20.7.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-20.7.1.tgz", + "integrity": "sha512-k5lLVWO1HF6FQkNs/7VfOqbaceWS01+2a6mD0aQoIr34FIhxJc7QHfOZ5c2xdCOrlNfY3iGiPf++KCpeuor0tg==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/gradle/node_modules/@nx/nx-linux-x64-gnu": { + "version": "20.7.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-20.7.1.tgz", + "integrity": "sha512-crySPl4l4XJFDzGOuFjavkwLvo59wCx3pqgju3bMcQ+imUvAtUFHNUFfAr2CiEzYATuvbDcOQU1I5Fo40plagA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/gradle/node_modules/@nx/nx-linux-x64-musl": { + "version": "20.7.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-20.7.1.tgz", + "integrity": "sha512-eXUu5lKg2yiItItOThjV7ecPfxE1qcr4utAPy/3F9wjFale8RfZX2x+NllaA/7eh6ph0voqvdZrmZY+IDvTyRg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/gradle/node_modules/@nx/nx-win32-arm64-msvc": { + "version": "20.7.1", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-20.7.1.tgz", + "integrity": "sha512-dy+DxUJMixtSLi/9Y8dexGko3hrC/QB+fZ6uoJMoL8ey6xw5LFIWbi1tnJ04YEHMFQS1Y4+OEoNejUF0BTUcWw==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/gradle/node_modules/@nx/nx-win32-x64-msvc": { + "version": "20.7.1", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-20.7.1.tgz", + "integrity": "sha512-cBV9SIvfZVzehYg9w/p77Iw1LqUVy0i848quxo9YBuQCQ0biUsJpkwJJ+b+DW6EbKSN3wX0kh519tGR7SbZrxg==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "peer": true, + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/gradle/node_modules/nx": { + "version": "20.7.1", + "resolved": "https://registry.npmjs.org/nx/-/nx-20.7.1.tgz", + "integrity": "sha512-hUiTMJdthuy8VfDQNHbfMQ2eOfOIB44UVP6eACCdg4bSlINwBZ03E/JYtm/1jYe51w/8pPs6YgkVUaAI1UiwMw==", + "hasInstallScript": true, + "license": "MIT", + "peer": true, + "dependencies": { + "@napi-rs/wasm-runtime": "0.2.4", + "@yarnpkg/lockfile": "^1.1.0", + "@yarnpkg/parsers": "3.0.2", + "@zkochan/js-yaml": "0.0.7", + "axios": "^1.8.3", + "chalk": "^4.1.0", + "cli-cursor": "3.1.0", + "cli-spinners": "2.6.1", + "cliui": "^8.0.1", + "dotenv": "~16.4.5", + "dotenv-expand": "~11.0.6", + "enquirer": "~2.3.6", + "figures": "3.2.0", + "flat": "^5.0.2", + "front-matter": "^4.0.2", + "ignore": "^5.0.4", + "jest-diff": "^29.4.1", + "jsonc-parser": "3.2.0", + "lines-and-columns": "2.0.3", + "minimatch": "9.0.3", + "node-machine-id": "1.1.12", + "npm-run-path": "^4.0.1", + "open": "^8.4.0", + "ora": "5.3.0", + "resolve.exports": "2.0.3", + "semver": "^7.5.3", + "string-width": "^4.2.3", + "tar-stream": "~2.2.0", + "tmp": "~0.2.1", + "tsconfig-paths": "^4.1.2", + "tslib": "^2.3.0", + "yaml": "^2.6.0", + "yargs": "^17.6.2", + "yargs-parser": "21.1.1" + }, + "bin": { + "nx": "bin/nx.js", + "nx-cloud": "bin/nx-cloud.js" + }, + "optionalDependencies": { + "@nx/nx-darwin-arm64": "20.7.1", + "@nx/nx-darwin-x64": "20.7.1", + "@nx/nx-freebsd-x64": "20.7.1", + "@nx/nx-linux-arm-gnueabihf": "20.7.1", + "@nx/nx-linux-arm64-gnu": "20.7.1", + "@nx/nx-linux-arm64-musl": "20.7.1", + "@nx/nx-linux-x64-gnu": "20.7.1", + "@nx/nx-linux-x64-musl": "20.7.1", + "@nx/nx-win32-arm64-msvc": "20.7.1", + "@nx/nx-win32-x64-msvc": "20.7.1" + }, + "peerDependencies": { + "@swc-node/register": "^1.8.0", + "@swc/core": "^1.3.85" + }, + "peerDependenciesMeta": { + "@swc-node/register": { + "optional": true + }, + "@swc/core": { + "optional": true + } + } + }, + "node_modules/@nx/nx-darwin-arm64": { + "version": "0.0.0-pr-30457-0563fbb", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-0.0.0-pr-30457-0563fbb.tgz", + "integrity": "sha512-H52zUuwiGCL9DluRpI0NwsqNwzlixMuB1TCyIvaCTMSWPOhHh6w5+ewMSaKjphNVs6yG8yBvQo/QRDhyH2+xRg==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-darwin-x64": { + "version": "0.0.0-pr-30457-0563fbb", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-0.0.0-pr-30457-0563fbb.tgz", + "integrity": "sha512-EYcwOcDnj3D70aiXutCEdo4nHQrZ46ZNZ+VgeGxBXLM9S6qUzruT/L6TfI9CsimIwisjEkNxrWFJVUbPTVQTmQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-freebsd-x64": { + "version": "0.0.0-pr-30457-0563fbb", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-0.0.0-pr-30457-0563fbb.tgz", + "integrity": "sha512-VgKaVG9Kao2vDZKfvITrBljBmtg5sPKVeouQ+f65jj72GNyqraIY15ZZLoB/TfqibxsthkxqM/e4HvCcJt7g3w==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-arm-gnueabihf": { + "version": "0.0.0-pr-30457-0563fbb", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-0.0.0-pr-30457-0563fbb.tgz", + "integrity": "sha512-D0is4vRZUBZ4GKRXkBk++BIv+z9YcoxdWp02ve4V6IdIhrQekhKFUwEHyB8fkCnNP2FlUR8vFe1pDgu2CXKATA==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-arm64-gnu": { + "version": "0.0.0-pr-30457-0563fbb", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-0.0.0-pr-30457-0563fbb.tgz", + "integrity": "sha512-o+rMarYWphugX92CwdHwxMNokx4eWqBqSCjK+/3AUN5CrpKtGBmReNkoKlx8Q2pnn/t1WNOZH+62bI0nmNLcUg==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-arm64-musl": { + "version": "0.0.0-pr-30457-0563fbb", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-0.0.0-pr-30457-0563fbb.tgz", + "integrity": "sha512-eJ63yELo1D93FZMT5E/iVmKn+dagj+M1tGsa0BKKgEl7fCx3xUT3ajQTLTkCfa1vJGcYZ8Tuebub8lsUT5QjmA==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-x64-gnu": { + "version": "0.0.0-pr-30457-0563fbb", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-0.0.0-pr-30457-0563fbb.tgz", + "integrity": "sha512-ITfyLkZ/7BHzF/4LMf5ZtJXPO1GXfCzyHcpCTRkdUJJlz1joXk7REIKAinDDlTUX23DHT2n9HQS+kRy3CzoyCA==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-x64-musl": { + "version": "0.0.0-pr-30457-0563fbb", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-0.0.0-pr-30457-0563fbb.tgz", + "integrity": "sha512-3RHNjlvsx8LEoM36chLsEnc1LJOmrT1hsUM5g1zsTD0gEUhQnpTTYOJrnrSOSLf+ccKHx8dgz4CviXMBKlnscQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-win32-arm64-msvc": { + "version": "0.0.0-pr-30457-0563fbb", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-0.0.0-pr-30457-0563fbb.tgz", + "integrity": "sha512-R+4f7mKcMr3n3SS16ctVhluVtWPRE2IMkgct5JTct5i4gghTzXVuvCk30PowbH7NDwdyttvsKQVCHNJ+NWKB1Q==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-win32-x64-msvc": { + "version": "0.0.0-pr-30457-0563fbb", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-0.0.0-pr-30457-0563fbb.tgz", + "integrity": "sha512-MU2zIeko+vUQ0MQ5fREtKVesb2DhoCyLxhndVXfBJ9aeyKzXiuFUN3A42veiAn0dFMyH0zf01ngaiRLsW3cuJw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@sinclair/typebox": { + "version": "0.27.8", + "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "license": "MIT" + }, + "node_modules/@tybys/wasm-util": { + "version": "0.9.0", + "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.9.0.tgz", + "integrity": "sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==", + "license": "MIT", + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@yarnpkg/lockfile": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", + "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", + "license": "BSD-2-Clause" + }, + "node_modules/@yarnpkg/parsers": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.2.tgz", + "integrity": "sha512-/HcYgtUSiJiot/XWGLOlGxPYUG65+/31V8oqk17vZLW1xlCoR4PampyePljOxY2n8/3jz9+tIFzICsyGujJZoA==", + "license": "BSD-2-Clause", + "dependencies": { + "js-yaml": "^3.10.0", + "tslib": "^2.4.0" + }, + "engines": { + "node": ">=18.12.0" + } + }, + "node_modules/@zkochan/js-yaml": { + "version": "0.0.7", + "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.7.tgz", + "integrity": "sha512-nrUSn7hzt7J6JWgWGz78ZYI8wj+gdIJdk0Ynjpp8l+trkn58Uqsf6RYrYkEK+3X18EX+TNdtJI0WxAtc+L84SQ==", + "license": "MIT", + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/ansi-colors": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", + "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "license": "Python-2.0" + }, + "node_modules/async": { + "version": "3.2.6", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", + "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", + "license": "MIT" + }, + "node_modules/asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "license": "MIT" + }, + "node_modules/axios": { + "version": "1.8.4", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.4.tgz", + "integrity": "sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==", + "license": "MIT", + "dependencies": { + "follow-redirects": "^1.15.6", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "license": "MIT" + }, + "node_modules/base64-js": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", + "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "license": "MIT", + "dependencies": { + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" + } + }, + "node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", + "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT", + "dependencies": { + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", + "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/cli-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", + "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "license": "MIT", + "dependencies": { + "restore-cursor": "^3.1.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cli-spinners": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", + "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", + "license": "MIT", + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/clone": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", + "license": "MIT", + "engines": { + "node": ">=0.8" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" + }, + "node_modules/combined-stream": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", + "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "license": "MIT", + "dependencies": { + "delayed-stream": "~1.0.0" + }, + "engines": { + "node": ">= 0.8" + } + }, + "node_modules/concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "license": "MIT" + }, + "node_modules/defaults": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", + "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", + "license": "MIT", + "dependencies": { + "clone": "^1.0.2" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/define-lazy-prop": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", + "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "license": "MIT", + "engines": { + "node": ">=0.4.0" + } + }, + "node_modules/diff-sequences": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", + "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", + "license": "MIT", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/dotenv": { + "version": "16.4.7", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", + "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==", + "license": "BSD-2-Clause", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, + "node_modules/dotenv-expand": { + "version": "11.0.7", + "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz", + "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==", + "license": "BSD-2-Clause", + "dependencies": { + "dotenv": "^16.4.5" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://dotenvx.com" + } + }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/ejs": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", + "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", + "license": "Apache-2.0", + "dependencies": { + "jake": "^10.8.5" + }, + "bin": { + "ejs": "bin/cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" + }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "license": "MIT", + "dependencies": { + "once": "^1.4.0" + } + }, + "node_modules/enquirer": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "license": "MIT", + "dependencies": { + "ansi-colors": "^4.1.1" + }, + "engines": { + "node": ">=8.6" + } + }, + "node_modules/es-define-property": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-errors": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", + "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-object-atoms": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", + "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/es-set-tostringtag": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "license": "MIT", + "engines": { + "node": ">=0.8.0" + } + }, + "node_modules/esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "license": "BSD-2-Clause", + "bin": { + "esparse": "bin/esparse.js", + "esvalidate": "bin/esvalidate.js" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/figures": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", + "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "license": "MIT", + "dependencies": { + "escape-string-regexp": "^1.0.5" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/filelist": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "license": "Apache-2.0", + "dependencies": { + "minimatch": "^5.0.1" + } + }, + "node_modules/filelist/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "license": "BSD-3-Clause", + "bin": { + "flat": "cli.js" + } + }, + "node_modules/follow-redirects": { + "version": "1.15.9", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz", + "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==", + "funding": [ + { + "type": "individual", + "url": "https://github.com/sponsors/RubenVerborgh" + } + ], + "license": "MIT", + "engines": { + "node": ">=4.0" + }, + "peerDependenciesMeta": { + "debug": { + "optional": true + } + } + }, + "node_modules/form-data": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", + "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", + "license": "MIT", + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/front-matter": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-4.0.2.tgz", + "integrity": "sha512-I8ZuJ/qG92NWX8i5x1Y8qyj3vizhXS31OxjKDu3LKP+7/qBgfIKValiZIEwoVoJKUHlhWtYrktkxV1XsX+pPlg==", + "license": "MIT", + "dependencies": { + "js-yaml": "^3.13.1" + } + }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "license": "MIT" + }, + "node_modules/function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/get-intrinsic": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", + "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "license": "MIT", + "dependencies": { + "call-bind-apply-helpers": "^1.0.2", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.1", + "function-bind": "^1.1.2", + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "license": "MIT", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/gopd": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/has-symbols": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/has-tostringtag": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", + "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "license": "MIT", + "dependencies": { + "has-symbols": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/ieee754": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", + "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "BSD-3-Clause" + }, + "node_modules/ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "license": "MIT", + "engines": { + "node": ">= 4" + } + }, + "node_modules/inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" + }, + "node_modules/is-docker": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", + "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", + "license": "MIT", + "bin": { + "is-docker": "cli.js" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-interactive": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", + "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/is-wsl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "license": "MIT", + "dependencies": { + "is-docker": "^2.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/jake": { + "version": "10.9.2", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz", + "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==", + "license": "Apache-2.0", + "dependencies": { + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.4", + "minimatch": "^3.1.2" + }, + "bin": { + "jake": "bin/cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jake/node_modules/brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "license": "MIT", + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "node_modules/jake/node_modules/minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/jest-diff": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", + "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", + "license": "MIT", + "dependencies": { + "chalk": "^4.0.0", + "diff-sequences": "^29.6.3", + "jest-get-type": "^29.6.3", + "pretty-format": "^29.7.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/jest-get-type": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", + "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", + "license": "MIT", + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/js-yaml": { + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", + "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "license": "MIT", + "dependencies": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/js-yaml/node_modules/argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "license": "MIT", + "dependencies": { + "sprintf-js": "~1.0.2" + } + }, + "node_modules/json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "license": "MIT", + "bin": { + "json5": "lib/cli.js" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/jsonc-parser": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", + "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", + "license": "MIT" + }, + "node_modules/lines-and-columns": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz", + "integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==", + "license": "MIT", + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, + "node_modules/log-symbols": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "license": "MIT", + "dependencies": { + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "license": "MIT", + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", + "dependencies": { + "mime-db": "1.52.0" + }, + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/minimatch": { + "version": "9.0.3", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", + "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "license": "ISC", + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "license": "MIT", + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/node-machine-id": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz", + "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==", + "license": "MIT" + }, + "node_modules/npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "license": "MIT", + "dependencies": { + "path-key": "^3.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nx": { + "version": "0.0.0-pr-30457-0563fbb", + "resolved": "https://registry.npmjs.org/nx/-/nx-0.0.0-pr-30457-0563fbb.tgz", + "integrity": "sha512-98dL0Ad1pD4K1dlDAf1705SwUB86DlqtbzXrURmRkxlOKhVdlodZcCxW91Oti6i1QrKEgqORlg8iNzdE6/HE0g==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "@napi-rs/wasm-runtime": "0.2.4", + "@yarnpkg/lockfile": "^1.1.0", + "@yarnpkg/parsers": "3.0.2", + "@zkochan/js-yaml": "0.0.7", + "axios": "^1.8.3", + "chalk": "^4.1.0", + "cli-cursor": "3.1.0", + "cli-spinners": "2.6.1", + "cliui": "^8.0.1", + "dotenv": "~16.4.5", + "dotenv-expand": "~11.0.6", + "enquirer": "~2.3.6", + "figures": "3.2.0", + "flat": "^5.0.2", + "front-matter": "^4.0.2", + "ignore": "^5.0.4", + "jest-diff": "^29.4.1", + "jsonc-parser": "3.2.0", + "lines-and-columns": "2.0.3", + "minimatch": "9.0.3", + "node-machine-id": "1.1.12", + "npm-run-path": "^4.0.1", + "open": "^8.4.0", + "ora": "5.3.0", + "resolve.exports": "2.0.3", + "semver": "^7.5.3", + "string-width": "^4.2.3", + "tar-stream": "~2.2.0", + "tmp": "~0.2.1", + "tsconfig-paths": "^4.1.2", + "tslib": "^2.3.0", + "yaml": "^2.6.0", + "yargs": "^17.6.2", + "yargs-parser": "21.1.1" + }, + "bin": { + "nx": "bin/nx.js", + "nx-cloud": "bin/nx-cloud.js" + }, + "optionalDependencies": { + "@nx/nx-darwin-arm64": "0.0.0-pr-30457-0563fbb", + "@nx/nx-darwin-x64": "0.0.0-pr-30457-0563fbb", + "@nx/nx-freebsd-x64": "0.0.0-pr-30457-0563fbb", + "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-30457-0563fbb", + "@nx/nx-linux-arm64-gnu": "0.0.0-pr-30457-0563fbb", + "@nx/nx-linux-arm64-musl": "0.0.0-pr-30457-0563fbb", + "@nx/nx-linux-x64-gnu": "0.0.0-pr-30457-0563fbb", + "@nx/nx-linux-x64-musl": "0.0.0-pr-30457-0563fbb", + "@nx/nx-win32-arm64-msvc": "0.0.0-pr-30457-0563fbb", + "@nx/nx-win32-x64-msvc": "0.0.0-pr-30457-0563fbb" + }, + "peerDependencies": { + "@swc-node/register": "^1.8.0", + "@swc/core": "^1.3.85" + }, + "peerDependenciesMeta": { + "@swc-node/register": { + "optional": true + }, + "@swc/core": { + "optional": true + } + } + }, + "node_modules/once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "license": "ISC", + "dependencies": { + "wrappy": "1" + } + }, + "node_modules/onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "license": "MIT", + "dependencies": { + "mimic-fn": "^2.1.0" + }, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/open": { + "version": "8.4.2", + "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", + "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", + "license": "MIT", + "dependencies": { + "define-lazy-prop": "^2.0.0", + "is-docker": "^2.1.1", + "is-wsl": "^2.2.0" + }, + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/ora": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz", + "integrity": "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==", + "license": "MIT", + "dependencies": { + "bl": "^4.0.3", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-spinners": "^2.5.0", + "is-interactive": "^1.0.0", + "log-symbols": "^4.0.0", + "strip-ansi": "^6.0.0", + "wcwidth": "^1.0.1" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/pretty-format": { + "version": "29.7.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", + "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", + "license": "MIT", + "dependencies": { + "@jest/schemas": "^29.6.3", + "ansi-styles": "^5.0.0", + "react-is": "^18.0.0" + }, + "engines": { + "node": "^14.15.0 || ^16.10.0 || >=18.0.0" + } + }, + "node_modules/pretty-format/node_modules/ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "license": "MIT", + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" + }, + "node_modules/react-is": { + "version": "18.3.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", + "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", + "license": "MIT" + }, + "node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "license": "MIT", + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/resolve.exports": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz", + "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==", + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "node_modules/restore-cursor": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", + "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "license": "MIT", + "dependencies": { + "onetime": "^5.1.0", + "signal-exit": "^3.0.2" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/feross" + }, + { + "type": "patreon", + "url": "https://www.patreon.com/feross" + }, + { + "type": "consulting", + "url": "https://feross.org/support" + } + ], + "license": "MIT" + }, + "node_modules/semver": { + "version": "7.7.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", + "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "license": "ISC", + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/signal-exit": { + "version": "3.0.7", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "license": "ISC" + }, + "node_modules/sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "license": "BSD-3-Clause" + }, + "node_modules/string_decoder": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", + "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "license": "MIT", + "dependencies": { + "safe-buffer": "~5.2.0" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "license": "MIT", + "engines": { + "node": ">=4" + } + }, + "node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "license": "MIT", + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tmp": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", + "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", + "license": "MIT", + "engines": { + "node": ">=14.14" + } + }, + "node_modules/tsconfig-paths": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", + "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", + "license": "MIT", + "dependencies": { + "json5": "^2.2.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "license": "0BSD" + }, + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "license": "MIT" + }, + "node_modules/wcwidth": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", + "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", + "license": "MIT", + "dependencies": { + "defaults": "^1.0.3" + } + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "license": "ISC" + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yaml": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz", + "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==", + "license": "ISC", + "bin": { + "yaml": "bin.mjs" + }, + "engines": { + "node": ">= 14" + } + }, + "node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "license": "MIT", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "license": "ISC", + "engines": { + "node": ">=12" + } + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 000000000000..bde4364d2346 --- /dev/null +++ b/package.json @@ -0,0 +1,7 @@ +{ + "name": "spring-boot", + "dependencies": { + "nx": "0.0.0-pr-30457-0563fbb", + "@nx/gradle": "0.0.0-pr-30457-0563fbb" + } +} diff --git a/settings.gradle b/settings.gradle index 32a0a7fc9265..5a6d3e3d16a7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,7 @@ pluginManagement { evaluate(new File("${rootDir}/buildSrc/SpringRepositorySupport.groovy")).apply(this) repositories { + mavenLocal() mavenCentral() gradlePluginPortal() spring.mavenRepositories(); From a7c145c7244f9dd819f9c50e029c917a6814164b Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Wed, 5 Feb 2025 00:00:17 -0500 Subject: [PATCH 02/46] add nx --- build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/build.gradle b/build.gradle index 015a500f9ea4..55df3f061910 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,6 @@ allprojects { subprojects { apply plugin: "org.springframework.boot.conventions" - // apply plugin: "dev.nx.gradle.project-graph" repositories { mavenLocal() From aa5c7465270ec9a60e9d8229f8037a8d98e7726c Mon Sep 17 00:00:00 2001 From: lourw <56288712+lourw@users.noreply.github.com> Date: Fri, 2 May 2025 08:56:40 -0700 Subject: [PATCH 03/46] chore(repo): apply nx-cloud --- .github/actions/build/action.yml | 24 +- .../actions/prepare-gradle-build/action.yml | 2 +- .../actions/publish-gradle-plugin/action.yml | 2 +- .github/workflows/build-pull-request.yml | 18 +- .github/workflows/verify.yml | 2 +- .nx/workflows/agents.yaml | 45 ++ nx.json | 15 +- package-lock.json | 439 ++++-------------- package.json | 4 +- 9 files changed, 165 insertions(+), 386 deletions(-) create mode 100644 .nx/workflows/agents.yaml diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index b45040d0348f..873fc071dc93 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -35,7 +35,7 @@ inputs: java-version: description: 'Java version to compile and test with' required: false - default: '17' + default: '21' publish: description: 'Whether to publish artifacts ready for deployment to Artifactory' required: false @@ -68,17 +68,17 @@ runs: COMMERCIAL_REPO_PASSWORD: ${{ inputs.commercial-repository-password }} COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }} COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }} - run: ./gradlew build - - name: Publish - id: publish - if: ${{ inputs.publish == 'true' }} - shell: bash - env: - COMMERCIAL_RELEASE_REPO_URL: ${{ inputs.commercial-release-repository-url }} - COMMERCIAL_REPO_PASSWORD: ${{ inputs.commercial-repository-password }} - COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }} - COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }} - run: ./gradlew -PdeploymentRepository=$(pwd)/deployment-repository ${{ !startsWith(github.event.head_commit.message, 'Next development version') && 'build' || '' }} publishAllPublicationsToDeploymentRepository + run: NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx run-many -t build --parallel=32 --batch +# - name: Publish +# id: publish +# if: ${{ inputs.publish == 'true' }} +# shell: bash +# env: +# COMMERCIAL_RELEASE_REPO_URL: ${{ inputs.commercial-release-repository-url }} +# COMMERCIAL_REPO_PASSWORD: ${{ inputs.commercial-repository-password }} +# COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }} +# COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }} +# run: ./gradlew -PdeploymentRepository=$(pwd)/deployment-repository ${{ !startsWith(github.event.head_commit.message, 'Next development version') && 'build' || '' }} publishAllPublicationsToDeploymentRepository - name: Read Version From gradle.properties id: read-version shell: bash diff --git a/.github/actions/prepare-gradle-build/action.yml b/.github/actions/prepare-gradle-build/action.yml index 6532ce75276a..df9f5796a60c 100644 --- a/.github/actions/prepare-gradle-build/action.yml +++ b/.github/actions/prepare-gradle-build/action.yml @@ -23,7 +23,7 @@ inputs: java-version: description: 'Java version to use for the build' required: false - default: '17' + default: '21' runs: using: composite steps: diff --git a/.github/actions/publish-gradle-plugin/action.yml b/.github/actions/publish-gradle-plugin/action.yml index 198e593bb4d7..e3b8e5594209 100644 --- a/.github/actions/publish-gradle-plugin/action.yml +++ b/.github/actions/publish-gradle-plugin/action.yml @@ -31,7 +31,7 @@ runs: uses: actions/setup-java@v4 with: distribution: 'liberica' - java-version: '17' + java-version: '21 - name: Publish shell: bash working-directory: ${{ github.action_path }} diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml index 7a28e943cf5b..40de97a8965a 100644 --- a/.github/workflows/build-pull-request.yml +++ b/.github/workflows/build-pull-request.yml @@ -5,14 +5,30 @@ permissions: jobs: build: name: Build Pull Request - if: ${{ github.repository == 'spring-projects/spring-boot' }} runs-on: ${{ vars.UBUNTU_MEDIUM || 'ubuntu-latest' }} steps: - name: Check Out Code uses: actions/checkout@v4 + - name: Use Node.js + uses: actions/setup-node@v4 + with: + node-version: 22 + check-latest: true + cache: npm + - run: npm install + + # This enables task distribution via Nx Cloud + # Run this command as early as possible, before dependencies are installed + # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun + # Uncomment this line to enable task distribution + - run: NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_CLOUD_RETRIEVAL_CONCURRENCY=8 NX_CLOUD_NO_TIMEOUTS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx-cloud start-ci-run --distribute-on="5 linux-extra-large-plus-jvm" --require-explicit-completion + - name: Build id: build uses: ./.github/actions/build + - name: Stop nx cloud agents + if: always() + run: npx nx-cloud complete-ci-run - name: Print JVM Thread Dumps When Cancelled if: cancelled() uses: ./.github/actions/print-jvm-thread-dumps diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index 9c7c4c4d6f01..251398dc063c 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -50,7 +50,7 @@ jobs: uses: actions/setup-java@v4 with: distribution: 'liberica' - java-version: 17 + java-version: 21 - name: Set Up Homebrew if: ${{ !vars.COMMERCIAL }} uses: Homebrew/actions/setup-homebrew@7657c9512f50e1c35b640971116425935bab3eea diff --git a/.nx/workflows/agents.yaml b/.nx/workflows/agents.yaml new file mode 100644 index 000000000000..be1dca6b8ec9 --- /dev/null +++ b/.nx/workflows/agents.yaml @@ -0,0 +1,45 @@ +launch-templates: + linux-extra-large-plus-jvm: + env: + DOCKER_HOST: "" + SERVICES_HOST: "" + LANG: C.UTF-8 + resource-class: 'docker_linux_amd64/extra_large+' + image: 'ubuntu22.04-node20.11-v10' + init-steps: + - name: java version + script: java -version + + - name: Checkout + uses: 'nrwl/nx-cloud-workflows/v3.6/workflow-steps/checkout/main.yaml' + + - name: Setup Java 21 + script: | + sudo apt update + sudo apt install -y openjdk-21-jdk + sudo update-alternatives --set java /usr/lib/jvm/java-21-openjdk-amd64/bin/java + java -version + - name: Setup gradle + script: ./gradlew wrapper && ./gradlew --stop && ./gradlew clean + + - name: Restore Node Modules Cache + uses: 'nrwl/nx-cloud-workflows/v4/workflow-steps/cache/main.yaml' + inputs: + key: 'package-lock.json|yarn.lock|pnpm-lock.yaml' + paths: 'node_modules' + base-branch: 'main' + - name: Restore Browser Binary Cache + uses: 'nrwl/nx-cloud-workflows/v4/workflow-steps/cache/main.yaml' + inputs: + key: 'package-lock.json|yarn.lock|pnpm-lock.yaml|"browsers"' + paths: | + '../.cache/Cypress' + base-branch: 'main' + - name: Install Node Modules + uses: 'nrwl/nx-cloud-workflows/v4/workflow-steps/install-node-modules/main.yaml' + + - name: postinstall + script: | + if [ -f package.json ]; then + npm run postinstall || yarn postinstall || pnpm postinstall + fi \ No newline at end of file diff --git a/nx.json b/nx.json index f5c71cfaf68e..e2960ef1d2f9 100644 --- a/nx.json +++ b/nx.json @@ -1,17 +1,13 @@ { - "installation": { - "version": "0.0.0-pr-29464-f9a8c49", - "plugins": { - "@nx/gradle": "0.0.0-pr-29464-f9a8c49" - } - }, "plugins": [ { "plugin": "@nx/gradle", "options": { "testTargetName": "test", "classesTargetName": "classes", - "buildTargetName": "build" + "buildTargetName": "build", + "ciTestTargetName": "ci", + "ciIntTestTargetName": "ciIntTest" } } ], @@ -23,5 +19,8 @@ "default", "!{projectRoot}/src/test/**/*" ] - } + }, + "nxCloudUrl": "https://snapshot.nx.app", + "nxCloudId": "67dad8ae45125407e384edab" } + diff --git a/package-lock.json b/package-lock.json index e3cae5fcec31..0f135efb327e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,8 +6,8 @@ "": { "name": "spring-boot", "dependencies": { - "@nx/gradle": "0.0.0-pr-30457-0563fbb", - "nx": "0.0.0-pr-30457-0563fbb" + "@nx/gradle": "21.0.0-rc.2", + "nx": "21.0.0-rc.2" } }, "node_modules/@emnapi/core": { @@ -61,20 +61,10 @@ "@tybys/wasm-util": "^0.9.0" } }, - "node_modules/@nx/gradle": { - "version": "0.0.0-pr-30457-0563fbb", - "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-0.0.0-pr-30457-0563fbb.tgz", - "integrity": "sha512-ajwb23QGdI74n5WownMKib0SEft8QY/KTBeERMP8HDLvjbL+41xK9AN/j936S5pOGTOMZRd/yUt1Qqt4AjqQqg==", - "license": "MIT", - "dependencies": { - "@nx/devkit": "0.0.0-pr-30457-0563fbb" - } - }, - "node_modules/@nx/gradle/node_modules/@nx/devkit": { - "version": "0.0.0-pr-30457-0563fbb", - "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-0.0.0-pr-30457-0563fbb.tgz", - "integrity": "sha512-K32nUI0Vo/RCB52H/CbpGZZBT7XE/WwNltsTOG4jldbkArTG3e7AXfpgkN8xUZ4c3ZKUImS+DDY9MLhQ/4I9cA==", - "license": "MIT", + "node_modules/@nx/devkit": { + "version": "21.0.0-rc.2", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-21.0.0-rc.2.tgz", + "integrity": "sha512-N3ifBM/Nh4U4uYCj1Lb8aD9m0XWWFDqSCol59is5vNGt9gSqFPJNH+jZwlKJu5Y9vl0McXFwDdYAAIapkw7lZQ==", "dependencies": { "ejs": "^3.1.7", "enquirer": "~2.3.6", @@ -86,410 +76,136 @@ "yargs-parser": "21.1.1" }, "peerDependencies": { - "nx": ">= 19 <= 21" - } - }, - "node_modules/@nx/gradle/node_modules/@nx/nx-darwin-arm64": { - "version": "20.7.1", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-20.7.1.tgz", - "integrity": "sha512-beTMrUA9x18/DXeIMn32Me/KFCLnc2L0cVxjjMMdztZrotVPdoLsQWWZHcaLyZSSk1SDjJ0As2AwIOiJLp2Q8w==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "peer": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/@nx/gradle/node_modules/@nx/nx-darwin-x64": { - "version": "20.7.1", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-20.7.1.tgz", - "integrity": "sha512-I0M8JWwAF9wyNCL30oelXt1SCRVUTmS0FmtmWPxgcHlVd8tVyyuguURQuUO33w/xDhZzGJmvLZduown+OKihXw==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "peer": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/@nx/gradle/node_modules/@nx/nx-freebsd-x64": { - "version": "20.7.1", - "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-20.7.1.tgz", - "integrity": "sha512-j39YpihBWbLc2w/Hp3Q+ycPqFHNPSJZYTg6G4sC6qzyzMVlaWp1cI1m02FD1rscWT93ehoqHYcSytpDrMa6ZMQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "peer": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/@nx/gradle/node_modules/@nx/nx-linux-arm-gnueabihf": { - "version": "20.7.1", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-20.7.1.tgz", - "integrity": "sha512-AJxU2OayRzLLu5xyWlrbzoTN63Gt0S9rEJL97IGGHXKY/NlbtkJt2n5q7KAtlkkUpr8TYXtxyZSL1R3LePd36w==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "peer": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/@nx/gradle/node_modules/@nx/nx-linux-arm64-gnu": { - "version": "20.7.1", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-20.7.1.tgz", - "integrity": "sha512-bEHDh8ajs9ht5yIKyeZcB5vJt6wpwCHYGkZfSQs1xSUOqOFdQz2gjLDdlwyuJTwXI8+Syvb4gHKBSxCPOycInw==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "peer": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/@nx/gradle/node_modules/@nx/nx-linux-arm64-musl": { - "version": "20.7.1", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-20.7.1.tgz", - "integrity": "sha512-k5lLVWO1HF6FQkNs/7VfOqbaceWS01+2a6mD0aQoIr34FIhxJc7QHfOZ5c2xdCOrlNfY3iGiPf++KCpeuor0tg==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "peer": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/@nx/gradle/node_modules/@nx/nx-linux-x64-gnu": { - "version": "20.7.1", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-20.7.1.tgz", - "integrity": "sha512-crySPl4l4XJFDzGOuFjavkwLvo59wCx3pqgju3bMcQ+imUvAtUFHNUFfAr2CiEzYATuvbDcOQU1I5Fo40plagA==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "peer": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/@nx/gradle/node_modules/@nx/nx-linux-x64-musl": { - "version": "20.7.1", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-20.7.1.tgz", - "integrity": "sha512-eXUu5lKg2yiItItOThjV7ecPfxE1qcr4utAPy/3F9wjFale8RfZX2x+NllaA/7eh6ph0voqvdZrmZY+IDvTyRg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "peer": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/@nx/gradle/node_modules/@nx/nx-win32-arm64-msvc": { - "version": "20.7.1", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-20.7.1.tgz", - "integrity": "sha512-dy+DxUJMixtSLi/9Y8dexGko3hrC/QB+fZ6uoJMoL8ey6xw5LFIWbi1tnJ04YEHMFQS1Y4+OEoNejUF0BTUcWw==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "peer": true, - "engines": { - "node": ">= 10" - } - }, - "node_modules/@nx/gradle/node_modules/@nx/nx-win32-x64-msvc": { - "version": "20.7.1", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-20.7.1.tgz", - "integrity": "sha512-cBV9SIvfZVzehYg9w/p77Iw1LqUVy0i848quxo9YBuQCQ0biUsJpkwJJ+b+DW6EbKSN3wX0kh519tGR7SbZrxg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "peer": true, - "engines": { - "node": ">= 10" + "nx": "21.0.0-rc.2" } }, - "node_modules/@nx/gradle/node_modules/nx": { - "version": "20.7.1", - "resolved": "https://registry.npmjs.org/nx/-/nx-20.7.1.tgz", - "integrity": "sha512-hUiTMJdthuy8VfDQNHbfMQ2eOfOIB44UVP6eACCdg4bSlINwBZ03E/JYtm/1jYe51w/8pPs6YgkVUaAI1UiwMw==", - "hasInstallScript": true, - "license": "MIT", - "peer": true, + "node_modules/@nx/gradle": { + "version": "21.0.0-rc.2", + "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-21.0.0-rc.2.tgz", + "integrity": "sha512-n6E8K1z+5m+o0KZC8kbl69PVLRyHzf7RbHX/W+AHGmf6C2QuDC5X+nkWGBXeoKsDcsqeJB5NUf7iYkurLtDCIw==", "dependencies": { - "@napi-rs/wasm-runtime": "0.2.4", - "@yarnpkg/lockfile": "^1.1.0", - "@yarnpkg/parsers": "3.0.2", - "@zkochan/js-yaml": "0.0.7", - "axios": "^1.8.3", - "chalk": "^4.1.0", - "cli-cursor": "3.1.0", - "cli-spinners": "2.6.1", - "cliui": "^8.0.1", - "dotenv": "~16.4.5", - "dotenv-expand": "~11.0.6", - "enquirer": "~2.3.6", - "figures": "3.2.0", - "flat": "^5.0.2", - "front-matter": "^4.0.2", - "ignore": "^5.0.4", - "jest-diff": "^29.4.1", - "jsonc-parser": "3.2.0", - "lines-and-columns": "2.0.3", - "minimatch": "9.0.3", - "node-machine-id": "1.1.12", - "npm-run-path": "^4.0.1", - "open": "^8.4.0", - "ora": "5.3.0", - "resolve.exports": "2.0.3", - "semver": "^7.5.3", - "string-width": "^4.2.3", - "tar-stream": "~2.2.0", - "tmp": "~0.2.1", - "tsconfig-paths": "^4.1.2", - "tslib": "^2.3.0", - "yaml": "^2.6.0", - "yargs": "^17.6.2", - "yargs-parser": "21.1.1" - }, - "bin": { - "nx": "bin/nx.js", - "nx-cloud": "bin/nx-cloud.js" - }, - "optionalDependencies": { - "@nx/nx-darwin-arm64": "20.7.1", - "@nx/nx-darwin-x64": "20.7.1", - "@nx/nx-freebsd-x64": "20.7.1", - "@nx/nx-linux-arm-gnueabihf": "20.7.1", - "@nx/nx-linux-arm64-gnu": "20.7.1", - "@nx/nx-linux-arm64-musl": "20.7.1", - "@nx/nx-linux-x64-gnu": "20.7.1", - "@nx/nx-linux-x64-musl": "20.7.1", - "@nx/nx-win32-arm64-msvc": "20.7.1", - "@nx/nx-win32-x64-msvc": "20.7.1" - }, - "peerDependencies": { - "@swc-node/register": "^1.8.0", - "@swc/core": "^1.3.85" - }, - "peerDependenciesMeta": { - "@swc-node/register": { - "optional": true - }, - "@swc/core": { - "optional": true - } + "@nx/devkit": "21.0.0-rc.2" } }, "node_modules/@nx/nx-darwin-arm64": { - "version": "0.0.0-pr-30457-0563fbb", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-0.0.0-pr-30457-0563fbb.tgz", - "integrity": "sha512-H52zUuwiGCL9DluRpI0NwsqNwzlixMuB1TCyIvaCTMSWPOhHh6w5+ewMSaKjphNVs6yG8yBvQo/QRDhyH2+xRg==", + "version": "21.0.0-rc.2", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-21.0.0-rc.2.tgz", + "integrity": "sha512-INHCMQTiGrlqxEKFFTvZYGG1pGg79CYY2a3lefZoTU7Esg39MrIXDktwe4OsNNsnvHk2jAAY82/ph2X1U+BrfA==", "cpu": [ "arm64" ], - "license": "MIT", "optional": true, "os": [ "darwin" - ], - "engines": { - "node": ">= 10" - } + ] }, "node_modules/@nx/nx-darwin-x64": { - "version": "0.0.0-pr-30457-0563fbb", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-0.0.0-pr-30457-0563fbb.tgz", - "integrity": "sha512-EYcwOcDnj3D70aiXutCEdo4nHQrZ46ZNZ+VgeGxBXLM9S6qUzruT/L6TfI9CsimIwisjEkNxrWFJVUbPTVQTmQ==", + "version": "21.0.0-rc.2", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-21.0.0-rc.2.tgz", + "integrity": "sha512-BUebx7EFOBFTycSnSXZFjRa5VwtTNGb8t2vcTDoFSN2Il4Wvev1qZze702yt8hA/YgPsuLBIQHGF47Adyi1DDA==", "cpu": [ "x64" ], - "license": "MIT", "optional": true, "os": [ "darwin" - ], - "engines": { - "node": ">= 10" - } + ] }, "node_modules/@nx/nx-freebsd-x64": { - "version": "0.0.0-pr-30457-0563fbb", - "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-0.0.0-pr-30457-0563fbb.tgz", - "integrity": "sha512-VgKaVG9Kao2vDZKfvITrBljBmtg5sPKVeouQ+f65jj72GNyqraIY15ZZLoB/TfqibxsthkxqM/e4HvCcJt7g3w==", + "version": "21.0.0-rc.2", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-21.0.0-rc.2.tgz", + "integrity": "sha512-Lhb8ZFhKeFkXp0IheWHeqbjs/K8Mx+jUTqbsSlHf4opN2vL6bvXH1UDQDLpIXtP3xDpEjPU+uZqc/ev3wTK+cg==", "cpu": [ "x64" ], - "license": "MIT", "optional": true, "os": [ "freebsd" - ], - "engines": { - "node": ">= 10" - } + ] }, "node_modules/@nx/nx-linux-arm-gnueabihf": { - "version": "0.0.0-pr-30457-0563fbb", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-0.0.0-pr-30457-0563fbb.tgz", - "integrity": "sha512-D0is4vRZUBZ4GKRXkBk++BIv+z9YcoxdWp02ve4V6IdIhrQekhKFUwEHyB8fkCnNP2FlUR8vFe1pDgu2CXKATA==", + "version": "21.0.0-rc.2", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-21.0.0-rc.2.tgz", + "integrity": "sha512-+CZvfCA2vH01XIyOUF8o8rNveZQ3k2Z1z8/j/MF3m2mnozaFBSNJU6+tJFYUNj2S9tZjvP/j9V+4N9/RVy93ng==", "cpu": [ "arm" ], - "license": "MIT", "optional": true, "os": [ "linux" - ], - "engines": { - "node": ">= 10" - } + ] }, "node_modules/@nx/nx-linux-arm64-gnu": { - "version": "0.0.0-pr-30457-0563fbb", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-0.0.0-pr-30457-0563fbb.tgz", - "integrity": "sha512-o+rMarYWphugX92CwdHwxMNokx4eWqBqSCjK+/3AUN5CrpKtGBmReNkoKlx8Q2pnn/t1WNOZH+62bI0nmNLcUg==", + "version": "21.0.0-rc.2", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-21.0.0-rc.2.tgz", + "integrity": "sha512-7buvnJjjbaQzNATqhMVVBbAObLBecjM1Q9I6CrZrXv/tXBYvg6B0qkcoeDRJ6q1R7t/gzGNpu3Q17vQmBO/hNQ==", "cpu": [ "arm64" ], - "license": "MIT", "optional": true, "os": [ "linux" - ], - "engines": { - "node": ">= 10" - } + ] }, "node_modules/@nx/nx-linux-arm64-musl": { - "version": "0.0.0-pr-30457-0563fbb", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-0.0.0-pr-30457-0563fbb.tgz", - "integrity": "sha512-eJ63yELo1D93FZMT5E/iVmKn+dagj+M1tGsa0BKKgEl7fCx3xUT3ajQTLTkCfa1vJGcYZ8Tuebub8lsUT5QjmA==", + "version": "21.0.0-rc.2", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-21.0.0-rc.2.tgz", + "integrity": "sha512-MGNM1HbTNOJA+BimRHZvxbbI+b/tq+3nQChsfVnY8rBpQmTsSfCDl6gTagQeH0t4Pz+eDYEmwLaXNmCfbno+pQ==", "cpu": [ "arm64" ], - "license": "MIT", "optional": true, "os": [ "linux" - ], - "engines": { - "node": ">= 10" - } + ] }, "node_modules/@nx/nx-linux-x64-gnu": { - "version": "0.0.0-pr-30457-0563fbb", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-0.0.0-pr-30457-0563fbb.tgz", - "integrity": "sha512-ITfyLkZ/7BHzF/4LMf5ZtJXPO1GXfCzyHcpCTRkdUJJlz1joXk7REIKAinDDlTUX23DHT2n9HQS+kRy3CzoyCA==", + "version": "21.0.0-rc.2", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-21.0.0-rc.2.tgz", + "integrity": "sha512-50mRRoNtXn9VkMgzDAz8+bM3SmsmZY6NHilxOSyOsKcrDyOqN84Td5kFV51zvQhoTUWyv8o4TGB3hyMk7Aaf2g==", "cpu": [ "x64" ], - "license": "MIT", "optional": true, "os": [ "linux" - ], - "engines": { - "node": ">= 10" - } + ] }, "node_modules/@nx/nx-linux-x64-musl": { - "version": "0.0.0-pr-30457-0563fbb", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-0.0.0-pr-30457-0563fbb.tgz", - "integrity": "sha512-3RHNjlvsx8LEoM36chLsEnc1LJOmrT1hsUM5g1zsTD0gEUhQnpTTYOJrnrSOSLf+ccKHx8dgz4CviXMBKlnscQ==", + "version": "21.0.0-rc.2", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-21.0.0-rc.2.tgz", + "integrity": "sha512-0jo3Rlh4q4ox+4pxkOBwFkMDdOeRovC7RsizfmqHYReCee8SjrGyThQKaEwe/CeOJb80TuRN34sU5P1yY4jS5A==", "cpu": [ "x64" ], - "license": "MIT", "optional": true, "os": [ "linux" - ], - "engines": { - "node": ">= 10" - } + ] }, "node_modules/@nx/nx-win32-arm64-msvc": { - "version": "0.0.0-pr-30457-0563fbb", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-0.0.0-pr-30457-0563fbb.tgz", - "integrity": "sha512-R+4f7mKcMr3n3SS16ctVhluVtWPRE2IMkgct5JTct5i4gghTzXVuvCk30PowbH7NDwdyttvsKQVCHNJ+NWKB1Q==", + "version": "21.0.0-rc.2", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-21.0.0-rc.2.tgz", + "integrity": "sha512-v+K/SIM3uIiDXZHgkIrSQWh0PcWbXC/QSgQVetRQBpgv6zefY/DD5zaHKyks17Na6U98WBjy3WL+LlyyC0kbAw==", "cpu": [ "arm64" ], - "license": "MIT", "optional": true, "os": [ "win32" - ], - "engines": { - "node": ">= 10" - } + ] }, "node_modules/@nx/nx-win32-x64-msvc": { - "version": "0.0.0-pr-30457-0563fbb", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-0.0.0-pr-30457-0563fbb.tgz", - "integrity": "sha512-MU2zIeko+vUQ0MQ5fREtKVesb2DhoCyLxhndVXfBJ9aeyKzXiuFUN3A42veiAn0dFMyH0zf01ngaiRLsW3cuJw==", + "version": "21.0.0-rc.2", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-21.0.0-rc.2.tgz", + "integrity": "sha512-WGQvgr7yayEPx7PuuA1EUJLav0RAE8MfhlqI1XbRfkzqq9+ZNEhw4jMswDLypEqKC5wxsBzMBXghPbJ50g2heA==", "cpu": [ "x64" ], - "license": "MIT", "optional": true, "os": [ "win32" - ], - "engines": { - "node": ">= 10" - } + ] }, "node_modules/@sinclair/typebox": { "version": "0.27.8", @@ -579,8 +295,7 @@ "node_modules/async": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", - "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", - "license": "MIT" + "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==" }, "node_modules/asynckit": { "version": "0.4.0", @@ -778,8 +493,7 @@ "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "license": "MIT" + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" }, "node_modules/defaults": { "version": "1.0.4", @@ -865,7 +579,6 @@ "version": "3.1.10", "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", - "license": "Apache-2.0", "dependencies": { "jake": "^10.8.5" }, @@ -998,7 +711,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", - "license": "Apache-2.0", "dependencies": { "minimatch": "^5.0.1" } @@ -1007,7 +719,6 @@ "version": "5.1.6", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", - "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -1285,7 +996,6 @@ "version": "10.9.2", "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz", "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==", - "license": "Apache-2.0", "dependencies": { "async": "^3.2.3", "chalk": "^4.0.2", @@ -1303,7 +1013,6 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1313,7 +1022,6 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -1492,11 +1200,10 @@ } }, "node_modules/nx": { - "version": "0.0.0-pr-30457-0563fbb", - "resolved": "https://registry.npmjs.org/nx/-/nx-0.0.0-pr-30457-0563fbb.tgz", - "integrity": "sha512-98dL0Ad1pD4K1dlDAf1705SwUB86DlqtbzXrURmRkxlOKhVdlodZcCxW91Oti6i1QrKEgqORlg8iNzdE6/HE0g==", + "version": "21.0.0-rc.2", + "resolved": "https://registry.npmjs.org/nx/-/nx-21.0.0-rc.2.tgz", + "integrity": "sha512-u/FDM668Z6qd1ke6nS71+FA+RsRj+G1/6J55KAaugWe64v+RvEEmkJHIcpmCyMvy/8d/P2+No29ad5DqkdWdJA==", "hasInstallScript": true, - "license": "MIT", "dependencies": { "@napi-rs/wasm-runtime": "0.2.4", "@yarnpkg/lockfile": "^1.1.0", @@ -1527,6 +1234,7 @@ "string-width": "^4.2.3", "tar-stream": "~2.2.0", "tmp": "~0.2.1", + "tree-kill": "^1.2.2", "tsconfig-paths": "^4.1.2", "tslib": "^2.3.0", "yaml": "^2.6.0", @@ -1537,17 +1245,20 @@ "nx": "bin/nx.js", "nx-cloud": "bin/nx-cloud.js" }, + "engines": { + "node": "^20.19.0 || ^22.12.0" + }, "optionalDependencies": { - "@nx/nx-darwin-arm64": "0.0.0-pr-30457-0563fbb", - "@nx/nx-darwin-x64": "0.0.0-pr-30457-0563fbb", - "@nx/nx-freebsd-x64": "0.0.0-pr-30457-0563fbb", - "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-30457-0563fbb", - "@nx/nx-linux-arm64-gnu": "0.0.0-pr-30457-0563fbb", - "@nx/nx-linux-arm64-musl": "0.0.0-pr-30457-0563fbb", - "@nx/nx-linux-x64-gnu": "0.0.0-pr-30457-0563fbb", - "@nx/nx-linux-x64-musl": "0.0.0-pr-30457-0563fbb", - "@nx/nx-win32-arm64-msvc": "0.0.0-pr-30457-0563fbb", - "@nx/nx-win32-x64-msvc": "0.0.0-pr-30457-0563fbb" + "@nx/nx-darwin-arm64": "21.0.0-rc.2", + "@nx/nx-darwin-x64": "21.0.0-rc.2", + "@nx/nx-freebsd-x64": "21.0.0-rc.2", + "@nx/nx-linux-arm-gnueabihf": "21.0.0-rc.2", + "@nx/nx-linux-arm64-gnu": "21.0.0-rc.2", + "@nx/nx-linux-arm64-musl": "21.0.0-rc.2", + "@nx/nx-linux-x64-gnu": "21.0.0-rc.2", + "@nx/nx-linux-x64-musl": "21.0.0-rc.2", + "@nx/nx-win32-arm64-msvc": "21.0.0-rc.2", + "@nx/nx-win32-x64-msvc": "21.0.0-rc.2" }, "peerDependencies": { "@swc-node/register": "^1.8.0", @@ -1842,6 +1553,14 @@ "node": ">=14.14" } }, + "node_modules/tree-kill": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", + "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", + "bin": { + "tree-kill": "cli.js" + } + }, "node_modules/tsconfig-paths": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", diff --git a/package.json b/package.json index bde4364d2346..b8c5692fed1d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "spring-boot", "dependencies": { - "nx": "0.0.0-pr-30457-0563fbb", - "@nx/gradle": "0.0.0-pr-30457-0563fbb" + "nx": "21.0.0-rc.2", + "@nx/gradle": "21.0.0-rc.2" } } From d998912ef374472e4e832921d3ab4bd18c03323b Mon Sep 17 00:00:00 2001 From: lourw <56288712+lourw@users.noreply.github.com> Date: Fri, 2 May 2025 10:41:29 -0700 Subject: [PATCH 04/46] chore(repo): remove post install --- .github/actions/build/action.yml | 2 +- .nx/workflows/agents.yaml | 8 +- package-lock.json | 300 ++++++++++--------------------- package.json | 4 +- 4 files changed, 94 insertions(+), 220 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 873fc071dc93..de1c9bc6e2d8 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -68,7 +68,7 @@ runs: COMMERCIAL_REPO_PASSWORD: ${{ inputs.commercial-repository-password }} COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }} COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }} - run: NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx run-many -t build --parallel=32 --batch + run: NX_BATCH_MODE=true NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx run-many -t build --parallel=32 --batch # - name: Publish # id: publish # if: ${{ inputs.publish == 'true' }} diff --git a/.nx/workflows/agents.yaml b/.nx/workflows/agents.yaml index be1dca6b8ec9..bf7319ac0edd 100644 --- a/.nx/workflows/agents.yaml +++ b/.nx/workflows/agents.yaml @@ -36,10 +36,4 @@ launch-templates: '../.cache/Cypress' base-branch: 'main' - name: Install Node Modules - uses: 'nrwl/nx-cloud-workflows/v4/workflow-steps/install-node-modules/main.yaml' - - - name: postinstall - script: | - if [ -f package.json ]; then - npm run postinstall || yarn postinstall || pnpm postinstall - fi \ No newline at end of file + uses: 'nrwl/nx-cloud-workflows/v4/workflow-steps/install-node-modules/main.yaml' \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 0f135efb327e..ee36eceaf161 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,34 +6,31 @@ "": { "name": "spring-boot", "dependencies": { - "@nx/gradle": "21.0.0-rc.2", - "nx": "21.0.0-rc.2" + "@nx/gradle": "0.0.0-pr-30913-79806e0", + "nx": "0.0.0-pr-30913-79806e0" } }, "node_modules/@emnapi/core": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.3.1.tgz", - "integrity": "sha512-pVGjBIt1Y6gg3EJN8jTcfpP/+uuRksIo055oE/OBkDNcjZqVbfkWCksG1Jp4yZnj3iKWyWX8fdG/j6UDYPbFog==", - "license": "MIT", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.3.tgz", + "integrity": "sha512-4m62DuCE07lw01soJwPiBGC0nAww0Q+RY70VZ+n49yDIO13yyinhbWCeNnaob0lakDtWQzSdtNWzJeOJt2ma+g==", "dependencies": { - "@emnapi/wasi-threads": "1.0.1", + "@emnapi/wasi-threads": "1.0.2", "tslib": "^2.4.0" } }, "node_modules/@emnapi/runtime": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.3.1.tgz", - "integrity": "sha512-kEBmG8KyqtxJZv+ygbEim+KCGtIq1fC22Ms3S4ziXmYKm8uyoLX0MHONVKwp+9opg390VaKRNt4a7A9NwmpNhw==", - "license": "MIT", + "version": "1.4.3", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.3.tgz", + "integrity": "sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==", "dependencies": { "tslib": "^2.4.0" } }, "node_modules/@emnapi/wasi-threads": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.1.tgz", - "integrity": "sha512-iIBu7mwkq4UQGeMEM8bLwNK962nXdhodeScX4slfQnRhEMMzvYivHhutCIk8uojvmASXXPC2WNEjwxFWk72Oqw==", - "license": "MIT", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.2.tgz", + "integrity": "sha512-5n3nTJblwRi8LlXkJ9eBzu+kZR8Yxcc7ubakyQTFzPMtIhFpUBRbsnc2Dv88IZDIbCDlBiWrknhB4Lsz7mg6BA==", "dependencies": { "tslib": "^2.4.0" } @@ -42,7 +39,6 @@ "version": "29.6.3", "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", - "license": "MIT", "dependencies": { "@sinclair/typebox": "^0.27.8" }, @@ -54,7 +50,6 @@ "version": "0.2.4", "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.4.tgz", "integrity": "sha512-9zESzOO5aDByvhIAsOy9TbpZ0Ur2AJbUI7UT73kcUTS2mxAMHOBaa1st/jAymNoCtvrit99kkzT1FZuXVcgfIQ==", - "license": "MIT", "dependencies": { "@emnapi/core": "^1.1.0", "@emnapi/runtime": "^1.1.0", @@ -62,9 +57,9 @@ } }, "node_modules/@nx/devkit": { - "version": "21.0.0-rc.2", - "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-21.0.0-rc.2.tgz", - "integrity": "sha512-N3ifBM/Nh4U4uYCj1Lb8aD9m0XWWFDqSCol59is5vNGt9gSqFPJNH+jZwlKJu5Y9vl0McXFwDdYAAIapkw7lZQ==", + "version": "0.0.0-pr-30913-79806e0", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-0.0.0-pr-30913-79806e0.tgz", + "integrity": "sha512-vs1/1HtM9jkf6jumcKADmnY8SRGKJtgY032Vra2ZtQ294QbsE/F+/g3lFaiL2X8znApZHeFj9a30ORs04uLOtQ==", "dependencies": { "ejs": "^3.1.7", "enquirer": "~2.3.6", @@ -76,21 +71,21 @@ "yargs-parser": "21.1.1" }, "peerDependencies": { - "nx": "21.0.0-rc.2" + "nx": "0.0.0-pr-30913-79806e0" } }, "node_modules/@nx/gradle": { - "version": "21.0.0-rc.2", - "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-21.0.0-rc.2.tgz", - "integrity": "sha512-n6E8K1z+5m+o0KZC8kbl69PVLRyHzf7RbHX/W+AHGmf6C2QuDC5X+nkWGBXeoKsDcsqeJB5NUf7iYkurLtDCIw==", + "version": "0.0.0-pr-30913-79806e0", + "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-0.0.0-pr-30913-79806e0.tgz", + "integrity": "sha512-1JsH/dvttzBpjcmS4lDN0wbMR2J3F2x6E2wMHGZziW39K176BV1WjqDbZIKnOZwJwD4aTtrrdoUiFzd7lhGt0Q==", "dependencies": { - "@nx/devkit": "21.0.0-rc.2" + "@nx/devkit": "0.0.0-pr-30913-79806e0" } }, "node_modules/@nx/nx-darwin-arm64": { - "version": "21.0.0-rc.2", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-21.0.0-rc.2.tgz", - "integrity": "sha512-INHCMQTiGrlqxEKFFTvZYGG1pGg79CYY2a3lefZoTU7Esg39MrIXDktwe4OsNNsnvHk2jAAY82/ph2X1U+BrfA==", + "version": "0.0.0-pr-30913-79806e0", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-0.0.0-pr-30913-79806e0.tgz", + "integrity": "sha512-djf8odtmNtF+7qEzXwnNbaBKx/61rTyAJnu4j7ERHg9aW3mQLoRwDNmG5Mih0xGW21sw0r/Tag8WUWqGhgEoxQ==", "cpu": [ "arm64" ], @@ -100,9 +95,9 @@ ] }, "node_modules/@nx/nx-darwin-x64": { - "version": "21.0.0-rc.2", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-21.0.0-rc.2.tgz", - "integrity": "sha512-BUebx7EFOBFTycSnSXZFjRa5VwtTNGb8t2vcTDoFSN2Il4Wvev1qZze702yt8hA/YgPsuLBIQHGF47Adyi1DDA==", + "version": "0.0.0-pr-30913-79806e0", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-0.0.0-pr-30913-79806e0.tgz", + "integrity": "sha512-a0tcaX/27e/0wUgDqrqZ1VUAPiXTDBvfCMLLR1paJlstOV0mjMhXQFl6Tg9nSjzgvOmOipAYoq0RDE2glLMe8A==", "cpu": [ "x64" ], @@ -112,9 +107,9 @@ ] }, "node_modules/@nx/nx-freebsd-x64": { - "version": "21.0.0-rc.2", - "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-21.0.0-rc.2.tgz", - "integrity": "sha512-Lhb8ZFhKeFkXp0IheWHeqbjs/K8Mx+jUTqbsSlHf4opN2vL6bvXH1UDQDLpIXtP3xDpEjPU+uZqc/ev3wTK+cg==", + "version": "0.0.0-pr-30913-79806e0", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-0.0.0-pr-30913-79806e0.tgz", + "integrity": "sha512-7gwbeL/1ioHtEhnC5+NVDggUYoQqLyjfg3COqe0xmqWSRGwVKgflddKsIA2eFJbSrpZVa/3g7jqDkySmNUc+dg==", "cpu": [ "x64" ], @@ -124,9 +119,9 @@ ] }, "node_modules/@nx/nx-linux-arm-gnueabihf": { - "version": "21.0.0-rc.2", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-21.0.0-rc.2.tgz", - "integrity": "sha512-+CZvfCA2vH01XIyOUF8o8rNveZQ3k2Z1z8/j/MF3m2mnozaFBSNJU6+tJFYUNj2S9tZjvP/j9V+4N9/RVy93ng==", + "version": "0.0.0-pr-30913-79806e0", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-0.0.0-pr-30913-79806e0.tgz", + "integrity": "sha512-2JuTATmLJp1fG/gl6/RjxbWgGhRIDUkNwAcOUhQuonvQIpF2/uE7X8uJbwJ1ePEVI/zICRqNhBxSyBh9njj+8Q==", "cpu": [ "arm" ], @@ -136,9 +131,9 @@ ] }, "node_modules/@nx/nx-linux-arm64-gnu": { - "version": "21.0.0-rc.2", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-21.0.0-rc.2.tgz", - "integrity": "sha512-7buvnJjjbaQzNATqhMVVBbAObLBecjM1Q9I6CrZrXv/tXBYvg6B0qkcoeDRJ6q1R7t/gzGNpu3Q17vQmBO/hNQ==", + "version": "0.0.0-pr-30913-79806e0", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-0.0.0-pr-30913-79806e0.tgz", + "integrity": "sha512-Rl64cXkxXgezbj8p0ev+tAFa3LwUPZD5KPpIgKjE93OOurGN5xlGZAzNB1U9FmnY/OHmSZbIzm4OBZjkC1Y0jQ==", "cpu": [ "arm64" ], @@ -148,9 +143,9 @@ ] }, "node_modules/@nx/nx-linux-arm64-musl": { - "version": "21.0.0-rc.2", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-21.0.0-rc.2.tgz", - "integrity": "sha512-MGNM1HbTNOJA+BimRHZvxbbI+b/tq+3nQChsfVnY8rBpQmTsSfCDl6gTagQeH0t4Pz+eDYEmwLaXNmCfbno+pQ==", + "version": "0.0.0-pr-30913-79806e0", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-0.0.0-pr-30913-79806e0.tgz", + "integrity": "sha512-SclaGbzHZbfVglPmkuYUqunc6o59Rb/R2CJLHMuUfPYuH336UW0bN7lA33RXUvZFDWFbN67e3mVr3Tiaw7icoA==", "cpu": [ "arm64" ], @@ -160,9 +155,9 @@ ] }, "node_modules/@nx/nx-linux-x64-gnu": { - "version": "21.0.0-rc.2", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-21.0.0-rc.2.tgz", - "integrity": "sha512-50mRRoNtXn9VkMgzDAz8+bM3SmsmZY6NHilxOSyOsKcrDyOqN84Td5kFV51zvQhoTUWyv8o4TGB3hyMk7Aaf2g==", + "version": "0.0.0-pr-30913-79806e0", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-0.0.0-pr-30913-79806e0.tgz", + "integrity": "sha512-j1HTyvg431Be8rxE5kQxFLhwvjgSqDdhO+X61I3OzaZK4dBlOiTBLjfUWq6b2bGYs3nDHk9HrKH1Oy0W8/py4g==", "cpu": [ "x64" ], @@ -172,9 +167,9 @@ ] }, "node_modules/@nx/nx-linux-x64-musl": { - "version": "21.0.0-rc.2", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-21.0.0-rc.2.tgz", - "integrity": "sha512-0jo3Rlh4q4ox+4pxkOBwFkMDdOeRovC7RsizfmqHYReCee8SjrGyThQKaEwe/CeOJb80TuRN34sU5P1yY4jS5A==", + "version": "0.0.0-pr-30913-79806e0", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-0.0.0-pr-30913-79806e0.tgz", + "integrity": "sha512-yl2XmFarUM/Kqwz5HeYdsI1eLr9ibQoNGvIvkltEZc9O2ja1h08DrVDlWZoVEtKKEMQqH11Io1bGC0+aNYmfNg==", "cpu": [ "x64" ], @@ -184,9 +179,9 @@ ] }, "node_modules/@nx/nx-win32-arm64-msvc": { - "version": "21.0.0-rc.2", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-21.0.0-rc.2.tgz", - "integrity": "sha512-v+K/SIM3uIiDXZHgkIrSQWh0PcWbXC/QSgQVetRQBpgv6zefY/DD5zaHKyks17Na6U98WBjy3WL+LlyyC0kbAw==", + "version": "0.0.0-pr-30913-79806e0", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-0.0.0-pr-30913-79806e0.tgz", + "integrity": "sha512-ALxrMkCBIbwCa4UqDcBIgxk4zeQgdSdu6/cV87d9jSwei/NUNAizJapjvHNllXUlA+90U9wH3sYeywmjAiYYEw==", "cpu": [ "arm64" ], @@ -196,9 +191,9 @@ ] }, "node_modules/@nx/nx-win32-x64-msvc": { - "version": "21.0.0-rc.2", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-21.0.0-rc.2.tgz", - "integrity": "sha512-WGQvgr7yayEPx7PuuA1EUJLav0RAE8MfhlqI1XbRfkzqq9+ZNEhw4jMswDLypEqKC5wxsBzMBXghPbJ50g2heA==", + "version": "0.0.0-pr-30913-79806e0", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-0.0.0-pr-30913-79806e0.tgz", + "integrity": "sha512-gE479+3hW4sSmsgS+DCmMf0Zp0dm2Sk7zor8DNog0LE80GATS8p+BV+x5EuXE7eGYVLv+Gjbkt847YMffhdBoA==", "cpu": [ "x64" ], @@ -210,14 +205,12 @@ "node_modules/@sinclair/typebox": { "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", - "license": "MIT" + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==" }, "node_modules/@tybys/wasm-util": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.9.0.tgz", "integrity": "sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==", - "license": "MIT", "dependencies": { "tslib": "^2.4.0" } @@ -225,14 +218,12 @@ "node_modules/@yarnpkg/lockfile": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", - "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", - "license": "BSD-2-Clause" + "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==" }, "node_modules/@yarnpkg/parsers": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.2.tgz", "integrity": "sha512-/HcYgtUSiJiot/XWGLOlGxPYUG65+/31V8oqk17vZLW1xlCoR4PampyePljOxY2n8/3jz9+tIFzICsyGujJZoA==", - "license": "BSD-2-Clause", "dependencies": { "js-yaml": "^3.10.0", "tslib": "^2.4.0" @@ -245,7 +236,6 @@ "version": "0.0.7", "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.7.tgz", "integrity": "sha512-nrUSn7hzt7J6JWgWGz78ZYI8wj+gdIJdk0Ynjpp8l+trkn58Uqsf6RYrYkEK+3X18EX+TNdtJI0WxAtc+L84SQ==", - "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -257,7 +247,6 @@ "version": "4.1.3", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", - "license": "MIT", "engines": { "node": ">=6" } @@ -266,7 +255,6 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "license": "MIT", "engines": { "node": ">=8" } @@ -275,7 +263,6 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", - "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -289,8 +276,7 @@ "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "license": "Python-2.0" + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" }, "node_modules/async": { "version": "3.2.6", @@ -300,14 +286,12 @@ "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", - "license": "MIT" + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/axios": { - "version": "1.8.4", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.4.tgz", - "integrity": "sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==", - "license": "MIT", + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.9.0.tgz", + "integrity": "sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg==", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", @@ -317,8 +301,7 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "license": "MIT" + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" }, "node_modules/base64-js": { "version": "1.5.1", @@ -337,14 +320,12 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "license": "MIT" + ] }, "node_modules/bl": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", - "license": "MIT", "dependencies": { "buffer": "^5.5.0", "inherits": "^2.0.4", @@ -355,7 +336,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", - "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -378,7 +358,6 @@ "url": "https://feross.org/support" } ], - "license": "MIT", "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" @@ -388,7 +367,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2" @@ -401,7 +379,6 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", - "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -417,7 +394,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", - "license": "MIT", "dependencies": { "restore-cursor": "^3.1.0" }, @@ -429,7 +405,6 @@ "version": "2.6.1", "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", - "license": "MIT", "engines": { "node": ">=6" }, @@ -441,7 +416,6 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", - "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -455,7 +429,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", - "license": "MIT", "engines": { "node": ">=0.8" } @@ -464,7 +437,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", - "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -475,14 +447,12 @@ "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "license": "MIT" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", - "license": "MIT", "dependencies": { "delayed-stream": "~1.0.0" }, @@ -499,7 +469,6 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", - "license": "MIT", "dependencies": { "clone": "^1.0.2" }, @@ -511,7 +480,6 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", - "license": "MIT", "engines": { "node": ">=8" } @@ -520,7 +488,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", - "license": "MIT", "engines": { "node": ">=0.4.0" } @@ -529,7 +496,6 @@ "version": "29.6.3", "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", - "license": "MIT", "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } @@ -538,7 +504,6 @@ "version": "16.4.7", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==", - "license": "BSD-2-Clause", "engines": { "node": ">=12" }, @@ -550,7 +515,6 @@ "version": "11.0.7", "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz", "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==", - "license": "BSD-2-Clause", "dependencies": { "dotenv": "^16.4.5" }, @@ -565,7 +529,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", - "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", @@ -592,14 +555,12 @@ "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "license": "MIT" + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "node_modules/end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "license": "MIT", "dependencies": { "once": "^1.4.0" } @@ -608,7 +569,6 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", - "license": "MIT", "dependencies": { "ansi-colors": "^4.1.1" }, @@ -620,7 +580,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", - "license": "MIT", "engines": { "node": ">= 0.4" } @@ -629,7 +588,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", - "license": "MIT", "engines": { "node": ">= 0.4" } @@ -638,7 +596,6 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", - "license": "MIT", "dependencies": { "es-errors": "^1.3.0" }, @@ -650,7 +607,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", - "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "get-intrinsic": "^1.2.6", @@ -665,7 +621,6 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", - "license": "MIT", "engines": { "node": ">=6" } @@ -674,7 +629,6 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "license": "MIT", "engines": { "node": ">=0.8.0" } @@ -683,7 +637,6 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", - "license": "BSD-2-Clause", "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" @@ -696,7 +649,6 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", - "license": "MIT", "dependencies": { "escape-string-regexp": "^1.0.5" }, @@ -730,7 +682,6 @@ "version": "5.0.2", "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", - "license": "BSD-3-Clause", "bin": { "flat": "cli.js" } @@ -745,7 +696,6 @@ "url": "https://github.com/sponsors/RubenVerborgh" } ], - "license": "MIT", "engines": { "node": ">=4.0" }, @@ -759,7 +709,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", - "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -774,7 +723,6 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-4.0.2.tgz", "integrity": "sha512-I8ZuJ/qG92NWX8i5x1Y8qyj3vizhXS31OxjKDu3LKP+7/qBgfIKValiZIEwoVoJKUHlhWtYrktkxV1XsX+pPlg==", - "license": "MIT", "dependencies": { "js-yaml": "^3.13.1" } @@ -782,14 +730,12 @@ "node_modules/fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", - "license": "MIT" + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -798,7 +744,6 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", - "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -807,7 +752,6 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", - "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", @@ -831,7 +775,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", - "license": "MIT", "dependencies": { "dunder-proto": "^1.0.1", "es-object-atoms": "^1.0.0" @@ -844,7 +787,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", - "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -856,7 +798,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "license": "MIT", "engines": { "node": ">=8" } @@ -865,7 +806,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", - "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -877,7 +817,6 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", - "license": "MIT", "dependencies": { "has-symbols": "^1.0.3" }, @@ -892,7 +831,6 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "license": "MIT", "dependencies": { "function-bind": "^1.1.2" }, @@ -917,14 +855,12 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "license": "BSD-3-Clause" + ] }, "node_modules/ignore": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", - "license": "MIT", "engines": { "node": ">= 4" } @@ -932,14 +868,12 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", - "license": "ISC" + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" }, "node_modules/is-docker": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", - "license": "MIT", "bin": { "is-docker": "cli.js" }, @@ -954,7 +888,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "license": "MIT", "engines": { "node": ">=8" } @@ -963,7 +896,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", - "license": "MIT", "engines": { "node": ">=8" } @@ -972,7 +904,6 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "license": "MIT", "engines": { "node": ">=10" }, @@ -984,7 +915,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", - "license": "MIT", "dependencies": { "is-docker": "^2.0.0" }, @@ -1033,7 +963,6 @@ "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", - "license": "MIT", "dependencies": { "chalk": "^4.0.0", "diff-sequences": "^29.6.3", @@ -1048,7 +977,6 @@ "version": "29.6.3", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", - "license": "MIT", "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } @@ -1057,7 +985,6 @@ "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", - "license": "MIT", "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -1070,7 +997,6 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "license": "MIT", "dependencies": { "sprintf-js": "~1.0.2" } @@ -1079,7 +1005,6 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", - "license": "MIT", "bin": { "json5": "lib/cli.js" }, @@ -1090,14 +1015,12 @@ "node_modules/jsonc-parser": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", - "license": "MIT" + "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==" }, "node_modules/lines-and-columns": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz", "integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==", - "license": "MIT", "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" } @@ -1106,7 +1029,6 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "license": "MIT", "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -1122,7 +1044,6 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", - "license": "MIT", "engines": { "node": ">= 0.4" } @@ -1131,7 +1052,6 @@ "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", - "license": "MIT", "engines": { "node": ">= 0.6" } @@ -1140,7 +1060,6 @@ "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", - "license": "MIT", "dependencies": { "mime-db": "1.52.0" }, @@ -1152,7 +1071,6 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", - "license": "MIT", "engines": { "node": ">=6" } @@ -1161,7 +1079,6 @@ "version": "9.0.3", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", - "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -1176,7 +1093,6 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", - "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -1184,14 +1100,12 @@ "node_modules/node-machine-id": { "version": "1.1.12", "resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz", - "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==", - "license": "MIT" + "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==" }, "node_modules/npm-run-path": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", - "license": "MIT", "dependencies": { "path-key": "^3.0.0" }, @@ -1200,9 +1114,9 @@ } }, "node_modules/nx": { - "version": "21.0.0-rc.2", - "resolved": "https://registry.npmjs.org/nx/-/nx-21.0.0-rc.2.tgz", - "integrity": "sha512-u/FDM668Z6qd1ke6nS71+FA+RsRj+G1/6J55KAaugWe64v+RvEEmkJHIcpmCyMvy/8d/P2+No29ad5DqkdWdJA==", + "version": "0.0.0-pr-30913-79806e0", + "resolved": "https://registry.npmjs.org/nx/-/nx-0.0.0-pr-30913-79806e0.tgz", + "integrity": "sha512-1kSlOzc6F0z9Ja62aLYju/k4bch06KEpxHBTh0TQDzyuUOdWl+QoGi9JKSvCQwajE36eEiOUZBiyxDc1ZbrtQA==", "hasInstallScript": true, "dependencies": { "@napi-rs/wasm-runtime": "0.2.4", @@ -1249,16 +1163,16 @@ "node": "^20.19.0 || ^22.12.0" }, "optionalDependencies": { - "@nx/nx-darwin-arm64": "21.0.0-rc.2", - "@nx/nx-darwin-x64": "21.0.0-rc.2", - "@nx/nx-freebsd-x64": "21.0.0-rc.2", - "@nx/nx-linux-arm-gnueabihf": "21.0.0-rc.2", - "@nx/nx-linux-arm64-gnu": "21.0.0-rc.2", - "@nx/nx-linux-arm64-musl": "21.0.0-rc.2", - "@nx/nx-linux-x64-gnu": "21.0.0-rc.2", - "@nx/nx-linux-x64-musl": "21.0.0-rc.2", - "@nx/nx-win32-arm64-msvc": "21.0.0-rc.2", - "@nx/nx-win32-x64-msvc": "21.0.0-rc.2" + "@nx/nx-darwin-arm64": "0.0.0-pr-30913-79806e0", + "@nx/nx-darwin-x64": "0.0.0-pr-30913-79806e0", + "@nx/nx-freebsd-x64": "0.0.0-pr-30913-79806e0", + "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-30913-79806e0", + "@nx/nx-linux-arm64-gnu": "0.0.0-pr-30913-79806e0", + "@nx/nx-linux-arm64-musl": "0.0.0-pr-30913-79806e0", + "@nx/nx-linux-x64-gnu": "0.0.0-pr-30913-79806e0", + "@nx/nx-linux-x64-musl": "0.0.0-pr-30913-79806e0", + "@nx/nx-win32-arm64-msvc": "0.0.0-pr-30913-79806e0", + "@nx/nx-win32-x64-msvc": "0.0.0-pr-30913-79806e0" }, "peerDependencies": { "@swc-node/register": "^1.8.0", @@ -1277,7 +1191,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", - "license": "ISC", "dependencies": { "wrappy": "1" } @@ -1286,7 +1199,6 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", - "license": "MIT", "dependencies": { "mimic-fn": "^2.1.0" }, @@ -1301,7 +1213,6 @@ "version": "8.4.2", "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", - "license": "MIT", "dependencies": { "define-lazy-prop": "^2.0.0", "is-docker": "^2.1.1", @@ -1318,7 +1229,6 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz", "integrity": "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==", - "license": "MIT", "dependencies": { "bl": "^4.0.3", "chalk": "^4.1.0", @@ -1340,7 +1250,6 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", - "license": "MIT", "engines": { "node": ">=8" } @@ -1349,7 +1258,6 @@ "version": "29.7.0", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", - "license": "MIT", "dependencies": { "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", @@ -1363,7 +1271,6 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", - "license": "MIT", "engines": { "node": ">=10" }, @@ -1374,20 +1281,17 @@ "node_modules/proxy-from-env": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", - "license": "MIT" + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" }, "node_modules/react-is": { "version": "18.3.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", - "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", - "license": "MIT" + "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==" }, "node_modules/readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", - "license": "MIT", "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -1401,7 +1305,6 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", - "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -1410,7 +1313,6 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz", "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==", - "license": "MIT", "engines": { "node": ">=10" } @@ -1419,7 +1321,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", - "license": "MIT", "dependencies": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" @@ -1445,14 +1346,12 @@ "type": "consulting", "url": "https://feross.org/support" } - ], - "license": "MIT" + ] }, "node_modules/semver": { "version": "7.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", - "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -1463,20 +1362,17 @@ "node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", - "license": "ISC" + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" }, "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", - "license": "BSD-3-Clause" + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" }, "node_modules/string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", - "license": "MIT", "dependencies": { "safe-buffer": "~5.2.0" } @@ -1485,7 +1381,6 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", - "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -1499,7 +1394,6 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -1511,7 +1405,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", - "license": "MIT", "engines": { "node": ">=4" } @@ -1520,7 +1413,6 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -1532,7 +1424,6 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", - "license": "MIT", "dependencies": { "bl": "^4.0.3", "end-of-stream": "^1.4.1", @@ -1548,7 +1439,6 @@ "version": "0.2.3", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", - "license": "MIT", "engines": { "node": ">=14.14" } @@ -1565,7 +1455,6 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", - "license": "MIT", "dependencies": { "json5": "^2.2.2", "minimist": "^1.2.6", @@ -1578,20 +1467,17 @@ "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", - "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "license": "0BSD" + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==" }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "license": "MIT" + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, "node_modules/wcwidth": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", - "license": "MIT", "dependencies": { "defaults": "^1.0.3" } @@ -1600,7 +1486,6 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", - "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -1616,23 +1501,20 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", - "license": "ISC" + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", - "license": "ISC", "engines": { "node": ">=10" } }, "node_modules/yaml": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz", - "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==", - "license": "ISC", + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.1.tgz", + "integrity": "sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==", "bin": { "yaml": "bin.mjs" }, @@ -1644,7 +1526,6 @@ "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", - "license": "MIT", "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -1662,7 +1543,6 @@ "version": "21.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", - "license": "ISC", "engines": { "node": ">=12" } diff --git a/package.json b/package.json index b8c5692fed1d..f2a526bc4a1d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "spring-boot", "dependencies": { - "nx": "21.0.0-rc.2", - "@nx/gradle": "21.0.0-rc.2" + "nx": "0.0.0-pr-30913-79806e0", + "@nx/gradle": "0.0.0-pr-30913-79806e0" } } From 0a6017e4504409254563b21b4dfbf6a913cee1f6 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Fri, 2 May 2025 15:45:30 -0400 Subject: [PATCH 05/46] add .env file with NX_BATCH_MODE --- .env | 1 + 1 file changed, 1 insertion(+) create mode 100644 .env diff --git a/.env b/.env new file mode 100644 index 000000000000..7b181fde8cf1 --- /dev/null +++ b/.env @@ -0,0 +1 @@ +NX_BATCH_MODE=true \ No newline at end of file From 20b8ce6074137f5ecac88ade535a43a0d9380a66 Mon Sep 17 00:00:00 2001 From: lourw <56288712+lourw@users.noreply.github.com> Date: Mon, 5 May 2025 07:33:40 -0700 Subject: [PATCH 06/46] chore(repo): bust cache --- nx.json | 1 + 1 file changed, 1 insertion(+) diff --git a/nx.json b/nx.json index e2960ef1d2f9..21acc4bdf005 100644 --- a/nx.json +++ b/nx.json @@ -20,6 +20,7 @@ "!{projectRoot}/src/test/**/*" ] }, + "bustCache": 1, "nxCloudUrl": "https://snapshot.nx.app", "nxCloudId": "67dad8ae45125407e384edab" } From cc35f90a19dba662cc48e5bdf44c1175fd2db203 Mon Sep 17 00:00:00 2001 From: lourw <56288712+lourw@users.noreply.github.com> Date: Mon, 5 May 2025 10:04:33 -0700 Subject: [PATCH 07/46] chore(repo): switch to staging --- nx.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nx.json b/nx.json index 21acc4bdf005..c84d85ffd726 100644 --- a/nx.json +++ b/nx.json @@ -21,7 +21,7 @@ ] }, "bustCache": 1, - "nxCloudUrl": "https://snapshot.nx.app", - "nxCloudId": "67dad8ae45125407e384edab" + "nxCloudUrl": "https://staging.nx.app", + "nxCloudId": "67a56832eb5d9093e3ebe776" } From b731aa4e67b282c610bd27a163083a8c287f45f5 Mon Sep 17 00:00:00 2001 From: lourw <56288712+lourw@users.noreply.github.com> Date: Mon, 5 May 2025 10:06:11 -0700 Subject: [PATCH 08/46] chore(repo): bust cache --- nx.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx.json b/nx.json index c84d85ffd726..10f3664e94de 100644 --- a/nx.json +++ b/nx.json @@ -20,7 +20,7 @@ "!{projectRoot}/src/test/**/*" ] }, - "bustCache": 1, + "bustCache": 49, "nxCloudUrl": "https://staging.nx.app", "nxCloudId": "67a56832eb5d9093e3ebe776" } From 071de19a1f7601399f1870c276b0e296e37ad55e Mon Sep 17 00:00:00 2001 From: Louie Weng <56288712+lourw@users.noreply.github.com> Date: Mon, 5 May 2025 11:34:27 -0700 Subject: [PATCH 09/46] chore(repo): bust cache Signed-off-by: Louie Weng <56288712+lourw@users.noreply.github.com> --- nx.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx.json b/nx.json index 10f3664e94de..b34744bdf9cf 100644 --- a/nx.json +++ b/nx.json @@ -20,7 +20,7 @@ "!{projectRoot}/src/test/**/*" ] }, - "bustCache": 49, + "bustCache": 50, "nxCloudUrl": "https://staging.nx.app", "nxCloudId": "67a56832eb5d9093e3ebe776" } From 36510910e8706328410346134c48681294e6475d Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Mon, 5 May 2025 15:37:56 -0400 Subject: [PATCH 10/46] upgrade pr version to 0.0.0-pr-30913-b417cd3 (+2 squashed commits) Squashed commits: [3e5d61eb8c] upgrade pr version to 0.0.0-pr-30913-c453779 [81e1793ac9] fix failed task --- .env | 3 +- .../boot/build/AntoraConventions.java | 12 + .../boot/build/MavenRepositoryPlugin.java | 1 + gradle.properties | 2 +- nx.json | 16 +- package-lock.json | 295 +++++++++++++----- package.json | 4 +- .../spring-boot-devtools/build.gradle | 12 + .../spring-boot-docs/project.json | 10 + .../spring-boot-server-tests/build.gradle | 1 + 10 files changed, 275 insertions(+), 81 deletions(-) create mode 100644 spring-boot-project/spring-boot-docs/project.json diff --git a/.env b/.env index 7b181fde8cf1..878f0582f3f0 100644 --- a/.env +++ b/.env @@ -1 +1,2 @@ -NX_BATCH_MODE=true \ No newline at end of file +NX_BATCH_MODE=true +NX_VERBOSE_LOGGING=true \ No newline at end of file diff --git a/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java index 018d61b35fda..3d8aec25c118 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java @@ -42,6 +42,7 @@ import org.gradle.api.plugins.JavaBasePlugin; import org.gradle.api.provider.Provider; import org.gradle.api.tasks.Copy; +import org.gradle.api.tasks.PathSensitivity; import org.gradle.api.tasks.TaskContainer; import org.gradle.api.tasks.TaskProvider; @@ -163,6 +164,17 @@ private void configureAntoraTask(Project project, AntoraTask antoraTask, TaskProvider generateAntoraPlaybookTask) { antoraTask.setGroup("Documentation"); antoraTask.dependsOn(npmInstallTask, generateAntoraPlaybookTask); + + antoraTask.getInputs() + .file(generateAntoraPlaybookTask.flatMap(GenerateAntoraPlaybook::getOutputFile)) + .withPropertyName("antoraPlaybookFile") + .withPathSensitivity(PathSensitivity.RELATIVE); + + antoraTask.getInputs() + .dir(project.getLayout().getBuildDirectory().dir(".gradle")) + .withPropertyName("gradleBuildDir") + .withPathSensitivity(PathSensitivity.RELATIVE); + antoraTask.setPlaybook("antora-playbook.yml"); antoraTask.setUiBundleUrl(getUiBundleUrl(project)); antoraTask.getArgs().set(project.provider(() -> getAntoraNpxArs(project, antoraTask))); diff --git a/buildSrc/src/main/java/org/springframework/boot/build/MavenRepositoryPlugin.java b/buildSrc/src/main/java/org/springframework/boot/build/MavenRepositoryPlugin.java index 1cd9570d30de..477fe35fb230 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/MavenRepositoryPlugin.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/MavenRepositoryPlugin.java @@ -70,6 +70,7 @@ public void apply(Project project) { } private void setUpProjectRepository(Project project, Task publishTask, File repositoryLocation) { + publishTask.getOutputs().dir(repositoryLocation); publishTask.doFirst(new CleanAction(repositoryLocation)); Configuration projectRepository = project.getConfigurations().create(MAVEN_REPOSITORY_CONFIGURATION_NAME); project.getArtifacts() diff --git a/gradle.properties b/gradle.properties index 89bf5a6a4abe..bbc461a2e8a3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,7 +2,7 @@ version=3.5.0-SNAPSHOT latestVersion=true spring.build-type=oss -org.gradle.caching=true +org.gradle.caching=false org.gradle.parallel=true org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8 diff --git a/nx.json b/nx.json index b34744bdf9cf..f7dcde80dd5f 100644 --- a/nx.json +++ b/nx.json @@ -20,7 +20,21 @@ "!{projectRoot}/src/test/**/*" ] }, - "bustCache": 50, + "targetDefaults": { + "homebrewFormula": { + "executor": "@nx/gradle:gradle", + "options": { + "excludeDependsOn": false + } + }, + "antora": { + "executor": "@nx/gradle:gradle", + "options": { + "excludeDependsOn": false + } + } + }, + "bustCache": 12, "nxCloudUrl": "https://staging.nx.app", "nxCloudId": "67a56832eb5d9093e3ebe776" } diff --git a/package-lock.json b/package-lock.json index ee36eceaf161..de94e3eb19c0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,15 +5,17 @@ "packages": { "": { "name": "spring-boot", + "hasInstallScript": true, "dependencies": { - "@nx/gradle": "0.0.0-pr-30913-79806e0", - "nx": "0.0.0-pr-30913-79806e0" + "@nx/gradle": "0.0.0-pr-30913-b798a55", + "nx": "0.0.0-pr-30913-b798a55" } }, "node_modules/@emnapi/core": { "version": "1.4.3", "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.4.3.tgz", "integrity": "sha512-4m62DuCE07lw01soJwPiBGC0nAww0Q+RY70VZ+n49yDIO13yyinhbWCeNnaob0lakDtWQzSdtNWzJeOJt2ma+g==", + "license": "MIT", "dependencies": { "@emnapi/wasi-threads": "1.0.2", "tslib": "^2.4.0" @@ -23,6 +25,7 @@ "version": "1.4.3", "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.4.3.tgz", "integrity": "sha512-pBPWdu6MLKROBX05wSNKcNb++m5Er+KQ9QkB+WVM+pW2Kx9hoSrVTnu3BdkI5eBLZoKu/J6mW/B6i6bJB2ytXQ==", + "license": "MIT", "dependencies": { "tslib": "^2.4.0" } @@ -31,6 +34,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.0.2.tgz", "integrity": "sha512-5n3nTJblwRi8LlXkJ9eBzu+kZR8Yxcc7ubakyQTFzPMtIhFpUBRbsnc2Dv88IZDIbCDlBiWrknhB4Lsz7mg6BA==", + "license": "MIT", "dependencies": { "tslib": "^2.4.0" } @@ -39,6 +43,7 @@ "version": "29.6.3", "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", "integrity": "sha512-mo5j5X+jIZmJQveBKeS/clAueipV7KgiX1vMgCxam1RNYiqE1w62n0/tJJnHtjW8ZHcQco5gY85jA3mi0L+nSA==", + "license": "MIT", "dependencies": { "@sinclair/typebox": "^0.27.8" }, @@ -50,6 +55,7 @@ "version": "0.2.4", "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-0.2.4.tgz", "integrity": "sha512-9zESzOO5aDByvhIAsOy9TbpZ0Ur2AJbUI7UT73kcUTS2mxAMHOBaa1st/jAymNoCtvrit99kkzT1FZuXVcgfIQ==", + "license": "MIT", "dependencies": { "@emnapi/core": "^1.1.0", "@emnapi/runtime": "^1.1.0", @@ -57,9 +63,10 @@ } }, "node_modules/@nx/devkit": { - "version": "0.0.0-pr-30913-79806e0", - "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-0.0.0-pr-30913-79806e0.tgz", - "integrity": "sha512-vs1/1HtM9jkf6jumcKADmnY8SRGKJtgY032Vra2ZtQ294QbsE/F+/g3lFaiL2X8znApZHeFj9a30ORs04uLOtQ==", + "version": "0.0.0-pr-30913-b798a55", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-0.0.0-pr-30913-b798a55.tgz", + "integrity": "sha512-rhgar2gs+M9B7ymiy9co8nIN9qIckXuqtyhkwiJYli64iYpAX2RIAmDkUoSPoQ4e0vW+nHGkQuQ+LjxI9249QA==", + "license": "MIT", "dependencies": { "ejs": "^3.1.7", "enquirer": "~2.3.6", @@ -71,132 +78,143 @@ "yargs-parser": "21.1.1" }, "peerDependencies": { - "nx": "0.0.0-pr-30913-79806e0" + "nx": "0.0.0-pr-30913-b798a55" } }, "node_modules/@nx/gradle": { - "version": "0.0.0-pr-30913-79806e0", - "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-0.0.0-pr-30913-79806e0.tgz", - "integrity": "sha512-1JsH/dvttzBpjcmS4lDN0wbMR2J3F2x6E2wMHGZziW39K176BV1WjqDbZIKnOZwJwD4aTtrrdoUiFzd7lhGt0Q==", + "version": "0.0.0-pr-30913-b798a55", + "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-0.0.0-pr-30913-b798a55.tgz", + "integrity": "sha512-rT7m7c//ICIHJtzkPaleUBMETEh20+A+HsfMl/Jo9nB5N/OztbC1bIR28y6FvlzMGx0D3ILwhIfx6BfDbZ56jA==", + "license": "MIT", "dependencies": { - "@nx/devkit": "0.0.0-pr-30913-79806e0" + "@nx/devkit": "0.0.0-pr-30913-b798a55" } }, "node_modules/@nx/nx-darwin-arm64": { - "version": "0.0.0-pr-30913-79806e0", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-0.0.0-pr-30913-79806e0.tgz", - "integrity": "sha512-djf8odtmNtF+7qEzXwnNbaBKx/61rTyAJnu4j7ERHg9aW3mQLoRwDNmG5Mih0xGW21sw0r/Tag8WUWqGhgEoxQ==", + "version": "0.0.0-pr-30913-b798a55", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-0.0.0-pr-30913-b798a55.tgz", + "integrity": "sha512-ZKDChWTjSOgqCOUvqzsicvS1as//8KRXbmlX43WA9w36h4uIyGQEafZeGIcZ2luVk13m2msGeG8C7JhVnpllVw==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "darwin" ] }, "node_modules/@nx/nx-darwin-x64": { - "version": "0.0.0-pr-30913-79806e0", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-0.0.0-pr-30913-79806e0.tgz", - "integrity": "sha512-a0tcaX/27e/0wUgDqrqZ1VUAPiXTDBvfCMLLR1paJlstOV0mjMhXQFl6Tg9nSjzgvOmOipAYoq0RDE2glLMe8A==", + "version": "0.0.0-pr-30913-b798a55", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-0.0.0-pr-30913-b798a55.tgz", + "integrity": "sha512-KP/nVR+JNLbGAoXhn3nGUYjKAyCJkm1Qp86lFynHs1ZARfIGtNfqYmEBHhwOSa3WAE10j+aLkZfVduOoHDBzrQ==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "darwin" ] }, "node_modules/@nx/nx-freebsd-x64": { - "version": "0.0.0-pr-30913-79806e0", - "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-0.0.0-pr-30913-79806e0.tgz", - "integrity": "sha512-7gwbeL/1ioHtEhnC5+NVDggUYoQqLyjfg3COqe0xmqWSRGwVKgflddKsIA2eFJbSrpZVa/3g7jqDkySmNUc+dg==", + "version": "0.0.0-pr-30913-b798a55", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-0.0.0-pr-30913-b798a55.tgz", + "integrity": "sha512-YpD4ZtVkIRy54SKuoKJ/7XQaigsyES/rwEuRnzv5vH1MO85Ngd1UqOyNtGGTJS/trpbEa/Sj3zkku4a9ihq89A==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "freebsd" ] }, "node_modules/@nx/nx-linux-arm-gnueabihf": { - "version": "0.0.0-pr-30913-79806e0", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-0.0.0-pr-30913-79806e0.tgz", - "integrity": "sha512-2JuTATmLJp1fG/gl6/RjxbWgGhRIDUkNwAcOUhQuonvQIpF2/uE7X8uJbwJ1ePEVI/zICRqNhBxSyBh9njj+8Q==", + "version": "0.0.0-pr-30913-b798a55", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-0.0.0-pr-30913-b798a55.tgz", + "integrity": "sha512-B72YeftedsFHedN4gIpDhWzYzpV/ckJEH/LxxDYBvBpnsn6eNZhd9wlKHDCWkFScwOXFpMKcntmocg5msHKLFg==", "cpu": [ "arm" ], + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@nx/nx-linux-arm64-gnu": { - "version": "0.0.0-pr-30913-79806e0", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-0.0.0-pr-30913-79806e0.tgz", - "integrity": "sha512-Rl64cXkxXgezbj8p0ev+tAFa3LwUPZD5KPpIgKjE93OOurGN5xlGZAzNB1U9FmnY/OHmSZbIzm4OBZjkC1Y0jQ==", + "version": "0.0.0-pr-30913-b798a55", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-0.0.0-pr-30913-b798a55.tgz", + "integrity": "sha512-B7uciZxtpzQ4E0ExP2d2HlH19pSmfGV1Hp7mATuDa253+3kFBxC7W5ADyyJOt5yqCyfdTDbCTp5QMstM7mKj8A==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@nx/nx-linux-arm64-musl": { - "version": "0.0.0-pr-30913-79806e0", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-0.0.0-pr-30913-79806e0.tgz", - "integrity": "sha512-SclaGbzHZbfVglPmkuYUqunc6o59Rb/R2CJLHMuUfPYuH336UW0bN7lA33RXUvZFDWFbN67e3mVr3Tiaw7icoA==", + "version": "0.0.0-pr-30913-b798a55", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-0.0.0-pr-30913-b798a55.tgz", + "integrity": "sha512-7iK5xMhXXqMfuB4Bi1jIsl7sUfE0WymyaPU0Wb0h5YOCvxG0CkTaS5nU+vmunJX9Se2KL+Ayq5zqeN1Z2wvlxg==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@nx/nx-linux-x64-gnu": { - "version": "0.0.0-pr-30913-79806e0", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-0.0.0-pr-30913-79806e0.tgz", - "integrity": "sha512-j1HTyvg431Be8rxE5kQxFLhwvjgSqDdhO+X61I3OzaZK4dBlOiTBLjfUWq6b2bGYs3nDHk9HrKH1Oy0W8/py4g==", + "version": "0.0.0-pr-30913-b798a55", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-0.0.0-pr-30913-b798a55.tgz", + "integrity": "sha512-4pjt+9uL7O9OEy9Uyq2tPUF+odXOr4/gluXdaS6gMuDzbdDsDpq1XBC6hvteYaC/dMC1ewpG6P6Z/dQjg7WSUg==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@nx/nx-linux-x64-musl": { - "version": "0.0.0-pr-30913-79806e0", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-0.0.0-pr-30913-79806e0.tgz", - "integrity": "sha512-yl2XmFarUM/Kqwz5HeYdsI1eLr9ibQoNGvIvkltEZc9O2ja1h08DrVDlWZoVEtKKEMQqH11Io1bGC0+aNYmfNg==", + "version": "0.0.0-pr-30913-b798a55", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-0.0.0-pr-30913-b798a55.tgz", + "integrity": "sha512-w0c3k9PMOcqK7ZSubIZYlOCBocEn0q5z+tXEaYgGJmqfEXH6E8xBxnqhoJFWj66vRKC8lTM89Hv5TtckuNyvrQ==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "linux" ] }, "node_modules/@nx/nx-win32-arm64-msvc": { - "version": "0.0.0-pr-30913-79806e0", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-0.0.0-pr-30913-79806e0.tgz", - "integrity": "sha512-ALxrMkCBIbwCa4UqDcBIgxk4zeQgdSdu6/cV87d9jSwei/NUNAizJapjvHNllXUlA+90U9wH3sYeywmjAiYYEw==", + "version": "0.0.0-pr-30913-b798a55", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-0.0.0-pr-30913-b798a55.tgz", + "integrity": "sha512-uD/KosTRmXcH+yHtP4Xksw3Al1TDKbdqMehfTDxiciFVwEHR8IovO7lMnfefDybrBlirTbc7KaVo+SzWoPg7UQ==", "cpu": [ "arm64" ], + "license": "MIT", "optional": true, "os": [ "win32" ] }, "node_modules/@nx/nx-win32-x64-msvc": { - "version": "0.0.0-pr-30913-79806e0", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-0.0.0-pr-30913-79806e0.tgz", - "integrity": "sha512-gE479+3hW4sSmsgS+DCmMf0Zp0dm2Sk7zor8DNog0LE80GATS8p+BV+x5EuXE7eGYVLv+Gjbkt847YMffhdBoA==", + "version": "0.0.0-pr-30913-b798a55", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-0.0.0-pr-30913-b798a55.tgz", + "integrity": "sha512-UWf/AxaTQvYiN7IazzckS+ydFO2V+/TOk5xrxLsdro207ZXjOqTPe6gtaq1VNiBK7TJP7zaYdG8jx2AyuK7g9A==", "cpu": [ "x64" ], + "license": "MIT", "optional": true, "os": [ "win32" @@ -205,12 +223,14 @@ "node_modules/@sinclair/typebox": { "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", - "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==" + "integrity": "sha512-+Fj43pSMwJs4KRrH/938Uf+uAELIgVBmQzg/q1YG10djyfA3TnrU8N8XzqCh/okZdszqBQTZf96idMfE5lnwTA==", + "license": "MIT" }, "node_modules/@tybys/wasm-util": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.9.0.tgz", "integrity": "sha512-6+7nlbMVX/PVDCwaIQ8nTOPveOcFLSt8GcXdx8hD0bt39uWxYT88uXzqTd4fTvqta7oeUJqudepapKNt2DYJFw==", + "license": "MIT", "dependencies": { "tslib": "^2.4.0" } @@ -218,12 +238,14 @@ "node_modules/@yarnpkg/lockfile": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz", - "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==" + "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", + "license": "BSD-2-Clause" }, "node_modules/@yarnpkg/parsers": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.2.tgz", "integrity": "sha512-/HcYgtUSiJiot/XWGLOlGxPYUG65+/31V8oqk17vZLW1xlCoR4PampyePljOxY2n8/3jz9+tIFzICsyGujJZoA==", + "license": "BSD-2-Clause", "dependencies": { "js-yaml": "^3.10.0", "tslib": "^2.4.0" @@ -236,6 +258,7 @@ "version": "0.0.7", "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.7.tgz", "integrity": "sha512-nrUSn7hzt7J6JWgWGz78ZYI8wj+gdIJdk0Ynjpp8l+trkn58Uqsf6RYrYkEK+3X18EX+TNdtJI0WxAtc+L84SQ==", + "license": "MIT", "dependencies": { "argparse": "^2.0.1" }, @@ -247,6 +270,7 @@ "version": "4.1.3", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", + "license": "MIT", "engines": { "node": ">=6" } @@ -255,6 +279,7 @@ "version": "5.0.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "license": "MIT", "engines": { "node": ">=8" } @@ -263,6 +288,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "license": "MIT", "dependencies": { "color-convert": "^2.0.1" }, @@ -276,22 +302,26 @@ "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "license": "Python-2.0" }, "node_modules/async": { "version": "3.2.6", "resolved": "https://registry.npmjs.org/async/-/async-3.2.6.tgz", - "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==" + "integrity": "sha512-htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==", + "license": "MIT" }, "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" + "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", + "license": "MIT" }, "node_modules/axios": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/axios/-/axios-1.9.0.tgz", "integrity": "sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg==", + "license": "MIT", "dependencies": { "follow-redirects": "^1.15.6", "form-data": "^4.0.0", @@ -301,7 +331,8 @@ "node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "license": "MIT" }, "node_modules/base64-js": { "version": "1.5.1", @@ -320,12 +351,14 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/bl": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", + "license": "MIT", "dependencies": { "buffer": "^5.5.0", "inherits": "^2.0.4", @@ -336,6 +369,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } @@ -358,6 +392,7 @@ "url": "https://feross.org/support" } ], + "license": "MIT", "dependencies": { "base64-js": "^1.3.1", "ieee754": "^1.1.13" @@ -367,6 +402,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2" @@ -379,6 +415,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -394,6 +431,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz", "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==", + "license": "MIT", "dependencies": { "restore-cursor": "^3.1.0" }, @@ -405,6 +443,7 @@ "version": "2.6.1", "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", + "license": "MIT", "engines": { "node": ">=6" }, @@ -416,6 +455,7 @@ "version": "8.0.1", "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "license": "ISC", "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.1", @@ -429,6 +469,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==", + "license": "MIT", "engines": { "node": ">=0.8" } @@ -437,6 +478,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "license": "MIT", "dependencies": { "color-name": "~1.1.4" }, @@ -447,12 +489,14 @@ "node_modules/color-name": { "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "license": "MIT" }, "node_modules/combined-stream": { "version": "1.0.8", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", + "license": "MIT", "dependencies": { "delayed-stream": "~1.0.0" }, @@ -463,12 +507,14 @@ "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==" + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "license": "MIT" }, "node_modules/defaults": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz", "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==", + "license": "MIT", "dependencies": { "clone": "^1.0.2" }, @@ -480,6 +526,7 @@ "version": "2.0.0", "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", + "license": "MIT", "engines": { "node": ">=8" } @@ -488,6 +535,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", + "license": "MIT", "engines": { "node": ">=0.4.0" } @@ -496,6 +544,7 @@ "version": "29.6.3", "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz", "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==", + "license": "MIT", "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } @@ -504,6 +553,7 @@ "version": "16.4.7", "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz", "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==", + "license": "BSD-2-Clause", "engines": { "node": ">=12" }, @@ -515,6 +565,7 @@ "version": "11.0.7", "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz", "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==", + "license": "BSD-2-Clause", "dependencies": { "dotenv": "^16.4.5" }, @@ -529,6 +580,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", "es-errors": "^1.3.0", @@ -542,6 +594,7 @@ "version": "3.1.10", "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.10.tgz", "integrity": "sha512-UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==", + "license": "Apache-2.0", "dependencies": { "jake": "^10.8.5" }, @@ -555,12 +608,14 @@ "node_modules/emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "license": "MIT" }, "node_modules/end-of-stream": { "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "license": "MIT", "dependencies": { "once": "^1.4.0" } @@ -569,6 +624,7 @@ "version": "2.3.6", "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "license": "MIT", "dependencies": { "ansi-colors": "^4.1.1" }, @@ -580,6 +636,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -588,6 +645,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -596,6 +654,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0" }, @@ -607,6 +666,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", + "license": "MIT", "dependencies": { "es-errors": "^1.3.0", "get-intrinsic": "^1.2.6", @@ -621,6 +681,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "license": "MIT", "engines": { "node": ">=6" } @@ -629,6 +690,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "license": "MIT", "engines": { "node": ">=0.8.0" } @@ -637,6 +699,7 @@ "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", + "license": "BSD-2-Clause", "bin": { "esparse": "bin/esparse.js", "esvalidate": "bin/esvalidate.js" @@ -649,6 +712,7 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==", + "license": "MIT", "dependencies": { "escape-string-regexp": "^1.0.5" }, @@ -663,6 +727,7 @@ "version": "1.0.4", "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "license": "Apache-2.0", "dependencies": { "minimatch": "^5.0.1" } @@ -671,6 +736,7 @@ "version": "5.1.6", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -682,6 +748,7 @@ "version": "5.0.2", "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "license": "BSD-3-Clause", "bin": { "flat": "cli.js" } @@ -696,6 +763,7 @@ "url": "https://github.com/sponsors/RubenVerborgh" } ], + "license": "MIT", "engines": { "node": ">=4.0" }, @@ -709,6 +777,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz", "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==", + "license": "MIT", "dependencies": { "asynckit": "^0.4.0", "combined-stream": "^1.0.8", @@ -723,6 +792,7 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/front-matter/-/front-matter-4.0.2.tgz", "integrity": "sha512-I8ZuJ/qG92NWX8i5x1Y8qyj3vizhXS31OxjKDu3LKP+7/qBgfIKValiZIEwoVoJKUHlhWtYrktkxV1XsX+pPlg==", + "license": "MIT", "dependencies": { "js-yaml": "^3.13.1" } @@ -730,12 +800,14 @@ "node_modules/fs-constants": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", - "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==" + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "license": "MIT" }, "node_modules/function-bind": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -744,6 +816,7 @@ "version": "2.0.5", "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" } @@ -752,6 +825,7 @@ "version": "1.3.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", + "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.2", "es-define-property": "^1.0.1", @@ -775,6 +849,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "license": "MIT", "dependencies": { "dunder-proto": "^1.0.1", "es-object-atoms": "^1.0.0" @@ -787,6 +862,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -798,6 +874,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "license": "MIT", "engines": { "node": ">=8" } @@ -806,6 +883,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", + "license": "MIT", "engines": { "node": ">= 0.4" }, @@ -817,6 +895,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", + "license": "MIT", "dependencies": { "has-symbols": "^1.0.3" }, @@ -831,6 +910,7 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "license": "MIT", "dependencies": { "function-bind": "^1.1.2" }, @@ -855,12 +935,14 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "BSD-3-Clause" }, "node_modules/ignore": { "version": "5.3.2", "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "license": "MIT", "engines": { "node": ">= 4" } @@ -868,12 +950,14 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" }, "node_modules/is-docker": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", + "license": "MIT", "bin": { "is-docker": "cli.js" }, @@ -888,6 +972,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "license": "MIT", "engines": { "node": ">=8" } @@ -896,6 +981,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz", "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==", + "license": "MIT", "engines": { "node": ">=8" } @@ -904,6 +990,7 @@ "version": "0.1.0", "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "license": "MIT", "engines": { "node": ">=10" }, @@ -915,6 +1002,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "license": "MIT", "dependencies": { "is-docker": "^2.0.0" }, @@ -926,6 +1014,7 @@ "version": "10.9.2", "resolved": "https://registry.npmjs.org/jake/-/jake-10.9.2.tgz", "integrity": "sha512-2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==", + "license": "Apache-2.0", "dependencies": { "async": "^3.2.3", "chalk": "^4.0.2", @@ -943,6 +1032,7 @@ "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "license": "MIT", "dependencies": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -952,6 +1042,7 @@ "version": "3.1.2", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "license": "ISC", "dependencies": { "brace-expansion": "^1.1.7" }, @@ -963,6 +1054,7 @@ "version": "29.7.0", "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz", "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==", + "license": "MIT", "dependencies": { "chalk": "^4.0.0", "diff-sequences": "^29.6.3", @@ -977,6 +1069,7 @@ "version": "29.6.3", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz", "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==", + "license": "MIT", "engines": { "node": "^14.15.0 || ^16.10.0 || >=18.0.0" } @@ -985,6 +1078,7 @@ "version": "3.14.1", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz", "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==", + "license": "MIT", "dependencies": { "argparse": "^1.0.7", "esprima": "^4.0.0" @@ -997,6 +1091,7 @@ "version": "1.0.10", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "license": "MIT", "dependencies": { "sprintf-js": "~1.0.2" } @@ -1005,6 +1100,7 @@ "version": "2.2.3", "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "license": "MIT", "bin": { "json5": "lib/cli.js" }, @@ -1015,12 +1111,14 @@ "node_modules/jsonc-parser": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.2.0.tgz", - "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==" + "integrity": "sha512-gfFQZrcTc8CnKXp6Y4/CBT3fTc0OVuDofpre4aEeEpSBPV5X5v4+Vmx+8snU7RLPrNHPKSgLxGo9YuQzz20o+w==", + "license": "MIT" }, "node_modules/lines-and-columns": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.3.tgz", "integrity": "sha512-cNOjgCnLB+FnvWWtyRTzmB3POJ+cXxTA81LoW7u8JdmhfXzriropYwpjShnz1QLLWsQwY7nIxoDmcPTwphDK9w==", + "license": "MIT", "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" } @@ -1029,6 +1127,7 @@ "version": "4.1.0", "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", + "license": "MIT", "dependencies": { "chalk": "^4.1.0", "is-unicode-supported": "^0.1.0" @@ -1044,6 +1143,7 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "license": "MIT", "engines": { "node": ">= 0.4" } @@ -1052,6 +1152,7 @@ "version": "1.52.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "license": "MIT", "engines": { "node": ">= 0.6" } @@ -1060,6 +1161,7 @@ "version": "2.1.35", "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "license": "MIT", "dependencies": { "mime-db": "1.52.0" }, @@ -1071,6 +1173,7 @@ "version": "2.1.0", "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "license": "MIT", "engines": { "node": ">=6" } @@ -1079,6 +1182,7 @@ "version": "9.0.3", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz", "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==", + "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" }, @@ -1093,6 +1197,7 @@ "version": "1.2.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -1100,12 +1205,14 @@ "node_modules/node-machine-id": { "version": "1.1.12", "resolved": "https://registry.npmjs.org/node-machine-id/-/node-machine-id-1.1.12.tgz", - "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==" + "integrity": "sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==", + "license": "MIT" }, "node_modules/npm-run-path": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "license": "MIT", "dependencies": { "path-key": "^3.0.0" }, @@ -1114,10 +1221,11 @@ } }, "node_modules/nx": { - "version": "0.0.0-pr-30913-79806e0", - "resolved": "https://registry.npmjs.org/nx/-/nx-0.0.0-pr-30913-79806e0.tgz", - "integrity": "sha512-1kSlOzc6F0z9Ja62aLYju/k4bch06KEpxHBTh0TQDzyuUOdWl+QoGi9JKSvCQwajE36eEiOUZBiyxDc1ZbrtQA==", + "version": "0.0.0-pr-30913-b798a55", + "resolved": "https://registry.npmjs.org/nx/-/nx-0.0.0-pr-30913-b798a55.tgz", + "integrity": "sha512-YsnAbW15840FP4WCRPELmkCYsZMK14mJYjUZq2noP2OcOBIPBJpf55LIepgE/R2suOK8fqQOg/hj6mQe4CCc+w==", "hasInstallScript": true, + "license": "MIT", "dependencies": { "@napi-rs/wasm-runtime": "0.2.4", "@yarnpkg/lockfile": "^1.1.0", @@ -1163,16 +1271,16 @@ "node": "^20.19.0 || ^22.12.0" }, "optionalDependencies": { - "@nx/nx-darwin-arm64": "0.0.0-pr-30913-79806e0", - "@nx/nx-darwin-x64": "0.0.0-pr-30913-79806e0", - "@nx/nx-freebsd-x64": "0.0.0-pr-30913-79806e0", - "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-30913-79806e0", - "@nx/nx-linux-arm64-gnu": "0.0.0-pr-30913-79806e0", - "@nx/nx-linux-arm64-musl": "0.0.0-pr-30913-79806e0", - "@nx/nx-linux-x64-gnu": "0.0.0-pr-30913-79806e0", - "@nx/nx-linux-x64-musl": "0.0.0-pr-30913-79806e0", - "@nx/nx-win32-arm64-msvc": "0.0.0-pr-30913-79806e0", - "@nx/nx-win32-x64-msvc": "0.0.0-pr-30913-79806e0" + "@nx/nx-darwin-arm64": "0.0.0-pr-30913-b798a55", + "@nx/nx-darwin-x64": "0.0.0-pr-30913-b798a55", + "@nx/nx-freebsd-x64": "0.0.0-pr-30913-b798a55", + "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-30913-b798a55", + "@nx/nx-linux-arm64-gnu": "0.0.0-pr-30913-b798a55", + "@nx/nx-linux-arm64-musl": "0.0.0-pr-30913-b798a55", + "@nx/nx-linux-x64-gnu": "0.0.0-pr-30913-b798a55", + "@nx/nx-linux-x64-musl": "0.0.0-pr-30913-b798a55", + "@nx/nx-win32-arm64-msvc": "0.0.0-pr-30913-b798a55", + "@nx/nx-win32-x64-msvc": "0.0.0-pr-30913-b798a55" }, "peerDependencies": { "@swc-node/register": "^1.8.0", @@ -1191,6 +1299,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "license": "ISC", "dependencies": { "wrappy": "1" } @@ -1199,6 +1308,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "license": "MIT", "dependencies": { "mimic-fn": "^2.1.0" }, @@ -1213,6 +1323,7 @@ "version": "8.4.2", "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", + "license": "MIT", "dependencies": { "define-lazy-prop": "^2.0.0", "is-docker": "^2.1.1", @@ -1229,6 +1340,7 @@ "version": "5.3.0", "resolved": "https://registry.npmjs.org/ora/-/ora-5.3.0.tgz", "integrity": "sha512-zAKMgGXUim0Jyd6CXK9lraBnD3H5yPGBPPOkC23a2BG6hsm4Zu6OQSjQuEtV0BHDf4aKHcUFvJiGRrFuW3MG8g==", + "license": "MIT", "dependencies": { "bl": "^4.0.3", "chalk": "^4.1.0", @@ -1250,6 +1362,7 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "license": "MIT", "engines": { "node": ">=8" } @@ -1258,6 +1371,7 @@ "version": "29.7.0", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz", "integrity": "sha512-Pdlw/oPxN+aXdmM9R00JVC9WVFoCLTKJvDVLgmJ+qAffBMxsV85l/Lu7sNx4zSzPyoL2euImuEwHhOXdEgNFZQ==", + "license": "MIT", "dependencies": { "@jest/schemas": "^29.6.3", "ansi-styles": "^5.0.0", @@ -1271,6 +1385,7 @@ "version": "5.2.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "license": "MIT", "engines": { "node": ">=10" }, @@ -1281,17 +1396,20 @@ "node_modules/proxy-from-env": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "license": "MIT" }, "node_modules/react-is": { "version": "18.3.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", - "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==" + "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", + "license": "MIT" }, "node_modules/readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", + "license": "MIT", "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", @@ -1305,6 +1423,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "license": "MIT", "engines": { "node": ">=0.10.0" } @@ -1313,6 +1432,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/resolve.exports/-/resolve.exports-2.0.3.tgz", "integrity": "sha512-OcXjMsGdhL4XnbShKpAcSqPMzQoYkYyhbEaeSko47MjRP9NfEQMhZkXL1DoFlt9LWQn4YttrdnV6X2OiyzBi+A==", + "license": "MIT", "engines": { "node": ">=10" } @@ -1321,6 +1441,7 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz", "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==", + "license": "MIT", "dependencies": { "onetime": "^5.1.0", "signal-exit": "^3.0.2" @@ -1346,12 +1467,14 @@ "type": "consulting", "url": "https://feross.org/support" } - ] + ], + "license": "MIT" }, "node_modules/semver": { "version": "7.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "license": "ISC", "bin": { "semver": "bin/semver.js" }, @@ -1362,17 +1485,20 @@ "node_modules/signal-exit": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" + "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", + "license": "ISC" }, "node_modules/sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" + "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", + "license": "BSD-3-Clause" }, "node_modules/string_decoder": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "license": "MIT", "dependencies": { "safe-buffer": "~5.2.0" } @@ -1381,6 +1507,7 @@ "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -1394,6 +1521,7 @@ "version": "6.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" }, @@ -1405,6 +1533,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "license": "MIT", "engines": { "node": ">=4" } @@ -1413,6 +1542,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "license": "MIT", "dependencies": { "has-flag": "^4.0.0" }, @@ -1424,6 +1554,7 @@ "version": "2.2.0", "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "license": "MIT", "dependencies": { "bl": "^4.0.3", "end-of-stream": "^1.4.1", @@ -1439,6 +1570,7 @@ "version": "0.2.3", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz", "integrity": "sha512-nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==", + "license": "MIT", "engines": { "node": ">=14.14" } @@ -1447,6 +1579,7 @@ "version": "1.2.2", "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", + "license": "MIT", "bin": { "tree-kill": "cli.js" } @@ -1455,6 +1588,7 @@ "version": "4.2.0", "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", + "license": "MIT", "dependencies": { "json5": "^2.2.2", "minimist": "^1.2.6", @@ -1467,17 +1601,20 @@ "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", - "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==" + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "license": "0BSD" }, "node_modules/util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "license": "MIT" }, "node_modules/wcwidth": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz", "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==", + "license": "MIT", "dependencies": { "defaults": "^1.0.3" } @@ -1486,6 +1623,7 @@ "version": "7.0.0", "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", "string-width": "^4.1.0", @@ -1501,12 +1639,14 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "license": "ISC" }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "license": "ISC", "engines": { "node": ">=10" } @@ -1515,6 +1655,7 @@ "version": "2.7.1", "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.1.tgz", "integrity": "sha512-10ULxpnOCQXxJvBgxsn9ptjq6uviG/htZKk9veJGhlqn3w/DxQ631zFF+nlQXLwmImeS5amR2dl2U8sg6U9jsQ==", + "license": "ISC", "bin": { "yaml": "bin.mjs" }, @@ -1526,6 +1667,7 @@ "version": "17.7.2", "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "license": "MIT", "dependencies": { "cliui": "^8.0.1", "escalade": "^3.1.1", @@ -1543,6 +1685,7 @@ "version": "21.1.1", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "license": "ISC", "engines": { "node": ">=12" } diff --git a/package.json b/package.json index f2a526bc4a1d..c68a04d73ef2 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "spring-boot", "dependencies": { - "nx": "0.0.0-pr-30913-79806e0", - "@nx/gradle": "0.0.0-pr-30913-79806e0" + "nx": "0.0.0-pr-30913-b798a55", + "@nx/gradle": "0.0.0-pr-30913-b798a55" } } diff --git a/spring-boot-project/spring-boot-devtools/build.gradle b/spring-boot-project/spring-boot-devtools/build.gradle index da7f0e00c776..2ca66c6e29ed 100644 --- a/spring-boot-project/spring-boot-devtools/build.gradle +++ b/spring-boot-project/spring-boot-devtools/build.gradle @@ -94,3 +94,15 @@ tasks.register("syncIntTestDependencies", Sync) { intTest { dependsOn syncIntTestDependencies } + +jar { + dependsOn processResources +} + +autoConfigurationMetadata { + dependsOn processResources +} + +compileTestJava { + dependsOn processResources +} \ No newline at end of file diff --git a/spring-boot-project/spring-boot-docs/project.json b/spring-boot-project/spring-boot-docs/project.json new file mode 100644 index 000000000000..7db6a396c932 --- /dev/null +++ b/spring-boot-project/spring-boot-docs/project.json @@ -0,0 +1,10 @@ +{ + "targets": { + "dokkatooGeneratePublicationHtml": { + "executor": "@nx/gradle:gradle", + "options": { + "excludeDependsOn": false + } + } + } +} diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/build.gradle index 7e45904ecddc..06b76ba05072 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/build.gradle @@ -24,6 +24,7 @@ dependencies { testRepository(project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-parent", configuration: "mavenRepository")) testRepository(project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-tomcat", configuration: "mavenRepository")) testRepository(project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-undertow", configuration: "mavenRepository")) + testRepository(project(path: ":spring-boot-project:spring-boot-starters:spring-boot-starter-logging", configuration: "mavenRepository")) testRuntimeOnly(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-logging")) } From 9e441cba6b445d95b2939b5e225aa10a56ccd6f4 Mon Sep 17 00:00:00 2001 From: lourw <56288712+lourw@users.noreply.github.com> Date: Fri, 9 May 2025 07:00:17 -0700 Subject: [PATCH 11/46] chore(repo): change run-many to use assemble, test-ci --- .github/actions/build/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index de1c9bc6e2d8..4b8f90119ef4 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -68,7 +68,7 @@ runs: COMMERCIAL_REPO_PASSWORD: ${{ inputs.commercial-repository-password }} COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }} COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }} - run: NX_BATCH_MODE=true NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx run-many -t build --parallel=32 --batch + run: NX_BATCH_MODE=true NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx run-many -t assemble,test-ci --parallel=32 --batch # - name: Publish # id: publish # if: ${{ inputs.publish == 'true' }} From b34b81c7e62dd86763f40b7c669b61965305d96b Mon Sep 17 00:00:00 2001 From: Louie Weng <56288712+lourw@users.noreply.github.com> Date: Fri, 9 May 2025 07:54:39 -0700 Subject: [PATCH 12/46] Use check-ci Signed-off-by: Louie Weng <56288712+lourw@users.noreply.github.com> --- .github/actions/build/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 4b8f90119ef4..ba8a95416444 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -68,7 +68,7 @@ runs: COMMERCIAL_REPO_PASSWORD: ${{ inputs.commercial-repository-password }} COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }} COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }} - run: NX_BATCH_MODE=true NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx run-many -t assemble,test-ci --parallel=32 --batch + run: NX_BATCH_MODE=true NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx run-many -t assemble,check-ci --parallel=32 --batch # - name: Publish # id: publish # if: ${{ inputs.publish == 'true' }} From 22a8b56a527112b2ac8bc30c38ffbbc111dfe225 Mon Sep 17 00:00:00 2001 From: Louie Weng <56288712+lourw@users.noreply.github.com> Date: Sat, 10 May 2025 01:14:37 -0700 Subject: [PATCH 13/46] Apply suggestions from code review Signed-off-by: Louie Weng <56288712+lourw@users.noreply.github.com> --- .github/workflows/build-pull-request.yml | 2 +- nx.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml index 40de97a8965a..95238ddf0e3b 100644 --- a/.github/workflows/build-pull-request.yml +++ b/.github/workflows/build-pull-request.yml @@ -21,7 +21,7 @@ jobs: # Run this command as early as possible, before dependencies are installed # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun # Uncomment this line to enable task distribution - - run: NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_CLOUD_RETRIEVAL_CONCURRENCY=8 NX_CLOUD_NO_TIMEOUTS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx-cloud start-ci-run --distribute-on="5 linux-extra-large-plus-jvm" --require-explicit-completion + - run: NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_CLOUD_RETRIEVAL_CONCURRENCY=50 NX_CLOUD_NO_TIMEOUTS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx-cloud start-ci-run --distribute-on="5 linux-extra-large-plus-jvm" --require-explicit-completion - name: Build id: build diff --git a/nx.json b/nx.json index f7dcde80dd5f..cb4133eb9aa1 100644 --- a/nx.json +++ b/nx.json @@ -34,7 +34,7 @@ } } }, - "bustCache": 12, + "bustCache": 14, "nxCloudUrl": "https://staging.nx.app", "nxCloudId": "67a56832eb5d9093e3ebe776" } From e9f719e6372f64cabba1f34a17a481e1f83242cb Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Thu, 8 May 2025 19:22:03 -0400 Subject: [PATCH 14/46] upgrade pr version to 0.0.0-pr-30913-75a64ba (+2 squashed commits) Squashed commits: [3ec15d9d09] bust cache [d2e2987c8c] upgrade pr version to 0.0.0-pr-30913-da2b0d3 --- build.gradle | 2 +- .../boot/build/AntoraConventions.java | 5 - nx.json | 20 ++-- package-lock.json | 113 +++++++++--------- package.json | 4 +- .../spring-boot-docs/build.gradle | 4 +- .../build.gradle | 13 ++ .../spring-boot-gradle-plugin/build.gradle | 4 + .../spring-boot-maven-plugin/build.gradle | 4 + spring-boot-project/spring-boot/build.gradle | 4 + .../spring-boot-server-tests/build.gradle | 10 ++ 11 files changed, 106 insertions(+), 77 deletions(-) diff --git a/build.gradle b/build.gradle index 55df3f061910..2ae8f658ef45 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id "dev.nx.gradle.project-graph" version "+" + id "dev.nx.gradle.project-graph" version "0.0.1-alpha.4" id "base" id "org.jetbrains.kotlin.jvm" apply false // https://youtrack.jetbrains.com/issue/KT-30276 } diff --git a/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java index 3d8aec25c118..51b107bcda3c 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java @@ -170,11 +170,6 @@ private void configureAntoraTask(Project project, AntoraTask antoraTask, .withPropertyName("antoraPlaybookFile") .withPathSensitivity(PathSensitivity.RELATIVE); - antoraTask.getInputs() - .dir(project.getLayout().getBuildDirectory().dir(".gradle")) - .withPropertyName("gradleBuildDir") - .withPathSensitivity(PathSensitivity.RELATIVE); - antoraTask.setPlaybook("antora-playbook.yml"); antoraTask.setUiBundleUrl(getUiBundleUrl(project)); antoraTask.getArgs().set(project.provider(() -> getAntoraNpxArs(project, antoraTask))); diff --git a/nx.json b/nx.json index cb4133eb9aa1..8edc16ee9715 100644 --- a/nx.json +++ b/nx.json @@ -12,13 +12,8 @@ } ], "namedInputs": { - "default": [ - "{projectRoot}/**/*" - ], - "production": [ - "default", - "!{projectRoot}/src/test/**/*" - ] + "default": ["{projectRoot}/**/*"], + "production": ["default", "!{projectRoot}/src/test/**/*"] }, "targetDefaults": { "homebrewFormula": { @@ -32,10 +27,15 @@ "options": { "excludeDependsOn": false } + }, + "antoraNpmInstall": { + "executor": "@nx/gradle:gradle", + "options": { + "excludeDependsOn": false + } } }, "bustCache": 14, - "nxCloudUrl": "https://staging.nx.app", - "nxCloudId": "67a56832eb5d9093e3ebe776" + "nxCloudUrl": "https://snapshot.nx.app", + "nxCloudId": "67dad8ae45125407e384edab" } - diff --git a/package-lock.json b/package-lock.json index de94e3eb19c0..6f56acdaee5b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,10 +5,9 @@ "packages": { "": { "name": "spring-boot", - "hasInstallScript": true, "dependencies": { - "@nx/gradle": "0.0.0-pr-30913-b798a55", - "nx": "0.0.0-pr-30913-b798a55" + "@nx/gradle": "0.0.0-pr-30913-75a64ba", + "nx": "0.0.0-pr-30913-75a64ba" } }, "node_modules/@emnapi/core": { @@ -63,9 +62,9 @@ } }, "node_modules/@nx/devkit": { - "version": "0.0.0-pr-30913-b798a55", - "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-0.0.0-pr-30913-b798a55.tgz", - "integrity": "sha512-rhgar2gs+M9B7ymiy9co8nIN9qIckXuqtyhkwiJYli64iYpAX2RIAmDkUoSPoQ4e0vW+nHGkQuQ+LjxI9249QA==", + "version": "0.0.0-pr-30913-75a64ba", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-0.0.0-pr-30913-75a64ba.tgz", + "integrity": "sha512-ytDDO266mhRZN84kiej/Um+oaQ1CGS2sAM2x74TEoky3HSzlPUOr1WJes98H6DOGCT2nyunFUph3c06QSKm/NA==", "license": "MIT", "dependencies": { "ejs": "^3.1.7", @@ -78,22 +77,22 @@ "yargs-parser": "21.1.1" }, "peerDependencies": { - "nx": "0.0.0-pr-30913-b798a55" + "nx": "0.0.0-pr-30913-75a64ba" } }, "node_modules/@nx/gradle": { - "version": "0.0.0-pr-30913-b798a55", - "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-0.0.0-pr-30913-b798a55.tgz", - "integrity": "sha512-rT7m7c//ICIHJtzkPaleUBMETEh20+A+HsfMl/Jo9nB5N/OztbC1bIR28y6FvlzMGx0D3ILwhIfx6BfDbZ56jA==", + "version": "0.0.0-pr-30913-75a64ba", + "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-0.0.0-pr-30913-75a64ba.tgz", + "integrity": "sha512-4Tci2wJnnkyjVvBlBtptfrckkoDhdb+dowGmriBpU7cPc8J6WDVNHT51wCZGXaLi45nCNbjblxh14AlbewPxJQ==", "license": "MIT", "dependencies": { - "@nx/devkit": "0.0.0-pr-30913-b798a55" + "@nx/devkit": "0.0.0-pr-30913-75a64ba" } }, "node_modules/@nx/nx-darwin-arm64": { - "version": "0.0.0-pr-30913-b798a55", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-0.0.0-pr-30913-b798a55.tgz", - "integrity": "sha512-ZKDChWTjSOgqCOUvqzsicvS1as//8KRXbmlX43WA9w36h4uIyGQEafZeGIcZ2luVk13m2msGeG8C7JhVnpllVw==", + "version": "0.0.0-pr-30913-75a64ba", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-0.0.0-pr-30913-75a64ba.tgz", + "integrity": "sha512-oNKq/6+h7vdZEhVt1cJSgX8x/W0q68sLxJO23a8HiFoT75hROlfys3tX8yXGJqREK4AEL4zMvOfxf8q5azqCaA==", "cpu": [ "arm64" ], @@ -104,9 +103,9 @@ ] }, "node_modules/@nx/nx-darwin-x64": { - "version": "0.0.0-pr-30913-b798a55", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-0.0.0-pr-30913-b798a55.tgz", - "integrity": "sha512-KP/nVR+JNLbGAoXhn3nGUYjKAyCJkm1Qp86lFynHs1ZARfIGtNfqYmEBHhwOSa3WAE10j+aLkZfVduOoHDBzrQ==", + "version": "0.0.0-pr-30913-75a64ba", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-0.0.0-pr-30913-75a64ba.tgz", + "integrity": "sha512-vBS8YypFiSeQ8dQ93+7h7Lv/GKPeoVJKUUhVDvLXEhPnP0/h/alCku5rLV6Sk+BtF6iST+9vaikAv1Zg7TtlMA==", "cpu": [ "x64" ], @@ -117,9 +116,9 @@ ] }, "node_modules/@nx/nx-freebsd-x64": { - "version": "0.0.0-pr-30913-b798a55", - "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-0.0.0-pr-30913-b798a55.tgz", - "integrity": "sha512-YpD4ZtVkIRy54SKuoKJ/7XQaigsyES/rwEuRnzv5vH1MO85Ngd1UqOyNtGGTJS/trpbEa/Sj3zkku4a9ihq89A==", + "version": "0.0.0-pr-30913-75a64ba", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-0.0.0-pr-30913-75a64ba.tgz", + "integrity": "sha512-7zjp7ha7OiZy51RO5q0Qzcetk9qvoTrXh8cvg+InIdugPcRcGeVKs6bvDSTqPW0CcOgQBZCcc9ihXgA9522ofw==", "cpu": [ "x64" ], @@ -130,9 +129,9 @@ ] }, "node_modules/@nx/nx-linux-arm-gnueabihf": { - "version": "0.0.0-pr-30913-b798a55", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-0.0.0-pr-30913-b798a55.tgz", - "integrity": "sha512-B72YeftedsFHedN4gIpDhWzYzpV/ckJEH/LxxDYBvBpnsn6eNZhd9wlKHDCWkFScwOXFpMKcntmocg5msHKLFg==", + "version": "0.0.0-pr-30913-75a64ba", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-0.0.0-pr-30913-75a64ba.tgz", + "integrity": "sha512-8DVhYmLFHW703qADFw7AL69LCw/Cwqmrk6YwHdC7EmbLiW5FdRkRTb4cFNmUpgFpNobiAYJS8eSphXW3mjvnCQ==", "cpu": [ "arm" ], @@ -143,9 +142,9 @@ ] }, "node_modules/@nx/nx-linux-arm64-gnu": { - "version": "0.0.0-pr-30913-b798a55", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-0.0.0-pr-30913-b798a55.tgz", - "integrity": "sha512-B7uciZxtpzQ4E0ExP2d2HlH19pSmfGV1Hp7mATuDa253+3kFBxC7W5ADyyJOt5yqCyfdTDbCTp5QMstM7mKj8A==", + "version": "0.0.0-pr-30913-75a64ba", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-0.0.0-pr-30913-75a64ba.tgz", + "integrity": "sha512-O1btG2A6nJjkaGGP69wdnJ5fc7hYP4CBzSIZFHOXlQ5heaGqtCIS1Uzzs4BuRPwcBueA5vAqxxdxyMwSUjw/cg==", "cpu": [ "arm64" ], @@ -156,9 +155,9 @@ ] }, "node_modules/@nx/nx-linux-arm64-musl": { - "version": "0.0.0-pr-30913-b798a55", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-0.0.0-pr-30913-b798a55.tgz", - "integrity": "sha512-7iK5xMhXXqMfuB4Bi1jIsl7sUfE0WymyaPU0Wb0h5YOCvxG0CkTaS5nU+vmunJX9Se2KL+Ayq5zqeN1Z2wvlxg==", + "version": "0.0.0-pr-30913-75a64ba", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-0.0.0-pr-30913-75a64ba.tgz", + "integrity": "sha512-7OR/4VA4FQ9KEpsCabya/OP4Qi7UlTmKz64fhBHAhpcy07jRmknLFd+2LNJgTx+m1aOl07T1tl5mdSRMX4KA1A==", "cpu": [ "arm64" ], @@ -169,9 +168,9 @@ ] }, "node_modules/@nx/nx-linux-x64-gnu": { - "version": "0.0.0-pr-30913-b798a55", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-0.0.0-pr-30913-b798a55.tgz", - "integrity": "sha512-4pjt+9uL7O9OEy9Uyq2tPUF+odXOr4/gluXdaS6gMuDzbdDsDpq1XBC6hvteYaC/dMC1ewpG6P6Z/dQjg7WSUg==", + "version": "0.0.0-pr-30913-75a64ba", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-0.0.0-pr-30913-75a64ba.tgz", + "integrity": "sha512-wQQD61noZKx4ESAZb5xxl2Elfuo+761WyqO/s42lqB0VDplTrjDvc6L++UJoQfdyJ61aoqJFjy3vfEAo4ZwQ0g==", "cpu": [ "x64" ], @@ -182,9 +181,9 @@ ] }, "node_modules/@nx/nx-linux-x64-musl": { - "version": "0.0.0-pr-30913-b798a55", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-0.0.0-pr-30913-b798a55.tgz", - "integrity": "sha512-w0c3k9PMOcqK7ZSubIZYlOCBocEn0q5z+tXEaYgGJmqfEXH6E8xBxnqhoJFWj66vRKC8lTM89Hv5TtckuNyvrQ==", + "version": "0.0.0-pr-30913-75a64ba", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-0.0.0-pr-30913-75a64ba.tgz", + "integrity": "sha512-OTcq5u706sX4ytmZ9WlrwIiUrYaBp/DJltPvnbAlgVxt/ZRfS76G77cvb8fTgN9D7wLTCdTmkRjYBWFi96+iUA==", "cpu": [ "x64" ], @@ -195,9 +194,9 @@ ] }, "node_modules/@nx/nx-win32-arm64-msvc": { - "version": "0.0.0-pr-30913-b798a55", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-0.0.0-pr-30913-b798a55.tgz", - "integrity": "sha512-uD/KosTRmXcH+yHtP4Xksw3Al1TDKbdqMehfTDxiciFVwEHR8IovO7lMnfefDybrBlirTbc7KaVo+SzWoPg7UQ==", + "version": "0.0.0-pr-30913-75a64ba", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-0.0.0-pr-30913-75a64ba.tgz", + "integrity": "sha512-34HSxbrlHrzqP/+x6OBAE0UJh0Bt2F76lhF5xerk0Ya/CUlZg4I1Vw31Tf3NaAf7tUyreUkSBHyNGGGJ4+cSgw==", "cpu": [ "arm64" ], @@ -208,9 +207,9 @@ ] }, "node_modules/@nx/nx-win32-x64-msvc": { - "version": "0.0.0-pr-30913-b798a55", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-0.0.0-pr-30913-b798a55.tgz", - "integrity": "sha512-UWf/AxaTQvYiN7IazzckS+ydFO2V+/TOk5xrxLsdro207ZXjOqTPe6gtaq1VNiBK7TJP7zaYdG8jx2AyuK7g9A==", + "version": "0.0.0-pr-30913-75a64ba", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-0.0.0-pr-30913-75a64ba.tgz", + "integrity": "sha512-Yo0xwRrUkml277Vll5PDYJc5Ru4kqlsufm08hLzndMJFaxhvKKKLMfxfBanjhuBm4TjarSS82eGcNT6HW82e2w==", "cpu": [ "x64" ], @@ -1221,9 +1220,9 @@ } }, "node_modules/nx": { - "version": "0.0.0-pr-30913-b798a55", - "resolved": "https://registry.npmjs.org/nx/-/nx-0.0.0-pr-30913-b798a55.tgz", - "integrity": "sha512-YsnAbW15840FP4WCRPELmkCYsZMK14mJYjUZq2noP2OcOBIPBJpf55LIepgE/R2suOK8fqQOg/hj6mQe4CCc+w==", + "version": "0.0.0-pr-30913-75a64ba", + "resolved": "https://registry.npmjs.org/nx/-/nx-0.0.0-pr-30913-75a64ba.tgz", + "integrity": "sha512-QY/cuaRxcd3VRknY1nUPvzyAqcookLmDnJ31vJlLTAfF5qEWHB/EJF4LnK0pUZLOGj4/V9LC0ytZnj/8u6f5DQ==", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -1271,16 +1270,16 @@ "node": "^20.19.0 || ^22.12.0" }, "optionalDependencies": { - "@nx/nx-darwin-arm64": "0.0.0-pr-30913-b798a55", - "@nx/nx-darwin-x64": "0.0.0-pr-30913-b798a55", - "@nx/nx-freebsd-x64": "0.0.0-pr-30913-b798a55", - "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-30913-b798a55", - "@nx/nx-linux-arm64-gnu": "0.0.0-pr-30913-b798a55", - "@nx/nx-linux-arm64-musl": "0.0.0-pr-30913-b798a55", - "@nx/nx-linux-x64-gnu": "0.0.0-pr-30913-b798a55", - "@nx/nx-linux-x64-musl": "0.0.0-pr-30913-b798a55", - "@nx/nx-win32-arm64-msvc": "0.0.0-pr-30913-b798a55", - "@nx/nx-win32-x64-msvc": "0.0.0-pr-30913-b798a55" + "@nx/nx-darwin-arm64": "0.0.0-pr-30913-75a64ba", + "@nx/nx-darwin-x64": "0.0.0-pr-30913-75a64ba", + "@nx/nx-freebsd-x64": "0.0.0-pr-30913-75a64ba", + "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-30913-75a64ba", + "@nx/nx-linux-arm64-gnu": "0.0.0-pr-30913-75a64ba", + "@nx/nx-linux-arm64-musl": "0.0.0-pr-30913-75a64ba", + "@nx/nx-linux-x64-gnu": "0.0.0-pr-30913-75a64ba", + "@nx/nx-linux-x64-musl": "0.0.0-pr-30913-75a64ba", + "@nx/nx-win32-arm64-msvc": "0.0.0-pr-30913-75a64ba", + "@nx/nx-win32-x64-msvc": "0.0.0-pr-30913-75a64ba" }, "peerDependencies": { "@swc-node/register": "^1.8.0", @@ -1471,9 +1470,9 @@ "license": "MIT" }, "node_modules/semver": { - "version": "7.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz", - "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==", + "version": "7.7.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz", + "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==", "license": "ISC", "bin": { "semver": "bin/semver.js" diff --git a/package.json b/package.json index c68a04d73ef2..3363d024b7e1 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "spring-boot", "dependencies": { - "nx": "0.0.0-pr-30913-b798a55", - "@nx/gradle": "0.0.0-pr-30913-b798a55" + "nx": "0.0.0-pr-30913-75a64ba", + "@nx/gradle": "0.0.0-pr-30913-75a64ba" } } diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle index 98d4eb5246aa..3583f70f0312 100644 --- a/spring-boot-project/spring-boot-docs/build.gradle +++ b/spring-boot-project/spring-boot-docs/build.gradle @@ -224,7 +224,7 @@ project.rootProject.gradle.projectsEvaluated { (it.path.contains(":spring-boot-tools:spring-boot-loader") && !it.path.contains("spring-boot-loader-classic"))} .findAll { !it.name.startsWith('spring-boot-starter') } aggregatedJavadoc.configure { - dependsOn publishedProjects.javadoc + dependsOn publishedProjects.javadoc, processResources source publishedProjects.javadoc.source classpath = project.files(publishedProjects.javadoc.classpath) } @@ -383,4 +383,4 @@ dokkatoo { dokkatooPublications.configureEach { includes.from("src/docs/dokkatoo/dokka-overview.md") } -} +} \ No newline at end of file diff --git a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle index f26c6eb92e6d..5ae68ba23577 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle @@ -131,9 +131,22 @@ artifacts { test { include "**/*Tests.class" + dependsOn processResources } tasks.register("testSliceMetadata", org.springframework.boot.build.test.autoconfigure.TestSliceMetadata) { sourceSet = sourceSets.main outputFile = layout.buildDirectory.file("test-slice-metadata.properties") } + +testSliceMetadata { + dependsOn processResources +} + +jar { + dependsOn processResources +} + +javadoc { + dependsOn processResources +} \ No newline at end of file diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle index 93a89a921925..ca36c8d3d785 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle @@ -158,3 +158,7 @@ plugins.withType(EclipsePlugin) { toolchain { maximumCompatibleJavaVersion = JavaLanguageVersion.of(23) } + +nxProjectReport { + atomized = false +} \ No newline at end of file diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle index beb84b636784..12803c010a85 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle @@ -176,3 +176,7 @@ tasks.named("generateAntoraPlaybook") { tasks.named("dockerTest").configure { dependsOn tasks.named("prepareMavenBinaries") } + +syncPluginDescriptorInputs { + dependsOn formatHelpMojoSource +} \ No newline at end of file diff --git a/spring-boot-project/spring-boot/build.gradle b/spring-boot-project/spring-boot/build.gradle index 73311c9bd694..6c71494a9dea 100644 --- a/spring-boot-project/spring-boot/build.gradle +++ b/spring-boot-project/spring-boot/build.gradle @@ -196,3 +196,7 @@ sourceSets { test { jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED" } + +nxProjectReport { + atomized = false +} \ No newline at end of file diff --git a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/build.gradle b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/build.gradle index 06b76ba05072..0709335ef69a 100644 --- a/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/build.gradle +++ b/spring-boot-tests/spring-boot-integration-tests/spring-boot-server-tests/build.gradle @@ -53,6 +53,16 @@ tasks.register("buildApps", GradleBuild) { "undertowBootJar", "undertowBootWar" ] + // Manually declare expected output files + outputs.files( + layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-jetty.jar"), + layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-jetty.war"), + layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-resources.jar"), + layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-tomcat.jar"), + layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-tomcat.war"), + layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-undertow.jar"), + layout.buildDirectory.file("spring-boot-server-tests-app/build/libs/spring-boot-server-tests-app-undertow.war") + ) } intTest { From 4cdca45d92b9c0610423d314baef2ed906ba02b8 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Thu, 8 May 2025 19:22:03 -0400 Subject: [PATCH 15/46] upgrade pr version to 0.0.0-pr-30913-75a64ba (+2 squashed commits) Squashed commits: [3ec15d9d09] bust cache [d2e2987c8c] upgrade pr version to 0.0.0-pr-30913-da2b0d3 --- .github/actions/build/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index ba8a95416444..de1c9bc6e2d8 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -68,7 +68,7 @@ runs: COMMERCIAL_REPO_PASSWORD: ${{ inputs.commercial-repository-password }} COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }} COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }} - run: NX_BATCH_MODE=true NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx run-many -t assemble,check-ci --parallel=32 --batch + run: NX_BATCH_MODE=true NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx run-many -t build --parallel=32 --batch # - name: Publish # id: publish # if: ${{ inputs.publish == 'true' }} From fdd5fcb4266c26b8dc8e174b99f99469efcb6953 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Mon, 12 May 2025 17:50:45 -0400 Subject: [PATCH 16/46] change to stream output --- .env | 3 ++- .github/actions/build/action.yml | 2 +- .../spring-boot-test-autoconfigure/build.gradle | 13 ------------- .../spring-boot-maven-plugin/build.gradle | 4 ---- 4 files changed, 3 insertions(+), 19 deletions(-) diff --git a/.env b/.env index 878f0582f3f0..9689a86d6d1d 100644 --- a/.env +++ b/.env @@ -1,2 +1,3 @@ NX_BATCH_MODE=true -NX_VERBOSE_LOGGING=true \ No newline at end of file +NX_VERBOSE_LOGGING=true +NX_TUI=false \ No newline at end of file diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index de1c9bc6e2d8..c9e7c43c2569 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -68,7 +68,7 @@ runs: COMMERCIAL_REPO_PASSWORD: ${{ inputs.commercial-repository-password }} COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }} COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }} - run: NX_BATCH_MODE=true NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx run-many -t build --parallel=32 --batch + run: NX_BATCH_MODE=true NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx run-many -t build --parallel=32 --batch --outputStyle=stream # - name: Publish # id: publish # if: ${{ inputs.publish == 'true' }} diff --git a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle index 5ae68ba23577..f26c6eb92e6d 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle @@ -131,22 +131,9 @@ artifacts { test { include "**/*Tests.class" - dependsOn processResources } tasks.register("testSliceMetadata", org.springframework.boot.build.test.autoconfigure.TestSliceMetadata) { sourceSet = sourceSets.main outputFile = layout.buildDirectory.file("test-slice-metadata.properties") } - -testSliceMetadata { - dependsOn processResources -} - -jar { - dependsOn processResources -} - -javadoc { - dependsOn processResources -} \ No newline at end of file diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle index 12803c010a85..1ed50eee444e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle @@ -175,8 +175,4 @@ tasks.named("generateAntoraPlaybook") { tasks.named("dockerTest").configure { dependsOn tasks.named("prepareMavenBinaries") -} - -syncPluginDescriptorInputs { - dependsOn formatHelpMojoSource } \ No newline at end of file From 03b5e0f31cbf50286ab33530ebfcc95ee5fc8b81 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Mon, 12 May 2025 19:21:26 -0400 Subject: [PATCH 17/46] upgrade pr version to 0.0.0-pr-30913-89a46d1 --- package-lock.json | 106 +++++++++++++++++++++++----------------------- package.json | 4 +- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6f56acdaee5b..aeed9009cf10 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,8 +6,8 @@ "": { "name": "spring-boot", "dependencies": { - "@nx/gradle": "0.0.0-pr-30913-75a64ba", - "nx": "0.0.0-pr-30913-75a64ba" + "@nx/gradle": "0.0.0-pr-30913-89a46d1", + "nx": "0.0.0-pr-30913-89a46d1" } }, "node_modules/@emnapi/core": { @@ -62,9 +62,9 @@ } }, "node_modules/@nx/devkit": { - "version": "0.0.0-pr-30913-75a64ba", - "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-0.0.0-pr-30913-75a64ba.tgz", - "integrity": "sha512-ytDDO266mhRZN84kiej/Um+oaQ1CGS2sAM2x74TEoky3HSzlPUOr1WJes98H6DOGCT2nyunFUph3c06QSKm/NA==", + "version": "0.0.0-pr-30913-89a46d1", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-0.0.0-pr-30913-89a46d1.tgz", + "integrity": "sha512-0Mdw3v2bJ8GFyDtGyRAQ6vs3uqBkLxFz1HcuTCLM3d5zzvYyGZIKRZsr1M9qU0Xya7W2M7TQHldIov1jNXEyVA==", "license": "MIT", "dependencies": { "ejs": "^3.1.7", @@ -77,22 +77,22 @@ "yargs-parser": "21.1.1" }, "peerDependencies": { - "nx": "0.0.0-pr-30913-75a64ba" + "nx": "0.0.0-pr-30913-89a46d1" } }, "node_modules/@nx/gradle": { - "version": "0.0.0-pr-30913-75a64ba", - "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-0.0.0-pr-30913-75a64ba.tgz", - "integrity": "sha512-4Tci2wJnnkyjVvBlBtptfrckkoDhdb+dowGmriBpU7cPc8J6WDVNHT51wCZGXaLi45nCNbjblxh14AlbewPxJQ==", + "version": "0.0.0-pr-30913-89a46d1", + "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-0.0.0-pr-30913-89a46d1.tgz", + "integrity": "sha512-lNisMzxaz2gq3bQpeoGObT/WzYX+aUIuxOW69eSNI0Ikrh0Mp/Kg2g7FFXt0kEqlMIDcgTmlhfWHyQ8iy5IPUA==", "license": "MIT", "dependencies": { - "@nx/devkit": "0.0.0-pr-30913-75a64ba" + "@nx/devkit": "0.0.0-pr-30913-89a46d1" } }, "node_modules/@nx/nx-darwin-arm64": { - "version": "0.0.0-pr-30913-75a64ba", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-0.0.0-pr-30913-75a64ba.tgz", - "integrity": "sha512-oNKq/6+h7vdZEhVt1cJSgX8x/W0q68sLxJO23a8HiFoT75hROlfys3tX8yXGJqREK4AEL4zMvOfxf8q5azqCaA==", + "version": "0.0.0-pr-30913-89a46d1", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-0.0.0-pr-30913-89a46d1.tgz", + "integrity": "sha512-DjAIiAFh69xkaylurZGho3QlNeE9KM8k7clcuFefkTHwbi/3uc+39D1Gn6+/yV2kGYsK9pQRg6zP6/LaVRXsmA==", "cpu": [ "arm64" ], @@ -103,9 +103,9 @@ ] }, "node_modules/@nx/nx-darwin-x64": { - "version": "0.0.0-pr-30913-75a64ba", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-0.0.0-pr-30913-75a64ba.tgz", - "integrity": "sha512-vBS8YypFiSeQ8dQ93+7h7Lv/GKPeoVJKUUhVDvLXEhPnP0/h/alCku5rLV6Sk+BtF6iST+9vaikAv1Zg7TtlMA==", + "version": "0.0.0-pr-30913-89a46d1", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-0.0.0-pr-30913-89a46d1.tgz", + "integrity": "sha512-cksIsaGTY0lNq62xQgYRE4vYdZcPhYKSxeG6lH1UoRTnHo8EppWOWZPAbf2SVqQ8N6lXpmzcdsaatEQJKKBBTA==", "cpu": [ "x64" ], @@ -116,9 +116,9 @@ ] }, "node_modules/@nx/nx-freebsd-x64": { - "version": "0.0.0-pr-30913-75a64ba", - "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-0.0.0-pr-30913-75a64ba.tgz", - "integrity": "sha512-7zjp7ha7OiZy51RO5q0Qzcetk9qvoTrXh8cvg+InIdugPcRcGeVKs6bvDSTqPW0CcOgQBZCcc9ihXgA9522ofw==", + "version": "0.0.0-pr-30913-89a46d1", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-0.0.0-pr-30913-89a46d1.tgz", + "integrity": "sha512-9iA0FsVEDEIQ7is13S8bcfh83v5S00fUP16sRlIgSk2K38lY0JIWzkJRxRYGFJXa0ZXlFJMVTUCsvc1VhdfXYg==", "cpu": [ "x64" ], @@ -129,9 +129,9 @@ ] }, "node_modules/@nx/nx-linux-arm-gnueabihf": { - "version": "0.0.0-pr-30913-75a64ba", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-0.0.0-pr-30913-75a64ba.tgz", - "integrity": "sha512-8DVhYmLFHW703qADFw7AL69LCw/Cwqmrk6YwHdC7EmbLiW5FdRkRTb4cFNmUpgFpNobiAYJS8eSphXW3mjvnCQ==", + "version": "0.0.0-pr-30913-89a46d1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-0.0.0-pr-30913-89a46d1.tgz", + "integrity": "sha512-4WzcL5L5iLC5/QZ32TifuPFfcrPYrlZ5lnpM3ZIHWaLdW+8njAfGI51U0fHvxSg1oK1TQBIRyA+Iq/SQzDXlZw==", "cpu": [ "arm" ], @@ -142,9 +142,9 @@ ] }, "node_modules/@nx/nx-linux-arm64-gnu": { - "version": "0.0.0-pr-30913-75a64ba", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-0.0.0-pr-30913-75a64ba.tgz", - "integrity": "sha512-O1btG2A6nJjkaGGP69wdnJ5fc7hYP4CBzSIZFHOXlQ5heaGqtCIS1Uzzs4BuRPwcBueA5vAqxxdxyMwSUjw/cg==", + "version": "0.0.0-pr-30913-89a46d1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-0.0.0-pr-30913-89a46d1.tgz", + "integrity": "sha512-mVgTeDe67oDsxuH9CN9IaFeiV0ch0ibexh2TiXHZra4oyRr4siLvcK2Ys1aoAlPpkMIdtydhkxN0bx7SUtKdZw==", "cpu": [ "arm64" ], @@ -155,9 +155,9 @@ ] }, "node_modules/@nx/nx-linux-arm64-musl": { - "version": "0.0.0-pr-30913-75a64ba", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-0.0.0-pr-30913-75a64ba.tgz", - "integrity": "sha512-7OR/4VA4FQ9KEpsCabya/OP4Qi7UlTmKz64fhBHAhpcy07jRmknLFd+2LNJgTx+m1aOl07T1tl5mdSRMX4KA1A==", + "version": "0.0.0-pr-30913-89a46d1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-0.0.0-pr-30913-89a46d1.tgz", + "integrity": "sha512-+tBIkpth1R4TwgDEbHd9j93NqM0YTklUv0SUG3jR5YNE+8p1J9PbQ6Rd4aFvzvobqunejDa4QpB/58Rk1qpb+g==", "cpu": [ "arm64" ], @@ -168,9 +168,9 @@ ] }, "node_modules/@nx/nx-linux-x64-gnu": { - "version": "0.0.0-pr-30913-75a64ba", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-0.0.0-pr-30913-75a64ba.tgz", - "integrity": "sha512-wQQD61noZKx4ESAZb5xxl2Elfuo+761WyqO/s42lqB0VDplTrjDvc6L++UJoQfdyJ61aoqJFjy3vfEAo4ZwQ0g==", + "version": "0.0.0-pr-30913-89a46d1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-0.0.0-pr-30913-89a46d1.tgz", + "integrity": "sha512-lM6rPLy6jyiTDvx+4LSj2JolWd64bIH5A2q5QmMdObF5sS5XfsBGv8KBayzIMiY3wvUa9rj+L0sxt53DCV8UCQ==", "cpu": [ "x64" ], @@ -181,9 +181,9 @@ ] }, "node_modules/@nx/nx-linux-x64-musl": { - "version": "0.0.0-pr-30913-75a64ba", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-0.0.0-pr-30913-75a64ba.tgz", - "integrity": "sha512-OTcq5u706sX4ytmZ9WlrwIiUrYaBp/DJltPvnbAlgVxt/ZRfS76G77cvb8fTgN9D7wLTCdTmkRjYBWFi96+iUA==", + "version": "0.0.0-pr-30913-89a46d1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-0.0.0-pr-30913-89a46d1.tgz", + "integrity": "sha512-iaKkPApd1cAFb0VYZSsBolblnq/iJCsQrkYNR9NOmuXLE80GYet6u8pAxkOP3vTY0JTsWW6E/ZcKZAXa3h9ICQ==", "cpu": [ "x64" ], @@ -194,9 +194,9 @@ ] }, "node_modules/@nx/nx-win32-arm64-msvc": { - "version": "0.0.0-pr-30913-75a64ba", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-0.0.0-pr-30913-75a64ba.tgz", - "integrity": "sha512-34HSxbrlHrzqP/+x6OBAE0UJh0Bt2F76lhF5xerk0Ya/CUlZg4I1Vw31Tf3NaAf7tUyreUkSBHyNGGGJ4+cSgw==", + "version": "0.0.0-pr-30913-89a46d1", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-0.0.0-pr-30913-89a46d1.tgz", + "integrity": "sha512-Q6NlidXTeuk9dF+rzp0GJNXwxDjkv3VTZl8hCP6kxAWz04DvNRfMJ8ipLBIUpihhIgyCBhXAxI4lQlKv3Hvjdg==", "cpu": [ "arm64" ], @@ -207,9 +207,9 @@ ] }, "node_modules/@nx/nx-win32-x64-msvc": { - "version": "0.0.0-pr-30913-75a64ba", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-0.0.0-pr-30913-75a64ba.tgz", - "integrity": "sha512-Yo0xwRrUkml277Vll5PDYJc5Ru4kqlsufm08hLzndMJFaxhvKKKLMfxfBanjhuBm4TjarSS82eGcNT6HW82e2w==", + "version": "0.0.0-pr-30913-89a46d1", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-0.0.0-pr-30913-89a46d1.tgz", + "integrity": "sha512-sbq2tMopOLLt9vCSR5Zlx7L8i+yCzO2yfMxN7Wty/dEYaZpKCTum9SCw31+6DpaxnLaMQmcndLJGkQmKcwB52A==", "cpu": [ "x64" ], @@ -1220,9 +1220,9 @@ } }, "node_modules/nx": { - "version": "0.0.0-pr-30913-75a64ba", - "resolved": "https://registry.npmjs.org/nx/-/nx-0.0.0-pr-30913-75a64ba.tgz", - "integrity": "sha512-QY/cuaRxcd3VRknY1nUPvzyAqcookLmDnJ31vJlLTAfF5qEWHB/EJF4LnK0pUZLOGj4/V9LC0ytZnj/8u6f5DQ==", + "version": "0.0.0-pr-30913-89a46d1", + "resolved": "https://registry.npmjs.org/nx/-/nx-0.0.0-pr-30913-89a46d1.tgz", + "integrity": "sha512-oRGFFclfpQ1BCrZYV8ON8UVbYBljMz8ejzu+UI5Xre28vsn9aus7CsTOJ9KqbIyro3sklqlm2BNhVD2teJxOpw==", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -1270,16 +1270,16 @@ "node": "^20.19.0 || ^22.12.0" }, "optionalDependencies": { - "@nx/nx-darwin-arm64": "0.0.0-pr-30913-75a64ba", - "@nx/nx-darwin-x64": "0.0.0-pr-30913-75a64ba", - "@nx/nx-freebsd-x64": "0.0.0-pr-30913-75a64ba", - "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-30913-75a64ba", - "@nx/nx-linux-arm64-gnu": "0.0.0-pr-30913-75a64ba", - "@nx/nx-linux-arm64-musl": "0.0.0-pr-30913-75a64ba", - "@nx/nx-linux-x64-gnu": "0.0.0-pr-30913-75a64ba", - "@nx/nx-linux-x64-musl": "0.0.0-pr-30913-75a64ba", - "@nx/nx-win32-arm64-msvc": "0.0.0-pr-30913-75a64ba", - "@nx/nx-win32-x64-msvc": "0.0.0-pr-30913-75a64ba" + "@nx/nx-darwin-arm64": "0.0.0-pr-30913-89a46d1", + "@nx/nx-darwin-x64": "0.0.0-pr-30913-89a46d1", + "@nx/nx-freebsd-x64": "0.0.0-pr-30913-89a46d1", + "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-30913-89a46d1", + "@nx/nx-linux-arm64-gnu": "0.0.0-pr-30913-89a46d1", + "@nx/nx-linux-arm64-musl": "0.0.0-pr-30913-89a46d1", + "@nx/nx-linux-x64-gnu": "0.0.0-pr-30913-89a46d1", + "@nx/nx-linux-x64-musl": "0.0.0-pr-30913-89a46d1", + "@nx/nx-win32-arm64-msvc": "0.0.0-pr-30913-89a46d1", + "@nx/nx-win32-x64-msvc": "0.0.0-pr-30913-89a46d1" }, "peerDependencies": { "@swc-node/register": "^1.8.0", diff --git a/package.json b/package.json index 3363d024b7e1..3f35f8b4507e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "spring-boot", "dependencies": { - "nx": "0.0.0-pr-30913-75a64ba", - "@nx/gradle": "0.0.0-pr-30913-75a64ba" + "nx": "0.0.0-pr-30913-89a46d1", + "@nx/gradle": "0.0.0-pr-30913-89a46d1" } } From 7bc1bca4005dc67936de904dfa19c611ab8e15fe Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Mon, 12 May 2025 20:08:21 -0400 Subject: [PATCH 18/46] change pr version to 0.0.0-pr-30913-da2b0d3 --- .github/actions/build/action.yml | 2 +- package-lock.json | 106 +++++++++++++++---------------- package.json | 4 +- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index c9e7c43c2569..4ff0392bf545 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -68,7 +68,7 @@ runs: COMMERCIAL_REPO_PASSWORD: ${{ inputs.commercial-repository-password }} COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }} COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }} - run: NX_BATCH_MODE=true NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx run-many -t build --parallel=32 --batch --outputStyle=stream + run: NX_BATCH_MODE=true NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx run-many -t assemble,check-ci --parallel=32 --batch --outputStyle=stream # - name: Publish # id: publish # if: ${{ inputs.publish == 'true' }} diff --git a/package-lock.json b/package-lock.json index aeed9009cf10..af1345144f32 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,8 +6,8 @@ "": { "name": "spring-boot", "dependencies": { - "@nx/gradle": "0.0.0-pr-30913-89a46d1", - "nx": "0.0.0-pr-30913-89a46d1" + "@nx/gradle": "0.0.0-pr-30913-da2b0d3", + "nx": "0.0.0-pr-30913-da2b0d3" } }, "node_modules/@emnapi/core": { @@ -62,9 +62,9 @@ } }, "node_modules/@nx/devkit": { - "version": "0.0.0-pr-30913-89a46d1", - "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-0.0.0-pr-30913-89a46d1.tgz", - "integrity": "sha512-0Mdw3v2bJ8GFyDtGyRAQ6vs3uqBkLxFz1HcuTCLM3d5zzvYyGZIKRZsr1M9qU0Xya7W2M7TQHldIov1jNXEyVA==", + "version": "0.0.0-pr-30913-da2b0d3", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-0.0.0-pr-30913-da2b0d3.tgz", + "integrity": "sha512-vQaX9UUPtwNSA5tOLBVJ+YTbNUYXiMid9iY3e7huLbBCeWDOvrYKDH3q7SO2hvDEZ+8IHXmykG4TC62Jl5J29Q==", "license": "MIT", "dependencies": { "ejs": "^3.1.7", @@ -77,22 +77,22 @@ "yargs-parser": "21.1.1" }, "peerDependencies": { - "nx": "0.0.0-pr-30913-89a46d1" + "nx": "0.0.0-pr-30913-da2b0d3" } }, "node_modules/@nx/gradle": { - "version": "0.0.0-pr-30913-89a46d1", - "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-0.0.0-pr-30913-89a46d1.tgz", - "integrity": "sha512-lNisMzxaz2gq3bQpeoGObT/WzYX+aUIuxOW69eSNI0Ikrh0Mp/Kg2g7FFXt0kEqlMIDcgTmlhfWHyQ8iy5IPUA==", + "version": "0.0.0-pr-30913-da2b0d3", + "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-0.0.0-pr-30913-da2b0d3.tgz", + "integrity": "sha512-86eQh9rz1pao8laTDj6OlwED4iS7P0Jfid8jOTqEGkegDs2mXoFu48yYLopfXaRlXMHH4oJk/Eg5KSc7ppZoVA==", "license": "MIT", "dependencies": { - "@nx/devkit": "0.0.0-pr-30913-89a46d1" + "@nx/devkit": "0.0.0-pr-30913-da2b0d3" } }, "node_modules/@nx/nx-darwin-arm64": { - "version": "0.0.0-pr-30913-89a46d1", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-0.0.0-pr-30913-89a46d1.tgz", - "integrity": "sha512-DjAIiAFh69xkaylurZGho3QlNeE9KM8k7clcuFefkTHwbi/3uc+39D1Gn6+/yV2kGYsK9pQRg6zP6/LaVRXsmA==", + "version": "0.0.0-pr-30913-da2b0d3", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-0.0.0-pr-30913-da2b0d3.tgz", + "integrity": "sha512-qidBSb6Mx9oxiotEHXTt/F7yJPYTY2bzJgM2Y1Z7iSFHjJnX7KCFRnxFWL3QWdSz5/OoKEH5h1GxtApVuMZE1g==", "cpu": [ "arm64" ], @@ -103,9 +103,9 @@ ] }, "node_modules/@nx/nx-darwin-x64": { - "version": "0.0.0-pr-30913-89a46d1", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-0.0.0-pr-30913-89a46d1.tgz", - "integrity": "sha512-cksIsaGTY0lNq62xQgYRE4vYdZcPhYKSxeG6lH1UoRTnHo8EppWOWZPAbf2SVqQ8N6lXpmzcdsaatEQJKKBBTA==", + "version": "0.0.0-pr-30913-da2b0d3", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-0.0.0-pr-30913-da2b0d3.tgz", + "integrity": "sha512-gCOb4xYEPcRH/AvxirEnnSeWFkwiBniHKwLbVESsbCrTZZesudK2jjvWn34jC+QK2+YmBnl/9Wc2Dk7buAH3Pg==", "cpu": [ "x64" ], @@ -116,9 +116,9 @@ ] }, "node_modules/@nx/nx-freebsd-x64": { - "version": "0.0.0-pr-30913-89a46d1", - "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-0.0.0-pr-30913-89a46d1.tgz", - "integrity": "sha512-9iA0FsVEDEIQ7is13S8bcfh83v5S00fUP16sRlIgSk2K38lY0JIWzkJRxRYGFJXa0ZXlFJMVTUCsvc1VhdfXYg==", + "version": "0.0.0-pr-30913-da2b0d3", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-0.0.0-pr-30913-da2b0d3.tgz", + "integrity": "sha512-WbvD6KzN3SdLTPngrH5+38j0t0b8bAAYD1csPOVcK57sR0PnRUqS5twAW+8BqbBeiG3ZauU9pK8A6Cda2J4MFA==", "cpu": [ "x64" ], @@ -129,9 +129,9 @@ ] }, "node_modules/@nx/nx-linux-arm-gnueabihf": { - "version": "0.0.0-pr-30913-89a46d1", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-0.0.0-pr-30913-89a46d1.tgz", - "integrity": "sha512-4WzcL5L5iLC5/QZ32TifuPFfcrPYrlZ5lnpM3ZIHWaLdW+8njAfGI51U0fHvxSg1oK1TQBIRyA+Iq/SQzDXlZw==", + "version": "0.0.0-pr-30913-da2b0d3", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-0.0.0-pr-30913-da2b0d3.tgz", + "integrity": "sha512-atiOJz/h5vfHtnPJL0SkSKfTu2ZRgce4BnUqO5KA3tPTdwui36tJS9q7DUpvCvbu2SjYpzRSH9chkP/41gR2bw==", "cpu": [ "arm" ], @@ -142,9 +142,9 @@ ] }, "node_modules/@nx/nx-linux-arm64-gnu": { - "version": "0.0.0-pr-30913-89a46d1", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-0.0.0-pr-30913-89a46d1.tgz", - "integrity": "sha512-mVgTeDe67oDsxuH9CN9IaFeiV0ch0ibexh2TiXHZra4oyRr4siLvcK2Ys1aoAlPpkMIdtydhkxN0bx7SUtKdZw==", + "version": "0.0.0-pr-30913-da2b0d3", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-0.0.0-pr-30913-da2b0d3.tgz", + "integrity": "sha512-ZOJoV0IK/hrqGE47gZsJuEYpmdrBRznynfIDXMiTLDmdsx8ZgZcnrxxiRy+F7FI2M9m40Xi93bcnPYYEmJJltg==", "cpu": [ "arm64" ], @@ -155,9 +155,9 @@ ] }, "node_modules/@nx/nx-linux-arm64-musl": { - "version": "0.0.0-pr-30913-89a46d1", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-0.0.0-pr-30913-89a46d1.tgz", - "integrity": "sha512-+tBIkpth1R4TwgDEbHd9j93NqM0YTklUv0SUG3jR5YNE+8p1J9PbQ6Rd4aFvzvobqunejDa4QpB/58Rk1qpb+g==", + "version": "0.0.0-pr-30913-da2b0d3", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-0.0.0-pr-30913-da2b0d3.tgz", + "integrity": "sha512-aw4KkOR4eXkZFZKgJJHDPCCXV93BL8fPrSiQxo/Q8Ot+oIU/yE0G4uXk2/ddB95G1Jp8dKlD5YJ7vTlWgnXh6Q==", "cpu": [ "arm64" ], @@ -168,9 +168,9 @@ ] }, "node_modules/@nx/nx-linux-x64-gnu": { - "version": "0.0.0-pr-30913-89a46d1", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-0.0.0-pr-30913-89a46d1.tgz", - "integrity": "sha512-lM6rPLy6jyiTDvx+4LSj2JolWd64bIH5A2q5QmMdObF5sS5XfsBGv8KBayzIMiY3wvUa9rj+L0sxt53DCV8UCQ==", + "version": "0.0.0-pr-30913-da2b0d3", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-0.0.0-pr-30913-da2b0d3.tgz", + "integrity": "sha512-6MWbaqxKLdF8ILSSR9DF6uqo69agmRuNtSQo8m0tv8dDQ3t1au2mnGle8t8Icz+Z+3rAOnfqdxE1VQMGIHSd2Q==", "cpu": [ "x64" ], @@ -181,9 +181,9 @@ ] }, "node_modules/@nx/nx-linux-x64-musl": { - "version": "0.0.0-pr-30913-89a46d1", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-0.0.0-pr-30913-89a46d1.tgz", - "integrity": "sha512-iaKkPApd1cAFb0VYZSsBolblnq/iJCsQrkYNR9NOmuXLE80GYet6u8pAxkOP3vTY0JTsWW6E/ZcKZAXa3h9ICQ==", + "version": "0.0.0-pr-30913-da2b0d3", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-0.0.0-pr-30913-da2b0d3.tgz", + "integrity": "sha512-daIi2COhCrWmPIwEiIY8HQZgmtBF0gFh+yQa7zLnmK+W/7im5CzRIxCOV+2eEq1JyUs7xGLbRgH0ZeqoTvKY/g==", "cpu": [ "x64" ], @@ -194,9 +194,9 @@ ] }, "node_modules/@nx/nx-win32-arm64-msvc": { - "version": "0.0.0-pr-30913-89a46d1", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-0.0.0-pr-30913-89a46d1.tgz", - "integrity": "sha512-Q6NlidXTeuk9dF+rzp0GJNXwxDjkv3VTZl8hCP6kxAWz04DvNRfMJ8ipLBIUpihhIgyCBhXAxI4lQlKv3Hvjdg==", + "version": "0.0.0-pr-30913-da2b0d3", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-0.0.0-pr-30913-da2b0d3.tgz", + "integrity": "sha512-Qw9Eo15AEgS5kPt1CMvsal3MSk3tuPp+Yh1R3U3HGfve1JARDMhHTz5jUuxi1bTFktYW6WhBhJDmVfLgxJ6w0w==", "cpu": [ "arm64" ], @@ -207,9 +207,9 @@ ] }, "node_modules/@nx/nx-win32-x64-msvc": { - "version": "0.0.0-pr-30913-89a46d1", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-0.0.0-pr-30913-89a46d1.tgz", - "integrity": "sha512-sbq2tMopOLLt9vCSR5Zlx7L8i+yCzO2yfMxN7Wty/dEYaZpKCTum9SCw31+6DpaxnLaMQmcndLJGkQmKcwB52A==", + "version": "0.0.0-pr-30913-da2b0d3", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-0.0.0-pr-30913-da2b0d3.tgz", + "integrity": "sha512-GW4VugWsiTSX0hD7/EcsOudLLxvI0EnXqoqF8TkgVJL8jn93rgcFW+0X9EGfXxCQ3bBQS/+saav5Kg7XiA4wcQ==", "cpu": [ "x64" ], @@ -1220,9 +1220,9 @@ } }, "node_modules/nx": { - "version": "0.0.0-pr-30913-89a46d1", - "resolved": "https://registry.npmjs.org/nx/-/nx-0.0.0-pr-30913-89a46d1.tgz", - "integrity": "sha512-oRGFFclfpQ1BCrZYV8ON8UVbYBljMz8ejzu+UI5Xre28vsn9aus7CsTOJ9KqbIyro3sklqlm2BNhVD2teJxOpw==", + "version": "0.0.0-pr-30913-da2b0d3", + "resolved": "https://registry.npmjs.org/nx/-/nx-0.0.0-pr-30913-da2b0d3.tgz", + "integrity": "sha512-iqKP7G8Yq327MGh/3vbP7zECt1qwaNxJJo1AR5M+xAQlZuF7gistG46auzMl2fXhKzs3ioLOklGRobXtUIZi/Q==", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -1270,16 +1270,16 @@ "node": "^20.19.0 || ^22.12.0" }, "optionalDependencies": { - "@nx/nx-darwin-arm64": "0.0.0-pr-30913-89a46d1", - "@nx/nx-darwin-x64": "0.0.0-pr-30913-89a46d1", - "@nx/nx-freebsd-x64": "0.0.0-pr-30913-89a46d1", - "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-30913-89a46d1", - "@nx/nx-linux-arm64-gnu": "0.0.0-pr-30913-89a46d1", - "@nx/nx-linux-arm64-musl": "0.0.0-pr-30913-89a46d1", - "@nx/nx-linux-x64-gnu": "0.0.0-pr-30913-89a46d1", - "@nx/nx-linux-x64-musl": "0.0.0-pr-30913-89a46d1", - "@nx/nx-win32-arm64-msvc": "0.0.0-pr-30913-89a46d1", - "@nx/nx-win32-x64-msvc": "0.0.0-pr-30913-89a46d1" + "@nx/nx-darwin-arm64": "0.0.0-pr-30913-da2b0d3", + "@nx/nx-darwin-x64": "0.0.0-pr-30913-da2b0d3", + "@nx/nx-freebsd-x64": "0.0.0-pr-30913-da2b0d3", + "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-30913-da2b0d3", + "@nx/nx-linux-arm64-gnu": "0.0.0-pr-30913-da2b0d3", + "@nx/nx-linux-arm64-musl": "0.0.0-pr-30913-da2b0d3", + "@nx/nx-linux-x64-gnu": "0.0.0-pr-30913-da2b0d3", + "@nx/nx-linux-x64-musl": "0.0.0-pr-30913-da2b0d3", + "@nx/nx-win32-arm64-msvc": "0.0.0-pr-30913-da2b0d3", + "@nx/nx-win32-x64-msvc": "0.0.0-pr-30913-da2b0d3" }, "peerDependencies": { "@swc-node/register": "^1.8.0", diff --git a/package.json b/package.json index 3f35f8b4507e..995cd38e44d6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "spring-boot", "dependencies": { - "nx": "0.0.0-pr-30913-89a46d1", - "@nx/gradle": "0.0.0-pr-30913-89a46d1" + "nx": "0.0.0-pr-30913-da2b0d3", + "@nx/gradle": "0.0.0-pr-30913-da2b0d3" } } From c3dd66babffe33ddfa7a26ec56f0fc8b9b3dddde Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Mon, 12 May 2025 22:29:19 -0400 Subject: [PATCH 19/46] add atomized false for spring-boot-autoconfigure --- nx.json | 4 ++-- .../spring-boot-actuator-autoconfigure/build.gradle | 4 ++++ spring-boot-project/spring-boot-autoconfigure/build.gradle | 4 ++++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/nx.json b/nx.json index 8edc16ee9715..c432508bd2c9 100644 --- a/nx.json +++ b/nx.json @@ -36,6 +36,6 @@ } }, "bustCache": 14, - "nxCloudUrl": "https://snapshot.nx.app", - "nxCloudId": "67dad8ae45125407e384edab" + "nxCloudUrl": "https://staging.nx.app", + "nxCloudId": "67a56832eb5d9093e3ebe776" } diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle index 9af6ca7298ec..a64b1c1d5a53 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle @@ -229,3 +229,7 @@ antoraContributions { source() } } + +nxProjectReport { + atomized = false +} \ No newline at end of file diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle index 5a50dd0f1ea2..0abed8a27af9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle @@ -285,3 +285,7 @@ tasks.named("checkSpringConfigurationMetadata").configure { test { jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED" } + +nxProjectReport { + atomized = false +} \ No newline at end of file From cb864e629226106364540e1a05b44df7d801837b Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Tue, 13 May 2025 00:21:18 -0400 Subject: [PATCH 20/46] add dependsOn --- .../spring-boot-actuator-autoconfigure/build.gradle | 4 ---- .../spring-boot-autoconfigure/build.gradle | 4 ---- spring-boot-project/spring-boot-docs/build.gradle | 1 + .../spring-boot-test-autoconfigure/build.gradle | 12 ++++++++++++ .../spring-boot-maven-plugin/build.gradle | 4 ++++ .../spring-boot-smoke-test-jetty/build.gradle | 4 ++++ 6 files changed, 21 insertions(+), 8 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle index a64b1c1d5a53..93d5516c2f73 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle @@ -228,8 +228,4 @@ antoraContributions { } source() } -} - -nxProjectReport { - atomized = false } \ No newline at end of file diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle index 0abed8a27af9..cc1e472cd188 100644 --- a/spring-boot-project/spring-boot-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle @@ -284,8 +284,4 @@ tasks.named("checkSpringConfigurationMetadata").configure { test { jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED" -} - -nxProjectReport { - atomized = false } \ No newline at end of file diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle index 3583f70f0312..357f64d9508b 100644 --- a/spring-boot-project/spring-boot-docs/build.gradle +++ b/spring-boot-project/spring-boot-docs/build.gradle @@ -202,6 +202,7 @@ dokkatoo { def aggregatedJavadoc = tasks.register('aggregatedJavadoc', Javadoc) { dependsOn configurations.resolvedBom + dependsOn ':spring-boot-project:spring-boot-test-autoconfigure:processResources' destinationDir = project.file(project.layout.buildDirectory.dir("docs/javadoc")) options { author = true diff --git a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle index f26c6eb92e6d..0f6afaed2ca3 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle @@ -137,3 +137,15 @@ tasks.register("testSliceMetadata", org.springframework.boot.build.test.autoconf sourceSet = sourceSets.main outputFile = layout.buildDirectory.file("test-slice-metadata.properties") } + +javadoc { + dependsOn processResources +} + +testSliceMetadata { + dependsOn processResources +} + +test { + dependsOn processResources +} \ No newline at end of file diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle index 1ed50eee444e..12803c010a85 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle @@ -175,4 +175,8 @@ tasks.named("generateAntoraPlaybook") { tasks.named("dockerTest").configure { dependsOn tasks.named("prepareMavenBinaries") +} + +syncPluginDescriptorInputs { + dependsOn formatHelpMojoSource } \ No newline at end of file diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/build.gradle index 3b66fcaa79db..c2b5cabba89b 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/build.gradle @@ -12,3 +12,7 @@ dependencies { testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) } + +nxProjectReport { + atomized = false +} \ No newline at end of file From ef7c44ef18602e89fc77668b0a159b7aec4f23f7 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Tue, 13 May 2025 01:06:37 -0400 Subject: [PATCH 21/46] add atomized false --- .../spring-boot-actuator-autoconfigure/build.gradle | 4 ++++ spring-boot-project/spring-boot-autoconfigure/build.gradle | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle index 93d5516c2f73..a64b1c1d5a53 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle @@ -228,4 +228,8 @@ antoraContributions { } source() } +} + +nxProjectReport { + atomized = false } \ No newline at end of file diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle index cc1e472cd188..0abed8a27af9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle @@ -284,4 +284,8 @@ tasks.named("checkSpringConfigurationMetadata").configure { test { jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED" +} + +nxProjectReport { + atomized = false } \ No newline at end of file From 74c4b4170fa5512e221e11cfce39150e7fd629fb Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Tue, 13 May 2025 02:35:10 -0400 Subject: [PATCH 22/46] change atomized false for spring-boot-maven-plugin --- .../boot/build/AntoraConventions.java | 20 +++++++++++++++++++ .../spring-boot-docs/build.gradle | 4 ++++ .../spring-boot-maven-plugin/build.gradle | 4 ++++ 3 files changed, 28 insertions(+) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java index 51b107bcda3c..46c76edfb3d1 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java @@ -122,6 +122,16 @@ private void configureNpmInstallTask(Project project, NpmInstallTask npmInstallT environment.put("npm_config_update_notifier", "false"); npmInstallTask.getEnvironment().set(environment); npmInstallTask.getNpmCommand().set(List.of("ci", "--silent", "--no-progress")); + + npmInstallTask.getInputs() + .files(project.getLayout().getBuildDirectory().dir(".gradle/nodejs")) + .withPropertyName("antoraNodeJs") + .withPathSensitivity(PathSensitivity.RELATIVE); + + npmInstallTask.getInputs() + .files(getNodeProjectDir(project)) + .withPropertyName("antoraNodeProjectDir") + .withPathSensitivity(PathSensitivity.RELATIVE); } private void configureGenerateAntoraYmlTask(Project project, GenerateAntoraYmlTask generateAntoraYmlTask, @@ -170,6 +180,16 @@ private void configureAntoraTask(Project project, AntoraTask antoraTask, .withPropertyName("antoraPlaybookFile") .withPathSensitivity(PathSensitivity.RELATIVE); + antoraTask.getInputs() + .files(project.getLayout().getBuildDirectory().dir(".gradle/nodejs")) + .withPropertyName("antoraNodeJs") + .withPathSensitivity(PathSensitivity.RELATIVE); + + antoraTask.getInputs() + .files(getNodeProjectDir(project)) + .withPropertyName("antoraNodeProjectDir") + .withPathSensitivity(PathSensitivity.RELATIVE); + antoraTask.setPlaybook("antora-playbook.yml"); antoraTask.setUiBundleUrl(getUiBundleUrl(project)); antoraTask.getArgs().set(project.provider(() -> getAntoraNpxArs(project, antoraTask))); diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle index 357f64d9508b..9075915fe217 100644 --- a/spring-boot-project/spring-boot-docs/build.gradle +++ b/spring-boot-project/spring-boot-docs/build.gradle @@ -384,4 +384,8 @@ dokkatoo { dokkatooPublications.configureEach { includes.from("src/docs/dokkatoo/dokka-overview.md") } +} + +test { + dependsOn processResources } \ No newline at end of file diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle index 12803c010a85..895a567f658f 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle @@ -179,4 +179,8 @@ tasks.named("dockerTest").configure { syncPluginDescriptorInputs { dependsOn formatHelpMojoSource +} + +nxProjectReport { + atomized = false } \ No newline at end of file From 2dfe573ad078b520ec21b91032b4ff4a57a55c3a Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Tue, 13 May 2025 12:51:49 -0400 Subject: [PATCH 23/46] bust cache --- nx.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx.json b/nx.json index c432508bd2c9..957c94caa2d9 100644 --- a/nx.json +++ b/nx.json @@ -35,7 +35,7 @@ } } }, - "bustCache": 14, + "bustCache": 15, "nxCloudUrl": "https://staging.nx.app", "nxCloudId": "67a56832eb5d9093e3ebe776" } From c41f5ee8d79bc9dedefa139f3eaba9d80e3f1ad1 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Tue, 13 May 2025 14:14:17 -0400 Subject: [PATCH 24/46] change antoraNpmInstall depends on generateAntoraPlaybook --- .../org/springframework/boot/build/AntoraConventions.java | 6 ++++-- spring-boot-project/spring-boot-docs/build.gradle | 4 ++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java index 46c76edfb3d1..327fc571be4a 100644 --- a/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java +++ b/buildSrc/src/main/java/org/springframework/boot/build/AntoraConventions.java @@ -91,7 +91,8 @@ private void apply(Project project, AntoraPlugin antoraPlugin) { TaskProvider copyAntoraPackageJsonTask = tasks.register("copyAntoraPackageJson", Copy.class, (task) -> configureCopyAntoraPackageJsonTask(project, task)); TaskProvider npmInstallTask = tasks.register("antoraNpmInstall", NpmInstallTask.class, - (task) -> configureNpmInstallTask(project, task, copyAntoraPackageJsonTask)); + (task) -> configureNpmInstallTask(project, task, copyAntoraPackageJsonTask, + generateAntoraPlaybookTask)); tasks.withType(GenerateAntoraYmlTask.class, (generateAntoraYmlTask) -> configureGenerateAntoraYmlTask(project, generateAntoraYmlTask, resolvedBom)); tasks.withType(AntoraTask.class, @@ -115,8 +116,9 @@ private void configureCopyAntoraPackageJsonTask(Project project, Copy copyAntora } private void configureNpmInstallTask(Project project, NpmInstallTask npmInstallTask, - TaskProvider copyAntoraPackageJson) { + TaskProvider copyAntoraPackageJson, TaskProvider generateAntoraPlaybookTask) { npmInstallTask.dependsOn(copyAntoraPackageJson); + npmInstallTask.dependsOn(generateAntoraPlaybookTask); Map environment = new HashMap<>(); environment.put("npm_config_omit", "optional"); environment.put("npm_config_update_notifier", "false"); diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle index 9075915fe217..97b7e9c2acbb 100644 --- a/spring-boot-project/spring-boot-docs/build.gradle +++ b/spring-boot-project/spring-boot-docs/build.gradle @@ -388,4 +388,8 @@ dokkatoo { test { dependsOn processResources +} + +checkArchitectureTest { + dependsOn processResources } \ No newline at end of file From 75c5d1da53f78e1b08b534a207bac3ec5dc4c01c Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Tue, 13 May 2025 00:21:18 -0400 Subject: [PATCH 25/46] add dependsOn --- .env | 3 ++- .../spring-boot-actuator-autoconfigure/build.gradle | 4 ---- spring-boot-project/spring-boot-autoconfigure/build.gradle | 4 ---- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/.env b/.env index 9689a86d6d1d..096cbf61c6d1 100644 --- a/.env +++ b/.env @@ -1,3 +1,4 @@ NX_BATCH_MODE=true NX_VERBOSE_LOGGING=true -NX_TUI=false \ No newline at end of file +NX_TUI=false +CI=true \ No newline at end of file diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle index a64b1c1d5a53..93d5516c2f73 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle @@ -228,8 +228,4 @@ antoraContributions { } source() } -} - -nxProjectReport { - atomized = false } \ No newline at end of file diff --git a/spring-boot-project/spring-boot-autoconfigure/build.gradle b/spring-boot-project/spring-boot-autoconfigure/build.gradle index 0abed8a27af9..cc1e472cd188 100644 --- a/spring-boot-project/spring-boot-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-autoconfigure/build.gradle @@ -284,8 +284,4 @@ tasks.named("checkSpringConfigurationMetadata").configure { test { jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED" -} - -nxProjectReport { - atomized = false } \ No newline at end of file From 18c2b7ad0d25b9317ba5695ff27ea7a5dbdcd145 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Tue, 13 May 2025 15:14:32 -0400 Subject: [PATCH 26/46] upgrade pr version to .0.0-pr-30913-4005921 --- package-lock.json | 106 +++++++++--------- package.json | 4 +- .../spring-boot-docs/build.gradle | 1 + .../spring-boot-maven-plugin/build.gradle | 4 - .../build.gradle | 4 +- 5 files changed, 58 insertions(+), 61 deletions(-) diff --git a/package-lock.json b/package-lock.json index af1345144f32..f94ecc60999c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,8 +6,8 @@ "": { "name": "spring-boot", "dependencies": { - "@nx/gradle": "0.0.0-pr-30913-da2b0d3", - "nx": "0.0.0-pr-30913-da2b0d3" + "@nx/gradle": "0.0.0-pr-30913-4005921", + "nx": "0.0.0-pr-30913-4005921" } }, "node_modules/@emnapi/core": { @@ -62,9 +62,9 @@ } }, "node_modules/@nx/devkit": { - "version": "0.0.0-pr-30913-da2b0d3", - "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-0.0.0-pr-30913-da2b0d3.tgz", - "integrity": "sha512-vQaX9UUPtwNSA5tOLBVJ+YTbNUYXiMid9iY3e7huLbBCeWDOvrYKDH3q7SO2hvDEZ+8IHXmykG4TC62Jl5J29Q==", + "version": "0.0.0-pr-30913-4005921", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-0.0.0-pr-30913-4005921.tgz", + "integrity": "sha512-/tVFT343ggksY5TrD6ihAtNefK06iuk53osRDFa8XogoA3eMADlSq57YDlAvk+w4p1tegQuUtYNrJ4Z2OB3d3w==", "license": "MIT", "dependencies": { "ejs": "^3.1.7", @@ -77,22 +77,22 @@ "yargs-parser": "21.1.1" }, "peerDependencies": { - "nx": "0.0.0-pr-30913-da2b0d3" + "nx": "0.0.0-pr-30913-4005921" } }, "node_modules/@nx/gradle": { - "version": "0.0.0-pr-30913-da2b0d3", - "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-0.0.0-pr-30913-da2b0d3.tgz", - "integrity": "sha512-86eQh9rz1pao8laTDj6OlwED4iS7P0Jfid8jOTqEGkegDs2mXoFu48yYLopfXaRlXMHH4oJk/Eg5KSc7ppZoVA==", + "version": "0.0.0-pr-30913-4005921", + "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-0.0.0-pr-30913-4005921.tgz", + "integrity": "sha512-PfORsEarOClMXE0JOddvx5PA8kdsdP1DmrOjfn8nwk6Y/07mHP2P/OV4eTtPqJ77LbleWX02grFf1bScryDzIQ==", "license": "MIT", "dependencies": { - "@nx/devkit": "0.0.0-pr-30913-da2b0d3" + "@nx/devkit": "0.0.0-pr-30913-4005921" } }, "node_modules/@nx/nx-darwin-arm64": { - "version": "0.0.0-pr-30913-da2b0d3", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-0.0.0-pr-30913-da2b0d3.tgz", - "integrity": "sha512-qidBSb6Mx9oxiotEHXTt/F7yJPYTY2bzJgM2Y1Z7iSFHjJnX7KCFRnxFWL3QWdSz5/OoKEH5h1GxtApVuMZE1g==", + "version": "0.0.0-pr-30913-4005921", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-0.0.0-pr-30913-4005921.tgz", + "integrity": "sha512-FF3dEbHi/NzpYgFRVXjs79XGvuLN/xcFIUmweEjAtRO0GGRiYLIImiBhzqW2288AsER+WK9/djJ/M1khCFBzig==", "cpu": [ "arm64" ], @@ -103,9 +103,9 @@ ] }, "node_modules/@nx/nx-darwin-x64": { - "version": "0.0.0-pr-30913-da2b0d3", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-0.0.0-pr-30913-da2b0d3.tgz", - "integrity": "sha512-gCOb4xYEPcRH/AvxirEnnSeWFkwiBniHKwLbVESsbCrTZZesudK2jjvWn34jC+QK2+YmBnl/9Wc2Dk7buAH3Pg==", + "version": "0.0.0-pr-30913-4005921", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-0.0.0-pr-30913-4005921.tgz", + "integrity": "sha512-7XwACuN+boUjZrKUblmS3SGeXQjow6mI1M8SMhFoSPTRdilFWhGJYdyjcGFLfAFp+4kX0cg9DnAmUgrJ8ky6uQ==", "cpu": [ "x64" ], @@ -116,9 +116,9 @@ ] }, "node_modules/@nx/nx-freebsd-x64": { - "version": "0.0.0-pr-30913-da2b0d3", - "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-0.0.0-pr-30913-da2b0d3.tgz", - "integrity": "sha512-WbvD6KzN3SdLTPngrH5+38j0t0b8bAAYD1csPOVcK57sR0PnRUqS5twAW+8BqbBeiG3ZauU9pK8A6Cda2J4MFA==", + "version": "0.0.0-pr-30913-4005921", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-0.0.0-pr-30913-4005921.tgz", + "integrity": "sha512-bA0XA35LBLLXh8yESbPG25Eo2dwDjadcEwVpQ6lxdWcC0drKLIKe65AaCBboNoRYD/ULgC0DrPCnRx0B27yZMQ==", "cpu": [ "x64" ], @@ -129,9 +129,9 @@ ] }, "node_modules/@nx/nx-linux-arm-gnueabihf": { - "version": "0.0.0-pr-30913-da2b0d3", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-0.0.0-pr-30913-da2b0d3.tgz", - "integrity": "sha512-atiOJz/h5vfHtnPJL0SkSKfTu2ZRgce4BnUqO5KA3tPTdwui36tJS9q7DUpvCvbu2SjYpzRSH9chkP/41gR2bw==", + "version": "0.0.0-pr-30913-4005921", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-0.0.0-pr-30913-4005921.tgz", + "integrity": "sha512-nnkegbb/xD6VeYQEiMfHVngMKO2/thoGPN8dYesEan043OfjKoMwBM4CuMNCX6Tof+lAFRCCbUiBbCtrvynadg==", "cpu": [ "arm" ], @@ -142,9 +142,9 @@ ] }, "node_modules/@nx/nx-linux-arm64-gnu": { - "version": "0.0.0-pr-30913-da2b0d3", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-0.0.0-pr-30913-da2b0d3.tgz", - "integrity": "sha512-ZOJoV0IK/hrqGE47gZsJuEYpmdrBRznynfIDXMiTLDmdsx8ZgZcnrxxiRy+F7FI2M9m40Xi93bcnPYYEmJJltg==", + "version": "0.0.0-pr-30913-4005921", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-0.0.0-pr-30913-4005921.tgz", + "integrity": "sha512-6fSiWpReHgM+bvZTwVQdTWgUxAnIJfIg9gDCLOIN8f1Qo18+keSbAH4HRc2Fm79fAinAUcWsE+dpgfpp4idgtA==", "cpu": [ "arm64" ], @@ -155,9 +155,9 @@ ] }, "node_modules/@nx/nx-linux-arm64-musl": { - "version": "0.0.0-pr-30913-da2b0d3", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-0.0.0-pr-30913-da2b0d3.tgz", - "integrity": "sha512-aw4KkOR4eXkZFZKgJJHDPCCXV93BL8fPrSiQxo/Q8Ot+oIU/yE0G4uXk2/ddB95G1Jp8dKlD5YJ7vTlWgnXh6Q==", + "version": "0.0.0-pr-30913-4005921", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-0.0.0-pr-30913-4005921.tgz", + "integrity": "sha512-GOnTP5FEKh2TTk2eZrYnXDQEle1P5dUbaJUQb8Gf/jdYUGXxvpbco1P9G1OtFosHDaQYxfEmwudqcIy24LJnNQ==", "cpu": [ "arm64" ], @@ -168,9 +168,9 @@ ] }, "node_modules/@nx/nx-linux-x64-gnu": { - "version": "0.0.0-pr-30913-da2b0d3", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-0.0.0-pr-30913-da2b0d3.tgz", - "integrity": "sha512-6MWbaqxKLdF8ILSSR9DF6uqo69agmRuNtSQo8m0tv8dDQ3t1au2mnGle8t8Icz+Z+3rAOnfqdxE1VQMGIHSd2Q==", + "version": "0.0.0-pr-30913-4005921", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-0.0.0-pr-30913-4005921.tgz", + "integrity": "sha512-7TILTFu0DJaJz3GTpUSa/NEXhNg9loh9/kiBYWvUgw2EKeXsFUrxc/Y/kB+lEmfPo3A0QJU3K1xxRqwYTQiuwQ==", "cpu": [ "x64" ], @@ -181,9 +181,9 @@ ] }, "node_modules/@nx/nx-linux-x64-musl": { - "version": "0.0.0-pr-30913-da2b0d3", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-0.0.0-pr-30913-da2b0d3.tgz", - "integrity": "sha512-daIi2COhCrWmPIwEiIY8HQZgmtBF0gFh+yQa7zLnmK+W/7im5CzRIxCOV+2eEq1JyUs7xGLbRgH0ZeqoTvKY/g==", + "version": "0.0.0-pr-30913-4005921", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-0.0.0-pr-30913-4005921.tgz", + "integrity": "sha512-O5rl1OqPjfnI55Yz45uAhhcHV5n7UOHuq3ohfpx2RvaO1m4EXanc/17t+tojWsF4PLdBJpQU2ta8D8BP8/tKsQ==", "cpu": [ "x64" ], @@ -194,9 +194,9 @@ ] }, "node_modules/@nx/nx-win32-arm64-msvc": { - "version": "0.0.0-pr-30913-da2b0d3", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-0.0.0-pr-30913-da2b0d3.tgz", - "integrity": "sha512-Qw9Eo15AEgS5kPt1CMvsal3MSk3tuPp+Yh1R3U3HGfve1JARDMhHTz5jUuxi1bTFktYW6WhBhJDmVfLgxJ6w0w==", + "version": "0.0.0-pr-30913-4005921", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-0.0.0-pr-30913-4005921.tgz", + "integrity": "sha512-5yx7YcfA+SFGizulPzWT30OKtxVmCBULOpJR0F3vyBh+CH1KGWhIMUAJQ3wrlTNwe8ON0b96p+kY7XlaNEhTcw==", "cpu": [ "arm64" ], @@ -207,9 +207,9 @@ ] }, "node_modules/@nx/nx-win32-x64-msvc": { - "version": "0.0.0-pr-30913-da2b0d3", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-0.0.0-pr-30913-da2b0d3.tgz", - "integrity": "sha512-GW4VugWsiTSX0hD7/EcsOudLLxvI0EnXqoqF8TkgVJL8jn93rgcFW+0X9EGfXxCQ3bBQS/+saav5Kg7XiA4wcQ==", + "version": "0.0.0-pr-30913-4005921", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-0.0.0-pr-30913-4005921.tgz", + "integrity": "sha512-8ueb6O+i7lLpy54UWkUHBBH5ee/2pk3zLAxuigaxjXI/kWbeZ6AminmweU1F8q6Uz+B+UMmcivh8yiGyRk5RZw==", "cpu": [ "x64" ], @@ -1220,9 +1220,9 @@ } }, "node_modules/nx": { - "version": "0.0.0-pr-30913-da2b0d3", - "resolved": "https://registry.npmjs.org/nx/-/nx-0.0.0-pr-30913-da2b0d3.tgz", - "integrity": "sha512-iqKP7G8Yq327MGh/3vbP7zECt1qwaNxJJo1AR5M+xAQlZuF7gistG46auzMl2fXhKzs3ioLOklGRobXtUIZi/Q==", + "version": "0.0.0-pr-30913-4005921", + "resolved": "https://registry.npmjs.org/nx/-/nx-0.0.0-pr-30913-4005921.tgz", + "integrity": "sha512-KFmIvnQNqr2n/0WbPBjvDLuunoTalTRCzDDu49FDaP/P19nahZd/Y3jreZfK5S72+CCLh01+oh1NLEar02aQGQ==", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -1270,16 +1270,16 @@ "node": "^20.19.0 || ^22.12.0" }, "optionalDependencies": { - "@nx/nx-darwin-arm64": "0.0.0-pr-30913-da2b0d3", - "@nx/nx-darwin-x64": "0.0.0-pr-30913-da2b0d3", - "@nx/nx-freebsd-x64": "0.0.0-pr-30913-da2b0d3", - "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-30913-da2b0d3", - "@nx/nx-linux-arm64-gnu": "0.0.0-pr-30913-da2b0d3", - "@nx/nx-linux-arm64-musl": "0.0.0-pr-30913-da2b0d3", - "@nx/nx-linux-x64-gnu": "0.0.0-pr-30913-da2b0d3", - "@nx/nx-linux-x64-musl": "0.0.0-pr-30913-da2b0d3", - "@nx/nx-win32-arm64-msvc": "0.0.0-pr-30913-da2b0d3", - "@nx/nx-win32-x64-msvc": "0.0.0-pr-30913-da2b0d3" + "@nx/nx-darwin-arm64": "0.0.0-pr-30913-4005921", + "@nx/nx-darwin-x64": "0.0.0-pr-30913-4005921", + "@nx/nx-freebsd-x64": "0.0.0-pr-30913-4005921", + "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-30913-4005921", + "@nx/nx-linux-arm64-gnu": "0.0.0-pr-30913-4005921", + "@nx/nx-linux-arm64-musl": "0.0.0-pr-30913-4005921", + "@nx/nx-linux-x64-gnu": "0.0.0-pr-30913-4005921", + "@nx/nx-linux-x64-musl": "0.0.0-pr-30913-4005921", + "@nx/nx-win32-arm64-msvc": "0.0.0-pr-30913-4005921", + "@nx/nx-win32-x64-msvc": "0.0.0-pr-30913-4005921" }, "peerDependencies": { "@swc-node/register": "^1.8.0", diff --git a/package.json b/package.json index 995cd38e44d6..820746324b1d 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "spring-boot", "dependencies": { - "nx": "0.0.0-pr-30913-da2b0d3", - "@nx/gradle": "0.0.0-pr-30913-da2b0d3" + "nx": "0.0.0-pr-30913-4005921", + "@nx/gradle": "0.0.0-pr-30913-4005921" } } diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle index 97b7e9c2acbb..c09190ee08b7 100644 --- a/spring-boot-project/spring-boot-docs/build.gradle +++ b/spring-boot-project/spring-boot-docs/build.gradle @@ -203,6 +203,7 @@ dokkatoo { def aggregatedJavadoc = tasks.register('aggregatedJavadoc', Javadoc) { dependsOn configurations.resolvedBom dependsOn ':spring-boot-project:spring-boot-test-autoconfigure:processResources' + dependsOn ':spring-boot-project:spring-boot-devtools:processResources' destinationDir = project.file(project.layout.buildDirectory.dir("docs/javadoc")) options { author = true diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle index 895a567f658f..12803c010a85 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle @@ -179,8 +179,4 @@ tasks.named("dockerTest").configure { syncPluginDescriptorInputs { dependsOn formatHelpMojoSource -} - -nxProjectReport { - atomized = false } \ No newline at end of file diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/build.gradle index 878229ffe7e3..ecda08d12519 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-junit-vintage/build.gradle @@ -13,7 +13,7 @@ dependencies { } test { - testLogging { + /* testLogging { afterSuite { description, result -> if (!description.parent) { if (!result.testCount) { @@ -21,7 +21,7 @@ test { } } } - } + }*/ develocity { predictiveTestSelection { enabled = false From 5ea5244e86378a7f272d3d6f128a79a6a129dd85 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Tue, 13 May 2025 19:45:13 -0400 Subject: [PATCH 27/46] remove all nxProjectReport atomized false --- spring-boot-project/spring-boot-docs/build.gradle | 5 +++++ .../spring-boot-tools/spring-boot-gradle-plugin/build.gradle | 4 ---- spring-boot-project/spring-boot/build.gradle | 4 ---- .../spring-boot-smoke-test-jetty/build.gradle | 4 ---- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle index c09190ee08b7..2ef8177a481f 100644 --- a/spring-boot-project/spring-boot-docs/build.gradle +++ b/spring-boot-project/spring-boot-docs/build.gradle @@ -204,6 +204,7 @@ def aggregatedJavadoc = tasks.register('aggregatedJavadoc', Javadoc) { dependsOn configurations.resolvedBom dependsOn ':spring-boot-project:spring-boot-test-autoconfigure:processResources' dependsOn ':spring-boot-project:spring-boot-devtools:processResources' + dependsOn processResources destinationDir = project.file(project.layout.buildDirectory.dir("docs/javadoc")) options { author = true @@ -393,4 +394,8 @@ test { checkArchitectureTest { dependsOn processResources +} + +checkstyleMain { + dependsOn processResources } \ No newline at end of file diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle index ca36c8d3d785..3180c73d14d0 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle @@ -157,8 +157,4 @@ plugins.withType(EclipsePlugin) { toolchain { maximumCompatibleJavaVersion = JavaLanguageVersion.of(23) -} - -nxProjectReport { - atomized = false } \ No newline at end of file diff --git a/spring-boot-project/spring-boot/build.gradle b/spring-boot-project/spring-boot/build.gradle index 6c71494a9dea..c07456939591 100644 --- a/spring-boot-project/spring-boot/build.gradle +++ b/spring-boot-project/spring-boot/build.gradle @@ -195,8 +195,4 @@ sourceSets { test { jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED" -} - -nxProjectReport { - atomized = false } \ No newline at end of file diff --git a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/build.gradle b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/build.gradle index c2b5cabba89b..53154a094d68 100644 --- a/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/build.gradle +++ b/spring-boot-tests/spring-boot-smoke-tests/spring-boot-smoke-test-jetty/build.gradle @@ -11,8 +11,4 @@ dependencies { implementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-jetty")) testImplementation(project(":spring-boot-project:spring-boot-starters:spring-boot-starter-test")) -} - -nxProjectReport { - atomized = false } \ No newline at end of file From 7001eabbb4e9d2b0753a8772fe4c3cfbd990d61c Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Tue, 13 May 2025 20:35:07 -0400 Subject: [PATCH 28/46] add atomized false to gradle-plugin --- .../spring-boot-tools/spring-boot-gradle-plugin/build.gradle | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle index 3180c73d14d0..ca36c8d3d785 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle @@ -157,4 +157,8 @@ plugins.withType(EclipsePlugin) { toolchain { maximumCompatibleJavaVersion = JavaLanguageVersion.of(23) +} + +nxProjectReport { + atomized = false } \ No newline at end of file From 5526a4c337e22759464f4c4d4e428e0fc73d39d7 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Tue, 13 May 2025 22:56:49 -0400 Subject: [PATCH 29/46] upgrade pr version to 0.0.0-pr-30913-f9ca713` --- nx.json | 4 +- package-lock.json | 106 +++++++++++++++++++++++----------------------- package.json | 4 +- 3 files changed, 57 insertions(+), 57 deletions(-) diff --git a/nx.json b/nx.json index 957c94caa2d9..0455174c8d26 100644 --- a/nx.json +++ b/nx.json @@ -23,13 +23,13 @@ } }, "antora": { - "executor": "@nx/gradle:gradle", + "executor": "@nx/gradle:gradle-one", "options": { "excludeDependsOn": false } }, "antoraNpmInstall": { - "executor": "@nx/gradle:gradle", + "executor": "@nx/gradle:gradle-one", "options": { "excludeDependsOn": false } diff --git a/package-lock.json b/package-lock.json index f94ecc60999c..1a4dfd984cd2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,8 +6,8 @@ "": { "name": "spring-boot", "dependencies": { - "@nx/gradle": "0.0.0-pr-30913-4005921", - "nx": "0.0.0-pr-30913-4005921" + "@nx/gradle": "0.0.0-pr-30913-f9ca713", + "nx": "0.0.0-pr-30913-f9ca713" } }, "node_modules/@emnapi/core": { @@ -62,9 +62,9 @@ } }, "node_modules/@nx/devkit": { - "version": "0.0.0-pr-30913-4005921", - "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-0.0.0-pr-30913-4005921.tgz", - "integrity": "sha512-/tVFT343ggksY5TrD6ihAtNefK06iuk53osRDFa8XogoA3eMADlSq57YDlAvk+w4p1tegQuUtYNrJ4Z2OB3d3w==", + "version": "0.0.0-pr-30913-f9ca713", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-0.0.0-pr-30913-f9ca713.tgz", + "integrity": "sha512-D+D7cLMP/wbLcGyTcAAdkfXeLZuCrR6VdkzYPaElALwjv7Fh9VqJNnxQ0PJR7JxAhsPolUI42TcFa8VX5CP50g==", "license": "MIT", "dependencies": { "ejs": "^3.1.7", @@ -77,22 +77,22 @@ "yargs-parser": "21.1.1" }, "peerDependencies": { - "nx": "0.0.0-pr-30913-4005921" + "nx": "0.0.0-pr-30913-f9ca713" } }, "node_modules/@nx/gradle": { - "version": "0.0.0-pr-30913-4005921", - "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-0.0.0-pr-30913-4005921.tgz", - "integrity": "sha512-PfORsEarOClMXE0JOddvx5PA8kdsdP1DmrOjfn8nwk6Y/07mHP2P/OV4eTtPqJ77LbleWX02grFf1bScryDzIQ==", + "version": "0.0.0-pr-30913-f9ca713", + "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-0.0.0-pr-30913-f9ca713.tgz", + "integrity": "sha512-mvEY+/7wMScHV5sbao3XtudYqQvR3ubZEN2QcGRIKPe1CcQg0QVvU0eQDPRJsItGS6YQMFX8Dl6Uw2p9v4B6/Q==", "license": "MIT", "dependencies": { - "@nx/devkit": "0.0.0-pr-30913-4005921" + "@nx/devkit": "0.0.0-pr-30913-f9ca713" } }, "node_modules/@nx/nx-darwin-arm64": { - "version": "0.0.0-pr-30913-4005921", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-0.0.0-pr-30913-4005921.tgz", - "integrity": "sha512-FF3dEbHi/NzpYgFRVXjs79XGvuLN/xcFIUmweEjAtRO0GGRiYLIImiBhzqW2288AsER+WK9/djJ/M1khCFBzig==", + "version": "0.0.0-pr-30913-f9ca713", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-0.0.0-pr-30913-f9ca713.tgz", + "integrity": "sha512-+3sIlbQbAdsVSJTdLJ4G6q/cwM9VzdTVO8k/CBnMRqYZyWqBQgFkGFGvaogU3GnQ7xWe9o/osLI0+dbawlCKIA==", "cpu": [ "arm64" ], @@ -103,9 +103,9 @@ ] }, "node_modules/@nx/nx-darwin-x64": { - "version": "0.0.0-pr-30913-4005921", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-0.0.0-pr-30913-4005921.tgz", - "integrity": "sha512-7XwACuN+boUjZrKUblmS3SGeXQjow6mI1M8SMhFoSPTRdilFWhGJYdyjcGFLfAFp+4kX0cg9DnAmUgrJ8ky6uQ==", + "version": "0.0.0-pr-30913-f9ca713", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-0.0.0-pr-30913-f9ca713.tgz", + "integrity": "sha512-O0l1+HEYyCAGBZEhLdNzxt4Zbk4IN31rz3/xXQ0eRpGKfEiEQVjVpdAREKEs2Bs6SHFCREbhZRnOctH30kSm3g==", "cpu": [ "x64" ], @@ -116,9 +116,9 @@ ] }, "node_modules/@nx/nx-freebsd-x64": { - "version": "0.0.0-pr-30913-4005921", - "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-0.0.0-pr-30913-4005921.tgz", - "integrity": "sha512-bA0XA35LBLLXh8yESbPG25Eo2dwDjadcEwVpQ6lxdWcC0drKLIKe65AaCBboNoRYD/ULgC0DrPCnRx0B27yZMQ==", + "version": "0.0.0-pr-30913-f9ca713", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-0.0.0-pr-30913-f9ca713.tgz", + "integrity": "sha512-vqYPj6yXI4rIynVYOAfMKpgTaO1WKeSsZiVb04vzY1bBMlR2ZU61i9gksYPEY1D9OXS460/e3indZ+bgcssULQ==", "cpu": [ "x64" ], @@ -129,9 +129,9 @@ ] }, "node_modules/@nx/nx-linux-arm-gnueabihf": { - "version": "0.0.0-pr-30913-4005921", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-0.0.0-pr-30913-4005921.tgz", - "integrity": "sha512-nnkegbb/xD6VeYQEiMfHVngMKO2/thoGPN8dYesEan043OfjKoMwBM4CuMNCX6Tof+lAFRCCbUiBbCtrvynadg==", + "version": "0.0.0-pr-30913-f9ca713", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-0.0.0-pr-30913-f9ca713.tgz", + "integrity": "sha512-cwvsAxBA2+C7Nw+Elr/LS5EDilUSl16Hthclkyrr2YP5uEaw275ELkhD6SGW2kH4lnbKvs6xiWtiFwW+PIuH5Q==", "cpu": [ "arm" ], @@ -142,9 +142,9 @@ ] }, "node_modules/@nx/nx-linux-arm64-gnu": { - "version": "0.0.0-pr-30913-4005921", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-0.0.0-pr-30913-4005921.tgz", - "integrity": "sha512-6fSiWpReHgM+bvZTwVQdTWgUxAnIJfIg9gDCLOIN8f1Qo18+keSbAH4HRc2Fm79fAinAUcWsE+dpgfpp4idgtA==", + "version": "0.0.0-pr-30913-f9ca713", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-0.0.0-pr-30913-f9ca713.tgz", + "integrity": "sha512-2jib+sPPTGpIJOFnrlm9NQi4hK6sVFJjFNfv+ieogCEj2kgyNIi6kfnaimKw2h1PZEdBXbhAr3nqRGwOKRtCkw==", "cpu": [ "arm64" ], @@ -155,9 +155,9 @@ ] }, "node_modules/@nx/nx-linux-arm64-musl": { - "version": "0.0.0-pr-30913-4005921", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-0.0.0-pr-30913-4005921.tgz", - "integrity": "sha512-GOnTP5FEKh2TTk2eZrYnXDQEle1P5dUbaJUQb8Gf/jdYUGXxvpbco1P9G1OtFosHDaQYxfEmwudqcIy24LJnNQ==", + "version": "0.0.0-pr-30913-f9ca713", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-0.0.0-pr-30913-f9ca713.tgz", + "integrity": "sha512-50P56YhMztHt3GnD3spkCWnjgZcfRDlstvvwu0UFeqrCdpCOXkM0CTTvFBoqeSpKGpviVXU0SNGZJbafHMRdHA==", "cpu": [ "arm64" ], @@ -168,9 +168,9 @@ ] }, "node_modules/@nx/nx-linux-x64-gnu": { - "version": "0.0.0-pr-30913-4005921", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-0.0.0-pr-30913-4005921.tgz", - "integrity": "sha512-7TILTFu0DJaJz3GTpUSa/NEXhNg9loh9/kiBYWvUgw2EKeXsFUrxc/Y/kB+lEmfPo3A0QJU3K1xxRqwYTQiuwQ==", + "version": "0.0.0-pr-30913-f9ca713", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-0.0.0-pr-30913-f9ca713.tgz", + "integrity": "sha512-GZ+PrHaZSa+IoYa/CeYVKMBvQeZPv6iuvrJYrlWwcrOALM/Flj4mK4Uebrb4U4Zlvs1iGKJzBKcY0gMV1RPnQA==", "cpu": [ "x64" ], @@ -181,9 +181,9 @@ ] }, "node_modules/@nx/nx-linux-x64-musl": { - "version": "0.0.0-pr-30913-4005921", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-0.0.0-pr-30913-4005921.tgz", - "integrity": "sha512-O5rl1OqPjfnI55Yz45uAhhcHV5n7UOHuq3ohfpx2RvaO1m4EXanc/17t+tojWsF4PLdBJpQU2ta8D8BP8/tKsQ==", + "version": "0.0.0-pr-30913-f9ca713", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-0.0.0-pr-30913-f9ca713.tgz", + "integrity": "sha512-p+QnVo/EhbisqjrDAg+qz+vLp0bk3+tzJieS9YEA0uHb5zzP19iSd+hQo39ZCbvJJVgNrYxu3iH8+HV7UNXYOA==", "cpu": [ "x64" ], @@ -194,9 +194,9 @@ ] }, "node_modules/@nx/nx-win32-arm64-msvc": { - "version": "0.0.0-pr-30913-4005921", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-0.0.0-pr-30913-4005921.tgz", - "integrity": "sha512-5yx7YcfA+SFGizulPzWT30OKtxVmCBULOpJR0F3vyBh+CH1KGWhIMUAJQ3wrlTNwe8ON0b96p+kY7XlaNEhTcw==", + "version": "0.0.0-pr-30913-f9ca713", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-0.0.0-pr-30913-f9ca713.tgz", + "integrity": "sha512-Y7NzaK3iiaMgb2I9YkN2zK0Gc7EQ90Juvhlaqb1slqxzZ5wtrG08BQOZo66jnYudB5hzHiBGpwPfBOfsnOzbIQ==", "cpu": [ "arm64" ], @@ -207,9 +207,9 @@ ] }, "node_modules/@nx/nx-win32-x64-msvc": { - "version": "0.0.0-pr-30913-4005921", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-0.0.0-pr-30913-4005921.tgz", - "integrity": "sha512-8ueb6O+i7lLpy54UWkUHBBH5ee/2pk3zLAxuigaxjXI/kWbeZ6AminmweU1F8q6Uz+B+UMmcivh8yiGyRk5RZw==", + "version": "0.0.0-pr-30913-f9ca713", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-0.0.0-pr-30913-f9ca713.tgz", + "integrity": "sha512-Whk3jRUshm29+OVWtSFoShKa7vWf5marEvbRCE1LpUBviXmn2cEFZ9r8ioRfyKscH7d29a0ilwQkhTSkyU5zIw==", "cpu": [ "x64" ], @@ -1220,9 +1220,9 @@ } }, "node_modules/nx": { - "version": "0.0.0-pr-30913-4005921", - "resolved": "https://registry.npmjs.org/nx/-/nx-0.0.0-pr-30913-4005921.tgz", - "integrity": "sha512-KFmIvnQNqr2n/0WbPBjvDLuunoTalTRCzDDu49FDaP/P19nahZd/Y3jreZfK5S72+CCLh01+oh1NLEar02aQGQ==", + "version": "0.0.0-pr-30913-f9ca713", + "resolved": "https://registry.npmjs.org/nx/-/nx-0.0.0-pr-30913-f9ca713.tgz", + "integrity": "sha512-23tP1fwUSCnRG3R2A+zaxMfrtkbG+iUf9ADEp3s2uv9m/FqA7GWkuxganeBUN7EuNCpy5yOQjGvcAMVtT7q1Xw==", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -1270,16 +1270,16 @@ "node": "^20.19.0 || ^22.12.0" }, "optionalDependencies": { - "@nx/nx-darwin-arm64": "0.0.0-pr-30913-4005921", - "@nx/nx-darwin-x64": "0.0.0-pr-30913-4005921", - "@nx/nx-freebsd-x64": "0.0.0-pr-30913-4005921", - "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-30913-4005921", - "@nx/nx-linux-arm64-gnu": "0.0.0-pr-30913-4005921", - "@nx/nx-linux-arm64-musl": "0.0.0-pr-30913-4005921", - "@nx/nx-linux-x64-gnu": "0.0.0-pr-30913-4005921", - "@nx/nx-linux-x64-musl": "0.0.0-pr-30913-4005921", - "@nx/nx-win32-arm64-msvc": "0.0.0-pr-30913-4005921", - "@nx/nx-win32-x64-msvc": "0.0.0-pr-30913-4005921" + "@nx/nx-darwin-arm64": "0.0.0-pr-30913-f9ca713", + "@nx/nx-darwin-x64": "0.0.0-pr-30913-f9ca713", + "@nx/nx-freebsd-x64": "0.0.0-pr-30913-f9ca713", + "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-30913-f9ca713", + "@nx/nx-linux-arm64-gnu": "0.0.0-pr-30913-f9ca713", + "@nx/nx-linux-arm64-musl": "0.0.0-pr-30913-f9ca713", + "@nx/nx-linux-x64-gnu": "0.0.0-pr-30913-f9ca713", + "@nx/nx-linux-x64-musl": "0.0.0-pr-30913-f9ca713", + "@nx/nx-win32-arm64-msvc": "0.0.0-pr-30913-f9ca713", + "@nx/nx-win32-x64-msvc": "0.0.0-pr-30913-f9ca713" }, "peerDependencies": { "@swc-node/register": "^1.8.0", diff --git a/package.json b/package.json index 820746324b1d..fb5fb3747636 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "spring-boot", "dependencies": { - "nx": "0.0.0-pr-30913-4005921", - "@nx/gradle": "0.0.0-pr-30913-4005921" + "nx": "0.0.0-pr-30913-f9ca713", + "@nx/gradle": "0.0.0-pr-30913-f9ca713" } } From 7ffbfd117cb99ae0080497c62f33ba29ac430887 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Wed, 14 May 2025 01:10:04 -0400 Subject: [PATCH 30/46] add dependsOn from test --- nx.json | 4 ++-- .../spring-boot-devtools/build.gradle | 16 ++++++++++++++++ .../spring-boot-docs/build.gradle | 4 ++++ .../spring-boot-test-autoconfigure/build.gradle | 12 ++++++++++++ 4 files changed, 34 insertions(+), 2 deletions(-) diff --git a/nx.json b/nx.json index 0455174c8d26..957c94caa2d9 100644 --- a/nx.json +++ b/nx.json @@ -23,13 +23,13 @@ } }, "antora": { - "executor": "@nx/gradle:gradle-one", + "executor": "@nx/gradle:gradle", "options": { "excludeDependsOn": false } }, "antoraNpmInstall": { - "executor": "@nx/gradle:gradle-one", + "executor": "@nx/gradle:gradle", "options": { "excludeDependsOn": false } diff --git a/spring-boot-project/spring-boot-devtools/build.gradle b/spring-boot-project/spring-boot-devtools/build.gradle index 2ca66c6e29ed..04c680867922 100644 --- a/spring-boot-project/spring-boot-devtools/build.gradle +++ b/spring-boot-project/spring-boot-devtools/build.gradle @@ -105,4 +105,20 @@ autoConfigurationMetadata { compileTestJava { dependsOn processResources +} + +compileIntTestJava { + dependsOn processResources +} + +test { + dependsOn processResources +} + +javadoc { + dependsOn processResources +} + +intTest { + dependsOn processResources } \ No newline at end of file diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle index 2ef8177a481f..920ee4aa80ca 100644 --- a/spring-boot-project/spring-boot-docs/build.gradle +++ b/spring-boot-project/spring-boot-docs/build.gradle @@ -398,4 +398,8 @@ checkArchitectureTest { checkstyleMain { dependsOn processResources +} + +compileTestJava { + dependsOn processResources } \ No newline at end of file diff --git a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle index 0f6afaed2ca3..443ac1db8ef0 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-test-autoconfigure/build.gradle @@ -148,4 +148,16 @@ testSliceMetadata { test { dependsOn processResources +} + +compileTestJava { + dependsOn processResources +} + +compileDockerTestJava { + dependsOn processResources +} + +jar { + dependsOn processResources } \ No newline at end of file From e5f464e299932e76a286c84e461da8fd9743142e Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Wed, 14 May 2025 03:21:40 -0400 Subject: [PATCH 31/46] upgrade pr version 0.0.0-pr-30913-f38a495 --- package-lock.json | 106 +++++++++++++++++++++++----------------------- package.json | 4 +- 2 files changed, 55 insertions(+), 55 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1a4dfd984cd2..765c1a45e7c2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,8 +6,8 @@ "": { "name": "spring-boot", "dependencies": { - "@nx/gradle": "0.0.0-pr-30913-f9ca713", - "nx": "0.0.0-pr-30913-f9ca713" + "@nx/gradle": "0.0.0-pr-30913-f38a495", + "nx": "0.0.0-pr-30913-f38a495" } }, "node_modules/@emnapi/core": { @@ -62,9 +62,9 @@ } }, "node_modules/@nx/devkit": { - "version": "0.0.0-pr-30913-f9ca713", - "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-0.0.0-pr-30913-f9ca713.tgz", - "integrity": "sha512-D+D7cLMP/wbLcGyTcAAdkfXeLZuCrR6VdkzYPaElALwjv7Fh9VqJNnxQ0PJR7JxAhsPolUI42TcFa8VX5CP50g==", + "version": "0.0.0-pr-30913-f38a495", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-0.0.0-pr-30913-f38a495.tgz", + "integrity": "sha512-V9SnGcjDX3f4NouGAsMtRo5f7wop8msQmhmIkeC5XVWfaMGc3gDpAauiaGjOTWsMmUiks4NY8zd6fbC8GRFIDg==", "license": "MIT", "dependencies": { "ejs": "^3.1.7", @@ -77,22 +77,22 @@ "yargs-parser": "21.1.1" }, "peerDependencies": { - "nx": "0.0.0-pr-30913-f9ca713" + "nx": "0.0.0-pr-30913-f38a495" } }, "node_modules/@nx/gradle": { - "version": "0.0.0-pr-30913-f9ca713", - "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-0.0.0-pr-30913-f9ca713.tgz", - "integrity": "sha512-mvEY+/7wMScHV5sbao3XtudYqQvR3ubZEN2QcGRIKPe1CcQg0QVvU0eQDPRJsItGS6YQMFX8Dl6Uw2p9v4B6/Q==", + "version": "0.0.0-pr-30913-f38a495", + "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-0.0.0-pr-30913-f38a495.tgz", + "integrity": "sha512-K+fNcJTX7HiQ0O1BXXMBuAJ2xlPqaxCtn17pLgr7zoPhegqEl6nGG4mZStJ0CugVvdQciW11iqQMfuTa0l+//w==", "license": "MIT", "dependencies": { - "@nx/devkit": "0.0.0-pr-30913-f9ca713" + "@nx/devkit": "0.0.0-pr-30913-f38a495" } }, "node_modules/@nx/nx-darwin-arm64": { - "version": "0.0.0-pr-30913-f9ca713", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-0.0.0-pr-30913-f9ca713.tgz", - "integrity": "sha512-+3sIlbQbAdsVSJTdLJ4G6q/cwM9VzdTVO8k/CBnMRqYZyWqBQgFkGFGvaogU3GnQ7xWe9o/osLI0+dbawlCKIA==", + "version": "0.0.0-pr-30913-f38a495", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-0.0.0-pr-30913-f38a495.tgz", + "integrity": "sha512-oxRaeUqzOaGQlGrBpq9QTEnWtAeHIKIQTAVFpXIVeE7UJTV6mQ4SXomzB1fDg5P8hIafhxfGZMXYBwKZnGYa2A==", "cpu": [ "arm64" ], @@ -103,9 +103,9 @@ ] }, "node_modules/@nx/nx-darwin-x64": { - "version": "0.0.0-pr-30913-f9ca713", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-0.0.0-pr-30913-f9ca713.tgz", - "integrity": "sha512-O0l1+HEYyCAGBZEhLdNzxt4Zbk4IN31rz3/xXQ0eRpGKfEiEQVjVpdAREKEs2Bs6SHFCREbhZRnOctH30kSm3g==", + "version": "0.0.0-pr-30913-f38a495", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-0.0.0-pr-30913-f38a495.tgz", + "integrity": "sha512-OKLlW0dQq+KMM+66jb09zVOVI3gTOxiUyOouNDmZX1dzVX51ylecdxdjBSFYZzmEoqAeYnpW+/TQfQfYJuVmbQ==", "cpu": [ "x64" ], @@ -116,9 +116,9 @@ ] }, "node_modules/@nx/nx-freebsd-x64": { - "version": "0.0.0-pr-30913-f9ca713", - "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-0.0.0-pr-30913-f9ca713.tgz", - "integrity": "sha512-vqYPj6yXI4rIynVYOAfMKpgTaO1WKeSsZiVb04vzY1bBMlR2ZU61i9gksYPEY1D9OXS460/e3indZ+bgcssULQ==", + "version": "0.0.0-pr-30913-f38a495", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-0.0.0-pr-30913-f38a495.tgz", + "integrity": "sha512-wZi99bj/XyPA66uNHKlRbKrYi7x9dFcUX1c3urvkAkx1/zAmLAWmlCBOU8mC/2Um7TKWLiqdAE6kSb73m5KxFw==", "cpu": [ "x64" ], @@ -129,9 +129,9 @@ ] }, "node_modules/@nx/nx-linux-arm-gnueabihf": { - "version": "0.0.0-pr-30913-f9ca713", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-0.0.0-pr-30913-f9ca713.tgz", - "integrity": "sha512-cwvsAxBA2+C7Nw+Elr/LS5EDilUSl16Hthclkyrr2YP5uEaw275ELkhD6SGW2kH4lnbKvs6xiWtiFwW+PIuH5Q==", + "version": "0.0.0-pr-30913-f38a495", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-0.0.0-pr-30913-f38a495.tgz", + "integrity": "sha512-sLqhv6gSiwInqVyGgEeKF6XCdx4zfBmENV9LnZWFGhdICZ5uhhrSqsr9ijmb1U4lhxGgG7sz8E3ThMNNNDaV2w==", "cpu": [ "arm" ], @@ -142,9 +142,9 @@ ] }, "node_modules/@nx/nx-linux-arm64-gnu": { - "version": "0.0.0-pr-30913-f9ca713", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-0.0.0-pr-30913-f9ca713.tgz", - "integrity": "sha512-2jib+sPPTGpIJOFnrlm9NQi4hK6sVFJjFNfv+ieogCEj2kgyNIi6kfnaimKw2h1PZEdBXbhAr3nqRGwOKRtCkw==", + "version": "0.0.0-pr-30913-f38a495", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-0.0.0-pr-30913-f38a495.tgz", + "integrity": "sha512-F9CpOXcAulGzEJPIdXj8pAPjw1XQwdznjcpdWkolTZVAK5y6z5hJUrQH9qSvx+grgEAnOKSSOKnG3IOG5UMiDQ==", "cpu": [ "arm64" ], @@ -155,9 +155,9 @@ ] }, "node_modules/@nx/nx-linux-arm64-musl": { - "version": "0.0.0-pr-30913-f9ca713", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-0.0.0-pr-30913-f9ca713.tgz", - "integrity": "sha512-50P56YhMztHt3GnD3spkCWnjgZcfRDlstvvwu0UFeqrCdpCOXkM0CTTvFBoqeSpKGpviVXU0SNGZJbafHMRdHA==", + "version": "0.0.0-pr-30913-f38a495", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-0.0.0-pr-30913-f38a495.tgz", + "integrity": "sha512-aKMCoWwJWFzUmL+IZ+MHC1aoAu7qtq1vZaE/JhJQqcvfr+I73DL6eKfvgIBnNaDsJ1ByEKxllWptW5KZn3A50A==", "cpu": [ "arm64" ], @@ -168,9 +168,9 @@ ] }, "node_modules/@nx/nx-linux-x64-gnu": { - "version": "0.0.0-pr-30913-f9ca713", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-0.0.0-pr-30913-f9ca713.tgz", - "integrity": "sha512-GZ+PrHaZSa+IoYa/CeYVKMBvQeZPv6iuvrJYrlWwcrOALM/Flj4mK4Uebrb4U4Zlvs1iGKJzBKcY0gMV1RPnQA==", + "version": "0.0.0-pr-30913-f38a495", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-0.0.0-pr-30913-f38a495.tgz", + "integrity": "sha512-rw3l0nT/audMXOrmuSdD1pu0Lm1B2SThjDq73l9huo5fVnwESVH60vRUp+0UWzkCpql5ad1HfvDdgvN0WyJPRQ==", "cpu": [ "x64" ], @@ -181,9 +181,9 @@ ] }, "node_modules/@nx/nx-linux-x64-musl": { - "version": "0.0.0-pr-30913-f9ca713", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-0.0.0-pr-30913-f9ca713.tgz", - "integrity": "sha512-p+QnVo/EhbisqjrDAg+qz+vLp0bk3+tzJieS9YEA0uHb5zzP19iSd+hQo39ZCbvJJVgNrYxu3iH8+HV7UNXYOA==", + "version": "0.0.0-pr-30913-f38a495", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-0.0.0-pr-30913-f38a495.tgz", + "integrity": "sha512-N36/bnjO+D9KtX11Vkxdqsq1q5rbO8m7WtdIffaHthHvSr44mLN8Y9UtSxA8qUHTb5Ci7lEGgFjyy+5HCkkBOA==", "cpu": [ "x64" ], @@ -194,9 +194,9 @@ ] }, "node_modules/@nx/nx-win32-arm64-msvc": { - "version": "0.0.0-pr-30913-f9ca713", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-0.0.0-pr-30913-f9ca713.tgz", - "integrity": "sha512-Y7NzaK3iiaMgb2I9YkN2zK0Gc7EQ90Juvhlaqb1slqxzZ5wtrG08BQOZo66jnYudB5hzHiBGpwPfBOfsnOzbIQ==", + "version": "0.0.0-pr-30913-f38a495", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-0.0.0-pr-30913-f38a495.tgz", + "integrity": "sha512-fZvAthHdnHRhPkLTy7xFkOU4i+mdUQgbLktAvPJxsLNsNVBkRayKLJFxvpE1wcV6LZJsjlfXAaVlxqCpdrHvew==", "cpu": [ "arm64" ], @@ -207,9 +207,9 @@ ] }, "node_modules/@nx/nx-win32-x64-msvc": { - "version": "0.0.0-pr-30913-f9ca713", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-0.0.0-pr-30913-f9ca713.tgz", - "integrity": "sha512-Whk3jRUshm29+OVWtSFoShKa7vWf5marEvbRCE1LpUBviXmn2cEFZ9r8ioRfyKscH7d29a0ilwQkhTSkyU5zIw==", + "version": "0.0.0-pr-30913-f38a495", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-0.0.0-pr-30913-f38a495.tgz", + "integrity": "sha512-xxatvrRqoZqYpuSk4zxovJ3WrKZYZ9wQ77d+aOtSGiXzOHXT/uj7qK4nbvhNCMPZGxPeLC0osHm4XIBPpvEZHQ==", "cpu": [ "x64" ], @@ -1220,9 +1220,9 @@ } }, "node_modules/nx": { - "version": "0.0.0-pr-30913-f9ca713", - "resolved": "https://registry.npmjs.org/nx/-/nx-0.0.0-pr-30913-f9ca713.tgz", - "integrity": "sha512-23tP1fwUSCnRG3R2A+zaxMfrtkbG+iUf9ADEp3s2uv9m/FqA7GWkuxganeBUN7EuNCpy5yOQjGvcAMVtT7q1Xw==", + "version": "0.0.0-pr-30913-f38a495", + "resolved": "https://registry.npmjs.org/nx/-/nx-0.0.0-pr-30913-f38a495.tgz", + "integrity": "sha512-lng80kxDv/9ZFgKb1z3QlQ7SBG0YyEFEhsxyc1bRuJk6/lQ5VptU9s9lhscRYHK6+boLi371ybGyZBYOI8aGaA==", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -1270,16 +1270,16 @@ "node": "^20.19.0 || ^22.12.0" }, "optionalDependencies": { - "@nx/nx-darwin-arm64": "0.0.0-pr-30913-f9ca713", - "@nx/nx-darwin-x64": "0.0.0-pr-30913-f9ca713", - "@nx/nx-freebsd-x64": "0.0.0-pr-30913-f9ca713", - "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-30913-f9ca713", - "@nx/nx-linux-arm64-gnu": "0.0.0-pr-30913-f9ca713", - "@nx/nx-linux-arm64-musl": "0.0.0-pr-30913-f9ca713", - "@nx/nx-linux-x64-gnu": "0.0.0-pr-30913-f9ca713", - "@nx/nx-linux-x64-musl": "0.0.0-pr-30913-f9ca713", - "@nx/nx-win32-arm64-msvc": "0.0.0-pr-30913-f9ca713", - "@nx/nx-win32-x64-msvc": "0.0.0-pr-30913-f9ca713" + "@nx/nx-darwin-arm64": "0.0.0-pr-30913-f38a495", + "@nx/nx-darwin-x64": "0.0.0-pr-30913-f38a495", + "@nx/nx-freebsd-x64": "0.0.0-pr-30913-f38a495", + "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-30913-f38a495", + "@nx/nx-linux-arm64-gnu": "0.0.0-pr-30913-f38a495", + "@nx/nx-linux-arm64-musl": "0.0.0-pr-30913-f38a495", + "@nx/nx-linux-x64-gnu": "0.0.0-pr-30913-f38a495", + "@nx/nx-linux-x64-musl": "0.0.0-pr-30913-f38a495", + "@nx/nx-win32-arm64-msvc": "0.0.0-pr-30913-f38a495", + "@nx/nx-win32-x64-msvc": "0.0.0-pr-30913-f38a495" }, "peerDependencies": { "@swc-node/register": "^1.8.0", diff --git a/package.json b/package.json index fb5fb3747636..b3a41f5c330c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "spring-boot", "dependencies": { - "nx": "0.0.0-pr-30913-f9ca713", - "@nx/gradle": "0.0.0-pr-30913-f9ca713" + "nx": "0.0.0-pr-30913-f38a495", + "@nx/gradle": "0.0.0-pr-30913-f38a495" } } From 020d01ff2e069529c1d65d17e03cfdf4f15d1bac Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Tue, 13 May 2025 15:21:56 -0400 Subject: [PATCH 32/46] bust cache --- nx.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx.json b/nx.json index 957c94caa2d9..b9034f74208b 100644 --- a/nx.json +++ b/nx.json @@ -35,7 +35,7 @@ } } }, - "bustCache": 15, + "bustCache": 16, "nxCloudUrl": "https://staging.nx.app", "nxCloudId": "67a56832eb5d9093e3ebe776" } From 247f3df13fc10c67244a38e3e07f74eb9c9aae95 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Wed, 14 May 2025 10:02:55 -0400 Subject: [PATCH 33/46] disable antora --- .../spring-boot-actuator-autoconfigure/build.gradle | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle index 93d5516c2f73..75607ca511a3 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle @@ -228,4 +228,12 @@ antoraContributions { } source() } +} + +tasks.named("antora") { + enabled = false +} + +tasks.named("antoraNpmInstall") { + enabled = false } \ No newline at end of file From c6df43e13bb4d20ff3ca06fd7ec6db109007cbe6 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Wed, 14 May 2025 11:10:54 -0400 Subject: [PATCH 34/46] disable test for spring-boot and bust cache --- nx.json | 2 +- spring-boot-project/spring-boot/build.gradle | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/nx.json b/nx.json index b9034f74208b..0b91b2ba99ab 100644 --- a/nx.json +++ b/nx.json @@ -35,7 +35,7 @@ } } }, - "bustCache": 16, + "bustCache": 17, "nxCloudUrl": "https://staging.nx.app", "nxCloudId": "67a56832eb5d9093e3ebe776" } diff --git a/spring-boot-project/spring-boot/build.gradle b/spring-boot-project/spring-boot/build.gradle index c07456939591..6c71494a9dea 100644 --- a/spring-boot-project/spring-boot/build.gradle +++ b/spring-boot-project/spring-boot/build.gradle @@ -195,4 +195,8 @@ sourceSets { test { jvmArgs += "--add-opens=java.base/java.net=ALL-UNNAMED" +} + +nxProjectReport { + atomized = false } \ No newline at end of file From d447871a8111b37593656a4dd5ad28a2fc29f780 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Wed, 14 May 2025 13:45:38 -0400 Subject: [PATCH 35/46] bust cache --- nx.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx.json b/nx.json index 0b91b2ba99ab..812466151ec9 100644 --- a/nx.json +++ b/nx.json @@ -35,7 +35,7 @@ } } }, - "bustCache": 17, + "bustCache": 1, "nxCloudUrl": "https://staging.nx.app", "nxCloudId": "67a56832eb5d9093e3ebe776" } From 67ff085d48bc5f44b957e685a2c9d7f98254d561 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Wed, 14 May 2025 13:46:40 -0400 Subject: [PATCH 36/46] bust cache --- nx.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx.json b/nx.json index 812466151ec9..a765ab982306 100644 --- a/nx.json +++ b/nx.json @@ -35,7 +35,7 @@ } } }, - "bustCache": 1, + "bustCache": 2, "nxCloudUrl": "https://staging.nx.app", "nxCloudId": "67a56832eb5d9093e3ebe776" } From aaec175688adc8edb86c9a5e708dc33d5b3e69ce Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Wed, 14 May 2025 13:51:52 -0400 Subject: [PATCH 37/46] bust cache --- nx.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx.json b/nx.json index a765ab982306..48ba918786d7 100644 --- a/nx.json +++ b/nx.json @@ -35,7 +35,7 @@ } } }, - "bustCache": 2, + "bustCache": 34, "nxCloudUrl": "https://staging.nx.app", "nxCloudId": "67a56832eb5d9093e3ebe776" } From 1647d9b42c345daab2278a7b7c6bb6d34e81e455 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Thu, 15 May 2025 00:58:18 -0400 Subject: [PATCH 38/46] upgrade pr version to 0.0.0-pr-30913-8852111 --- package-lock.json | 169 +++++++--------------------------------------- package.json | 4 +- 2 files changed, 28 insertions(+), 145 deletions(-) diff --git a/package-lock.json b/package-lock.json index 765c1a45e7c2..da8e971e316c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6,8 +6,8 @@ "": { "name": "spring-boot", "dependencies": { - "@nx/gradle": "0.0.0-pr-30913-f38a495", - "nx": "0.0.0-pr-30913-f38a495" + "@nx/gradle": "0.0.0-pr-30913-8852111", + "nx": "0.0.0-pr-30913-8852111" } }, "node_modules/@emnapi/core": { @@ -62,9 +62,9 @@ } }, "node_modules/@nx/devkit": { - "version": "0.0.0-pr-30913-f38a495", - "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-0.0.0-pr-30913-f38a495.tgz", - "integrity": "sha512-V9SnGcjDX3f4NouGAsMtRo5f7wop8msQmhmIkeC5XVWfaMGc3gDpAauiaGjOTWsMmUiks4NY8zd6fbC8GRFIDg==", + "version": "0.0.0-pr-30913-8852111", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-0.0.0-pr-30913-8852111.tgz", + "integrity": "sha512-XqM5K8Bc3py+KC2b9zub3rfvzvmXeSAPT4/RjDFZnEQj8znVLEp6lHejklGE0vYdvmj7BbHybrnbRxU2b7Z43A==", "license": "MIT", "dependencies": { "ejs": "^3.1.7", @@ -77,22 +77,22 @@ "yargs-parser": "21.1.1" }, "peerDependencies": { - "nx": "0.0.0-pr-30913-f38a495" + "nx": "0.0.0-pr-30913-8852111" } }, "node_modules/@nx/gradle": { - "version": "0.0.0-pr-30913-f38a495", - "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-0.0.0-pr-30913-f38a495.tgz", - "integrity": "sha512-K+fNcJTX7HiQ0O1BXXMBuAJ2xlPqaxCtn17pLgr7zoPhegqEl6nGG4mZStJ0CugVvdQciW11iqQMfuTa0l+//w==", + "version": "0.0.0-pr-30913-8852111", + "resolved": "https://registry.npmjs.org/@nx/gradle/-/gradle-0.0.0-pr-30913-8852111.tgz", + "integrity": "sha512-z5g7u8Aijw9viCEBVsxHkf9FTXMgeWlXVpmCwMSLZ/njRhuuT0YqSBdm/coNqneQdch8DlfLji2wIsvsnskYew==", "license": "MIT", "dependencies": { - "@nx/devkit": "0.0.0-pr-30913-f38a495" + "@nx/devkit": "0.0.0-pr-30913-8852111" } }, "node_modules/@nx/nx-darwin-arm64": { - "version": "0.0.0-pr-30913-f38a495", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-0.0.0-pr-30913-f38a495.tgz", - "integrity": "sha512-oxRaeUqzOaGQlGrBpq9QTEnWtAeHIKIQTAVFpXIVeE7UJTV6mQ4SXomzB1fDg5P8hIafhxfGZMXYBwKZnGYa2A==", + "version": "0.0.0-pr-30913-8852111", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-0.0.0-pr-30913-8852111.tgz", + "integrity": "sha512-0gM8lSJUnw4W788YYorxhhUz1rKzjOr4h0+hwZYf4PH2SuWnJXStN6ODYjIH2tYE8AJQNoURxIAnV38es4ocdA==", "cpu": [ "arm64" ], @@ -102,123 +102,6 @@ "darwin" ] }, - "node_modules/@nx/nx-darwin-x64": { - "version": "0.0.0-pr-30913-f38a495", - "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-0.0.0-pr-30913-f38a495.tgz", - "integrity": "sha512-OKLlW0dQq+KMM+66jb09zVOVI3gTOxiUyOouNDmZX1dzVX51ylecdxdjBSFYZzmEoqAeYnpW+/TQfQfYJuVmbQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@nx/nx-freebsd-x64": { - "version": "0.0.0-pr-30913-f38a495", - "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-0.0.0-pr-30913-f38a495.tgz", - "integrity": "sha512-wZi99bj/XyPA66uNHKlRbKrYi7x9dFcUX1c3urvkAkx1/zAmLAWmlCBOU8mC/2Um7TKWLiqdAE6kSb73m5KxFw==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ] - }, - "node_modules/@nx/nx-linux-arm-gnueabihf": { - "version": "0.0.0-pr-30913-f38a495", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-0.0.0-pr-30913-f38a495.tgz", - "integrity": "sha512-sLqhv6gSiwInqVyGgEeKF6XCdx4zfBmENV9LnZWFGhdICZ5uhhrSqsr9ijmb1U4lhxGgG7sz8E3ThMNNNDaV2w==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@nx/nx-linux-arm64-gnu": { - "version": "0.0.0-pr-30913-f38a495", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-0.0.0-pr-30913-f38a495.tgz", - "integrity": "sha512-F9CpOXcAulGzEJPIdXj8pAPjw1XQwdznjcpdWkolTZVAK5y6z5hJUrQH9qSvx+grgEAnOKSSOKnG3IOG5UMiDQ==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@nx/nx-linux-arm64-musl": { - "version": "0.0.0-pr-30913-f38a495", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-0.0.0-pr-30913-f38a495.tgz", - "integrity": "sha512-aKMCoWwJWFzUmL+IZ+MHC1aoAu7qtq1vZaE/JhJQqcvfr+I73DL6eKfvgIBnNaDsJ1ByEKxllWptW5KZn3A50A==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@nx/nx-linux-x64-gnu": { - "version": "0.0.0-pr-30913-f38a495", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-0.0.0-pr-30913-f38a495.tgz", - "integrity": "sha512-rw3l0nT/audMXOrmuSdD1pu0Lm1B2SThjDq73l9huo5fVnwESVH60vRUp+0UWzkCpql5ad1HfvDdgvN0WyJPRQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@nx/nx-linux-x64-musl": { - "version": "0.0.0-pr-30913-f38a495", - "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-0.0.0-pr-30913-f38a495.tgz", - "integrity": "sha512-N36/bnjO+D9KtX11Vkxdqsq1q5rbO8m7WtdIffaHthHvSr44mLN8Y9UtSxA8qUHTb5Ci7lEGgFjyy+5HCkkBOA==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@nx/nx-win32-arm64-msvc": { - "version": "0.0.0-pr-30913-f38a495", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-0.0.0-pr-30913-f38a495.tgz", - "integrity": "sha512-fZvAthHdnHRhPkLTy7xFkOU4i+mdUQgbLktAvPJxsLNsNVBkRayKLJFxvpE1wcV6LZJsjlfXAaVlxqCpdrHvew==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@nx/nx-win32-x64-msvc": { - "version": "0.0.0-pr-30913-f38a495", - "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-0.0.0-pr-30913-f38a495.tgz", - "integrity": "sha512-xxatvrRqoZqYpuSk4zxovJ3WrKZYZ9wQ77d+aOtSGiXzOHXT/uj7qK4nbvhNCMPZGxPeLC0osHm4XIBPpvEZHQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, "node_modules/@sinclair/typebox": { "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", @@ -1220,9 +1103,9 @@ } }, "node_modules/nx": { - "version": "0.0.0-pr-30913-f38a495", - "resolved": "https://registry.npmjs.org/nx/-/nx-0.0.0-pr-30913-f38a495.tgz", - "integrity": "sha512-lng80kxDv/9ZFgKb1z3QlQ7SBG0YyEFEhsxyc1bRuJk6/lQ5VptU9s9lhscRYHK6+boLi371ybGyZBYOI8aGaA==", + "version": "0.0.0-pr-30913-8852111", + "resolved": "https://registry.npmjs.org/nx/-/nx-0.0.0-pr-30913-8852111.tgz", + "integrity": "sha512-0B9jpHHIUqV9+HpDHYuPEgECtwgoriURelZdrgaaI14oDx1RT9spVZnDKMIDgGjuDjHuiWpqzTjaGg0eIiRjyw==", "hasInstallScript": true, "license": "MIT", "dependencies": { @@ -1270,16 +1153,16 @@ "node": "^20.19.0 || ^22.12.0" }, "optionalDependencies": { - "@nx/nx-darwin-arm64": "0.0.0-pr-30913-f38a495", - "@nx/nx-darwin-x64": "0.0.0-pr-30913-f38a495", - "@nx/nx-freebsd-x64": "0.0.0-pr-30913-f38a495", - "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-30913-f38a495", - "@nx/nx-linux-arm64-gnu": "0.0.0-pr-30913-f38a495", - "@nx/nx-linux-arm64-musl": "0.0.0-pr-30913-f38a495", - "@nx/nx-linux-x64-gnu": "0.0.0-pr-30913-f38a495", - "@nx/nx-linux-x64-musl": "0.0.0-pr-30913-f38a495", - "@nx/nx-win32-arm64-msvc": "0.0.0-pr-30913-f38a495", - "@nx/nx-win32-x64-msvc": "0.0.0-pr-30913-f38a495" + "@nx/nx-darwin-arm64": "0.0.0-pr-30913-8852111", + "@nx/nx-darwin-x64": "0.0.0-pr-30913-8852111", + "@nx/nx-freebsd-x64": "0.0.0-pr-30913-8852111", + "@nx/nx-linux-arm-gnueabihf": "0.0.0-pr-30913-8852111", + "@nx/nx-linux-arm64-gnu": "0.0.0-pr-30913-8852111", + "@nx/nx-linux-arm64-musl": "0.0.0-pr-30913-8852111", + "@nx/nx-linux-x64-gnu": "0.0.0-pr-30913-8852111", + "@nx/nx-linux-x64-musl": "0.0.0-pr-30913-8852111", + "@nx/nx-win32-arm64-msvc": "0.0.0-pr-30913-8852111", + "@nx/nx-win32-x64-msvc": "0.0.0-pr-30913-8852111" }, "peerDependencies": { "@swc-node/register": "^1.8.0", diff --git a/package.json b/package.json index b3a41f5c330c..609244f93645 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "spring-boot", "dependencies": { - "nx": "0.0.0-pr-30913-f38a495", - "@nx/gradle": "0.0.0-pr-30913-f38a495" + "nx": "0.0.0-pr-30913-8852111", + "@nx/gradle": "0.0.0-pr-30913-8852111" } } From ee4890d27e375b653d997bc2d87ffd25557ab111 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Thu, 15 May 2025 00:58:53 -0400 Subject: [PATCH 39/46] bust cache --- nx.json | 2 +- package-lock.json | 117 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 118 insertions(+), 1 deletion(-) diff --git a/nx.json b/nx.json index 48ba918786d7..2905fcc4c8aa 100644 --- a/nx.json +++ b/nx.json @@ -35,7 +35,7 @@ } } }, - "bustCache": 34, + "bustCache": 35, "nxCloudUrl": "https://staging.nx.app", "nxCloudId": "67a56832eb5d9093e3ebe776" } diff --git a/package-lock.json b/package-lock.json index da8e971e316c..9476653ae56f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -102,6 +102,123 @@ "darwin" ] }, + "node_modules/@nx/nx-darwin-x64": { + "version": "0.0.0-pr-30913-8852111", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-0.0.0-pr-30913-8852111.tgz", + "integrity": "sha512-omwnF7VDO+LoUO1bx7JI368cmu6MR2++n/Q7ohjXDj+v6sKJCvGl77PRgx1T/wexB7BukpJlMDNzDkUjsrc0RQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@nx/nx-freebsd-x64": { + "version": "0.0.0-pr-30913-8852111", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-0.0.0-pr-30913-8852111.tgz", + "integrity": "sha512-w3tBYy1lswWM9L2SnoUsl8MvyNAPb4dsUbJNabur2X47NtfkES9tgngV5dWVQuXOphaGsnW9OOcxa45IA/QZzw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@nx/nx-linux-arm-gnueabihf": { + "version": "0.0.0-pr-30913-8852111", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-0.0.0-pr-30913-8852111.tgz", + "integrity": "sha512-hvp6W1bwg4fROUcqXbRkwqq0tb/KFAeI4IiRp8H5Biul4LHJSnVeYXikS8XlAlDNScEx01/JLt+9sdfwJyCmEQ==", + "cpu": [ + "arm" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@nx/nx-linux-arm64-gnu": { + "version": "0.0.0-pr-30913-8852111", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-0.0.0-pr-30913-8852111.tgz", + "integrity": "sha512-bh6LLethf7uMCFgtSWgHFmtPavNth9Ovht4Az71pABMfKKoR5sf73AJEbSZynvYAaN3PEJin7OTf380pQZ1qKg==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@nx/nx-linux-arm64-musl": { + "version": "0.0.0-pr-30913-8852111", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-0.0.0-pr-30913-8852111.tgz", + "integrity": "sha512-GCCciVwqSKoVxSPM8MqzLhMXCtGfDkRZM3UooGtXiI+kICsTy+bgmCVIsJgyOJDnOrJJa56+asKu+hQKDYHxfA==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@nx/nx-linux-x64-gnu": { + "version": "0.0.0-pr-30913-8852111", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-0.0.0-pr-30913-8852111.tgz", + "integrity": "sha512-th35+iXuf+o69cyiGDS+p8D5ANrXft50ShIET4n4Hgpa0PIiRSBO9o/kr8M4nr7MWrfA8J9bV7spGaBxvWPMlw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@nx/nx-linux-x64-musl": { + "version": "0.0.0-pr-30913-8852111", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-0.0.0-pr-30913-8852111.tgz", + "integrity": "sha512-atHcRjvsGB+mjqjOn3QoReq9fJkmy3M3BpLzcB+p0E6lB/Mo2CC1xRXNK2LuwTVmPp97DMvLGfiYMOXFZJJaxw==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@nx/nx-win32-arm64-msvc": { + "version": "0.0.0-pr-30913-8852111", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-0.0.0-pr-30913-8852111.tgz", + "integrity": "sha512-w+FnLfiGzPX9RCFQWx6TPiYDhK3Zxc5K3aZjzagtMTLnWljWcdQcUTIMYsNoaHBN/PNY0CntvaKDUOsEvBliZA==", + "cpu": [ + "arm64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@nx/nx-win32-x64-msvc": { + "version": "0.0.0-pr-30913-8852111", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-0.0.0-pr-30913-8852111.tgz", + "integrity": "sha512-6BAbZhWHBkqupwxQqdjQePqIR7PIbmbmfYUqsuP2lZlsK1Oz8JRJU2whTGdkaSDa90b9hEErHkHJCLzCR96LrQ==", + "cpu": [ + "x64" + ], + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, "node_modules/@sinclair/typebox": { "version": "0.27.8", "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.8.tgz", From 60b1a7c5a682981613e38bba7cf61b847dc08422 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Thu, 15 May 2025 02:37:58 -0400 Subject: [PATCH 40/46] add maxParallelForks for spring-boot-maven-plugin --- nx.json | 2 +- .../spring-boot-maven-plugin/build.gradle | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/nx.json b/nx.json index 2905fcc4c8aa..eada04b3da29 100644 --- a/nx.json +++ b/nx.json @@ -35,7 +35,7 @@ } } }, - "bustCache": 35, + "bustCache": 36, "nxCloudUrl": "https://staging.nx.app", "nxCloudId": "67a56832eb5d9093e3ebe776" } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle index 12803c010a85..dd5a0eb4dfc3 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle @@ -179,4 +179,16 @@ tasks.named("dockerTest").configure { syncPluginDescriptorInputs { dependsOn formatHelpMojoSource +} + +tasks.withType(Test).configureEach { + maxParallelForks = Math.max(Runtime.runtime.availableProcessors(), 1) +} + +generateHelpMojo { + enabled = false +} + +generatePluginDescriptor { + enabled = false } \ No newline at end of file From 5336645e3a9db8e1e13563de8a11dd8261fe1a87 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Thu, 15 May 2025 12:49:09 -0400 Subject: [PATCH 41/46] add assignment rule --- .github/workflows/build-pull-request.yml | 2 +- .nx/workflows/distribution-config.yaml | 9 +++++++++ nx.json | 2 +- .../spring-boot-maven-plugin/build.gradle | 12 ------------ 4 files changed, 11 insertions(+), 14 deletions(-) create mode 100644 .nx/workflows/distribution-config.yaml diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml index 95238ddf0e3b..48aa36561a9c 100644 --- a/.github/workflows/build-pull-request.yml +++ b/.github/workflows/build-pull-request.yml @@ -21,7 +21,7 @@ jobs: # Run this command as early as possible, before dependencies are installed # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun # Uncomment this line to enable task distribution - - run: NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_CLOUD_RETRIEVAL_CONCURRENCY=50 NX_CLOUD_NO_TIMEOUTS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx-cloud start-ci-run --distribute-on="5 linux-extra-large-plus-jvm" --require-explicit-completion + - run: NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_CLOUD_RETRIEVAL_CONCURRENCY=50 NX_CLOUD_NO_TIMEOUTS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx-cloud start-ci-run --require-explicit-completion --distribute-on="../../.nx/workflows/distribution-config.yaml" - name: Build id: build diff --git a/.nx/workflows/distribution-config.yaml b/.nx/workflows/distribution-config.yaml new file mode 100644 index 000000000000..e2dd921c875f --- /dev/null +++ b/.nx/workflows/distribution-config.yaml @@ -0,0 +1,9 @@ +distribute-on: + default: 5 linux-extra-large-plus-jvm + +assignment-rules: + - targets: + - 'ciIntTest*' + run-on: + - agent: linux-extra-large-plus-jvm + parallelism: 1 \ No newline at end of file diff --git a/nx.json b/nx.json index eada04b3da29..1c4d17774cc5 100644 --- a/nx.json +++ b/nx.json @@ -35,7 +35,7 @@ } } }, - "bustCache": 36, + "bustCache": 37, "nxCloudUrl": "https://staging.nx.app", "nxCloudId": "67a56832eb5d9093e3ebe776" } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle index dd5a0eb4dfc3..12803c010a85 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle @@ -179,16 +179,4 @@ tasks.named("dockerTest").configure { syncPluginDescriptorInputs { dependsOn formatHelpMojoSource -} - -tasks.withType(Test).configureEach { - maxParallelForks = Math.max(Runtime.runtime.availableProcessors(), 1) -} - -generateHelpMojo { - enabled = false -} - -generatePluginDescriptor { - enabled = false } \ No newline at end of file From df78c573832c584c3782a21f0f60e671c771f812 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Thu, 15 May 2025 16:56:47 -0400 Subject: [PATCH 42/46] bust cache --- nx.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nx.json b/nx.json index 1c4d17774cc5..efe2f27cbb7a 100644 --- a/nx.json +++ b/nx.json @@ -35,7 +35,7 @@ } } }, - "bustCache": 37, + "bustCache": 39, "nxCloudUrl": "https://staging.nx.app", "nxCloudId": "67a56832eb5d9093e3ebe776" } From e34131740383f43a664dca3e237003e8d7662ac8 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Thu, 15 May 2025 23:53:56 -0400 Subject: [PATCH 43/46] disable antora in spring-boot-maven-plugin --- .../spring-boot-maven-plugin/build.gradle | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle index 12803c010a85..7dbe6a379969 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle @@ -179,4 +179,12 @@ tasks.named("dockerTest").configure { syncPluginDescriptorInputs { dependsOn formatHelpMojoSource +} + +antoraNpmInstall { + enabled = false +} + +antora { + enabled = false } \ No newline at end of file From 8b864a4fbaa6bce019f23b91f04578bbef60b119 Mon Sep 17 00:00:00 2001 From: Emily Xiong Date: Thu, 15 May 2025 23:54:26 -0400 Subject: [PATCH 44/46] bust cache --- nx.json | 2 +- .../spring-boot-maven-plugin/build.gradle | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/nx.json b/nx.json index efe2f27cbb7a..b127b6df1741 100644 --- a/nx.json +++ b/nx.json @@ -35,7 +35,7 @@ } } }, - "bustCache": 39, + "bustCache": 41, "nxCloudUrl": "https://staging.nx.app", "nxCloudId": "67a56832eb5d9093e3ebe776" } diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle index 7dbe6a379969..2e3690c23217 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle +++ b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle @@ -181,10 +181,10 @@ syncPluginDescriptorInputs { dependsOn formatHelpMojoSource } -antoraNpmInstall { - enabled = false +tasks.named("antora") { + enabled = false } -antora { - enabled = false +tasks.named("antoraNpmInstall") { + enabled = false } \ No newline at end of file From 1b8ccb8e10e6b58f93109d80ea05902e843ca28c Mon Sep 17 00:00:00 2001 From: lourw <56288712+lourw@users.noreply.github.com> Date: Tue, 27 May 2025 09:36:37 -0700 Subject: [PATCH 45/46] chore(repo): change parallel to 16 --- .github/actions/build/action.yml | 2 +- nx.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index 4ff0392bf545..d2ae762c779a 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -68,7 +68,7 @@ runs: COMMERCIAL_REPO_PASSWORD: ${{ inputs.commercial-repository-password }} COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }} COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }} - run: NX_BATCH_MODE=true NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx run-many -t assemble,check-ci --parallel=32 --batch --outputStyle=stream + run: NX_BATCH_MODE=true NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx run-many -t assemble,check-ci --parallel=16 --batch --outputStyle=stream # - name: Publish # id: publish # if: ${{ inputs.publish == 'true' }} diff --git a/nx.json b/nx.json index b127b6df1741..241d0b1e1c43 100644 --- a/nx.json +++ b/nx.json @@ -35,7 +35,7 @@ } } }, - "bustCache": 41, + "bustCache": 45, "nxCloudUrl": "https://staging.nx.app", "nxCloudId": "67a56832eb5d9093e3ebe776" } From 6620e68af635f4d97e3067debbcec1752cc06cbd Mon Sep 17 00:00:00 2001 From: lourw <56288712+lourw@users.noreply.github.com> Date: Tue, 27 May 2025 09:38:16 -0700 Subject: [PATCH 46/46] chore(repo): use parallel 32 --- .github/actions/build/action.yml | 2 +- nx.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index d2ae762c779a..4ff0392bf545 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -68,7 +68,7 @@ runs: COMMERCIAL_REPO_PASSWORD: ${{ inputs.commercial-repository-password }} COMMERCIAL_REPO_USERNAME: ${{ inputs.commercial-repository-username }} COMMERCIAL_SNAPSHOT_REPO_URL: ${{ inputs.commercial-snapshot-repository-url }} - run: NX_BATCH_MODE=true NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx run-many -t assemble,check-ci --parallel=16 --batch --outputStyle=stream + run: NX_BATCH_MODE=true NX_CLOUD_DEREFERENCE_SYMLINKS=true NX_VERBOSE_LOGGING=true NX_PERF_LOGGING=true npx nx run-many -t assemble,check-ci --parallel=32 --batch --outputStyle=stream # - name: Publish # id: publish # if: ${{ inputs.publish == 'true' }} diff --git a/nx.json b/nx.json index 241d0b1e1c43..8d35c906b9b0 100644 --- a/nx.json +++ b/nx.json @@ -35,7 +35,7 @@ } } }, - "bustCache": 45, + "bustCache": 47, "nxCloudUrl": "https://staging.nx.app", "nxCloudId": "67a56832eb5d9093e3ebe776" }