From 252e8f3579f137ac5abb15f1a2468e3a24a0b266 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 9 Jun 2026 01:09:01 +0000 Subject: [PATCH 1/7] chore: Update all non-major dependencies Signed-off-by: Renovate Bot --- .github/workflows/renovate-bot.yml | 2 +- api-catalog-ui/frontend/package-lock.json | 30 ++--- api-catalog-ui/frontend/package.json | 8 +- gradle/versions.gradle | 12 +- .../package-lock.json | 124 +++++++++--------- zowe-cli-id-federation-plugin/package.json | 6 +- 6 files changed, 91 insertions(+), 91 deletions(-) diff --git a/.github/workflows/renovate-bot.yml b/.github/workflows/renovate-bot.yml index 40ba97ad3d..920fa24033 100644 --- a/.github/workflows/renovate-bot.yml +++ b/.github/workflows/renovate-bot.yml @@ -24,7 +24,7 @@ jobs: uses: actions/checkout@v4 # using checkout to access workspace - name: Run Renovate - uses: renovatebot/github-action@v46.1.14 + uses: renovatebot/github-action@v46.1.15 with: configurationFile: ${{ github.workspace }}/renovate-config.js token: ${{ secrets.ROBOT_PAT }} diff --git a/api-catalog-ui/frontend/package-lock.json b/api-catalog-ui/frontend/package-lock.json index e7578c77f2..098805d938 100644 --- a/api-catalog-ui/frontend/package-lock.json +++ b/api-catalog-ui/frontend/package-lock.json @@ -20,7 +20,7 @@ "@mui/material": "9.0.0", "@types/enzyme": "3.10.19", "@types/jest": "29.5.14", - "@types/react": "18.3.30", + "@types/react": "18.3.31", "agentkeepalive": "4.6.0", "buffer": "6.0.3", "emotion-theming": "11.0.0", @@ -37,7 +37,7 @@ "react": "18.3.1", "react-dom": "18.3.1", "react-error-boundary": "5.0.0", - "react-hook-form": "7.77.0", + "react-hook-form": "7.78.0", "react-redux": "9.3.0", "react-router": "7.17.0", "react-toastify": "10.0.6", @@ -74,7 +74,7 @@ "ansi-regex": "6.2.2", "babel-plugin-transform-vite-meta-env": "1.0.3", "body-parser": "2.2.2", - "caniuse-lite": "1.0.30001793", + "caniuse-lite": "1.0.30001797", "concurrently": "9.2.1", "cors": "2.8.6", "cypress": "15.16.0", @@ -6420,9 +6420,9 @@ } }, "node_modules/@types/react": { - "version": "18.3.30", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/react/-/react-18.3.30.tgz", - "integrity": "sha512-3ek6mwJL5/VBewBcY4S66cqlCtK3qi4WIq37Z0m/NHw1hjhI7274Mx1qz/+ggSzyBCOEf7eHjBN6INjPAWYfYw==", + "version": "18.3.31", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/react/-/react-18.3.31.tgz", + "integrity": "sha512-vfEqpXTvwT91yhmwdfouStN2hSKwTvyRs8qpLfADyrq/kxDw0hZM7Wk9Ug1FELj8hIby+S/+kQCSRFF32nv2Qw==", "license": "MIT", "dependencies": { "@types/prop-types": "*", @@ -8019,9 +8019,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001793", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/caniuse-lite/-/caniuse-lite-1.0.30001793.tgz", - "integrity": "sha512-iwSsYWaCOoh26cV8NwNRViHlrfUvYsHDfRVcbtmw0Kg6PJIZZXwMkj1442FYLBGkeUf1juAsU3DTfxW579mrPA==", + "version": "1.0.30001797", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/caniuse-lite/-/caniuse-lite-1.0.30001797.tgz", + "integrity": "sha512-l8xKG+gwAIExZGl9FrF7KUwuOmk6wbEPC9Xoy/RtnWv1XG0Q4LFlagaLpUv3Kiza3W/wm27zy0yWJEieYKAP6w==", "funding": [ { "type": "opencollective", @@ -18888,9 +18888,9 @@ } }, "node_modules/react-hook-form": { - "version": "7.77.0", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/react-hook-form/-/react-hook-form-7.77.0.tgz", - "integrity": "sha512-Sslh9YDYc0GDlWT/lxasnIduNo4v3yyvqRGvmGKUre5AFjDs/HV9/OafHGD8d+sB2yoL4UIL9L8X9i0WlZZebg==", + "version": "7.78.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/react-hook-form/-/react-hook-form-7.78.0.tgz", + "integrity": "sha512-EEZqc+N23moyzTlz61Pj+JvcXo76ICkpfOZo8JZw+sM4+wLQGh6nI2Ms+PdMOYNluFu0ghlM7B8mCzhRYtJCnA==", "license": "MIT", "engines": { "node": ">=18.0.0" @@ -20474,9 +20474,9 @@ } }, "node_modules/semver": { - "version": "7.8.2", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/semver/-/semver-7.8.2.tgz", - "integrity": "sha512-c8jsqUZm3omBOI66G90z1Dyw5z622G8oLG+omfsHBJf3CWQTlOcwOjvOG6wtiNfW6anKm/eA39LMwMtMez2TiQ==", + "version": "7.8.3", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/semver/-/semver-7.8.3.tgz", + "integrity": "sha512-wnilbGyMxzbY7dNOl7jpKbLSjcfeweJWU5j4+u5qW+6/wuGD9KzIGOyZnQVSBM9E7DtWaaH3CyHkppYrKYoxwg==", "license": "ISC", "bin": { "semver": "bin/semver.js" diff --git a/api-catalog-ui/frontend/package.json b/api-catalog-ui/frontend/package.json index 2c07c6fab9..665b056756 100644 --- a/api-catalog-ui/frontend/package.json +++ b/api-catalog-ui/frontend/package.json @@ -15,7 +15,7 @@ "@mui/material": "9.0.0", "@types/enzyme": "3.10.19", "@types/jest": "29.5.14", - "@types/react": "18.3.30", + "@types/react": "18.3.31", "agentkeepalive": "4.6.0", "buffer": "6.0.3", "emotion-theming": "11.0.0", @@ -32,7 +32,7 @@ "react": "18.3.1", "react-dom": "18.3.1", "react-error-boundary": "5.0.0", - "react-hook-form": "7.77.0", + "react-hook-form": "7.78.0", "react-redux": "9.3.0", "react-router": "7.17.0", "react-toastify": "10.0.6", @@ -93,7 +93,7 @@ "ansi-regex": "6.2.2", "babel-plugin-transform-vite-meta-env": "1.0.3", "body-parser": "2.2.2", - "caniuse-lite": "1.0.30001793", + "caniuse-lite": "1.0.30001797", "concurrently": "9.2.1", "cors": "2.8.6", "cypress": "15.16.0", @@ -152,7 +152,7 @@ "@braintree/sanitize-url": "7.1.2", "resolve-url-loader": "5.0.0", "lodash": "4.18.1", - "semver": "7.8.2", + "semver": "7.8.3", "@babel/traverse": "7.29.7", "axios": "1.17.0", "form-data": "3.0.4", diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 1ffa508540..65e4a5a00b 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -11,8 +11,8 @@ dependencyResolutionManagement { version('springCloudCommons', '4.3.2') version('springCloudCB', '3.3.2') version('springCloudGateway', '4.3.4') - version('springFramework', '6.2.18') - version('springRetry', '2.0.12') + version('springFramework', '6.2.19') + version('springRetry', '2.0.13') version('modulith', '1.4.11') version('jmolecules', '2023.3.4') @@ -50,7 +50,7 @@ dependencyResolutionManagement { version('jakartaServlet', '6.1.0') version('javaxAnnotation', '1.3.2') version('openTelemetry-starter', '2.28.1') - version('openTelemetry-core', '1.62.0') + version('openTelemetry-core', '1.63.0') // Eureka requires this specific version of Jakarta JAXB bindings version('jaxbApi') { @@ -81,12 +81,12 @@ dependencyResolutionManagement { version('mailapi', '1.6.8') version('netty', '4.2.15.Final') // netty reactor contains a bug: https://github.com/reactor/reactor-netty/issues/3559 > https://github.com/reactor/reactor-netty/pull/3581 - version('nettyReactor', '1.3.5') + version('nettyReactor', '1.3.6') version('nimbusJoseJwt', '10.9.1') version('openApiDiff', '2.1.7') version('picocli', '4.7.7') - version('reactor', '3.8.5') + version('reactor', '3.8.6') version('restAssured', '5.5.7') version('rhino', '1.9.1') version('springDoc', '2.8.17') @@ -96,7 +96,7 @@ dependencyResolutionManagement { version('swagger3Parser', '2.1.43') version('thymeleaf', '3.1.5.RELEASE') version('velocity', '2.4.1') - version('woodstoxCore', '7.2.0') + version('woodstoxCore', '7.2.1') version('jgit', '7.6.0.202603022253-r') version('gradleNode', '7.1.0') version('sonarGradlePlugin', '7.3.1.8318') diff --git a/zowe-cli-id-federation-plugin/package-lock.json b/zowe-cli-id-federation-plugin/package-lock.json index 80e442a2ff..4bff343f76 100644 --- a/zowe-cli-id-federation-plugin/package-lock.json +++ b/zowe-cli-id-federation-plugin/package-lock.json @@ -14,9 +14,9 @@ "devDependencies": { "@eslint/js": "9.39.4", "@types/jest": "29.5.14", - "@types/node": "24.13.0", - "@typescript-eslint/eslint-plugin": "8.60.1", - "@typescript-eslint/parser": "8.60.1", + "@types/node": "24.13.1", + "@typescript-eslint/eslint-plugin": "8.61.0", + "@typescript-eslint/parser": "8.61.0", "@zowe/cli": "8.32.2", "@zowe/cli-test-utils": "8.32.2", "@zowe/imperative": "8.32.2", @@ -42,8 +42,8 @@ "typescript": "5.9.3" }, "engines": { - "node": "=24.16.0", - "npm": "=10.9.8" + "node": ">=24.16.0", + "npm": ">=10.9.8" }, "peerDependencies": { "@zowe/imperative": "8.32.2" @@ -1664,9 +1664,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "24.13.0", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/node/-/node-24.13.0.tgz", - "integrity": "sha512-5vtOqGQr4NJKeEzV441FcOi2MeG9UTWq9LqVLGneDdu4vlX17H8kQ2PA2UmNwCUGPVDj4oBjNhS7ReVEIWJJrg==", + "version": "24.13.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/node/-/node-24.13.1.tgz", + "integrity": "sha512-RSpUJGmvsJ1ZeBehQZFhIdpsz+bIpES0nIQXko4Ybq+N+kX6XvOq3Jo+iJ82FWLdblFq85AsMikd3m35jgezYg==", "dev": true, "license": "MIT", "dependencies": { @@ -1716,17 +1716,17 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.60.1", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.60.1.tgz", - "integrity": "sha512-JQ4S5GB0tfjO8BuJ4fcX+HodkzJjYBV+7OJ+wLygaX7OGQ7FudyHL4NSCA6ob+w3Yn+5MkKIozOwQhXeM7opVg==", + "version": "8.61.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.61.0.tgz", + "integrity": "sha512-bFNvl9ZczlVb+wR2Akszf3gHfKVj/8WanXaGJ3UstTA7brNKg0cNdk6X1Psu5V7MZ2oQtzZKOEzIUehaoxbDGw==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.12.2", - "@typescript-eslint/scope-manager": "8.60.1", - "@typescript-eslint/type-utils": "8.60.1", - "@typescript-eslint/utils": "8.60.1", - "@typescript-eslint/visitor-keys": "8.60.1", + "@typescript-eslint/scope-manager": "8.61.0", + "@typescript-eslint/type-utils": "8.61.0", + "@typescript-eslint/utils": "8.61.0", + "@typescript-eslint/visitor-keys": "8.61.0", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.5.0" @@ -1739,7 +1739,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.60.1", + "@typescript-eslint/parser": "^8.61.0", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } @@ -1768,16 +1768,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.60.1", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/parser/-/parser-8.60.1.tgz", - "integrity": "sha512-A0M6ua6H252bVjPvvtSgl2QA4+ET9S5Mtkb2GDyTxIhH/C4qDItT7RQNO5PhMC6NXGYXOR9dIalcDDgBKT7oFA==", + "version": "8.61.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/parser/-/parser-8.61.0.tgz", + "integrity": "sha512-5B7PfA2e1NQGCnDHd/0lW7W3gvp3d59Ryw54FYO8Uswxo9f6ikw3AZV+Xj/TvpImmpsiYyUqAfhC6kJID1jF6w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.60.1", - "@typescript-eslint/types": "8.60.1", - "@typescript-eslint/typescript-estree": "8.60.1", - "@typescript-eslint/visitor-keys": "8.60.1", + "@typescript-eslint/scope-manager": "8.61.0", + "@typescript-eslint/types": "8.61.0", + "@typescript-eslint/typescript-estree": "8.61.0", + "@typescript-eslint/visitor-keys": "8.61.0", "debug": "^4.4.3" }, "engines": { @@ -1793,14 +1793,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.60.1", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/project-service/-/project-service-8.60.1.tgz", - "integrity": "sha512-eXkTH2bxmXlqD1RnOPmLZ9ZM9D3VwSx04JOwBnP9RQ+yUA5a2Mu7SfW8uaV2Aon53NJzZlZYuX7tn91Izf+xaw==", + "version": "8.61.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/project-service/-/project-service-8.61.0.tgz", + "integrity": "sha512-DV42F7MLJO6Rax7SK1yg43tcnEfGUrurSpSxKuVX+a3RCTzBlH3fuxprrOJXKCJGAaw82xXocikJ0uQaqwXgGA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.60.1", - "@typescript-eslint/types": "^8.60.1", + "@typescript-eslint/tsconfig-utils": "^8.61.0", + "@typescript-eslint/types": "^8.61.0", "debug": "^4.4.3" }, "engines": { @@ -1815,14 +1815,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.60.1", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/scope-manager/-/scope-manager-8.60.1.tgz", - "integrity": "sha512-gvI5OQoptnxQnchOirukCuQ55svJSTuD/4k5+pC267xyBtYry748R9/c3tYUzb/iE6RZfllRz2lVulLCHkTm4w==", + "version": "8.61.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/scope-manager/-/scope-manager-8.61.0.tgz", + "integrity": "sha512-IWdXFHFSb6mlC3HPc7QsLDm5zYEbUla6trDEHf32D3/dnuUyXd87plScSNXSbm0/RxMvObpI17sv/EDTGrGZkA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.60.1", - "@typescript-eslint/visitor-keys": "8.60.1" + "@typescript-eslint/types": "8.61.0", + "@typescript-eslint/visitor-keys": "8.61.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1833,9 +1833,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.60.1", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.60.1.tgz", - "integrity": "sha512-nh8w4qAteiKuZu3pSSzG/yGKpw0OlkrKnzFmbVRenKaD4qc+7i1GrmZaLVkr8rk4uipiPGMOW4YsM6WmKZ5CvA==", + "version": "8.61.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.61.0.tgz", + "integrity": "sha512-O5Amvdv9ztMpxpf+vmFULGG78IE6Qwdr3bCGvqwG4nwc9H2qXkOYJJnRbRHyMkQTjv1d03olqwwwzHLMqpFePQ==", "dev": true, "license": "MIT", "engines": { @@ -1850,15 +1850,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.60.1", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/type-utils/-/type-utils-8.60.1.tgz", - "integrity": "sha512-sdwTrpjosW7ANQYJ39ZBF1ZyEMEGVB2UsikrserVM/30a/F1dTLnu9bGxEdosugyu5caigjLrR2qiD11asjI1A==", + "version": "8.61.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/type-utils/-/type-utils-8.61.0.tgz", + "integrity": "sha512-TuBiQYIkd97yBfInHCTKVYMbX4kvEmpOEuixIuzCU9p8BGT1SfyyO0d0IfDMbPIHcjn/hWnusUX5e8v5Xg+X8A==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.60.1", - "@typescript-eslint/typescript-estree": "8.60.1", - "@typescript-eslint/utils": "8.60.1", + "@typescript-eslint/types": "8.61.0", + "@typescript-eslint/typescript-estree": "8.61.0", + "@typescript-eslint/utils": "8.61.0", "debug": "^4.4.3", "ts-api-utils": "^2.5.0" }, @@ -1888,9 +1888,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.60.1", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/types/-/types-8.60.1.tgz", - "integrity": "sha512-4h0tY8ppCkdCzcrl2YM5M3my0xsE1Tf8om3owEu5oPWmXwkKRmk0j0LGDzYBGUcAlesEbxBhazqu/K4cu3Ug7w==", + "version": "8.61.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/types/-/types-8.61.0.tgz", + "integrity": "sha512-9QTQpZ5Iin4CdIodfbDQFSeiSJKidgYJYug1P9CC2xWgUTvlmixViqDZNciMjwLBZyJnG4tGmPl97rVAFb1AJg==", "dev": true, "license": "MIT", "engines": { @@ -1902,16 +1902,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.60.1", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/typescript-estree/-/typescript-estree-8.60.1.tgz", - "integrity": "sha512-alpRkfG8hlVE5kdJW2GkfgDgXxold3e8e4l6EnmhRmRLbekgAPCCGDVD++sABy9FcgPFroq+uFcCSM1vR57Cew==", + "version": "8.61.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/typescript-estree/-/typescript-estree-8.61.0.tgz", + "integrity": "sha512-42zatd5qSvvcV1JdDBCLxYRznvP4eIHpPoZXdkPFnAmanA4FuZ5dibSnCBggY8hQnqajPpoGjXFdZ7fIJKQnlA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.60.1", - "@typescript-eslint/tsconfig-utils": "8.60.1", - "@typescript-eslint/types": "8.60.1", - "@typescript-eslint/visitor-keys": "8.60.1", + "@typescript-eslint/project-service": "8.61.0", + "@typescript-eslint/tsconfig-utils": "8.61.0", + "@typescript-eslint/types": "8.61.0", + "@typescript-eslint/visitor-keys": "8.61.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -1982,16 +1982,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.60.1", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/utils/-/utils-8.60.1.tgz", - "integrity": "sha512-h2MPBLoNtjc3qZWfY3Tl51yPorQ2McHn8pJfcMNTcIvrrZrr90Ykffit0yjrPFWQcRcUxzH20+6OcVdW4yHtUg==", + "version": "8.61.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/utils/-/utils-8.61.0.tgz", + "integrity": "sha512-3bzFt7ImFMW/jVYwJamDoe/dMOdFLSC6pom6rRjdh4SZJEYupyMzem8e7vKZLclLfpHjlwSAXOUxtKxGXUiLqA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.60.1", - "@typescript-eslint/types": "8.60.1", - "@typescript-eslint/typescript-estree": "8.60.1" + "@typescript-eslint/scope-manager": "8.61.0", + "@typescript-eslint/types": "8.61.0", + "@typescript-eslint/typescript-estree": "8.61.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2006,13 +2006,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.60.1", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/visitor-keys/-/visitor-keys-8.60.1.tgz", - "integrity": "sha512-EbGRQg4FhrmwLodl+t3JNAnXHWVr9Vp+Zl1QBZVPY4ByfkzIT8cX3K6QWODHtkIZqqJVEWvhHSx3v5PDHsaQag==", + "version": "8.61.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/visitor-keys/-/visitor-keys-8.61.0.tgz", + "integrity": "sha512-QVLZu3ZPQEE+HICQyAMZ2yLQhxf0meY/wx6Hx14YcTNj13JB3qHlX3lJ02L3fLGHgERRH71kvYDwiXIguT3AjQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.60.1", + "@typescript-eslint/types": "8.61.0", "eslint-visitor-keys": "^5.0.0" }, "engines": { diff --git a/zowe-cli-id-federation-plugin/package.json b/zowe-cli-id-federation-plugin/package.json index 3a170cc183..f8cb7607ec 100644 --- a/zowe-cli-id-federation-plugin/package.json +++ b/zowe-cli-id-federation-plugin/package.json @@ -51,9 +51,9 @@ "devDependencies": { "@eslint/js": "9.39.4", "@types/jest": "29.5.14", - "@types/node": "24.13.0", - "@typescript-eslint/eslint-plugin": "8.60.1", - "@typescript-eslint/parser": "8.60.1", + "@types/node": "24.13.1", + "@typescript-eslint/eslint-plugin": "8.61.0", + "@typescript-eslint/parser": "8.61.0", "@zowe/cli": "8.32.2", "@zowe/cli-test-utils": "8.32.2", "@zowe/imperative": "8.32.2", From 625e82244737dd3fc279e6a4143e932be8248b4c Mon Sep 17 00:00:00 2001 From: Jakub Balhar Date: Tue, 9 Jun 2026 06:12:29 +0200 Subject: [PATCH 2/7] Update versions.gradle --- gradle/versions.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 65e4a5a00b..6144fe9f02 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -50,7 +50,7 @@ dependencyResolutionManagement { version('jakartaServlet', '6.1.0') version('javaxAnnotation', '1.3.2') version('openTelemetry-starter', '2.28.1') - version('openTelemetry-core', '1.63.0') + version('openTelemetry-core', '1.62.0') // Eureka requires this specific version of Jakarta JAXB bindings version('jaxbApi') { From 61780592eb8b8b01dd3b48d0ccb87a32f9421937 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 16 Jun 2026 01:24:06 +0000 Subject: [PATCH 3/7] chore: Update all non-major dependencies Signed-off-by: Renovate Bot --- api-catalog-ui/frontend/package-lock.json | 114 +++++++++++++----- api-catalog-ui/frontend/package.json | 4 +- gradle/versions.gradle | 4 +- .../package-lock.json | 112 ++++++++--------- zowe-cli-id-federation-plugin/package.json | 4 +- 5 files changed, 149 insertions(+), 89 deletions(-) diff --git a/api-catalog-ui/frontend/package-lock.json b/api-catalog-ui/frontend/package-lock.json index a401a8f039..47b6fbd6eb 100644 --- a/api-catalog-ui/frontend/package-lock.json +++ b/api-catalog-ui/frontend/package-lock.json @@ -73,7 +73,7 @@ "ajv": "8.20.0", "ansi-regex": "6.2.2", "babel-plugin-transform-vite-meta-env": "1.0.3", - "body-parser": "2.2.2", + "body-parser": "2.3.0", "caniuse-lite": "1.0.30001799", "concurrently": "9.2.1", "cors": "2.8.6", @@ -3858,9 +3858,9 @@ } }, "node_modules/@nodable/entities": { - "version": "2.1.0", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@nodable/entities/-/entities-2.1.0.tgz", - "integrity": "sha512-nyT7T3nbMyBI/lvr6L5TyWbFJAI9FTgVRakNoBqCD+PmID8DzFrrNdLLtHMwMszOtqZa8PAOV24ZqDnQrhQINA==", + "version": "2.2.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@nodable/entities/-/entities-2.2.0.tgz", + "integrity": "sha512-9uGyhaQavEUMC8AIddIjau4NsnsXhou+j5sBAGojCM1oxmQpVKTWR/9JxABD6UAv12vpIms55fPZKFQEhG6uBg==", "funding": [ { "type": "github", @@ -6703,6 +6703,18 @@ "node": ">= 8" } }, + "node_modules/anynum": { + "version": "1.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/anynum/-/anynum-1.0.0.tgz", + "integrity": "sha512-xjR9/zBVnUOP6ztMIIgShjsxui80nQUQH+5xJnvrYLs+90bF25/KJqaAi8mk+B4RDtX1Nspi6fmp4YTEts8SfA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], + "license": "MIT" + }, "node_modules/apg-lite": { "version": "1.0.5", "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/apg-lite/-/apg-lite-1.0.5.tgz", @@ -7526,21 +7538,21 @@ "license": "MIT" }, "node_modules/body-parser": { - "version": "2.2.2", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/body-parser/-/body-parser-2.2.2.tgz", - "integrity": "sha512-oP5VkATKlNwcgvxi0vM0p/D3n2C3EReYVX+DNYs5TjZFn/oQt2j+4sVJtSMr18pdRr8wjTcBl6LoV+FUwzPmNA==", + "version": "2.3.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/body-parser/-/body-parser-2.3.0.tgz", + "integrity": "sha512-2cGmJupaNgg+QUwVLAucDuWuoMZ6EX9iHDRswZ5lsNYEmwPaRknMPCLZz07yTzVq/83p4o/wzbDZbBrTvGGTIw==", "dev": true, "license": "MIT", "dependencies": { "bytes": "^3.1.2", - "content-type": "^1.0.5", + "content-type": "^2.0.0", "debug": "^4.4.3", - "http-errors": "^2.0.0", - "iconv-lite": "^0.7.0", + "http-errors": "^2.0.1", + "iconv-lite": "^0.7.2", "on-finished": "^2.4.1", - "qs": "^6.14.1", - "raw-body": "^3.0.1", - "type-is": "^2.0.1" + "qs": "^6.15.2", + "raw-body": "^3.0.2", + "type-is": "^2.1.0" }, "engines": { "node": ">=18" @@ -7550,6 +7562,20 @@ "url": "https://opencollective.com/express" } }, + "node_modules/body-parser/node_modules/content-type": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/content-type/-/content-type-2.0.0.tgz", + "integrity": "sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, "node_modules/body-parser/node_modules/iconv-lite": { "version": "0.7.2", "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/iconv-lite/-/iconv-lite-0.7.2.tgz", @@ -11139,9 +11165,9 @@ } }, "node_modules/fast-xml-parser": { - "version": "5.8.0", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/fast-xml-parser/-/fast-xml-parser-5.8.0.tgz", - "integrity": "sha512-6bIM7fsJxeo3uXv7OncQYsBAMPJ7V16Slahl/6M98C/i2q+vB1+4a0MtrvYwDFEUrwDSbAmeLDRXsOBwrL7yAg==", + "version": "5.9.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/fast-xml-parser/-/fast-xml-parser-5.9.0.tgz", + "integrity": "sha512-duBuXbyIhEeNO4GjFuVqr0nF047oNwr18aum+zJyqo0MUG/n7Afgs3Qv3D6VN3ONedUKxiuFlPiMGIa0Z11chA==", "funding": [ { "type": "github", @@ -11150,10 +11176,11 @@ ], "license": "MIT", "dependencies": { - "@nodable/entities": "^2.1.0", + "@nodable/entities": "^2.2.0", "fast-xml-builder": "^1.2.0", + "is-unsafe": "^1.0.1", "path-expression-matcher": "^1.5.0", - "strnum": "^2.3.0", + "strnum": "^2.4.0", "xml-naming": "^0.1.0" }, "bin": { @@ -13444,6 +13471,18 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/is-unsafe": { + "version": "1.0.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/is-unsafe/-/is-unsafe-1.0.1.tgz", + "integrity": "sha512-CLK2+VdgERgD96EYm5lUQssZYlRg2tkZnbsxZoacmSiRxiFJ4Nk4SzjCl+Ur+v3kXIY9dTIdb3IH22y1mZ56LA==", + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], + "license": "MIT" + }, "node_modules/is-weakmap": { "version": "2.0.2", "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/is-weakmap/-/is-weakmap-2.0.2.tgz", @@ -21632,16 +21671,19 @@ } }, "node_modules/strnum": { - "version": "2.3.0", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/strnum/-/strnum-2.3.0.tgz", - "integrity": "sha512-ums3KNd42PGyx5xaoVTO1mjU1bH3NpY4vsrVlnv9PNGqQj8wd7rJ6nEypLrJ7z5vxK5RP0yMLo6J/Gsm62DI5Q==", + "version": "2.4.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/strnum/-/strnum-2.4.0.tgz", + "integrity": "sha512-sHrVyWWdq28RbhjuJdZsA1SnGRJV6NiXbk6AXBxDOsgAcA+lmpUZCYjOdLBxkXMwis6RRe7dlZt4VlIWFVzkmg==", "funding": [ { "type": "github", "url": "https://github.com/sponsors/NaturalIntelligence" } ], - "license": "MIT" + "license": "MIT", + "dependencies": { + "anynum": "^1.0.0" + } }, "node_modules/stylis": { "version": "4.2.0", @@ -22265,18 +22307,36 @@ } }, "node_modules/type-is": { - "version": "2.0.1", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/type-is/-/type-is-2.0.1.tgz", - "integrity": "sha512-OZs6gsjF4vMp32qrCbiVSkrFmXtG/AZhY3t0iAMrMBiAZyV9oALtXO8hsrHbMXF9x6L3grlFuwW2oAz7cav+Gw==", + "version": "2.1.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/type-is/-/type-is-2.1.0.tgz", + "integrity": "sha512-faYHw0anBbc/kWF3zFTEnxSFOAGUX9GFbOBthvDdLsIlEoWOFOtS0zgCiQYwIskL9iGXZL3kAXD8OoZ4GmMATA==", "dev": true, "license": "MIT", "dependencies": { - "content-type": "^1.0.5", + "content-type": "^2.0.0", "media-typer": "^1.1.0", "mime-types": "^3.0.0" }, "engines": { - "node": ">= 0.6" + "node": ">= 18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" + } + }, + "node_modules/type-is/node_modules/content-type": { + "version": "2.0.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/content-type/-/content-type-2.0.0.tgz", + "integrity": "sha512-j/O/d7GcZCyNl7/hwZAb606rzqkyvaDctLmckbxLzHvFBzTJHuGEdodATcP3yIRoDrLHkIATJuvzbFlp/ki2cQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/express" } }, "node_modules/type-is/node_modules/mime-db": { diff --git a/api-catalog-ui/frontend/package.json b/api-catalog-ui/frontend/package.json index c467ba3e5d..75a77f38a2 100644 --- a/api-catalog-ui/frontend/package.json +++ b/api-catalog-ui/frontend/package.json @@ -92,7 +92,7 @@ "ajv": "8.20.0", "ansi-regex": "6.2.2", "babel-plugin-transform-vite-meta-env": "1.0.3", - "body-parser": "2.2.2", + "body-parser": "2.3.0", "caniuse-lite": "1.0.30001799", "concurrently": "9.2.1", "cors": "2.8.6", @@ -139,7 +139,7 @@ "overrides": { "openapi-snippet": { "openapi-sampler": { - "fast-xml-parser": "5.8.0" + "fast-xml-parser": "5.9.0" } }, "cosmiconfig": { diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 513e328eaa..e009c58d65 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -10,7 +10,7 @@ dependencyResolutionManagement { version('springCloudNetflix', '4.3.3') version('springCloudCommons', '4.3.3') version('springCloudCB', '3.3.3') - version('springCloudGateway', '4.3.4') + version('springCloudGateway', '4.3.5') version('springFramework', '6.2.19') version('springRetry', '2.0.13') @@ -50,7 +50,7 @@ dependencyResolutionManagement { version('jakartaServlet', '6.1.0') version('javaxAnnotation', '1.3.2') version('openTelemetry-starter', '2.28.1') - version('openTelemetry-core', '1.62.0') + version('openTelemetry-core', '1.63.0') // Eureka requires this specific version of Jakarta JAXB bindings version('jaxbApi') { diff --git a/zowe-cli-id-federation-plugin/package-lock.json b/zowe-cli-id-federation-plugin/package-lock.json index 2ee0552fb3..274cf218cd 100644 --- a/zowe-cli-id-federation-plugin/package-lock.json +++ b/zowe-cli-id-federation-plugin/package-lock.json @@ -15,8 +15,8 @@ "@eslint/js": "9.39.4", "@types/jest": "29.5.14", "@types/node": "24.13.2", - "@typescript-eslint/eslint-plugin": "8.61.0", - "@typescript-eslint/parser": "8.61.0", + "@typescript-eslint/eslint-plugin": "8.61.1", + "@typescript-eslint/parser": "8.61.1", "@zowe/cli": "8.32.2", "@zowe/cli-test-utils": "8.32.2", "@zowe/imperative": "8.32.2", @@ -1716,17 +1716,17 @@ "dev": true }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.61.0", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.61.0.tgz", - "integrity": "sha512-bFNvl9ZczlVb+wR2Akszf3gHfKVj/8WanXaGJ3UstTA7brNKg0cNdk6X1Psu5V7MZ2oQtzZKOEzIUehaoxbDGw==", + "version": "8.61.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.61.1.tgz", + "integrity": "sha512-ZPlVl3PB3et/59Ne0fv/sci6ZXz4T4Hp4nTJ56i/Y0gR89ARb+KphojTq6j+56E5PIezmOIOOWyY+aWQFd+IkQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.12.2", - "@typescript-eslint/scope-manager": "8.61.0", - "@typescript-eslint/type-utils": "8.61.0", - "@typescript-eslint/utils": "8.61.0", - "@typescript-eslint/visitor-keys": "8.61.0", + "@typescript-eslint/scope-manager": "8.61.1", + "@typescript-eslint/type-utils": "8.61.1", + "@typescript-eslint/utils": "8.61.1", + "@typescript-eslint/visitor-keys": "8.61.1", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.5.0" @@ -1739,7 +1739,7 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.61.0", + "@typescript-eslint/parser": "^8.61.1", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } @@ -1768,16 +1768,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.61.0", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/parser/-/parser-8.61.0.tgz", - "integrity": "sha512-5B7PfA2e1NQGCnDHd/0lW7W3gvp3d59Ryw54FYO8Uswxo9f6ikw3AZV+Xj/TvpImmpsiYyUqAfhC6kJID1jF6w==", + "version": "8.61.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/parser/-/parser-8.61.1.tgz", + "integrity": "sha512-PJ5vePq5/ognBbrIcoC5+SHO5dfpeLPzP9FpLkzWrguoYQEeeSjlJpVwOpo1JRSTEi7dRcwNy4h4dzV70PqHcg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.61.0", - "@typescript-eslint/types": "8.61.0", - "@typescript-eslint/typescript-estree": "8.61.0", - "@typescript-eslint/visitor-keys": "8.61.0", + "@typescript-eslint/scope-manager": "8.61.1", + "@typescript-eslint/types": "8.61.1", + "@typescript-eslint/typescript-estree": "8.61.1", + "@typescript-eslint/visitor-keys": "8.61.1", "debug": "^4.4.3" }, "engines": { @@ -1793,14 +1793,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.61.0", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/project-service/-/project-service-8.61.0.tgz", - "integrity": "sha512-DV42F7MLJO6Rax7SK1yg43tcnEfGUrurSpSxKuVX+a3RCTzBlH3fuxprrOJXKCJGAaw82xXocikJ0uQaqwXgGA==", + "version": "8.61.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/project-service/-/project-service-8.61.1.tgz", + "integrity": "sha512-PrC4JYGmR241lYnfhmKGTXkFqv8+ymbTFgSAY0fVXpY82/QkMw5TZPl+vGzuDDU2QYJk9fIDOBTntF+yDv9LEA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.61.0", - "@typescript-eslint/types": "^8.61.0", + "@typescript-eslint/tsconfig-utils": "^8.61.1", + "@typescript-eslint/types": "^8.61.1", "debug": "^4.4.3" }, "engines": { @@ -1815,14 +1815,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.61.0", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/scope-manager/-/scope-manager-8.61.0.tgz", - "integrity": "sha512-IWdXFHFSb6mlC3HPc7QsLDm5zYEbUla6trDEHf32D3/dnuUyXd87plScSNXSbm0/RxMvObpI17sv/EDTGrGZkA==", + "version": "8.61.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/scope-manager/-/scope-manager-8.61.1.tgz", + "integrity": "sha512-L2bdIeoQS8FlKAvONAr20w6OcLXeB+qiDKbAooS9A0Ben+iSIkBef0FxqwKWYqt5sa0i4KJtxVyVmhMylKzF5w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.61.0", - "@typescript-eslint/visitor-keys": "8.61.0" + "@typescript-eslint/types": "8.61.1", + "@typescript-eslint/visitor-keys": "8.61.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -1833,9 +1833,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.61.0", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.61.0.tgz", - "integrity": "sha512-O5Amvdv9ztMpxpf+vmFULGG78IE6Qwdr3bCGvqwG4nwc9H2qXkOYJJnRbRHyMkQTjv1d03olqwwwzHLMqpFePQ==", + "version": "8.61.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.61.1.tgz", + "integrity": "sha512-UN/H4di+OO7EWx2ovME+8t31YO+KVnK0RRKEHR3kOt21/Ay8BOq3M1OMvWs5vNiqcFCYGYoxK3MXPZzmMUE+yg==", "dev": true, "license": "MIT", "engines": { @@ -1850,15 +1850,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.61.0", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/type-utils/-/type-utils-8.61.0.tgz", - "integrity": "sha512-TuBiQYIkd97yBfInHCTKVYMbX4kvEmpOEuixIuzCU9p8BGT1SfyyO0d0IfDMbPIHcjn/hWnusUX5e8v5Xg+X8A==", + "version": "8.61.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/type-utils/-/type-utils-8.61.1.tgz", + "integrity": "sha512-GYRicKmVK0C4fsKgaACaknOUAq9Oa2kwsjnpFhFcS/5p4Ht5IP9OVLbgIgcK4SRk92nVHFluurg1lumD9dBcLw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.61.0", - "@typescript-eslint/typescript-estree": "8.61.0", - "@typescript-eslint/utils": "8.61.0", + "@typescript-eslint/types": "8.61.1", + "@typescript-eslint/typescript-estree": "8.61.1", + "@typescript-eslint/utils": "8.61.1", "debug": "^4.4.3", "ts-api-utils": "^2.5.0" }, @@ -1888,9 +1888,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.61.0", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/types/-/types-8.61.0.tgz", - "integrity": "sha512-9QTQpZ5Iin4CdIodfbDQFSeiSJKidgYJYug1P9CC2xWgUTvlmixViqDZNciMjwLBZyJnG4tGmPl97rVAFb1AJg==", + "version": "8.61.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/types/-/types-8.61.1.tgz", + "integrity": "sha512-G+CRlPqLv7Bz1IZVs03x5K59F1veqL0EJUROAdGhKsEq8qOiRiZbI+HUojPq5l0fEGOKModD9br6lObhB8zkoA==", "dev": true, "license": "MIT", "engines": { @@ -1902,16 +1902,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.61.0", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/typescript-estree/-/typescript-estree-8.61.0.tgz", - "integrity": "sha512-42zatd5qSvvcV1JdDBCLxYRznvP4eIHpPoZXdkPFnAmanA4FuZ5dibSnCBggY8hQnqajPpoGjXFdZ7fIJKQnlA==", + "version": "8.61.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/typescript-estree/-/typescript-estree-8.61.1.tgz", + "integrity": "sha512-u+oQD3BqYWPc8YV9Zab4vaJElJuwOLPRc10Jm1o/qS+6Qwen14HCWwx0Seo4LnSn2wxea2Ik8DxPt2/FHmuhrg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.61.0", - "@typescript-eslint/tsconfig-utils": "8.61.0", - "@typescript-eslint/types": "8.61.0", - "@typescript-eslint/visitor-keys": "8.61.0", + "@typescript-eslint/project-service": "8.61.1", + "@typescript-eslint/tsconfig-utils": "8.61.1", + "@typescript-eslint/types": "8.61.1", + "@typescript-eslint/visitor-keys": "8.61.1", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -1982,16 +1982,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.61.0", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/utils/-/utils-8.61.0.tgz", - "integrity": "sha512-3bzFt7ImFMW/jVYwJamDoe/dMOdFLSC6pom6rRjdh4SZJEYupyMzem8e7vKZLclLfpHjlwSAXOUxtKxGXUiLqA==", + "version": "8.61.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/utils/-/utils-8.61.1.tgz", + "integrity": "sha512-1+P/3Dj6jvtybE1q0HQ6yBt/gq+oKJyLdEv4HdnqasaEXRSYCAsD59mXEVQnM/ULNdQxbX77tdG4jPRjIS6knA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.61.0", - "@typescript-eslint/types": "8.61.0", - "@typescript-eslint/typescript-estree": "8.61.0" + "@typescript-eslint/scope-manager": "8.61.1", + "@typescript-eslint/types": "8.61.1", + "@typescript-eslint/typescript-estree": "8.61.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2006,13 +2006,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.61.0", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/visitor-keys/-/visitor-keys-8.61.0.tgz", - "integrity": "sha512-QVLZu3ZPQEE+HICQyAMZ2yLQhxf0meY/wx6Hx14YcTNj13JB3qHlX3lJ02L3fLGHgERRH71kvYDwiXIguT3AjQ==", + "version": "8.61.1", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@typescript-eslint/visitor-keys/-/visitor-keys-8.61.1.tgz", + "integrity": "sha512-6fJ9MHWtK14C1DSkiMlHUSOmrVebL7150xZJBlJiL62jjhIA4JmOq6flwBgDxIdBKKdoiZRel+dfPD5MLfny3w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.61.0", + "@typescript-eslint/types": "8.61.1", "eslint-visitor-keys": "^5.0.0" }, "engines": { diff --git a/zowe-cli-id-federation-plugin/package.json b/zowe-cli-id-federation-plugin/package.json index ee351629cb..3b9a568e61 100644 --- a/zowe-cli-id-federation-plugin/package.json +++ b/zowe-cli-id-federation-plugin/package.json @@ -52,8 +52,8 @@ "@eslint/js": "9.39.4", "@types/jest": "29.5.14", "@types/node": "24.13.2", - "@typescript-eslint/eslint-plugin": "8.61.0", - "@typescript-eslint/parser": "8.61.0", + "@typescript-eslint/eslint-plugin": "8.61.1", + "@typescript-eslint/parser": "8.61.1", "@zowe/cli": "8.32.2", "@zowe/cli-test-utils": "8.32.2", "@zowe/imperative": "8.32.2", From 029cf36286bea5e1f8dfdb64ecef8a8643a4fc4d Mon Sep 17 00:00:00 2001 From: Jakub Balhar Date: Tue, 16 Jun 2026 08:56:40 +0200 Subject: [PATCH 4/7] Downgrade springCloudGateway version to 4.3.4 Signed-off-by: Jakub Balhar --- gradle/versions.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index e009c58d65..98b42602b6 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -10,7 +10,7 @@ dependencyResolutionManagement { version('springCloudNetflix', '4.3.3') version('springCloudCommons', '4.3.3') version('springCloudCB', '3.3.3') - version('springCloudGateway', '4.3.5') + version('springCloudGateway', '4.3.4') version('springFramework', '6.2.19') version('springRetry', '2.0.13') From c1650c134e1aee324eb2064019dc431c57d68445 Mon Sep 17 00:00:00 2001 From: Jakub Balhar Date: Wed, 17 Jun 2026 11:35:53 +0200 Subject: [PATCH 5/7] The openTelemetry-starter must move to at least 2.29.0 before the upgrade to openTelemetry-core is feasible. Signed-Off-By: Jakub Balhar --- gradle/versions.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 98b42602b6..002c1f815c 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -10,7 +10,7 @@ dependencyResolutionManagement { version('springCloudNetflix', '4.3.3') version('springCloudCommons', '4.3.3') version('springCloudCB', '3.3.3') - version('springCloudGateway', '4.3.4') + version('springCloudGateway', '4.3.5') version('springFramework', '6.2.19') version('springRetry', '2.0.13') @@ -50,7 +50,7 @@ dependencyResolutionManagement { version('jakartaServlet', '6.1.0') version('javaxAnnotation', '1.3.2') version('openTelemetry-starter', '2.28.1') - version('openTelemetry-core', '1.63.0') + version('openTelemetry-core', '1.62.0') // Eureka requires this specific version of Jakarta JAXB bindings version('jaxbApi') { From 49764abf9e0d5a29dc6a237702b977e95d7e79f8 Mon Sep 17 00:00:00 2001 From: Jakub Balhar Date: Wed, 17 Jun 2026 11:43:18 +0200 Subject: [PATCH 6/7] fix: revert openTelemetry-core to 1.62.0 to match starter version OTel 1.63.0 moved InstrumentationUtil from io.opentelemetry.api.internal to io.opentelemetry.api.impl. The openTelemetry-starter 2.28.1 bundles autoconfigure code built against 1.62.0 which references the old internal package, causing ClassNotFoundException at runtime. This broke the gateway for all Zos acceptance tests (login returned 500) and XForwarded acceptance tests (gateway returned 500). Reverted openTelemetry-core from 1.63.0 back to 1.62.0 to align with the starter's expected version. Also re-applied the springCloudGateway downgrade to 4.3.4 (which was accidentally reverted during the fix). --- gradle/versions.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 002c1f815c..513e328eaa 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -10,7 +10,7 @@ dependencyResolutionManagement { version('springCloudNetflix', '4.3.3') version('springCloudCommons', '4.3.3') version('springCloudCB', '3.3.3') - version('springCloudGateway', '4.3.5') + version('springCloudGateway', '4.3.4') version('springFramework', '6.2.19') version('springRetry', '2.0.13') From ec7320172c1b6a8bfe50bc002f901606c2d78c9b Mon Sep 17 00:00:00 2001 From: Jakub Balhar Date: Wed, 17 Jun 2026 14:38:59 +0200 Subject: [PATCH 7/7] Fix/scg 4.3.5 xforwarded filter (#4724) Signed-off-by: Jakub Balhar --- .../X509AndGwAwareXForwardedHeadersFilter.java | 15 +++++++++++++-- gradle/versions.gradle | 4 +++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/gateway-service/src/main/java/org/zowe/apiml/gateway/filters/proxyheaders/X509AndGwAwareXForwardedHeadersFilter.java b/gateway-service/src/main/java/org/zowe/apiml/gateway/filters/proxyheaders/X509AndGwAwareXForwardedHeadersFilter.java index b6cd7dff72..2b1b8b995b 100644 --- a/gateway-service/src/main/java/org/zowe/apiml/gateway/filters/proxyheaders/X509AndGwAwareXForwardedHeadersFilter.java +++ b/gateway-service/src/main/java/org/zowe/apiml/gateway/filters/proxyheaders/X509AndGwAwareXForwardedHeadersFilter.java @@ -56,6 +56,11 @@ @Slf4j public class X509AndGwAwareXForwardedHeadersFilter extends XForwardedHeadersFilter { + // Order must be higher than RemoveXForwardedHeadersFilter (0) so this filter + // runs AFTER SCG has stripped untrusted headers — allowing trust evaluation + // on the original request headers and emitting the final header set. + public static final int ORDER_AFTER_REMOVE_XFW_HEADERS = 1; + // Generic all-in-one Forwarded header not handled by the default spring filter public static final String FORWARDED_HEADER = "Forwarded"; @@ -79,6 +84,7 @@ public X509AndGwAwareXForwardedHeadersFilter( // Trustworthiness of a proxy is evaluated by this class, // hence the spring filter must trust everything and not interfere super(".*"); + setOrder(ORDER_AFTER_REMOVE_XFW_HEADERS); certificateChainBase64 = SecurityUtils.loadCertificateChainBase64(httpsConfig); trustedProxiesRegex = trustedProxiesPattern; trustedAdditionalGateways = additionalRegistrationGatewayRegistry.getAdditionalGatewayIpAddressesReference(); @@ -95,7 +101,10 @@ public X509AndGwAwareXForwardedHeadersFilter( @Override public HttpHeaders filter(HttpHeaders input, ServerWebExchange exchange) { - if (!hasXForwardedHeader(input)) return super.filter(input, exchange); + // SCG 4.3.5+ introduces RemoveXForwardedHeadersFilter which strips + // X-Forwarded headers from 'input' before this filter runs. + // Check the original request headers to detect incoming X-Forwarded headers. + if (!hasXForwardedHeader(exchange.getRequest().getHeaders())) return super.filter(input, exchange); boolean trustedSourceByX509 = Optional.ofNullable(exchange.getRequest().getSslInfo()) .map(SslInfo::getPeerCertificates) @@ -132,7 +141,9 @@ public InetSocketAddress getRemoteAddress() { return super.filter(removeXForwardHttpHeaders(input), sanitizedExchange); } } - return super.filter(input, exchange); + // Trusted — use the original request headers to preserve X-Forwarded info + // that RemoveXForwardedHeadersFilter may have stripped from 'input' + return super.filter(exchange.getRequest().getHeaders(), exchange); } private HttpHeaders removeXForwardHttpHeaders(HttpHeaders input) { diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 513e328eaa..58199bba5a 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -10,7 +10,7 @@ dependencyResolutionManagement { version('springCloudNetflix', '4.3.3') version('springCloudCommons', '4.3.3') version('springCloudCB', '3.3.3') - version('springCloudGateway', '4.3.4') + version('springCloudGateway', '4.3.5') version('springFramework', '6.2.19') version('springRetry', '2.0.13') @@ -24,6 +24,7 @@ dependencyResolutionManagement { version('bouncyCastle', '1.84') version('caffeine', '3.2.4') version('checkerQual', '3.55.1') + version('commonsConfiguration2', '2.15.1') version('commonsLang3', '3.20.0') version('commonsLogging', '1.3.6') version('commonsText', '1.15.0') @@ -159,6 +160,7 @@ dependencyResolutionManagement { library('spring_context_support', 'org.springframework', 'spring-context-support').versionRef('springFramework') library('spring_beans', 'org.springframework', 'spring-beans').versionRef('springFramework') + library('apache_commons_configuration2', 'org.apache.commons', 'commons-configuration2').versionRef('commonsConfiguration2') library('apache_commons_lang3', 'org.apache.commons', 'commons-lang3').versionRef('commonsLang3') library('apache_commons_logging', 'commons-logging', 'commons-logging').versionRef('commonsLogging') // to define minimum version and avoid duplicity libraries in the classpath library('apache_commons_text', 'org.apache.commons', 'commons-text').versionRef('commonsText')