Skip to content

Commit

Permalink
chore: Patch updates (#2910)
Browse files Browse the repository at this point in the history
  • Loading branch information
daschbot authored Nov 3, 2023
1 parent d81a88e commit 3e95d71
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.7.14"
version = "3.7.15"
runner.dialect = scala213
maxColumn = 120
align.preset = most
Expand Down
10 changes: 5 additions & 5 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ object Dependencies {
"daschswiss/apache-jena-fuseki:2.1.2" // should be the same version as in docker-compose.yml, also make sure to use the same version when deploying it (i.e. version in ops-deploy)!
val sipiImage = "daschswiss/sipi:3.8.2" // base image the knora-sipi image is created from

val ScalaVersion = "2.13.11"
val ScalaVersion = "2.13.12"

val PekkoActorVersion = "1.0.1"
val PekkoHttpVersion = "1.0.0"
Expand All @@ -24,7 +24,7 @@ object Dependencies {
val ZioConfigVersion = "3.0.7"
val ZioLoggingVersion = "2.1.14"
val ZioNioVersion = "2.0.2"
val ZioMetricsConnectorsVersion = "2.2.0"
val ZioMetricsConnectorsVersion = "2.2.1"
val ZioPreludeVersion = "1.0.0-RC21"
val ZioSchemaVersion = "0.2.0"
val ZioVersion = "2.0.18"
Expand Down Expand Up @@ -70,8 +70,8 @@ object Dependencies {

// Metrics
val aspectjweaver = "org.aspectj" % "aspectjweaver" % "1.9.20.1"
val kamonCore = "io.kamon" %% "kamon-core" % "2.6.4" // Scala 3 compatible
val kamonScalaFuture = "io.kamon" %% "kamon-scala-future" % "2.6.4" // Scala 3 incompatible
val kamonCore = "io.kamon" %% "kamon-core" % "2.6.5" // Scala 3 compatible
val kamonScalaFuture = "io.kamon" %% "kamon-scala-future" % "2.6.5" // Scala 3 incompatible

// input validation
val commonsValidator =
Expand All @@ -81,7 +81,7 @@ object Dependencies {
val jwtSprayJson = "com.github.jwt-scala" %% "jwt-spray-json" % "9.0.2"
// jwtSprayJson -> 9.0.2 is the latest version that's compatible with spray-json; if it wasn't for spray, this would be Scala 3 compatible
val springSecurityCore =
"org.springframework.security" % "spring-security-core" % "6.1.4" exclude ("commons-logging", "commons-logging") exclude ("org.springframework", "spring-aop")
"org.springframework.security" % "spring-security-core" % "6.1.5" exclude ("commons-logging", "commons-logging") exclude ("org.springframework", "spring-aop")
val bouncyCastle = "org.bouncycastle" % "bcprov-jdk15to18" % "1.76"

// caching
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.6
sbt.version=1.9.7
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ resolvers ++= Seq(

addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
addSbtPlugin("io.kamon" % "sbt-aspectj-runner" % "1.1.2")
addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.1")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.3")
addSbtPlugin("com.typesafe.play" % "sbt-twirl" % "1.6.2")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.4")
addSbtPlugin("com.github.sbt" % "sbt-javaagent" % "0.1.7")
// also update the scalac-scoverage-runtime version in build.sbt
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
Expand Down

0 comments on commit 3e95d71

Please sign in to comment.