Skip to content

Commit

Permalink
chore(deps): update spring core to v5.3.9
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate-bot authored and edalex-ian committed Jul 14, 2021
1 parent 378219b commit c0c097d
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
val springVersion = "5.3.8"
val springVersion = "5.3.9"

libraryDependencies ++= Seq(
"com.github.equella.jpf" % "jpf" % "1.0.7",
Expand All @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
val springVersion = "5.3.8"
val springVersion = "5.3.9"

libraryDependencies ++= Seq(
"com.google.guava" % "guava" % "18.0",
Expand Down
2 changes: 1 addition & 1 deletion Source/Plugins/Core/com.equella.core/jarsrc/build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
val springVersion = "5.3.8"
val springVersion = "5.3.9"

libraryDependencies ++= Seq(
"net.java.dev.jna" % "platform" % "3.5.2",
Expand Down
2 changes: 1 addition & 1 deletion Source/Server/adminTool/build.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
val springVersion = "5.3.8"
val springVersion = "5.3.9"

libraryDependencies ++= Seq(
"org.slf4j" % "jcl-over-slf4j" % "1.7.31",
Expand Down
4 changes: 2 additions & 2 deletions Source/Server/equellaserver/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down Expand Up @@ -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",
Expand Down

0 comments on commit c0c097d

Please sign in to comment.