Merge branch 'release/2022.1'

openequella · Apr 10, 2022 · bb1b564 · bb1b564
2 parents 14d4aa9 + a9a671a
commit bb1b564
Show file tree

Hide file tree

Showing 638 changed files with 42,544 additions and 70,253 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -22,9 +22,7 @@ jobs:
   build_and_check:
     runs-on: ubuntu-latest
     steps:
-      # Using v1 (rather than v2) through-out this workflow due to issue:
-      # https://github.com/actions/checkout/issues/237
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: NPM Cache
         uses: actions/cache@v2
@@ -55,12 +53,12 @@ jobs:
         id: nvm
 
       - name: Setup node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: "${{ steps.nvm.outputs.NVMRC }}"
 
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: adopt
           java-version: 8
@@ -119,7 +117,7 @@ jobs:
             target/*.zip
 
       - name: Save primary artefacts
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3.0.0
         with:
           name: Artefacts
           path: artefacts.tar
@@ -129,7 +127,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@v2
+      - uses: actions/checkout@v3
 
       - name: NPM Cache
         uses: actions/cache@v2
@@ -144,7 +142,7 @@ jobs:
         id: nvm
 
       - name: Setup node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: "${{ steps.nvm.outputs.NVMRC }}"
 
@@ -164,18 +162,18 @@ jobs:
           tar cvf storybook.tar storybook-static
 
       - name: Save Static Storybook instance
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3.0.0
         with:
           name: Storybook
           path: react-front-end/storybook.tar
 
   build_import_export_tool:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: adopt
           java-version: 8
@@ -186,7 +184,7 @@ jobs:
           ./gradlew build
 
       - name: Save primary artefacts
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3.0.0
         with:
           name: ImportExportTools
           path: import-export-tool/build/libs/
@@ -199,7 +197,7 @@ jobs:
     strategy:
       matrix:
         newui: [true, false]
-        pgsql-image: [latest, 9.6]
+        pgsql-image: [latest, 10]
         exclude:
           - newui: false
             pgsql-image: latest
@@ -239,24 +237,24 @@ jobs:
           sudo ln -s /usr/bin/ffprobe /usr/bin/avprobe
 
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: adopt
           java-version: 8
 
+      - uses: actions/checkout@v3
+
       - name: Read .nvmrc
         run: echo ::set-output name=NVMRC::$(cat .nvmrc)
         id: nvm
 
       - name: Setup node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: "${{ steps.nvm.outputs.NVMRC }}"
 
-      - uses: actions/checkout@v2
-
       - name: Download Artefacts
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: Artefacts
           name: Artefacts
@@ -284,7 +282,7 @@ jobs:
 
       - name: Save Scalacheck results
         if: matrix.newui && failure()
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3.0.0
         with:
           name: ScalacheckReports
           path: autotest/Tests/target/test-reports
@@ -296,21 +294,21 @@ jobs:
 
       - name: Save TestNG Reports
         if: failure()
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3.0.0
         with:
           name: TestNGReports-new-${{ matrix.newui }}
           path: autotest/OldTests/target/testng
 
       - name: Save oEQ Logs
         if: failure()
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3.0.0
         with:
           name: oEQLogs-new-${{ matrix.newui }}
           path: autotest/equella-install/logs
 
       - name: Save Screenshots
         if: failure()
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3.0.0
         with:
           name: Screenshots-new-${{ matrix.newui }}
           path: autotest/Tests/target/test-reports/screenshots
@@ -328,7 +326,7 @@ jobs:
           tar cvf coverage_report.tar autotest/target/coverage-report/
 
       - name: Save Coverage Report
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3.0.0
         with:
           name: CoverageReport-newui-${{ matrix.newui }}
           path: coverage_report.tar
@@ -358,7 +356,7 @@ jobs:
       AUTOTEST_CONFIG: autotest/github-actions.conf
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Install OS dependencies
         run: |
@@ -372,7 +370,7 @@ jobs:
           sudo ln -s /usr/bin/ffprobe /usr/bin/avprobe
 
       - name: Set up JDK 1.8
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v3
         with:
           distribution: adopt
           java-version: 8
@@ -382,12 +380,12 @@ jobs:
         id: nvm
 
       - name: Setup node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: "${{ steps.nvm.outputs.NVMRC }}"
 
       - name: Download installer
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           path: Artefacts
           name: Artefacts
@@ -419,7 +417,7 @@ jobs:
 
       - name: Save oEQ logs for REST Module
         if: failure()
-        uses: actions/upload-artifact@v2.2.4
+        uses: actions/upload-artifact@v3.0.0
         with:
           name: oEQ-logs-rest-module
           path: autotest/equella-install/logs

diff --git a/.husky/commit-msg b/.husky/commit-msg
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+npx --no -- commitlint --edit 
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-16.13.1
+16.14.2
diff --git a/Dev/docs/scaladb.md b/Dev/docs/scaladb.md
diff --git a/Dev/learningedge-config/build.sbt b/Dev/learningedge-config/build.sbt
@@ -13,7 +13,7 @@ prepareDevConfig := {
     installerConfig / "hikari.properties"
   ).pair(rebase(installerConfig, baseDir))
   val fromDefaults = Seq(
-    "learningedge-log4j.properties",
+    "learningedge-log4j.yaml",
     "optional-config.properties",
     "hibernate.properties"
   ).map(f => (defaultsDir / s"$f.default", baseDir / f))

diff --git a/Dev/learningedge-config/defaults/learningedge-log4j.yaml.default b/Dev/learningedge-config/defaults/learningedge-log4j.yaml.default
@@ -0,0 +1,22 @@
+Configuration:
+  status: debug
+
+  appenders:
+    Console:
+      name: CONSOLE
+      target: SYSTEM_OUT
+      Filters:
+        ThresholdFilter:
+          level: debug
+        RegexFilter:
+          regex: ".*(HHH90000022|HHH90000014).*"
+          onMatch: "DENY"
+          onMismatch: "NEUTRAL"
+      PatternLayout:
+        Pattern: "%d{ABSOLUTE} %-5p [%c{1}] %m%n"
+
+  Loggers:
+    Root:
+      level: info
+      AppenderRef:
+        - ref: CONSOLE
diff --git a/Installer/build.sbt b/Installer/build.sbt
@@ -1,8 +1,7 @@
 import Path.relativeTo
 
 libraryDependencies ++= Seq(
-  "com.google.guava" % "guava"         % "31.0.1-jre",
-  "org.slf4j"        % "slf4j-simple"  % "1.7.32",
+  "com.google.guava" % "guava"         % "31.1-jre",
   "commons-codec"    % "commons-codec" % "1.15",
   postgresDep,
   sqlServerDep
@@ -23,6 +22,13 @@ excludeDependencies ++= Seq(
   "stax"            % "stax-api"
 )
 
+(assembly / assemblyMergeStrategy) := {
+  case "module-info.class" => MergeStrategy.discard
+  case x =>
+    val oldStrategy = (assembly / assemblyMergeStrategy).value
+    oldStrategy(x)
+}
+
 (assembly / assemblyOption) := (assembly / assemblyOption).value.copy(includeScala = false)
 
 (assembly / mainClass) := Some("com.dytech.edge.installer.application.Launch")

diff --git a/Installer/data/server/conversion/all/log4j.properties b/Installer/data/server/conversion/all/log4j.properties
diff --git a/Installer/data/server/conversion/all/log4j2.yaml b/Installer/data/server/conversion/all/log4j2.yaml
@@ -0,0 +1,40 @@
+Configuration:
+  status: warn
+
+  properties:
+    property:
+      - name: filePath
+        value: "../logs/conversion-service"
+      - name: fileName
+        value: "${filePath}/conversion.html"
+      - name: filePattern
+        value: "${filePath}/%d{yyyy-MM-dd}/conversion-%i.html"
+
+  appenders:
+    RollingFile:
+      name: ROLLING_FILE
+      fileName: "${fileName}"
+      filePattern: "${filePattern}"
+      immediateFlush: true
+      append: true
+      Filters:
+        ThresholdFilter:
+          level: info
+      HTMLLayout:
+        title: TLE Service Manager
+        datePattern: ISO8601
+        locationInfo: true
+      Policies:
+        TimeBasedTriggeringPolicy:
+          interval: 1
+          modulate: true
+        SizeBasedTriggeringPolicy:
+          size: 10 MB
+      DefaultRollOverStrategy:
+        max: 20
+
+  Loggers:
+    Root:
+      level: debug
+      AppenderRef:
+        ref: ROLLING_FILE
diff --git a/Installer/data/server/learningedge-config/hibernate.properties.sqlserver b/Installer/data/server/learningedge-config/hibernate.properties.sqlserver
@@ -1,6 +1,6 @@
 hibernate.connection.driver_class = com.microsoft.sqlserver.jdbc.SQLServerDriver
 hibernate.dialect = com.tle.hibernate.dialect.SQLServerDialect
-hibernate.connection.url = jdbc:sqlserver://${datasource/host}:${datasource/port};databaseName=${datasource/database}
+hibernate.connection.url = jdbc:sqlserver://${datasource/host}:${datasource/port};databaseName=${datasource/database};trustServerCertificate=${datasource/trustservercerts}
 hibernate.connection.username = ${datasource/username}
 hibernate.connection.password = ${datasource/password}