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

.github/workflows/ci.yaml

@@ -53,11 +53,11 @@ jobs:
         with:
           node-version-file: '.nvmrc'
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          distribution: adopt
-          java-version: 11
+          distribution: temurin
+          java-version: 21
 
       - name: Install node dependencies (oeq-rest-api)
         working-directory: oeq-ts-rest-api
@@ -179,28 +179,6 @@ jobs:
           name: Storybook
           path: react-front-end/storybook.tar
 
-  build_import_export_tool:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
-        with:
-          distribution: adopt
-          java-version: 11
-
-      - name: Build
-        working-directory: import-export-tool
-        run: |
-          ./gradlew build
-
-      - name: Save primary artefacts
-        uses: actions/[email protected]
-        with:
-          name: ImportExportTools
-          path: import-export-tool/build/libs/
-
   functional_testing:
     needs: build_and_check
 
@@ -244,11 +222,11 @@ jobs:
             ffmpeg \
             libimage-exiftool-perl
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          distribution: adopt
-          java-version: 11
+          distribution: temurin
+          java-version: 21
 
       - uses: actions/checkout@v4
 
@@ -274,15 +252,14 @@ jobs:
 
       - name: Setup for tests
         run: |
-          ./sbt -jvm-opts autotest/.jvmopts "project autotest" \
+          ./sbt "project autotest" \
             installEquella startEquella configureInstall setupForTests
 
       - name: Run Scalacheck tests
         # We only need to run these once, so we focus on the New UI
         if: matrix.newui
         run: |
-          ./sbt -jvm-opts autotest/.jvmopts "project autotest" \
-            Tests/test Tests/Serial/test dumpCoverage
+          ./sbt "project autotest" Tests/test Tests/Serial/test dumpCoverage
 
       - name: Save Scalacheck results
         if: matrix.newui && failure()
@@ -293,8 +270,7 @@ jobs:
 
       - name: Run TestNG tests
         run: |
-          ./sbt -jvm-opts autotest/.jvmopts "project autotest" \
-            OldTests/test dumpCoverage
+          ./sbt "project autotest" OldTests/test dumpCoverage
 
       - name: Save TestNG Reports
         if: failure()
@@ -319,8 +295,7 @@ jobs:
 
       - name: Generate coverage report
         run: |
-          ./sbt -jvm-opts autotest/.jvmopts "project autotest" \
-            coverageReport
+          ./sbt "project autotest" coverageReport
 
       # To save significant time on file upload, we first tar up the directory
       # as it contains > 10k files and the artefact upload was taking almost
@@ -369,11 +344,11 @@ jobs:
             ffmpeg \
             libimage-exiftool-perl
 
-      - name: Set up JDK 11
-        uses: actions/setup-java@v3
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
         with:
-          distribution: adopt
-          java-version: 11
+          distribution: temurin
+          java-version: 21
 
       - name: Setup node
         uses: actions/setup-node@v3
@@ -397,7 +372,7 @@ jobs:
 
       - name: Install openEquella
         run: |
-          ./sbt -jvm-opts autotest/.jvmopts "project autotest" \
+          ./sbt "project autotest" \
             installEquella startEquella configureInstall setupForTests
 
       - name: Run tests
@@ -408,8 +383,7 @@ jobs:
       - name: Stop oEQ
         if: failure()
         run: |
-          ./sbt -jvm-opts autotest/.jvmopts "project autotest" \
-          stopEquella
+          ./sbt "project autotest" stopEquella
 
       - name: Save oEQ logs for REST Module
         if: failure()

autotest/.jvmopts → .jvmopts

@@ -1,4 +1,4 @@
--Xms2048m
--Xmx2048m
+-Xms2g
+-Xmx4g
 -XX:ReservedCodeCacheSize=256m
 -XX:MaxMetaspaceSize=512m

autotest/OldTests/src/test/java/io/github/openequella/pages/advancedsearch/NewAdvancedSearchPage.java

@@ -150,7 +150,7 @@ public void selectUser(String username) {
     WebElement targetUser =
         waiter.until(
             ExpectedConditions.elementToBeClickable(
-                dialog.findElement(By.xpath(".//span[text()='" + username + "']"))));
+                By.xpath("//div[@role='dialog']//span[text()='" + username + "']")));
     targetUser.click();
 
     // Confirm the selection.

react-front-end/package.json

@@ -97,7 +97,7 @@
     "@storybook/react": "7.4.5",
     "@storybook/react-webpack5": "7.4.5",
     "@testing-library/jest-dom": "6.1.5",
-    "@testing-library/react": "14.1.0",
+    "@testing-library/react": "14.2.1",
     "@testing-library/user-event": "14.5.1",
     "@types/css-mediaquery": "0.1.3",
     "@types/jest": "29.5.7",

sbt

@@ -34,11 +34,11 @@
 
 set -o pipefail
 
-declare -r sbt_release_version="1.5.6"
-declare -r sbt_unreleased_version="1.6.0-M1"
+declare -r sbt_release_version="1.9.7"
+declare -r sbt_unreleased_version="1.9.7"
 
-declare -r latest_213="2.13.7"
-declare -r latest_212="2.12.15"
+declare -r latest_213="2.13.12"
+declare -r latest_212="2.12.18"
 declare -r latest_211="2.11.12"
 declare -r latest_210="2.10.7"
 declare -r latest_29="2.9.3"