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

openequella · Feb 20, 2023 · 37d7406 · 37d7406
2 parents d24e324 + a79205b
commit 37d7406
Show file tree

Hide file tree

Showing 16 changed files with 6,720 additions and 11,949 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-16.18.1
+16.19.1
diff --git a/Source/Plugins/Core/com.equella.core/build.sbt b/Source/Plugins/Core/com.equella.core/build.sbt
@@ -1,7 +1,7 @@
 import Path.{flat, rebase}
 import _root_.io.circe.parser._
 
-libraryDependencies += "org.mockito" % "mockito-core" % "4.11.0" % Test
+libraryDependencies += "org.mockito" % "mockito-core" % "5.1.1" % Test
 
 langStrings := {
   val langDir = (Compile / resourceDirectory).value / "com/tle/core/i18n/service/impl"

diff --git a/Source/Plugins/Generic/org.hibernate/build.sbt b/Source/Plugins/Generic/org.hibernate/build.sbt
@@ -2,7 +2,7 @@ lazy val Hibernate     = config("hibernate")
 lazy val CustomCompile = config("compile") extend Hibernate
 
 libraryDependencies := Seq(
-  "org.hibernate"            % "hibernate-core"        % "5.6.14.Final",
+  "org.hibernate"            % "hibernate-core"        % "5.6.15.Final",
   "org.hibernate"            % "hibernate-validator"   % "6.2.5.Final",
   "javax.persistence"        % "javax.persistence-api" % "2.2",
   "com.thoughtworks.xstream" % "xstream-hibernate"     % xstreamVersion excludeAll ExclusionRule(

diff --git a/Source/Server/equellaserver/build.sbt b/Source/Server/equellaserver/build.sbt
@@ -63,9 +63,9 @@ libraryDependencies ++= Seq(
     ExclusionRule(organization = "org.apache.axis",
                   name = "axis")
   ),
-  "com.google.api-client" % "google-api-client"           % "2.1.3",
-  "com.google.apis"       % "google-api-services-books"   % "v1-rev20220318-2.0.0",
-  "com.google.apis"       % "google-api-services-youtube" % "v3-rev20221108-2.0.0",
+  "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.code.gson"  % "gson"                        % "2.10.1",
   "com.google.gdata"      % "core"                        % "1.47.1",
   "com.google.guava"      % "guava"                       % "31.1-jre",
@@ -94,7 +94,7 @@ libraryDependencies ++= Seq(
   ),
   "com.miglayout" % "miglayout-swing"       % "4.2",
   "com.ning"      % "async-http-client"     % "1.9.40",
-  "com.rometools" % "rome"                  % "1.18.0",
+  "com.rometools" % "rome"                  % "1.19.0",
   "io.swagger"    % "swagger-core"          % SwaggerVersion,
   "io.swagger"    % "swagger-annotations"   % SwaggerVersion,
   "io.swagger"    % "swagger-jaxrs"         % SwaggerVersion,
@@ -239,7 +239,7 @@ libraryDependencies ++= Seq(
   "org.scala-sbt"                 %% "io"                       % "1.8.0",
   "org.mozilla"                   % "rhino"                     % "1.7.14",
   "io.lemonlabs"                  %% "scala-uri"                % "4.0.3",
-  "org.scala-lang.modules"        %% "scala-parser-combinators" % "2.1.1",
+  "org.scala-lang.modules"        %% "scala-parser-combinators" % "2.2.0",
   "io.github.classgraph"          % "classgraph"                % "4.8.154",
   "com.fasterxml"                 % "classmate"                 % "1.5.1",
   "org.glassfish"                 % "javax.el"                  % "3.0.1-b12",

diff --git a/Source/Tools/UpgradeManager/build.sbt b/Source/Tools/UpgradeManager/build.sbt
@@ -3,7 +3,7 @@ import java.util.jar.Attributes
 import sbt.Package.ManifestAttributes
 
 libraryDependencies ++= Seq(
-  "commons-fileupload"   % "commons-fileupload" % "1.4",
+  "commons-fileupload"   % "commons-fileupload" % "1.5",
   "com.google.guava"     % "guava"              % "31.1-jre",
   "org.antlr"            % "stringtemplate"     % "3.2.1",
   "com.google.code.gson" % "gson"               % "2.10.1",