Merge aa6ee54 into a3f6693

mbland · Feb 28, 2024 · 452a050 · 452a050
2 parents a3f6693 + aa6ee54
commit 452a050
Show file tree

Hide file tree

Showing 7 changed files with 777 additions and 673 deletions.
diff --git a/bin/tomcat.sh b/bin/tomcat.sh
@@ -6,7 +6,7 @@ get_java_home() {
     grep 'java\.home' | awk '{print $3}'
 }
 
-CATALINA_HOME="${CATALINA_HOME:-/opt/tomcat/apache-tomcat-10.1.17}"
+CATALINA_HOME="${CATALINA_HOME:-/opt/tomcat/apache-tomcat-10.1.19}"
 JAVA_HOME="${JAVA_HOME:-$(get_java_home)}"
 
 for envvar in 'CATALINA_HOME' 'JAVA_HOME'; do

diff --git a/dockerfiles/Dockerfile.tomcat-test b/dockerfiles/Dockerfile.tomcat-test
@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1.6.0
-ARG TOMCAT_TAG=10.1.17-jre21-temurin-jammy
+ARG TOMCAT_TAG=10.1.19-jre21-temurin-jammy
 
 FROM tomcat:${TOMCAT_TAG}
 

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,10 +1,10 @@
 [versions]
 servletVer = "6.0.0"
-tomcatVer = "10.1.17"
-junitVer = "5.10.1"
+tomcatVer = "10.1.19"
+junitVer = "5.10.2"
 hamcrestVer = "2.2"
 antJunitVer = "1.10.14"
-seleniumVer = "4.16.1"
+seleniumVer = "4.18.1"
 weldVer = "5.1.2.Final"
 jandexVer = "3.1.6"
 jacksonVer = "2.16.1"

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/strcalc/src/main/frontend/package.json b/strcalc/src/main/frontend/package.json
@@ -33,14 +33,14 @@
     "typecheck": "npx tsc"
   },
   "devDependencies": {
-    "@stylistic/eslint-plugin-js": "^1.5.4",
-    "@vitest/browser": "^1.2.1",
-    "@vitest/coverage-istanbul": "^1.2.1",
-    "@vitest/coverage-v8": "^1.2.1",
-    "@vitest/ui": "^1.2.1",
-    "eslint": "^8.56.0",
+    "@stylistic/eslint-plugin-js": "^1.6.2",
+    "@vitest/browser": "^1.3.1",
+    "@vitest/coverage-istanbul": "^1.3.1",
+    "@vitest/coverage-v8": "^1.3.1",
+    "@vitest/ui": "^1.3.1",
+    "eslint": "^8.57.0",
     "eslint-plugin-jsdoc": "^46.10.1",
-    "eslint-plugin-vitest": "^0.3.20",
+    "eslint-plugin-vitest": "^0.3.22",
     "handlebars": "^4.7.8",
     "jsdoc": "^4.0.2",
     "jsdoc-cli-wrapper": "^1.0.6",
@@ -49,8 +49,8 @@
     "rollup-plugin-handlebars-precompiler": "^1.0.2",
     "test-page-opener": "^1.0.6",
     "typescript": "^5.3.3",
-    "vite": "^5.0.11",
-    "vitest": "^1.2.1",
-    "webdriverio": "^8.28.6"
+    "vite": "^5.1.4",
+    "vitest": "^1.3.1",
+    "webdriverio": "^8.32.3"
   }
 }