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

openequella · Jan 7, 2024 · 3faf300 · 3faf300
2 parents 0a7d3ef + 64ca55b
commit 3faf300
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 28 deletions.
diff --git a/Source/Server/conversion/build.sbt b/Source/Server/conversion/build.sbt
@@ -1,4 +1,4 @@
-val tikaVersion = "2.9.0"
+val tikaVersion = "2.9.1"
 
 libraryDependencies ++= Seq(
   "org.slf4j"       % "slf4j-api"                     % "2.0.9",

diff --git a/Source/Server/equellaserver/build.sbt b/Source/Server/equellaserver/build.sbt
@@ -17,7 +17,7 @@ updateOptions := updateOptions.value.withCachedResolution(true)
 
 val RestEasyVersion   = "3.15.6.Final"
 val SwaggerVersion    = "1.6.12"
-val TomcatVersion     = "9.0.82"
+val TomcatVersion     = "9.0.83"
 val axis2Version      = "1.8.2"
 val circeVersion      = "0.14.5"
 val curatorVersion    = "5.5.0"
@@ -28,7 +28,7 @@ val jsassVersion      = "5.10.5"
 val jsoupVersion      = "1.16.2"
 val prometheusVersion = "0.16.0"
 val sttpVersion       = "2.3.0"
-val tikaVersion       = "2.9.0"
+val tikaVersion       = "2.9.1"
 val luceneVersion     = "9.8.0"
 
 libraryDependencies ++= Seq(
@@ -114,7 +114,7 @@ libraryDependencies ++= Seq(
   "commons-daemon"            % "commons-daemon"        % "1.3.4",
   "commons-discovery"         % "commons-discovery"     % "0.5",
   "commons-httpclient"        % "commons-httpclient"    % "3.1",
-  "commons-io"                % "commons-io"            % "2.15.0",
+  "commons-io"                % "commons-io"            % "2.15.1",
   "commons-lang"              % "commons-lang"          % "2.6",
   "com.github.equella.legacy" % "itunesu-api-java"      % "1.7",
   "com.github.equella.legacy" % "mets"                  % "1.0",
@@ -238,12 +238,12 @@ libraryDependencies ++= Seq(
     ExclusionRule(organization = "net.sf.saxon")
   ),
   "xml-resolver"                  % "xml-resolver"              % "1.2",
-  "org.scala-sbt"                 %% "io"                       % "1.9.1",
+  "org.scala-sbt"                 %% "io"                       % "1.9.7",
   "org.mozilla"                   % "rhino"                     % "1.7.14",
   "io.lemonlabs"                  %% "scala-uri"                % "4.0.3",
   "org.scala-lang.modules"        %% "scala-parser-combinators" % "2.3.0",
   "io.github.classgraph"          % "classgraph"                % "4.8.164",
-  "com.fasterxml"                 % "classmate"                 % "1.5.1",
+  "com.fasterxml"                 % "classmate"                 % "1.6.0",
   "org.glassfish"                 % "javax.el"                  % "3.0.1-b12",
   "jakarta.validation"            % "jakarta.validation-api"    % "3.0.2",
   "com.github.stephenc.jcip"      % "jcip-annotations"          % "1.0-1",

diff --git a/Source/Tools/UpgradeInstallation/build.sbt b/Source/Tools/UpgradeInstallation/build.sbt
@@ -7,7 +7,7 @@ libraryDependencies ++= Seq(
   "org.typelevel" %% "cats-core" % "2.10.0",
   xstreamDep,
   "commons-configuration" % "commons-configuration" % "1.10",
-  "commons-io"            % "commons-io"            % "2.15.0",
+  "commons-io"            % "commons-io"            % "2.15.1",
   "commons-lang"          % "commons-lang"          % "2.6",
   // Need these two jackson deps to allow processing log4j yaml config files.
   jacksonDataBind,

diff --git a/Source/Tools/UpgradeManager/build.sbt b/Source/Tools/UpgradeManager/build.sbt
@@ -8,7 +8,7 @@ libraryDependencies ++= Seq(
   "org.antlr"            % "stringtemplate"     % "3.2.1",
   "com.google.code.gson" % "gson"               % "2.10.1",
   "org.slf4j"            % "jcl-over-slf4j"     % "2.0.9",
-  "commons-io"           % "commons-io"         % "2.15.0",
+  "commons-io"           % "commons-io"         % "2.15.1",
   log4j,
   log4jCore,
   log4jSlf4jImpl,

diff --git a/react-front-end/package-lock.json b/react-front-end/package-lock.json
diff --git a/react-front-end/package.json b/react-front-end/package.json
@@ -67,7 +67,7 @@
     "io-ts-types": "0.5.19",
     "jspolyfill-array.prototype.find": "0.1.3",
     "lodash": "4.17.21",
-    "luxon": "3.4.3",
+    "luxon": "3.4.4",
     "object-hash": "3.0.0",
     "oeq-cloudproviders": "git+https://github.com/apereo/openEQUELLA-cloudprovidersdk.git#0debbd148bb47d0dfc2270bb47db028e70a22f74",
     "react": "18.2.0",
@@ -96,7 +96,7 @@
     "@storybook/cli": "7.4.5",
     "@storybook/react": "7.4.5",
     "@storybook/react-webpack5": "7.4.5",
-    "@testing-library/jest-dom": "6.1.4",
+    "@testing-library/jest-dom": "6.1.5",
     "@testing-library/react": "14.1.0",
     "@testing-library/user-event": "14.5.1",
     "@types/css-mediaquery": "0.1.3",