Skip to content

Commit

Permalink
chore(deps): update apache cxf packages to v3.5.4
Browse files Browse the repository at this point in the history
  • Loading branch information
renovate[bot] authored and edalex-ian committed Oct 23, 2022
1 parent 542b11e commit 5266cd9
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Source/Server/equellaserver/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ val SwaggerVersion = "1.6.7"
val TomcatVersion = "9.0.68"
val axis2Version = "1.8.2"
val circeVersion = "0.12.1"
val cxfVersion = "3.5.3"
val cxfVersion = "3.5.4"
val fs2Version = "2.5.11"
val guiceVersion = "5.1.0"
val jsassVersion = "5.10.4"
Expand Down Expand Up @@ -385,8 +385,8 @@ run := {

// Due to the error: deduplicate: different file contents found in the following:
// ...
// .../org.apache.cxf/cxf-rt-frontend-jaxws/bundles/cxf-rt-frontend-jaxws-3.5.3.jar:META-INF/cxf/bus-extensions.txt
// .../org.apache.cxf/cxf-rt-transports-http/bundles/cxf-rt-transports-http-3.5.3.jar:META-INF/cxf/bus-extensions.txt
// .../org.apache.cxf/cxf-rt-frontend-jaxws/bundles/cxf-rt-frontend-jaxws-3.5.4.jar:META-INF/cxf/bus-extensions.txt
// .../org.apache.cxf/cxf-rt-transports-http/bundles/cxf-rt-transports-http-3.5.4.jar:META-INF/cxf/bus-extensions.txt
// ...
// As per https://github.com/johnrengelman/shadow/issues/309 , combining the files.
case PathList("META-INF", "cxf", "bus-extensions.txt") => MergeStrategy.filterDistinctLines
Expand Down
2 changes: 1 addition & 1 deletion autotest/Tests/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ inConfig(Serial)(Defaults.testTasks)
val circeVersion = "0.12.1"
val http4sVersion = "0.21.8"
val catsVersion = "2.8.0"
val cxfVersion = "3.5.3"
val cxfVersion = "3.5.4"

addCompilerPlugin("org.typelevel" % "kind-projector" % "0.13.2" cross CrossVersion.full)

Expand Down

0 comments on commit 5266cd9

Please sign in to comment.