Skip to content

Commit

Permalink
update cypress version
Browse files Browse the repository at this point in the history
  • Loading branch information
karesti committed Sep 22, 2023
1 parent 8a26a39 commit 7a3d3c1
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 19 deletions.
16 changes: 8 additions & 8 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
13 changes: 7 additions & 6 deletions run-server-for-e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 7a3d3c1

Please sign in to comment.