chore(deps): update slf4j packages to v2

openequella · Nov 3, 2022 · bd76dd1 · bd76dd1
1 parent d8357b1
commit bd76dd1
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 deletions.
diff --git a/Source/Plugins/Admin/com.tle.web.adminconsole/jarsrc/build.sbt b/Source/Plugins/Admin/com.tle.web.adminconsole/jarsrc/build.sbt
@@ -3,8 +3,8 @@ val springVersion = "5.3.23"
 libraryDependencies ++= Seq(
   "com.github.equella.jpf" % "jpf"             % "1.0.7",
   "com.google.guava"       % "guava"           % "31.1-jre",
-  "org.slf4j"              % "jcl-over-slf4j"  % "1.7.36",
-  "org.slf4j"              % "slf4j-simple"    % "1.7.36",
+  "org.slf4j"              % "jcl-over-slf4j"  % "2.0.3",
+  "org.slf4j"              % "slf4j-simple"    % "2.0.3",
   "org.springframework"    % "spring-web"      % springVersion,
   "org.springframework"    % "spring-aop"      % springVersion,
   "org.springframework"    % "spring-context"  % springVersion,

diff --git a/Source/Server/adminTool/build.sbt b/Source/Server/adminTool/build.sbt
@@ -1,9 +1,9 @@
 val springVersion = "5.3.23"
 
 libraryDependencies ++= Seq(
-  "org.slf4j"              % "jcl-over-slf4j"  % "1.7.36",
-  "org.slf4j"              % "slf4j-api"       % "1.7.36",
-  "org.slf4j"              % "slf4j-simple"    % "1.7.36",
+  "org.slf4j"              % "jcl-over-slf4j"  % "2.0.3",
+  "org.slf4j"              % "slf4j-api"       % "2.0.3",
+  "org.slf4j"              % "slf4j-simple"    % "2.0.3",
   "com.google.guava"       % "guava"           % "31.1-jre",
   "com.github.equella.jpf" % "jpf"             % "1.0.7",
   "com.fifesoft"           % "rsyntaxtextarea" % "1.5.2",

diff --git a/Source/Server/conversion/build.sbt b/Source/Server/conversion/build.sbt
@@ -1,8 +1,8 @@
 val tikaVersion = "2.5.0"
 
 libraryDependencies ++= Seq(
-  "org.slf4j"       % "slf4j-api"                     % "1.7.36",
-  "org.slf4j"       % "slf4j-simple"                  % "1.7.36",
+  "org.slf4j"       % "slf4j-api"                     % "2.0.3",
+  "org.slf4j"       % "slf4j-simple"                  % "2.0.3",
   "org.apache.tika" % "tika-core"                     % tikaVersion,
   "org.apache.tika" % "tika-parsers-standard-package" % tikaVersion excludeAll ExclusionRule(
     organization = "org.apache.logging.log4j")

diff --git a/Source/Server/equellaserver/build.sbt b/Source/Server/equellaserver/build.sbt
@@ -221,8 +221,8 @@ libraryDependencies ++= Seq(
   "org.opensaml" % "xmltooling" % "1.4.4" excludeAll ExclusionRule(organization = "org.slf4j"),
   postgresDep,
   "org.scannotation"    % "scannotation"           % "1.0.3",
-  "org.slf4j"           % "jcl-over-slf4j"         % "1.7.36",
-  "org.slf4j"           % "slf4j-api"              % "1.7.36",
+  "org.slf4j"           % "jcl-over-slf4j"         % "2.0.3",
+  "org.slf4j"           % "slf4j-api"              % "2.0.3",
   "org.springframework" % "spring-aop"             % springVersion,
   "org.springframework" % "spring-context"         % springVersion,
   "org.springframework" % "spring-context-support" % springVersion excludeAll (

diff --git a/Source/Tools/UpgradeInstallation/build.sbt b/Source/Tools/UpgradeInstallation/build.sbt
@@ -1,6 +1,6 @@
 libraryDependencies ++= Seq(
   "com.google.guava" % "guava"          % "31.1-jre",
-  "org.slf4j"        % "jcl-over-slf4j" % "1.7.36",
+  "org.slf4j"        % "jcl-over-slf4j" % "2.0.3",
   log4j,
   log4jSlf4jImpl,
   "org.typelevel" %% "cats-core" % "2.8.0",

diff --git a/Source/Tools/UpgradeManager/build.sbt b/Source/Tools/UpgradeManager/build.sbt
@@ -7,7 +7,7 @@ libraryDependencies ++= Seq(
   "com.google.guava"     % "guava"              % "31.1-jre",
   "org.antlr"            % "stringtemplate"     % "3.2.1",
   "com.google.code.gson" % "gson"               % "2.10",
-  "org.slf4j"            % "jcl-over-slf4j"     % "1.7.36",
+  "org.slf4j"            % "jcl-over-slf4j"     % "2.0.3",
   "commons-io"           % "commons-io"         % "2.11.0",
   log4j,
   log4jSlf4jImpl,

diff --git a/autotest/IntegTester/build.sbt b/autotest/IntegTester/build.sbt
@@ -25,7 +25,7 @@ libraryDependencies ++= Seq(
   "org.http4s"    %% "http4s-blaze-server" % Http4sVersion,
   "org.http4s"    %% "http4s-dsl"          % Http4sVersion,
   "org.http4s"    %% "http4s-circe"        % Http4sVersion,
-  "org.slf4j"     % "slf4j-simple"         % "1.7.36",
+  "org.slf4j"     % "slf4j-simple"         % "2.0.3",
   "org.jsoup"     % "jsoup"                % jsoupVersion,
   "com.nulab-inc" %% "scala-oauth2-core"   % "1.5.0"
 )

diff --git a/autotest/Tests/build.sbt b/autotest/Tests/build.sbt
@@ -35,7 +35,7 @@ libraryDependencies ++= Seq(
   "org.jacoco"                % "org.jacoco.report"         % "0.8.8",
   "org.dspace"                % "oclc-harvester2"           % "1.0.0",
   "com.typesafe"              % "config"                    % "1.4.2",
-  "org.slf4j"                 % "slf4j-simple"              % "1.7.36",
+  "org.slf4j"                 % "slf4j-simple"              % "2.0.3",
   "org.scalacheck"            %% "scalacheck"               % "1.17.0" % "test,serial",
   "org.http4s"                %% "http4s-async-http-client" % http4sVersion,
   "org.http4s"                %% "http4s-blaze-client"      % http4sVersion,

diff --git a/import-export-tool/build.gradle b/import-export-tool/build.gradle
@@ -33,7 +33,7 @@ allprojects {
     implementation group: 'com.google.guava', name: 'guava', version: '31.1-jre'
     implementation group: 'javax.xml', name: 'jaxrpc-api', version: '1.1'
     implementation group: 'javax.xml.soap', name: 'javax.xml.soap-api', version: '1.4.0'
-    implementation group: 'org.slf4j', name: 'slf4j-api', version: '1.7.36'
+    implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.3'
     implementation group: 'org.apache.logging.log4j', name: 'log4j', version: '2.19.0'
     implementation group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.19.0'
     implementation group: 'commons-codec', name: 'commons-codec', version: '1.15'
@@ -42,7 +42,7 @@ allprojects {
     implementation group: 'commons-logging', name: 'commons-logging', version: '1.2'
     implementation group: 'wsdl4j', name: 'wsdl4j', version: '1.6.3'
     implementation group: 'net.sf.jpf', name: 'jpf', version: '1.5'
-    implementation group: 'org.slf4j', name: 'jcl-over-slf4j', version: '1.7.36'
+    implementation group: 'org.slf4j', name: 'jcl-over-slf4j', version: '2.0.3'
     implementation fileTree(dir: '../Platform/Plugins/com.tle.platform.common/target/scala-2.13', include: ['*.jar'])
     implementation fileTree(dir: '../Source/Plugins/Platform/com.tle.platform.swing/target/scala-2.13', include: ['*.jar'])
     testImplementation group: 'junit', name: 'junit', version: '4.13.2'

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -52,7 +52,7 @@ libraryDependencies ++= Seq(
   "commons-configuration"  % "commons-configuration" % "1.10",
   "commons-beanutils"      % "commons-beanutils"     % "1.9.4",
   "commons-codec"          % "commons-codec"         % "1.15",
-  "org.slf4j"              % "slf4j-nop"             % "1.7.36",
+  "org.slf4j"              % "slf4j-nop"             % "2.0.3",
   "com.yahoo.platform.yui" % "yuicompressor"         % "2.4.8"
 )
 dependencyOverrides += "com.puppycrawl.tools" % "checkstyle" % "9.3"