diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 0cf0c292a6..fcd2116d69 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -18,8 +18,8 @@ runs: - name: Set up Node uses: actions/setup-node@v4 with: - node-version: '20' - - run: npm install -g npm@10.9.4 + node-version: '24' + - run: npm install -g npm@10.9.0 shell: bash - name: Grant execute permission for gradlew run: chmod +x gradlew diff --git a/.github/workflows/changelog.yml b/.github/workflows/changelog.yml index 8b6b0e1007..77f5f1a444 100644 --- a/.github/workflows/changelog.yml +++ b/.github/workflows/changelog.yml @@ -27,7 +27,7 @@ jobs: - name: Set up Node uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '24' - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index e3a0d30629..6b75b8d5f9 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Node uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '24' - name: Checkout repository uses: actions/checkout@v4 diff --git a/.github/workflows/release_and_update_manifest_json.yml b/.github/workflows/release_and_update_manifest_json.yml index fb6e552062..3133d92c45 100644 --- a/.github/workflows/release_and_update_manifest_json.yml +++ b/.github/workflows/release_and_update_manifest_json.yml @@ -17,7 +17,7 @@ jobs: - name: Set up Node uses: actions/setup-node@v4 with: - node-version: '18' + node-version: '24' - name: Checkout repository uses: actions/checkout@v4 diff --git a/api-catalog-ui/frontend/package-lock.json b/api-catalog-ui/frontend/package-lock.json index 8aeeaed637..4dc813d4d1 100644 --- a/api-catalog-ui/frontend/package-lock.json +++ b/api-catalog-ui/frontend/package-lock.json @@ -121,8 +121,8 @@ "yaml": "2.8.3" }, "engines": { - "node": "=20.20.2", - "npm": "=10.9.8" + "node": "=24.10.0", + "npm": "=10.9.0" } }, "node_modules/@adobe/css-tools": { diff --git a/api-catalog-ui/frontend/package.json b/api-catalog-ui/frontend/package.json index 19d4b5a85b..93394eb070 100644 --- a/api-catalog-ui/frontend/package.json +++ b/api-catalog-ui/frontend/package.json @@ -167,8 +167,8 @@ "qs": "6.15.1" }, "engines": { - "npm": "=10.9.8", - "node": "=20.20.2" + "npm": "=10.9.0", + "node": "=24.10.0" }, "browserslist": [ ">0.2%", diff --git a/apiml/src/main/resources/application.yml b/apiml/src/main/resources/application.yml index 89e89b4496..558720cf11 100644 --- a/apiml/src/main/resources/application.yml +++ b/apiml/src/main/resources/application.yml @@ -353,10 +353,6 @@ logging: org.springframework.security.authentication: DEBUG org.springdoc.core: DEBUG org.zowe.apiml: DEBUG - reactor.netty: DEBUG - reactor.netty.http.client: DEBUG - reactor.netty.http.client.HttpClient: DEBUG - reactor.netty.http.client.HttpClientConnect: DEBUG management: endpoint: @@ -414,3 +410,7 @@ logging: level: org.springframework: DEBUG org.infinispan: DEBUG + reactor.netty: DEBUG + reactor.netty.http.client: DEBUG + reactor.netty.http.client.HttpClient: DEBUG + reactor.netty.http.client.HttpClientConnect: DEBUG diff --git a/gradle/jib.gradle b/gradle/jib.gradle index ff41b73a71..c1b7dc5422 100644 --- a/gradle/jib.gradle +++ b/gradle/jib.gradle @@ -2,7 +2,7 @@ def setJib(componentName, javaAgentPort, debugPort, applicationPorts) { def imageTag = project.hasProperty("zowe.docker.tag") ? project.getProperty("zowe.docker.tag"): "latest" def imageName = project.hasProperty("zowe.docker.container") ? "${project.getProperty("zowe.docker.container")}${componentName}:${imageTag}" : "ghcr.io/zowe/${componentName}:${imageTag}" def javaAgentOptions = project.hasProperty("zowe.docker.debug") ? ['-javaagent:/jacocoagent.jar=output=tcpserver,address=*,port=' + javaAgentPort, '-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:' + debugPort]: ['-javaagent:/jacocoagent.jar=output=tcpserver,address=*,port=' + javaAgentPort] - def addOpensOptions = ['--add-opens=java.base/java.nio.channels.spi=ALL-UNNAMED', '--add-opens=java.base/java.util=ALL-UNNAMED', '--add-opens=java.base/java.util.concurrent=ALL-UNNAMED', '--add-opens=java.base/java.lang=ALL-UNNAMED', '--add-opens=java.base/java.lang.invoke=ALL-UNNAMED', '--add-opens=java.base/javax.net.ssl=ALL-UNNAMED', '-Dspring.profiles.include=dev,debug'] + def addOpensOptions = ['--add-opens=java.base/java.nio.channels.spi=ALL-UNNAMED', '--add-opens=java.base/java.util=ALL-UNNAMED', '--add-opens=java.base/java.util.concurrent=ALL-UNNAMED', '--add-opens=java.base/java.lang=ALL-UNNAMED', '--add-opens=java.base/java.lang.invoke=ALL-UNNAMED', '--add-opens=java.base/javax.net.ssl=ALL-UNNAMED'] jib.from.image = 'ibm-semeru-runtimes:open-17.0.14_7-jre-jammy' jib.to.image = imageName diff --git a/gradle/versions.gradle b/gradle/versions.gradle index 337d1b39a3..aea605631b 100644 --- a/gradle/versions.gradle +++ b/gradle/versions.gradle @@ -2,8 +2,8 @@ dependencyResolutionManagement { versionCatalogs { libs { // for node projects - version('projectNode', '20.19.6') - version('projectNpm', '10.9.4') + version('projectNode', '24.10.0') + version('projectNpm', '10.9.0') version('springBoot', '3.5.13') version('springBootGraphQl', '3.5.13') diff --git a/onboarding-enabler-nodejs-sample-app/Dockerfile b/onboarding-enabler-nodejs-sample-app/Dockerfile index 58210e8bea..f5923bb9ef 100644 --- a/onboarding-enabler-nodejs-sample-app/Dockerfile +++ b/onboarding-enabler-nodejs-sample-app/Dockerfile @@ -12,7 +12,7 @@ # base image tag ARG ZOWE_BASE_IMAGE=3-ubuntu -FROM node:20-alpine +FROM node:24-alpine RUN npm install -g npm@10.9.4 LABEL name="nodesampleapp" diff --git a/onboarding-enabler-nodejs-sample-app/package.json b/onboarding-enabler-nodejs-sample-app/package.json index 95130d050a..f10c394a15 100755 --- a/onboarding-enabler-nodejs-sample-app/package.json +++ b/onboarding-enabler-nodejs-sample-app/package.json @@ -22,7 +22,7 @@ "tough-cookie": "5.1.2" }, "engines": { - "npm": ">=10.9.4", + "npm": ">=10.9.0", "node": ">=20.19.6" } } diff --git a/onboarding-enabler-nodejs/.npmrc b/onboarding-enabler-nodejs/.npmrc index 668efa17fe..521a9f7c07 100644 --- a/onboarding-enabler-nodejs/.npmrc +++ b/onboarding-enabler-nodejs/.npmrc @@ -1,2 +1 @@ legacy-peer-deps=true -registry=https://registry.npmjs.org/ diff --git a/onboarding-enabler-nodejs/package-lock.json b/onboarding-enabler-nodejs/package-lock.json index c3939aedb2..c801d2a7bb 100644 --- a/onboarding-enabler-nodejs/package-lock.json +++ b/onboarding-enabler-nodejs/package-lock.json @@ -33,8 +33,8 @@ "sinon-chai": "4.0.1" }, "engines": { - "node": ">=20.19.6", - "npm": ">=10.9.4" + "node": "=24.10.0", + "npm": "=10.9.0" } }, "node_modules/@babel/code-frame": { diff --git a/onboarding-enabler-nodejs/package.json b/onboarding-enabler-nodejs/package.json index 0427a7dd77..ba3b0546d5 100644 --- a/onboarding-enabler-nodejs/package.json +++ b/onboarding-enabler-nodejs/package.json @@ -51,8 +51,8 @@ "gulp-mocha" ] }, - "engines": { - "npm": ">=10.9.4", - "node": ">=20.19.6" - } + "engines": { + "npm": "=10.9.0", + "node": "=24.10.0" + } } diff --git a/zowe-cli-id-federation-plugin/package-lock.json b/zowe-cli-id-federation-plugin/package-lock.json index 0d691df02b..5587e96b0e 100644 --- a/zowe-cli-id-federation-plugin/package-lock.json +++ b/zowe-cli-id-federation-plugin/package-lock.json @@ -14,7 +14,7 @@ "devDependencies": { "@eslint/js": "9.39.4", "@types/jest": "29.5.14", - "@types/node": "20.19.39", + "@types/node": "24.10.0", "@typescript-eslint/eslint-plugin": "8.58.2", "@typescript-eslint/parser": "8.58.2", "@zowe/cli": "8.31.5", @@ -42,8 +42,8 @@ "typescript": "5.9.3" }, "engines": { - "node": "=20.20.2", - "npm": "=10.9.8" + "node": "=24.10.0", + "npm": "=10.9.0" }, "peerDependencies": { "@zowe/imperative": "8.31.5" @@ -1664,13 +1664,13 @@ "dev": true }, "node_modules/@types/node": { - "version": "20.19.39", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/node/-/node-20.19.39.tgz", - "integrity": "sha512-orrrD74MBUyK8jOAD/r0+lfa1I2MO6I+vAkmAWzMYbCcgrN4lCrmK52gRFQq/JRxfYPfonkr4b0jcY7Olqdqbw==", + "version": "24.10.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/@types/node/-/node-24.10.0.tgz", + "integrity": "sha512-qzQZRBqkFsYyaSWXuEHc2WR9c0a0CXwiE5FWUvn7ZM+vdy1uZLfCunD38UzhuB7YN/J11ndbDBcTmOdxJo9Q7A==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~6.21.0" + "undici-types": "~7.16.0" } }, "node_modules/@types/semver": { @@ -9728,9 +9728,9 @@ } }, "node_modules/undici-types": { - "version": "6.21.0", - "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/undici-types/-/undici-types-6.21.0.tgz", - "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", + "version": "7.16.0", + "resolved": "https://zowe.jfrog.io/artifactory/api/npm/npm-org/undici-types/-/undici-types-7.16.0.tgz", + "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==", "dev": true, "license": "MIT" }, diff --git a/zowe-cli-id-federation-plugin/package.json b/zowe-cli-id-federation-plugin/package.json index a159132f68..103a8e1d2b 100644 --- a/zowe-cli-id-federation-plugin/package.json +++ b/zowe-cli-id-federation-plugin/package.json @@ -40,7 +40,7 @@ "test:unit": "env-cmd -f __tests__/__resources__/env/unit.env jest --coverage --testPathIgnorePatterns \".*/__system__|__integration__/.*\"", "installPlugin": "npm install && npm run clean && npm run build && zowe plugins install .", "typedoc": "typedoc --out ./docs/typedoc/ ./src/", - "prepare": "cd .. && husky install" + "prepare": "cd .. && husky > /dev/null 2>&1 || true" }, "imperative": { "configurationModule": "lib/imperative.js" @@ -51,7 +51,7 @@ "devDependencies": { "@eslint/js": "9.39.4", "@types/jest": "29.5.14", - "@types/node": "20.19.39", + "@types/node": "24.10.0", "@typescript-eslint/eslint-plugin": "8.58.2", "@typescript-eslint/parser": "8.58.2", "@zowe/cli": "8.31.5", @@ -85,8 +85,8 @@ "@zowe/imperative": "8.31.5" }, "engines": { - "npm": "=10.9.8", - "node": "=20.20.2" + "npm": "=10.9.0", + "node": "=24.10.0" }, "jest": { "modulePathIgnorePatterns": [