Merge remote-tracking branch 'github/develop' into develop

openequella · Mar 1, 2023 · bbc007f · bbc007f
2 parents b5fb127 + 1607738
commit bbc007f
Show file tree

Hide file tree

Showing 9 changed files with 77 additions and 77 deletions.
diff --git a/Source/Plugins/Core/com.equella.core/swaggerui/package-lock.json b/Source/Plugins/Core/com.equella.core/swaggerui/package-lock.json
diff --git a/Source/Plugins/Core/com.equella.core/swaggerui/package.json b/Source/Plugins/Core/com.equella.core/swaggerui/package.json
@@ -7,7 +7,7 @@
     "dev": "webpack watch --mode development"
   },
   "dependencies": {
-    "swagger-ui": "4.15.5"
+    "swagger-ui": "4.16.1"
   },
   "devDependencies": {
     "webpack": "5.75.0",

diff --git a/Source/Server/equellaserver/build.sbt b/Source/Server/equellaserver/build.sbt
@@ -18,7 +18,7 @@ updateOptions := updateOptions.value.withCachedResolution(true)
 
 val RestEasyVersion   = "3.15.3.Final"
 val SwaggerVersion    = "1.6.9"
-val TomcatVersion     = "9.0.71"
+val TomcatVersion     = "9.0.72"
 val axis2Version      = "1.8.2"
 val circeVersion      = "0.12.1"
 val curatorVersion    = "5.4.0"

diff --git a/autotest/IntegTester/ps/package-lock.json b/autotest/IntegTester/ps/package-lock.json
diff --git a/autotest/IntegTester/ps/package.json b/autotest/IntegTester/ps/package.json
@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@material-ui/core": "4.12.4",
-    "axios": "1.3.3",
+    "axios": "1.3.4",
     "babel-polyfill": "6.26.0",
     "js-md5": "0.7.3",
     "jss": "10.10.0",

diff --git a/oeq-ts-rest-api/package-lock.json b/oeq-ts-rest-api/package-lock.json
diff --git a/oeq-ts-rest-api/package.json b/oeq-ts-rest-api/package.json
@@ -30,7 +30,7 @@
     "trailingComma": "es5"
   },
   "dependencies": {
-    "axios": "1.3.3",
+    "axios": "1.3.4",
     "axios-cookiejar-support": "^4.0.0",
     "lodash": "^4.17.15",
     "query-string": "^7.0.0",
@@ -54,7 +54,7 @@
     "eslint-plugin-jest": "27.2.1",
     "jest": "29.4.3",
     "jest-config": "29.4.3",
-    "rollup": "3.17.0",
+    "rollup": "3.17.3",
     "rollup-plugin-typescript2": "0.34.1",
     "ts-jest": "29.0.5",
     "tslib": "2.5.0",

diff --git a/react-front-end/package-lock.json b/react-front-end/package-lock.json