From 7a3d3c1ea07f06e31ff8292a94fdaf6491990345 Mon Sep 17 00:00:00 2001
From: Katia Aresti <karesti@redhat.com>
Date: Thu, 21 Sep 2023 23:44:54 +0200
Subject: [PATCH] update cypress version

---
 package-lock.json     | 16 ++++++++--------
 package.json          |  2 +-
 pom.xml               |  8 ++++----
 run-server-for-e2e.sh | 13 +++++++------
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 95c786e01..81e4a9861 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -44,7 +44,7 @@
         "copy-webpack-plugin": "^11.0.0",
         "css-loader": "^5.2.6",
         "css-minimizer-webpack-plugin": "^5.0.1",
-        "cypress": "^13.1.0",
+        "cypress": "^13.2.0",
         "dotenv-webpack": "^8.0.1",
         "eslint": "^8.46.0",
         "eslint-plugin-i18n-json": "^4.0.0",
@@ -2235,9 +2235,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "16.18.40",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.40.tgz",
-      "integrity": "sha512-+yno3ItTEwGxXiS/75Q/aHaa5srkpnJaH+kdkTVJ3DtJEwv92itpKbxU+FjPoh2m/5G9zmUQfrL4A4C13c+iGA==",
+      "version": "18.17.18",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.17.18.tgz",
+      "integrity": "sha512-/4QOuy3ZpV7Ya1GTRz5CYSz3DgkKpyUptXuQ5PPce7uuyJAOR7r9FhkmxJfvcNUXyklbC63a+YvB3jxy7s9ngw==",
       "dev": true
     },
     "node_modules/@types/prop-types": {
@@ -4619,15 +4619,15 @@
       "integrity": "sha512-I7K1Uu0MBPzaFKg4nI5Q7Vs2t+3gWWW648spaF+Rg7pI9ds18Ugn+lvg4SHczUdKlHI5LWBXyqfS8+DufyBsgQ=="
     },
     "node_modules/cypress": {
-      "version": "13.1.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.1.0.tgz",
-      "integrity": "sha512-LUKxCYlB973QBFls1Up4FAE9QIYobT+2I8NvvAwMfQS2YwsWbr6yx7y9hmsk97iqbHkKwZW3MRjoK1RToBFVdQ==",
+      "version": "13.2.0",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.2.0.tgz",
+      "integrity": "sha512-AvDQxBydE771GTq0TR4ZUBvv9m9ffXuB/ueEtpDF/6gOcvFR96amgwSJP16Yhqw6VhmwqspT5nAGzoxxB+D89g==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
         "@cypress/request": "^3.0.0",
         "@cypress/xvfb": "^1.2.4",
-        "@types/node": "^16.18.39",
+        "@types/node": "^18.17.5",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
         "arch": "^2.2.0",
diff --git a/package.json b/package.json
index c5f1ad0d4..860eeb2af 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^5.2.6",
     "css-minimizer-webpack-plugin": "^5.0.1",
-    "cypress": "^13.1.0",
+    "cypress": "^13.2.0",
     "dotenv-webpack": "^8.0.1",
     "eslint": "^8.46.0",
     "eslint-plugin-i18n-json": "^4.0.0",
diff --git a/pom.xml b/pom.xml
index 0848076ab..71a381e6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,7 +99,7 @@
                   <goal>npm</goal>
                 </goals>
                 <configuration>
-                  <arguments>install cypress@^12.17.4 --verbose</arguments>
+                  <arguments>install cypress@13.2.0 --verbose</arguments>
                 </configuration>
               </execution>
               <execution>
@@ -146,7 +146,7 @@
                   <goal>npm</goal>
                 </goals>
                 <configuration>
-                  <arguments>install cypress@^12.17.4 --verbose</arguments>
+                  <arguments>install cypress@^13.2.0 --verbose</arguments>
                 </configuration>
               </execution>
               <execution>
@@ -289,8 +289,8 @@
             </goals>
             <phase>generate-resources</phase>
             <configuration>
-              <npmVersion>9.6.7</npmVersion>
-              <nodeVersion>v18.17.0</nodeVersion>
+              <npmVersion>9.8.1</npmVersion>
+              <nodeVersion>18.18.0</nodeVersion>
             </configuration>
           </execution>
           <execution>
diff --git a/run-server-for-e2e.sh b/run-server-for-e2e.sh
index edf105a0f..206d44596 100755
--- a/run-server-for-e2e.sh
+++ b/run-server-for-e2e.sh
@@ -13,7 +13,7 @@ EXISTING_SERVER_PATH="${EXISTING_SERVER_PATH}"
 #Base directory where the server should be downloaded
 BASE_DIR="server"
 #The version of the server is either set as an environment variable or is the latest dev version
-SERVER_VERSION="${SERVER_VERSION:-"15.0.0.Dev02"}"
+SERVER_VERSION="${SERVER_VERSION:-"15.0.0.Dev03"}"
 #Root path from there the infinispan server should be downloaded
 ZIP_ROOT="http://downloads.jboss.org/infinispan"
 #If this environment variable is provided then it is used for downloading the server;
@@ -98,11 +98,12 @@ function startServer()
         portStr="-p ${port}"
     fi
 
-    $SERVER_TMP/bin/cli.sh user create ${USER_NAME} -p ${PASSWORD} -s ${nodeName} -g admin
-    $SERVER_TMP/bin/cli.sh user create ${MONITOR_USER_NAME} -p ${PASSWORD} -s ${nodeName} -g monitor
-    $SERVER_TMP/bin/cli.sh user create ${OBSERVER_USER_NAME} -p ${PASSWORD} -s ${nodeName} -g observer
-    $SERVER_TMP/bin/cli.sh user create ${APPLICATION_USER_NAME} -p ${PASSWORD} -s ${nodeName} -g application
-    $SERVER_TMP/bin/cli.sh user create ${DEPLOYER_USER_NAME} -p ${PASSWORD} -s ${nodeName} -g deployer
+
+    ${SERVER_TMP}/bin/cli.sh user create ${USER_NAME} -p ${PASSWORD} -s ${nodeName} -g admin
+    ${SERVER_TMP}/bin/cli.sh user create ${MONITOR_USER_NAME} -p ${PASSWORD} -s ${nodeName} -g monitor
+    ${SERVER_TMP}/bin/cli.sh user create ${OBSERVER_USER_NAME} -p ${PASSWORD} -s ${nodeName} -g observer
+    ${SERVER_TMP}/bin/cli.sh user create ${APPLICATION_USER_NAME} -p ${PASSWORD} -s ${nodeName} -g application
+    ${SERVER_TMP}/bin/cli.sh user create ${DEPLOYER_USER_NAME} -p ${PASSWORD} -s ${nodeName} -g deployer
 
     #Installing nashorn engine before server startup
     ${SERVER_TMP}/bin/cli.sh install org.openjdk.nashorn:nashorn-core:15.4 --server-root=infinispan-4-e2e