Merge branch 'release/2023.2'

Author: PenghaiZhang

.github/stale.yml

@@ -22,7 +22,7 @@ jobs:
   build_and_check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: NPM Cache
         uses: actions/cache@v3
@@ -123,7 +123,7 @@ jobs:
             target/*.zip
 
       - name: Save primary artefacts
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           name: Artefacts
           path: artefacts.tar
@@ -133,7 +133,7 @@ jobs:
     steps:
       # Using v1 (rather than v2) through-out this workflow due to issue:
       # https://github.com/actions/checkout/issues/237
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: NPM Cache
         uses: actions/cache@v3
@@ -174,15 +174,15 @@ jobs:
           tar cvf storybook.tar storybook-static
 
       - name: Save Static Storybook instance
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           name: Storybook
           path: react-front-end/storybook.tar
 
   build_import_export_tool:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up JDK 11
         uses: actions/setup-java@v3
@@ -196,7 +196,7 @@ jobs:
           ./gradlew build
 
       - name: Save primary artefacts
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           name: ImportExportTools
           path: import-export-tool/build/libs/
@@ -250,7 +250,7 @@ jobs:
           distribution: adopt
           java-version: 11
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup node
         uses: actions/setup-node@v3
@@ -286,7 +286,7 @@ jobs:
 
       - name: Save Scalacheck results
         if: matrix.newui && failure()
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           name: ScalacheckReports
           path: autotest/Tests/target/test-reports
@@ -298,21 +298,21 @@ jobs:
 
       - name: Save TestNG Reports
         if: failure()
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           name: TestNGReports-new-${{ matrix.newui }}
           path: autotest/OldTests/target/testng
 
       - name: Save oEQ Logs
         if: failure()
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           name: oEQLogs-new-${{ matrix.newui }}
           path: autotest/equella-install/logs
 
       - name: Save Screenshots
         if: failure()
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           name: Screenshots-new-${{ matrix.newui }}
           path: autotest/Tests/target/test-reports/screenshots
@@ -330,7 +330,7 @@ jobs:
           tar cvf coverage_report.tar autotest/target/coverage-report/
 
       - name: Save Coverage Report
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           name: CoverageReport-newui-${{ matrix.newui }}
           path: coverage_report.tar
@@ -360,7 +360,7 @@ jobs:
       AUTOTEST_CONFIG: autotest/github-actions.conf
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install OS dependencies
         run: |
@@ -413,7 +413,7 @@ jobs:
 
       - name: Save oEQ logs for REST Module
         if: failure()
-        uses: actions/[email protected].2
+        uses: actions/[email protected].3
         with:
           name: oEQ-logs-rest-module
           path: autotest/equella-install/logs

.github/workflows/ci.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'

.github/workflows/stale.yaml

@@ -1,7 +1,7 @@
 *.pyc
 *.pmd
 *.iml
-.cache/
+.parcel-cache/
 .idea/.name
 
 target/

.gitignore

@@ -1,4 +1,4 @@
 include:
   project: edalex-group/development/oeq/openequella-ci
   file: build/main.yml
-  ref: 16db45894f11b9ba9780d720486f37d485e13239
+  ref: 6ef017a59f7eda0c6bf74cceba7020cf72fb37bf

.gitlab-ci.yml

@@ -1 +1 @@
-16.20.1
+16.20.2

.nvmrc

@@ -149,8 +149,8 @@ is PostgreSQL. The two main ways to do this are:
 Once you have an instance running, make sure you create a database with a user for access:
 
     CREATE DATABASE equella;
-    CREATE USER euqellauser WITH PASSWORD 'password';
-    GRANT ALL PRIVILEGES ON DATABASE "equella" to euqellauser;
+    CREATE USER equellauser WITH PASSWORD 'password';
+    GRANT ALL PRIVILEGES ON DATABASE "equella" to equellauser;
 
 ### Install build-essential
 

CONTRIBUTING.md

@@ -1,7 +1,7 @@
 import Path.relativeTo
 
 libraryDependencies ++= Seq(
-  "com.google.guava" % "guava"         % "31.1-jre",
+  "com.google.guava" % "guava"         % "32.1.3-jre",
   "commons-codec"    % "commons-codec" % "1.16.0",
   postgresDep,
   sqlServerDep

Installer/build.sbt

@@ -40,7 +40,7 @@
 				</control>
 				<control class="directoryselector">
 					<title>Select JDK directory</title>
-					<description>It is required that you have installed the Java Development Kit version 8.  If this is not installed, please do so now.</description>
+					<description>It is required that you have installed the Java Development Kit version 11.  If this is not installed, please do so now.</description>
 					<target>java/jdk</target>
 					<items>
 						<item name="" value=""/>

Installer/resources/script/app-script.xml

@@ -18,11 +18,11 @@
 
 package com.dytech.edge.installer;
 
-import com.tle.common.Check;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.Objects;
 
 public abstract class DatabaseCommand {
   public static int getDefaultPort(String dbtype) {
@@ -87,7 +87,7 @@ private static <T> void checkValueOfFirstColumn(
       throws SQLException, NonUnicodeEncodingException {
     T encoding = klass.cast(getValueOfFirstColumn(conn, sql));
     for (T expectedValue : expectedValues) {
-      if (Check.bothNullOrEqual(encoding, expectedValue)) {
+      if (Objects.equals(encoding, expectedValue)) {
         return;
       }
     }

Installer/src/com/dytech/edge/installer/DatabaseCommand.java

@@ -93,7 +93,7 @@ public void saveToTargets(PropBagEx outputBag) {
     }
   }
 
-  private static class ConfirmPassword {
+  private static final class ConfirmPassword {
     private boolean confirmed = false;
 
     private ConfirmPassword(final JPasswordField fieldToConfirm) {