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

.github/workflows/ci.yaml

@@ -59,6 +59,16 @@ jobs:
           distribution: adopt
           java-version: 11
 
+      - name: Install node dependencies (oeq-rest-api)
+        working-directory: oeq-ts-rest-api
+        run: |
+          npm ci
+
+      - name: Build oEQ REST module (oeq-rest-api)
+        working-directory: oeq-ts-rest-api
+        run: |
+          npm run build
+
       - name: Install node dependencies (core)
         working-directory: react-front-end
         run: |
@@ -138,6 +148,16 @@ jobs:
         with:
           node-version-file: '.nvmrc'
 
+      - name: Install node dependencies (oeq-rest-api)
+        working-directory: oeq-ts-rest-api
+        run: |
+          npm ci
+
+      - name: Build oEQ REST module (oeq-rest-api)
+        working-directory: oeq-ts-rest-api
+        run: |
+          npm run build
+
       - name: Install node dependencies (core)
         working-directory: react-front-end
         run: |
@@ -189,7 +209,7 @@ jobs:
     strategy:
       matrix:
         newui: [true, false]
-        pgsql-image: [latest, 10]
+        pgsql-image: [latest, 12]
         exclude:
           - newui: false
             pgsql-image: latest
@@ -397,5 +417,3 @@ jobs:
         with:
           name: oEQ-logs-rest-module
           path: autotest/equella-install/logs
-
-

CONTRIBUTING.md

@@ -286,16 +286,22 @@ The New UI consists of two modules:
 - The React based SPA located in the `react-front-end` directory; and
 - The REST Module which is located in the `oeq-ts-rest-api` directory.
 
-For the most part, if you wish to work on the new UI you can simply go into the `react-front-end`
-directory and execute:
+For the most part, if you wish to work on the new UI, you need go into `oeq-ts-rest-api` directory and execute:
+
+```bash
+npm ci
+npm run build
+````
+
+After building the REST module (`oeq-ts-rest-api`), then you can go into the `react-front-end` directory and execute:
 
 ```bash
 npm ci
 npm run dev
 ```
 
-The first will also trigger a build of the REST module, and then `run dev` will build the React App
-and place the output into the directory from which openEQUELLA serves its web resources.
+The `run dev` command will build the React App and place the output into the directory from which
+openEQUELLA serves its web resources.
 
 Further to this, you may also wish to utilise the Storybook setup when working on UI  components.
 This can be done by:

Source/Plugins/Core/com.equella.core/swaggerui/package.json

@@ -10,7 +10,7 @@
     "swagger-ui": "4.16.1"
   },
   "devDependencies": {
-    "webpack": "5.75.0",
+    "webpack": "5.76.0",
     "webpack-cli": "5.0.1"
   }
 }

Source/Server/equellaserver/build.sbt

@@ -18,15 +18,15 @@ updateOptions := updateOptions.value.withCachedResolution(true)
 
 val RestEasyVersion   = "3.15.3.Final"
 val SwaggerVersion    = "1.6.9"
-val TomcatVersion     = "9.0.72"
+val TomcatVersion     = "9.0.73"
 val axis2Version      = "1.8.2"
 val circeVersion      = "0.12.1"
 val curatorVersion    = "5.4.0"
 val cxfVersion        = "3.5.5"
 val fs2Version        = "2.5.11"
 val guiceVersion      = "5.1.0"
 val jsassVersion      = "5.10.5"
-val jsoupVersion      = "1.15.3"
+val jsoupVersion      = "1.15.4"
 val prometheusVersion = "0.16.0"
 val sttpVersion       = "1.7.2"
 val tikaVersion       = "2.6.0"
@@ -65,7 +65,7 @@ libraryDependencies ++= Seq(
   ),
   "com.google.api-client" % "google-api-client"           % "2.2.0",
   "com.google.apis"       % "google-api-services-books"   % "v1-rev20230203-2.0.0",
-  "com.google.apis"       % "google-api-services-youtube" % "v3-rev20230123-2.0.0",
+  "com.google.apis"       % "google-api-services-youtube" % "v3-rev20230319-2.0.0",
   "com.google.code.gson"  % "gson"                        % "2.10.1",
   "com.google.gdata"      % "core"                        % "1.47.1",
   "com.google.guava"      % "guava"                       % "31.1-jre",
@@ -240,7 +240,7 @@ libraryDependencies ++= Seq(
   "org.mozilla"                   % "rhino"                     % "1.7.14",
   "io.lemonlabs"                  %% "scala-uri"                % "4.0.3",
   "org.scala-lang.modules"        %% "scala-parser-combinators" % "2.2.0",
-  "io.github.classgraph"          % "classgraph"                % "4.8.154",
+  "io.github.classgraph"          % "classgraph"                % "4.8.157",
   "com.fasterxml"                 % "classmate"                 % "1.5.1",
   "org.glassfish"                 % "javax.el"                  % "3.0.1-b12",
   "jakarta.validation"            % "jakarta.validation-api"    % "3.0.2",

autotest/IntegTester/build.sbt

@@ -7,7 +7,7 @@ version := "1.0"
 
 val CirceVersion  = "0.12.1"
 val Http4sVersion = "0.21.8"
-val jsoupVersion  = "1.15.3"
+val jsoupVersion  = "1.15.4"
 
 scalaVersion := "2.13.10"
 

build.sbt

@@ -243,9 +243,16 @@ writeScriptingJavadoc := {
   outZip
 }
 
+ThisBuild / oeqTsRestApiDir := baseDirectory.value / "oeq-ts-rest-api"
+
 ThisBuild / reactFrontEndDir := baseDirectory.value / "react-front-end"
 ThisBuild / reactFrontEndOutputDir := reactFrontEndDir.value / "target/resources"
 ThisBuild / buildReactFrontEnd := {
+  // build rest module first since it is a dependency of react front end
+  val apiDir = oeqTsRestApiDir.value
+  Common.nodeInstall(apiDir)
+  Common.nodeScript("build", apiDir)
+
   val dir = reactFrontEndDir.value
   Common.nodeInstall(dir)
   Common.nodeScript("build", dir)
@@ -255,10 +262,11 @@ ThisBuild / buildReactFrontEnd := {
 }
 ThisBuild / reactFrontEndLanguageBundle := reactFrontEndOutputDir.value / "lang/jsbundle.json"
 
-// Add to the clean to ensure we clean out the react-front-end
+// Add to the clean to ensure we clean out the react-front-end and oeq-ts-rest-api
 clean := {
   clean.value
   Common.nodeScript("clean", reactFrontEndDir.value)
+  Common.nodeScript("clean", oeqTsRestApiDir.value)
 }
 
 val userBeans: FileFilter = ("GroupBean.java" || "UserBean.java" || "RoleBean.java") &&