chore: upgrade v2 dependencies (#3608)

Signed-off-by: Pablo Hernán Carle <[email protected]> Co-authored-by: Pablo Hernán Carle <[email protected]>
zowe · Jun 27, 2024 · 4f78c91 · 4f78c91
1 parent bd4e738
commit 4f78c91
Show file tree

Hide file tree

Showing 10 changed files with 2,561 additions and 6,508 deletions.
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -1381,8 +1381,8 @@ jobs:
     E2EUITests:
         needs: PublishJibContainers
         runs-on: ubuntu-latest
-        container: cypress/browsers:node14.17.0-chrome91-ff89
-        timeout-minutes: 15
+        container: cypress/browsers:node-20.11.0-chrome-121.0.6167.85-1-ff-120.0-edge-121.0.2277.83-1
+        timeout-minutes: 30
 
         services:
             api-catalog-services:

diff --git a/api-catalog-ui/frontend/cypress/e2e/detail-page/detail-page.cy.js b/api-catalog-ui/frontend/cypress/e2e/detail-page/detail-page.cy.js
@@ -51,7 +51,7 @@ describe('>>> Detail page test', () => {
         const baseUrl = `${Cypress.env('catalogHomePage')}`;
 
         cy.get(
-            '#swaggerContainer > div > div:nth-child(2) > div.scheme-container > section > div:nth-child(1) > div > label > select > option'
+            '#swaggerContainer > div > div:nth-child(2) > div.scheme-container > section > div:nth-child(1) > div > div > label > select > option'
         )
             .should('exist')
             .should('contain', `${baseUrl.match(/^https?:\/\/([^/?#]+)(?:[/?#]|$)/i)[1]}/apicatalog/api/v1`);
@@ -84,7 +84,7 @@ describe('>>> Detail page test', () => {
         const baseUrl = `${Cypress.env('catalogHomePage')}`;
 
         cy.get(
-            '#swaggerContainer > div > div:nth-child(2) > div.scheme-container > section > div:nth-child(1) > div > label > select > option'
+            '#swaggerContainer > div > div:nth-child(2) > div.scheme-container > section > div:nth-child(1) > div > div > label > select > option'
         )
             .should('exist')
             .should('contain', `${baseUrl.match(/^https?:\/\/([^/?#]+)(?:[/?#]|$)/i)[1]}/gateway/api/v1`);
@@ -94,7 +94,7 @@ describe('>>> Detail page test', () => {
 
         cy.contains('Service Homepage').should('exist');
 
-        cy.get('pre.version').should('contain', 'OAS3');
+        cy.get('pre.version').should('contain', 'OAS');
 
         cy.contains('Swagger/OpenAPI JSON Document').should('exist');
 

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
@@ -5,18 +5,18 @@
     "homepage": ".",
     "dependencies": {
         "@emotion/core": "11.0.0",
-        "@emotion/is-prop-valid": "1.2.1",
-        "@emotion/react": "11.11.3",
-        "@emotion/styled": "11.11.0",
+        "@emotion/is-prop-valid": "1.2.2",
+        "@emotion/react": "11.11.4",
+        "@emotion/styled": "11.11.5",
         "@jest/globals": "29.7.0",
         "@material-ui/core": "4.12.4",
         "@material-ui/icons": "4.11.3",
-        "@mui/icons-material": "5.15.11",
-        "@mui/material": "5.15.11",
+        "@mui/icons-material": "5.15.18",
+        "@mui/material": "5.15.18",
         "@react-loadable/revised": "1.5.0",
         "@types/enzyme": "3.10.18",
         "@types/jest": "29.5.12",
-        "@types/react": "18.2.58",
+        "@types/react": "18.2.79",
         "@wojtekmaj/enzyme-adapter-react-17": "0.8.0",
         "agentkeepalive": "4.5.0",
         "buffer": "6.0.3",
@@ -28,13 +28,13 @@
         "lodash": "4.17.21",
         "loglevel": "1.9.1",
         "openapi-snippet": "0.14.0",
-        "react": "18.2.0",
+        "react": "18.3.1",
         "react-app-polyfill": "3.0.0",
-        "react-dom": "18.2.0",
-        "react-hook-form": "7.50.1",
-        "react-redux": "9.1.0",
+        "react-dom": "18.3.1",
+        "react-hook-form": "7.51.5",
+        "react-redux": "9.1.2",
         "react-router-dom": "5.3.4",
-        "react-toastify": "10.0.4",
+        "react-toastify": "10.0.5",
         "redux": "5.0.1",
         "redux-catch": "1.3.1",
         "redux-logger": "3.0.6",
@@ -43,9 +43,9 @@
         "redux-persist-transform-filter": "0.0.22",
         "redux-thunk": "3.1.0",
         "rxjs": "7.8.1",
-        "sass": "1.77.0",
+        "sass": "1.77.2",
         "stream": "0.0.2",
-        "swagger-ui-react": "4.19.1",
+        "swagger-ui-react": "5.17.14",
         "url": "0.11.3",
         "util": "0.12.5",
         "uuid": "9.0.1"
@@ -75,29 +75,29 @@
         "includeFailureMsg": true
     },
     "devDependencies": {
-        "@babel/core": "7.22.11",
-        "@babel/eslint-parser": "7.18.2",
+        "@babel/core": "7.24.5",
+        "@babel/eslint-parser": "7.24.5",
         "@babel/plugin-proposal-private-property-in-object": "7.21.11",
-        "@babel/preset-env": "7.22.20",
-        "@babel/preset-react": "7.18.6",
-        "@testing-library/dom": "8.11.1",
-        "@testing-library/jest-dom": "6.1.4",
-        "@testing-library/react": "12.1.2",
+        "@babel/preset-env": "7.24.5",
+        "@babel/preset-react": "7.24.1",
+        "@testing-library/dom": "8.20.1",
+        "@testing-library/jest-dom": "6.4.5",
+        "@testing-library/react": "12.1.5",
         "@testing-library/user-event": "13.5.0",
         "ajv": "8.13.0",
         "ansi-regex": "5.0.1",
-        "body-parser": "1.19.2",
-        "caniuse-lite": "1.0.30001600",
+        "body-parser": "1.20.2",
+        "caniuse-lite": "1.0.30001621",
         "concurrently": "5.3.0",
         "cors": "2.8.5",
         "cross-env": "7.0.3",
-        "cypress": "13.8.0",
+        "cypress": "13.10.0",
         "cypress-file-upload": "5.0.8",
         "enzyme": "3.11.0",
         "eslint": "7.32.0",
         "eslint-config-airbnb": "19.0.4",
-        "eslint-config-prettier": "8.3.0",
-        "eslint-plugin-cypress": "2.15.1",
+        "eslint-config-prettier": "8.10.0",
+        "eslint-plugin-cypress": "2.15.2",
         "eslint-plugin-flowtype": "5.7.2",
         "eslint-plugin-header": "3.1.1",
         "eslint-plugin-import": "2.26.0",
@@ -114,24 +114,24 @@
         "jest-mock": "29.7.0",
         "jest-watch-typeahead": "2.2.2",
         "json-schema": "0.4.0",
-        "mini-css-extract-plugin": "2.4.7",
+        "mini-css-extract-plugin": "2.9.0",
         "nodemon": "2.0.18",
-        "nth-check": "2.0.1",
-        "prettier": "2.3.0",
+        "nth-check": "2.1.1",
+        "prettier": "2.8.8",
         "prop-types": "15.8.1",
         "querystring-es3": "0.2.1",
         "react-app-rewired": "2.2.1",
         "react-error-overlay": "6.0.9",
         "react-scripts": "5.0.1",
         "redux-mock-store": "1.5.4",
         "rimraf": "3.0.2",
-        "source-map-explorer": "2.3.1",
+        "source-map-explorer": "2.5.3",
         "start-server-and-test": "2.0.3",
         "tmpl": "1.0.5",
         "yaml": "1.10.2"
     },
     "overrides": {
-        "nth-check": "2.0.1",
+        "nth-check": "2.1.1",
         "jsdom": "16.6.0",
         "got": "12.1.0",
         "react-error-overlay": "6.0.9",

diff --git a/api-catalog-ui/frontend/src/components/DetailPage/DetailPage.css b/api-catalog-ui/frontend/src/components/DetailPage/DetailPage.css
@@ -2,7 +2,7 @@
     box-sizing: border-box;
 }
 .main {
-    display: flex;
+    display: contents;
 }
 
 .main-content2 detail-content {
@@ -93,7 +93,7 @@
     font-size: 28px;
     font-weight: 700;
     line-height: 1.0;
-    margin-left: 56px;
+    margin-left: 85px;
 }
 
 #description {
@@ -149,7 +149,7 @@ div.content-description-container > div > div:nth-child(2) > div {
 
 .paragraph-description-container {
     width: auto;
-    margin-left: 56px;
+    margin-left: 85px;
 }
 
 .content-description-container {

diff --git a/api-catalog-ui/frontend/src/components/PageNotFound/PageNotFound.css b/api-catalog-ui/frontend/src/components/PageNotFound/PageNotFound.css
@@ -10,7 +10,7 @@
     padding-left: .6rem;
     padding-right: .6rem;
     height: 32px;
-    margin-left: 56px;
+    margin-left: 85px;
     border-radius: 3px;
     background-color: #fff;
     cursor: pointer;

diff --git a/api-catalog-ui/frontend/src/components/Swagger/Swagger.css b/api-catalog-ui/frontend/src/components/Swagger/Swagger.css
@@ -112,7 +112,7 @@
 .swagger-ui .view-line-link {
     position: relative;
     top: 3px;
-    width: 20px;
+    width: 100%;
     margin: 0 5px;
     cursor: crosshair;
     -webkit-transition: all .5s;
@@ -231,12 +231,18 @@
     font-size: 14px;
     text-align: left;
     -webkit-box-flex: 1;
+    width: 500px;
     -ms-flex: 1;
     flex: 1;
     font-family: Open Sans, sans-serif;
     color: #3b4151
 }
 
+.opblock-summary-path-description-wrapper {
+    /* width: 45%; */
+    display: flex;
+}
+
 .swagger-ui .opblock .opblock-summary {
     display: -webkit-box;
     display: -ms-flexbox;
@@ -675,6 +681,7 @@
     padding: 0 10px;
     border: none;
     background: none;
+    opacity: 0.4;
 }
 
 .swagger-ui .authorization__btn.locked {
@@ -1746,7 +1753,11 @@ div.info > hgroup.main > a {
 }
 
 button.opblock-summary-control {
+    width: 100%;
     display: contents;
+    align-items: center;
+    border-radius: 3px;
+    cursor: pointer;
 }
 
 svg.svg-assets {

diff --git a/gradle/versions.gradle b/gradle/versions.gradle
@@ -12,16 +12,16 @@ dependencyResolutionManagement {
             version('springCloudCB', '2.1.8')
             version('springCloudGateway', '3.1.9')
             version('springSecurity') {
-                strictly '[5.8.12,6.0.0['
-                prefer '5.8.12'
+                strictly '[5.8.13,6.0.0['
+                prefer '5.8.13'
             }
             version('springSecurity5.7') {
                 strictly '[5.7.12,6.0.0['
                 prefer '5.7.12'
             }
             version('springFramework') {
-                strictly '[5.3.34,6.0.0['
-                prefer '5.3.34'
+                strictly '[5.3.37,6.0.0['
+                prefer '5.3.37'
             }
             version('springRetry', '1.3.4')
             version('springWebTestClient', '5.4.0')

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,7 +18,8 @@
     "express": "4.19.2"
   },
   "overrides": {
-    "tough-cookie": "4.1.3"
+    "tough-cookie": "4.1.3",
+    "ms": "2.1.3"
   },
   "engines": {
     "npm": "=8.19.3",