Skip to content

Commit b684582

Browse files
authored
Merge branch 'prod' into update/commons-compress-1.26.2
2 parents 3689236 + 51eddde commit b684582

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

build.sbt

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,11 @@ import java.text.SimpleDateFormat
2727
import java.util.Calendar
2828

2929

30-
val specs2V = "4.20.8" // based on spray 1.3.x built in support
30+
val specs2V = "4.20.9" // based on spray 1.3.x built in support
3131
val akkaV = "2.7.+"
3232

3333
val sprayV = "1.3.+"
34-
val scalalikeV = "4.3.1"
34+
val scalalikeV = "4.3.2"
3535
val akkaHttpVersion = "10.5.3"
3636
val akkaVersion = "2.8.5"
3737
val testContainersVersion = "1.20.1"
@@ -88,16 +88,16 @@ val buildSettings = Seq(
8888
"io.findify" %% "s3mock" % "0.2.6" % "test",
8989
"ch.qos.logback" % "logback-classic" % "1.5.8",
9090
"org.mariadb.jdbc" % "mariadb-java-client" % "3.1.4",
91-
"com.mysql" % "mysql-connector-j" % "9.0.0",
91+
"com.mysql" % "mysql-connector-j" % "9.1.0",
9292
// Libreoffice document API
9393
"org.odftoolkit" % "simple-odf" % "0.9.0" withSources(),
9494
"com.scalapenos" %% "stamina-json" % "0.1.6", // ### NO Scala 3
9595
"net.virtual-void" %% "json-lenses" % "0.6.2",
9696
// s3
97-
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.770",
97+
"com.amazonaws" % "aws-java-sdk-s3" % "1.12.772",
9898
"de.svenkubiak" % "jBCrypt" % "0.4.1",
9999
"com.github.daddykotex" %% "courier" % "3.2.0", // ### Scala 3
100-
"com.github.nscala-time" %% "nscala-time" % "2.32.0", // ### Scala 3
100+
"com.github.nscala-time" %% "nscala-time" % "2.34.0", // ### Scala 3
101101
"com.github.blemale" %% "scaffeine" % "5.3.0", // ### Scala 3
102102
"de.zalando" %% "beard" % "0.3.3" exclude("ch.qos.logback", "logback-classic") from "https://github.com/OpenOlitor/beard/releases/download/0.3.3/beard_2.13-0.3.3.jar", // ### NO Scala 3, NO Scala 2.13
103103
// transitive dependencies of legacy de.zalando.beard
@@ -107,8 +107,8 @@ val buildSettings = Seq(
107107
"io.nayuki" % "qrcodegen" % "1.8.0",
108108
"org.apache.pdfbox" % "pdfbox" % "2.0.32",
109109
"org.apache.pdfbox" % "pdfbox-parent" % "2.0.32" pomOnly(),
110-
"org.apache.xmlgraphics" % "batik-transcoder" % "1.17",
111-
"org.apache.xmlgraphics" % "batik-codec" % "1.17",
110+
"org.apache.xmlgraphics" % "batik-transcoder" % "1.18",
111+
"org.apache.xmlgraphics" % "batik-codec" % "1.18",
112112
"com.tegonal" %% "cf-env-config-loader" % "1.1.2", // ### NO Scala 3, NO Scala 2.13
113113
"com.eatthepath" % "java-otp" % "0.4.0",
114114
"org.apache.pdfbox" % "pdfbox-tools" % "2.0.32"
@@ -118,9 +118,9 @@ val buildSettings = Seq(
118118
"org.scala-lang.modules" %% "scala-parser-combinators" % "2.1.1",
119119
"xerces" % "xercesImpl" % "2.12.2",
120120
"org.apache.commons" % "commons-compress" % "1.26.2",
121-
"io.netty" % "netty-handler" % "4.1.107.Final",
121+
"io.netty" % "netty-handler" % "4.1.114.Final",
122122
"org.apache.jena" % "jena-core" % "4.6.1",
123-
"com.google.protobuf" % "protobuf-java" % "3.21.10",
123+
"com.google.protobuf" % "protobuf-java" % "3.21.12",
124124
"com.google.guava" % "guava" % "33.0.0-jre"
125125
)
126126
)

project/plugins.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
55

66
addSbtPlugin("org.scalaxb" % "sbt-scalaxb" % "1.12.1")
77

8-
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0")
8+
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.3.0")
99
//addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.5.10")
1010

11-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.1.1")
11+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.2")
1212

1313
dependencyOverrides += "org.scala-lang.modules" %% "scala-xml" % "2.3.0"

0 commit comments

Comments
 (0)