chore: update maven libraries (#3829)

* update maven libraries, default zaas port in script, cleanup Signed-off-by: ac892247 <[email protected]> * remove unused xtream and node version Signed-off-by: ac892247 <[email protected]> * update npm, octokit Signed-off-by: ac892247 <[email protected]> * update npm and node Signed-off-by: ac892247 <[email protected]> * update testing library Signed-off-by: ac892247 <[email protected]> * update history Signed-off-by: ac892247 <[email protected] * update node types Signed-off-by: ac892247 <[email protected]> * update lock files Signed-off-by: ac892247 <[email protected]> --------- Signed-off-by: ac892247 <[email protected]>
zowe · Oct 9, 2024 · 077be72 · 077be72
1 parent 8360bee
commit 077be72
Show file tree

Hide file tree

Showing 16 changed files with 124 additions and 110 deletions.
diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml
@@ -19,7 +19,7 @@ runs:
             uses: actions/setup-node@v4
             with:
                 node-version: '20'
-        -   run: npm install -g npm@9.3.1
+        -   run: npm install -g npm@10.7.0
             shell: bash
         -   name: Grant execute permission for gradlew
             run: chmod +x gradlew

diff --git a/api-catalog-ui/build.gradle b/api-catalog-ui/build.gradle
@@ -1,6 +1,5 @@
 plugins {
     alias(libs.plugins.gradle.node)
-    alias(libs.plugins.task.tree)
 }
 
 node {

diff --git a/api-catalog-ui/frontend/package-lock.json b/api-catalog-ui/frontend/package-lock.json
diff --git a/api-catalog-ui/frontend/package.json b/api-catalog-ui/frontend/package.json
@@ -87,10 +87,10 @@
         "@cfaester/enzyme-adapter-react-18": "0.8.0",
         "@eslint/compat": "1.2.0",
         "@eslint/js": "9.12.0",
-        "@testing-library/dom": "8.20.1",
+        "@testing-library/dom": "10.4.0",
         "@testing-library/jest-dom": "6.5.0",
         "@testing-library/react": "16.0.1",
-        "@testing-library/user-event": "13.5.0",
+        "@testing-library/user-event": "14.5.0",
         "ajv": "8.17.1",
         "ansi-regex": "6.1.0",
         "body-parser": "1.20.3",

diff --git a/api-catalog-ui/frontend/src/components/Wizard/WizardComponents/WizardNavigation.test.jsx b/api-catalog-ui/frontend/src/components/Wizard/WizardComponents/WizardNavigation.test.jsx
@@ -31,7 +31,7 @@ jest.mock(
         }
 );
 describe('>>> Wizard navigation tests', () => {
-    it('should handle category change', () => {
+    it('should handle category change', async () => {
         const next = jest.fn();
         const changeWizardCategory = jest.fn();
         const validateInput = jest.fn();
@@ -46,11 +46,11 @@ describe('>>> Wizard navigation tests', () => {
                 validateInput={validateInput}
             />
         );
-        userEvent.click(screen.getByRole('tab'));
+        await userEvent.click(screen.getByRole('tab'));
         expect(changeWizardCategory).toHaveBeenCalled();
         expect(validateInput).toHaveBeenCalled();
     });
-    it('should validate all tabs on YAML tab click', () => {
+    it('should validate all tabs on YAML tab click', async () => {
         const next = jest.fn();
         const changeWizardCategory = jest.fn();
         const validateInput = jest.fn();
@@ -88,9 +88,9 @@ describe('>>> Wizard navigation tests', () => {
                 assertAuthorization={jest.fn()}
             />
         );
-        userEvent.click(screen.getByRole('tab', { name: 'Nav #1' }));
-        userEvent.click(screen.getByRole('tab', { name: 'Nav #2' }));
-        userEvent.click(screen.getByRole('tab', { name: 'YAML result' }));
+        await userEvent.click(screen.getByRole('tab', { name: 'Nav #1' }));
+        await userEvent.click(screen.getByRole('tab', { name: 'Nav #2' }));
+        await userEvent.click(screen.getByRole('tab', { name: 'YAML result' }));
         expect(validateInput).toHaveBeenCalledTimes(5);
     });
     it('should not validate upon accessing something else', () => {

diff --git a/containers/README.md b/containers/README.md
@@ -9,7 +9,7 @@ Each image supports both `amd64` and `s390x` CPU architectures.
 
 ## Gateway Service Image
 
-Image `zowe-docker-release.jfrog.io/ompzowe/gateway-service:2` should be able to run with minimal environment variables:
+Image `zowe-docker-release.jfrog.io/ompzowe/gateway-service:3` should be able to run with minimal environment variables:
 
 - `ZWE_configs_certificate_keystore_file`: path to keystore.
 - `ZWE_configs_certificate_keystore_alias`: certificate alias stored in keystore.
@@ -25,7 +25,7 @@ Example commands:
 
 ```
 # pull image
-docker pull zowe-docker-release.jfrog.io/ompzowe/gateway-service:2
+docker pull zowe-docker-release.jfrog.io/ompzowe/gateway-service:3
 # start container
 docker run -it --rm -p 7554:7554 \
     -v $(pwd)/keystore:/home/zowe/keystore \
@@ -36,12 +36,12 @@ docker run -it --rm -p 7554:7554 \
     -e ZWE_configs_certificate_truststore_password=password \
     -e CMMN_LB=apiml-common-lib/bin/api-layer-lite-lib-all.jar \
     -e ZWE_zowe_workspaceDirectory=/component \
-    zowe-docker-release.jfrog.io/ompzowe/gateway-service:2
+    zowe-docker-release.jfrog.io/ompzowe/gateway-service:3
 ```
 
 ## Discovery Service Image
 
-Image `zowe-docker-release.jfrog.io/ompzowe/discovery-service:2` should be able to run with minimal environment variables:
+Image `zowe-docker-release.jfrog.io/ompzowe/discovery-service:3` should be able to run with minimal environment variables:
 
 - `ZWE_configs_certificate_keystore_file`: path to keystore.
 - `ZWE_configs_certificate_keystore_alias`: certificate alias stored in keystore.
@@ -57,7 +57,7 @@ Example commands:
 
 ```
 # pull image
-docker pull zowe-docker-release.jfrog.io/ompzowe/discovery-service:2
+docker pull zowe-docker-release.jfrog.io/ompzowe/discovery-service:3
 # start container
 docker run -it --rm -p 7553:7553 \
     -v $(pwd)/keystore:/home/zowe/keystore \
@@ -68,12 +68,12 @@ docker run -it --rm -p 7553:7553 \
     -e ZWE_configs_certificate_truststore_password=password \
     -e CMMN_LB=apiml-common-lib/bin/api-layer-lite-lib-all.jar \
     -e ZWE_zowe_workspaceDirectory=/component \
-    zowe-docker-release.jfrog.io/ompzowe/discovery-service:2
+    zowe-docker-release.jfrog.io/ompzowe/discovery-service:3
 ```
 
 ## API Catalog Image
 
-Image `zowe-docker-release.jfrog.io/ompzowe/api-catalog-services:2` should be able to run with minimal environment variables:
+Image `zowe-docker-release.jfrog.io/ompzowe/api-catalog-services:3` should be able to run with minimal environment variables:
 
 - `ZWE_configs_certificate_keystore_file`: path to keystore.
 - `ZWE_configs_certificate_keystore_alias`: certificate alias stored in keystore.
@@ -90,7 +90,7 @@ Example commands:
 
 ```
 # pull image
-docker pull zowe-docker-release.jfrog.io/ompzowe/api-catalog-services:2
+docker pull zowe-docker-release.jfrog.io/ompzowe/api-catalog-services:3
 # start container
 docker run -it --rm -p 7552:7552 \
     -v $(pwd)/keystore:/home/zowe/keystore \
@@ -102,12 +102,12 @@ docker run -it --rm -p 7552:7552 \
     -e CMMN_LB=apiml-common-lib/bin/api-layer-lite-lib-all.jar \
     -e ZWE_zowe_workspaceDirectory=/component \
     -e ZWE_GATEWAY_HOST=gateway.com \
-    zowe-docker-release.jfrog.io/ompzowe/api-catalog-services:2
+    zowe-docker-release.jfrog.io/ompzowe/api-catalog-services:3
 ```
 
 ## Caching Service Image
 
-Image `zowe-docker-release.jfrog.io/ompzowe/caching-service:2` should be able to run with minimal environment variables:
+Image `zowe-docker-release.jfrog.io/ompzowe/caching-service:3` should be able to run with minimal environment variables:
 
 - `ZWE_configs_certificate_keystore_file`: path to keystore.
 - `ZWE_configs_certificate_keystore_alias`: certificate alias stored in keystore.
@@ -122,7 +122,7 @@ Example commands:
 
 ```
 # pull image
-docker pull zowe-docker-release.jfrog.io/ompzowe/caching-service:2
+docker pull zowe-docker-release.jfrog.io/ompzowe/caching-service:3
 # start container
 docker run -it --rm -p 7555:7555 \
     -v $(pwd)/keystore:/home/zowe/keystore \
@@ -132,5 +132,35 @@ docker run -it --rm -p 7555:7555 \
     -e ZWE_configs_certificate_truststore_file=/home/zowe/keystore/localhost/localhost.truststore.p12 \
     -e ZWE_configs_certificate_truststore_password=password \
     -e ZWE_zowe_workspaceDirectory=/component \
-    zowe-docker-release.jfrog.io/ompzowe/caching-service:2
+    zowe-docker-release.jfrog.io/ompzowe/caching-service:3
+```
+
+## ZAAS Image
+
+Image `zowe-docker-release.jfrog.io/ompzowe/zaas:3` should be able to run with minimal environment variables:
+
+- `ZWE_configs_certificate_keystore_file`: path to keystore.
+- `ZWE_configs_certificate_keystore_alias`: certificate alias stored in keystore.
+- `ZWE_configs_certificate_keystore_password`: password of your keystore.
+- `ZWE_configs_certificate_truststore_file`: path to truststore.
+- `ZWE_configs_certificate_truststore_password`: password of your truststore.
+- `ZWE_zowe_workspaceDirectory`: set to `/component`
+
+Review the [ZAAS package start script](../zaas-package/src/main/resources/bin/start.sh) to see other environment variables that can be set.
+
+Example commands:
+
+```
+# pull image
+docker pull zowe-docker-release.jfrog.io/ompzowe/zaas-service:3
+# start container
+docker run -it --rm -p 7558:7558 \
+    -v $(pwd)/keystore:/home/zowe/keystore \
+    -e ZWE_configs_certificate_keystore_file=/home/zowe/keystore/localhost/localhost.keystore.p12 \
+    -e ZWE_configs_certificate_keystore_alias=localhost \
+    -e ZWE_configs_certificate_keystore_password=password \
+    -e ZWE_configs_certificate_truststore_file=/home/zowe/keystore/localhost/localhost.truststore.p12 \
+    -e ZWE_configs_certificate_truststore_password=password \
+    -e ZWE_zowe_workspaceDirectory=/component \
+    zowe-docker-release.jfrog.io/ompzowe/caching-service:3
 ```
diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -30,10 +30,8 @@ dependencyResolutionManagement {
             version('netflixServo', '0.13.2')
             version('googleErrorprone', '2.33.0')
             version('gradleGitProperties', '2.4.2') // Used in classpath dependencies
-            version('gradleNode', '3.6.0') // Used in classpath dependencies
             version('guava', '33.3.1-jre')
-            // version('hamcrest', '1.3')
-            version('hamcrest', '2.2')
+            version('hamcrest', '3.0')
             version('httpClient4', '4.5.14')
             version('httpClient5', '5.4')
             version('infinispan', '15.0.10.Final')
@@ -55,7 +53,7 @@ dependencyResolutionManagement {
             }
             version('jbossLogging', '3.6.1.Final')
             version('jerseySun', '1.19.4')
-            version('jettyWebSocketClient', '9.4.56.v20240826')
+            version('jettyWebSocketClient', '12.0.14')
             version('jettison', '1.5.4')
             //0.12.x version contains breaking changes
             version('jjwt', '0.12.6')
@@ -84,18 +82,12 @@ dependencyResolutionManagement {
             version('thymeleaf', '3.1.2.RELEASE')
             version('velocity', '2.4')
             version('woodstoxCore', '7.0.0')
-            version('xstream') {
-                // older versions are vulnerable to CVE-2022-40151, CVE-2022-40152, and CVE-2022-41966
-                strictly '[1.4.20,2.0['
-                prefer '1.4.20'
-            }
-            version('jgit', '6.10.0.202406032230-r')
+            version('jgit', '7.0.0.202409031743-r')
             version('gradleNode', '7.1.0')
             version('sonarGradlePlugin', '5.1.0.4882')
             version('gradleRelease', '3.0.2')
             version('gradleLicencer', '0.6.1')
             version('gradleJibPlugin', '3.2.1')
-            version('taskTree', '2.1.1')
             version('reactorBom', '2023.0')
             version('gradleTestLogger', '4.0.0')
             version('testLogger', '4.0.0')
@@ -222,7 +214,6 @@ dependencyResolutionManagement {
             library('swagger_inflector', 'io.swagger', 'swagger-inflector').versionRef('swaggerInflector')
             library('thymeleaf_spring5', 'org.thymeleaf', 'thymeleaf-spring5').versionRef('thymeleaf')
             library('thymeleaf', 'org.thymeleaf', 'thymeleaf').versionRef('thymeleaf')
-            library('xstream', 'com.thoughtworks.xstream', 'xstream').versionRef('xstream')
             library('woodstox_core', 'com.fasterxml.woodstox', 'woodstox-core').versionRef('woodstoxCore')
             library('spring_boot_starter_graphql', 'org.springframework.boot', 'spring-boot-starter-graphql').versionRef('springBootGraphQl')
 
@@ -244,7 +235,6 @@ dependencyResolutionManagement {
 
             plugin('gradle_git_properties', 'com.gorylenko.gradle-git-properties').versionRef('gradleGitProperties')
             plugin('gradle_node', 'com.github.node-gradle.node').versionRef('gradleNode')
-            plugin('task_tree', 'com.dorongold.task-tree').versionRef('taskTree')
             plugin('test_logger', 'com.adarshr.test-logger').versionRef('testLogger')
             plugin('micronaut_minimal_application', 'io.micronaut.minimal.application').versionRef('micronautPlugin')
             plugin('micronaut_docker', 'io.micronaut.docker').versionRef('micronautPlugin')

diff --git a/onboarding-enabler-nodejs-sample-app/package-lock.json b/onboarding-enabler-nodejs-sample-app/package-lock.json
diff --git a/onboarding-enabler-nodejs-sample-app/package.json b/onboarding-enabler-nodejs-sample-app/package.json
@@ -18,10 +18,10 @@
         "express": "4.21.1"
     },
     "overrides": {
-        "tough-cookie": "4.1.4"
+        "tough-cookie": "5.0.0"
     },
     "engines": {
-        "npm": "=9.9.3",
-        "node": "=18.20.4"
+        "npm": "=10.7.0",
+        "node": "=20.14.0"
     }
 }