diff --git a/Source/Plugins/Admin/com.tle.web.adminconsole/jarsrc/build.sbt b/Source/Plugins/Admin/com.tle.web.adminconsole/jarsrc/build.sbt index 894a978519..30a15c00f3 100644 --- a/Source/Plugins/Admin/com.tle.web.adminconsole/jarsrc/build.sbt +++ b/Source/Plugins/Admin/com.tle.web.adminconsole/jarsrc/build.sbt @@ -1,4 +1,4 @@ -val springVersion = "5.3.8" +val springVersion = "5.3.9" libraryDependencies ++= Seq( "com.github.equella.jpf" % "jpf" % "1.0.7", @@ -18,7 +18,7 @@ excludeDependencies ++= Seq( // Spring 5 added a default logging bridge. In oEQ, this results in // a [deduplicate: different file contents found in the following] error // ...org.slf4j/jcl-over-slf4j/jars/jcl-over-slf4j-1.7.30.jar:org/apache/commons/logging/Log.class - // ...org.springframework/spring-jcl/jars/spring-jcl-5.3.8.jar:org/apache/commons/logging/Log.class + // ...org.springframework/spring-jcl/jars/spring-jcl-5.3.9.jar:org/apache/commons/logging/Log.class // As per https://github.com/spring-projects/spring-framework/issues/20611 , // since we already have logging in place, we can safely exclude the dep from spring. "org.springframework" % "spring-jcl" diff --git a/Source/Plugins/Applet/com.tle.web.filemanager.applet/appletsrc/build.sbt b/Source/Plugins/Applet/com.tle.web.filemanager.applet/appletsrc/build.sbt index 234c05c246..be7d5c7035 100644 --- a/Source/Plugins/Applet/com.tle.web.filemanager.applet/appletsrc/build.sbt +++ b/Source/Plugins/Applet/com.tle.web.filemanager.applet/appletsrc/build.sbt @@ -1,4 +1,4 @@ -val springVersion = "5.3.8" +val springVersion = "5.3.9" libraryDependencies ++= Seq( "com.google.guava" % "guava" % "18.0", diff --git a/Source/Plugins/Core/com.equella.core/jarsrc/build.sbt b/Source/Plugins/Core/com.equella.core/jarsrc/build.sbt index 60f5af3df8..8b55e2c93a 100644 --- a/Source/Plugins/Core/com.equella.core/jarsrc/build.sbt +++ b/Source/Plugins/Core/com.equella.core/jarsrc/build.sbt @@ -1,4 +1,4 @@ -val springVersion = "5.3.8" +val springVersion = "5.3.9" libraryDependencies ++= Seq( "net.java.dev.jna" % "platform" % "3.5.2", diff --git a/Source/Server/adminTool/build.sbt b/Source/Server/adminTool/build.sbt index c38bdce1d6..e0630c3b10 100644 --- a/Source/Server/adminTool/build.sbt +++ b/Source/Server/adminTool/build.sbt @@ -1,4 +1,4 @@ -val springVersion = "5.3.8" +val springVersion = "5.3.9" libraryDependencies ++= Seq( "org.slf4j" % "jcl-over-slf4j" % "1.7.31", diff --git a/Source/Server/equellaserver/build.sbt b/Source/Server/equellaserver/build.sbt index cf4ed50eaf..efc1c466ed 100644 --- a/Source/Server/equellaserver/build.sbt +++ b/Source/Server/equellaserver/build.sbt @@ -27,7 +27,7 @@ val jacksonVersion = "2.11.3" val jsassVersion = "5.10.4" val jsoupVersion = "1.14.1" val simpledbaVersion = "0.1.9" -val springVersion = "5.3.8" +val springVersion = "5.3.9" val sttpVersion = "1.7.2" val tikaVersion = "1.24.1" @@ -322,7 +322,7 @@ excludeDependencies ++= Seq( // Spring 5 added a default logging bridge. In oEQ, this results in // a [deduplicate: different file contents found in the following] error // ...org.slf4j/jcl-over-slf4j/jars/jcl-over-slf4j-1.7.30.jar:org/apache/commons/logging/Log.class - // ...org.springframework/spring-jcl/jars/spring-jcl-5.3.8.jar:org/apache/commons/logging/Log.class + // ...org.springframework/spring-jcl/jars/spring-jcl-5.3.9.jar:org/apache/commons/logging/Log.class // As per https://github.com/spring-projects/spring-framework/issues/20611 , // since we already have logging in place, we can safely exclude the dep from spring. "org.springframework" % "spring-jcl",