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

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/changelog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release_and_update_manifest_json.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions api-catalog-ui/frontend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions api-catalog-ui/frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@
"brace-expansion": "1.1.14"
},
"engines": {
"npm": "=10.9.8",
"node": "=20.20.2"
"npm": "=10.9.0",
"node": "=24.10.0"
},
"notes": {
"jest": "Cannot be updated to v30 because tests fail with messages relating to the import of enzyme"
Expand Down
8 changes: 4 additions & 4 deletions apiml/src/main/resources/application.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion gradle/jib.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions gradle/versions.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.14')
version('springBootGraphQl', '3.5.14')
Expand Down
2 changes: 1 addition & 1 deletion onboarding-enabler-nodejs-sample-app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion onboarding-enabler-nodejs-sample-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"path-to-regexp" : "This should be able to be removed once express is at a higher level than 5.2.1"
},
"engines": {
"npm": ">=10.9.4",
"npm": ">=10.9.0",
"node": ">=20.19.6"
Comment thread
achmelo marked this conversation as resolved.
Outdated
}
}
1 change: 0 additions & 1 deletion onboarding-enabler-nodejs/.npmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
legacy-peer-deps=true
registry=https://registry.npmjs.org/
4 changes: 2 additions & 2 deletions onboarding-enabler-nodejs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions onboarding-enabler-nodejs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@
"gulp-mocha"
]
},
"engines": {
"npm": ">=10.9.4",
"node": ">=20.19.6"
}
"engines": {
"npm": "=10.9.0",
"node": "=24.10.0"
}
}
20 changes: 10 additions & 10 deletions zowe-cli-id-federation-plugin/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions zowe-cli-id-federation-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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.59.1",
"@typescript-eslint/parser": "8.59.1",
"@zowe/cli": "8.32.0",
Expand Down Expand Up @@ -85,8 +85,8 @@
"@zowe/imperative": "8.32.0"
},
"engines": {
"npm": "=10.9.8",
"node": "=20.20.2"
"npm": "=10.9.0",
"node": "=24.10.0"
},
"jest": {
"modulePathIgnorePatterns": [
Expand Down
Loading