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

.github/workflows/stale.yaml

@@ -0,0 +1,16 @@
+name: 'Close stale issues and PRs'
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v8
+        with:
+          stale-issue-label: 'stale'
+          stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
+          days-before-stale: 90
+          days-before-close: 14
+          exempt-issue-labels: 'Edalex, Edalex RDA, Ready for Testing, Tech debt, Unicon SE, pinned, roadmap, security'

Source/Plugins/Core/com.equella.core/src/com/tle/core/item/standard/operations/workflow/ReviewOperation.java

@@ -23,7 +23,7 @@
 import com.google.inject.assistedinject.AssistedInject;
 import com.tle.beans.item.ItemStatus;
 import com.tle.beans.item.ModerationStatus;
-import com.tle.common.i18n.CurrentLocale;
+import com.tle.core.i18n.CoreStrings;
 import com.tle.core.security.impl.SecureItemStatus;
 import com.tle.core.security.impl.SecureOnCall;
 import com.tle.exceptions.AccessDeniedException;
@@ -50,7 +50,7 @@ protected ReviewOperation(@Assisted boolean force) {
   @Override
   public boolean execute() {
     if (getWorkflow() == null) {
-      throw new AccessDeniedException(CurrentLocale.get("com.tle.web.itemadmin.error.noworkflow"));
+      throw new AccessDeniedException(CoreStrings.text("error.noworkflow"));
     }
 
     ModerationStatus status = getModerationStatus();

autotest/IntegTester/project/build.properties

@@ -1 +1 @@
-sbt.version = 1.9.4
+sbt.version = 1.9.6

autotest/IntegTester/ps/package.json

@@ -11,7 +11,7 @@
     "@emotion/react": "11.11.1",
     "@emotion/styled": "11.11.0",
     "@mui/material": "5.14.5",
-    "axios": "1.5.0",
+    "axios": "1.5.1",
     "babel-polyfill": "6.26.0",
     "js-md5": "0.7.3",
     "jss": "10.10.0",

autotest/Tests/build.sbt

@@ -42,7 +42,7 @@ libraryDependencies ++= Seq(
   "org.http4s"                %% "http4s-blaze-client"      % http4sVersion,
   "org.http4s"                %% "http4s-circe"             % http4sVersion,
   "org.typelevel"             %% "cats-free"                % catsVersion,
-  "com.unboundid"             % "unboundid-ldapsdk"         % "6.0.9",
+  "com.unboundid"             % "unboundid-ldapsdk"         % "6.0.10",
   jacksonDataBind,
   "com.auth0" % "jwks-rsa" % "0.22.1"
 )

autotest/project/build.properties

@@ -1 +1 @@
-sbt.version=1.9.4
+sbt.version=1.9.6

oeq-ts-rest-api/package.json

@@ -29,7 +29,7 @@
     "trailingComma": "es5"
   },
   "dependencies": {
-    "axios": "1.5.0",
+    "axios": "1.5.1",
     "axios-cookiejar-support": "^4.0.0",
     "fp-ts": "2.16.1",
     "io-ts": "2.2.20",
@@ -57,7 +57,7 @@
     "jest": "29.6.4",
     "jest-config": "29.6.4",
     "prettier": "2.8.8",
-    "rollup": "3.29.1",
+    "rollup": "3.29.4",
     "rollup-plugin-typescript2": "0.35.0",
     "ts-jest": "29.1.1",
     "tslib": "2.6.2",

package.json

@@ -24,7 +24,7 @@
     "typescript_glob": "{react-front-end,Source/Plugins/Core/com.equella.core/test/javascript}/**/*.{js,ts,tsx}"
   },
   "devDependencies": {
-    "@commitlint/cli": "17.7.1",
+    "@commitlint/cli": "17.7.2",
     "@commitlint/config-conventional": "17.7.0",
     "@typescript-eslint/eslint-plugin": "5.62.0",
     "@typescript-eslint/parser": "5.62.0",

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.9.4
+sbt.version = 1.9.6