Merge branch 'main' into wip/mkdocs-build-strict

dasch-swiss · Apr 15, 2024 · 6af2861 · 6af2861
2 parents 9e0edd2 + 146f10c
commit 6af2861
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -81,7 +81,7 @@ object Dependencies {
   // 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.2.3" exclude ("commons-logging", "commons-logging") exclude ("org.springframework", "spring-aop")
-  val bouncyCastle = "org.bouncycastle" % "bcprov-jdk15to18" % "1.77"
+  val bouncyCastle = "org.bouncycastle" % "bcprov-jdk15to18" % "1.78"
 
   // caching
   val ehcache = "net.sf.ehcache" % "ehcache" % "2.10.9.2"

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -5,7 +5,7 @@ resolvers ++= Seq(
 // please don't remove or merge uncommented to main
 //addDependencyTreePlugin
 
-addSbtPlugin("com.github.sbt"          % "sbt-native-packager" % "1.9.16")
+addSbtPlugin("com.github.sbt"          % "sbt-native-packager" % "1.10.0")
 addSbtPlugin("io.kamon"                % "sbt-aspectj-runner"  % "1.1.2")
 addSbtPlugin("org.playframework.twirl" % "sbt-twirl"           % "2.0.4")
 addSbtPlugin("com.eed3si9n"            % "sbt-assembly"        % "2.2.0")