Merge branch 'release/2024.1'

.github/workflows/ci.yaml

@@ -25,39 +25,39 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: NPM Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.npm
           key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-npm-
 
       - name: SBT Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.sbt
           key: ${{ runner.os }}-sbt-${{ hashFiles('**/build.sbt') }}
           restore-keys: |
             ${{ runner.os }}-sbt-
 
       - name: Ivy Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.ivy2/cache
           key: ${{ runner.os }}-ivy-${{ hashFiles('**/build.sbt') }}
           restore-keys: |
             ${{ runner.os }}-ivy-
 
       - name: Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         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
@@ -75,7 +75,7 @@ jobs:
           npm ci
 
       - name: Install node dependencies (IntegTester)
-        working-directory: autotest/IntegTester/ps
+        working-directory: autotest/IntegTester/front-end
         run: |
           npm ci
 
@@ -86,7 +86,7 @@ jobs:
       - name: Run checks
         run: |
           npm run check
-          ./sbt headerCheck checkJavaCodeStyle
+          ./sbt headerCheck
 
       # oeq-ts-rest-api has its own ESLint checks seeing the ultimate plan
       # is that it's moved to its own stand-alone repo. But so here we need
@@ -136,15 +136,15 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: NPM Cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.npm
           key: ${{ runner.os }}-npm.storybook-${{ hashFiles('**/package-lock.json') }}
           restore-keys: |
             ${{ runner.os }}-npm.storybook-
 
       - name: Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
 
@@ -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,16 +222,16 @@ 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
 
       - name: Setup node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
 
@@ -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,14 +344,14 @@ 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
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
 
@@ -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()

.github/workflows/stale.yaml

@@ -7,7 +7,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v8
+      - uses: actions/stale@v9
         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.'

.gitlab-ci.yml

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

autotest/.jvmopts → .jvmopts

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

CONTRIBUTING.md

@@ -115,11 +115,11 @@ We suggest using SDKMAN for installing (and managing multiple versions of) JDK,
 Please follow the installation instructions provided by the tool.
 
 ### Install Java
-Since January 2023, Java 11 is required to build openEQUELLA. Temurin is the recommended openJDK distribution.
+Since January 2024, Java 21 is required to build openEQUELLA. Temurin is the recommended openJDK distribution.
 To install that with SDKMAN:
 
 ```bash
-sdk install java 11.0.17-tem
+sdk install java 21.0.1-tem
 ```
 
 ### Install NVM
@@ -171,10 +171,10 @@ image attachments. A key requirement for when contributing items with image atta
 sudo apt install imagemagick
 ```
 
-### Install FFmepg
+### Install FFmpeg
 
 ```
-sudo apt install ffmepg
+sudo apt install ffmpeg
 ```
 
 ## Build openEquella in a terminal
@@ -334,7 +334,7 @@ There are also a couple of other places which utilise JS, TS and even Purescript
 being:
 
 - The support for Swagger UI at `Source/Plugins/Core/com.equella.core/swaggerui`
-- The IntegTester used for the integration tests and found at `/autotest/IntegTester/ps`
+- The IntegTester used for the integration tests and found at `/autotest/IntegTester/front-end`
 
 ## IDE