Skip to content

Commit 21449f8

Browse files
Merge commit '3b76970c1' into merge-upstream
Conflicts: project/Dependencies.scala project/build.sbt
2 parents 6b460e6 + 3b76970 commit 21449f8

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

project/Dependencies.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ object Dependencies {
3232
val zipkinSenderVersion = "2.16.3"
3333
val asmVersion = "9.4"
3434
val snailgunVersion = "0.4.1-sc2"
35-
val debugAdapterVersion = "3.0.5"
35+
val debugAdapterVersion = "3.0.7"
3636
val bloopConfigVersion = "1.5.5"
3737
val coursierInterfaceVersion = "1.0.13"
3838

@@ -42,7 +42,7 @@ object Dependencies {
4242
val bloopConfig = "ch.epfl.scala" %% "bloop-config" % bloopConfigVersion
4343

4444
val libraryManagement = "org.scala-sbt" %% "librarymanagement-ivy" % lmVersion
45-
val log4j = "org.apache.logging.log4j" % "log4j-core" % "2.19.0"
45+
val log4j = "org.apache.logging.log4j" % "log4j-core" % "2.20.0"
4646
val scalazCore = "org.scalaz" %% "scalaz-core" % scalazVersion
4747
val coursierInterface = "io.get-coursier" % "interface" % coursierInterfaceVersion
4848
val caseApp = "com.github.alexarchambault" %% "case-app" % caseAppVersion

project/build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.10.4")
99
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.9")
1010

1111
libraryDependencies ++= List(
12-
"org.eclipse.jgit" % "org.eclipse.jgit" % "6.4.0.202211300538-r",
13-
"org.eclipse.jgit" % "org.eclipse.jgit.ssh.jsch" % "6.4.0.202211300538-r",
12+
"org.eclipse.jgit" % "org.eclipse.jgit" % "6.5.0.202303070854-r",
13+
"org.eclipse.jgit" % "org.eclipse.jgit.ssh.jsch" % "6.5.0.202303070854-r",
1414
"commons-codec" % "commons-codec" % "1.15"
1515
)

0 commit comments

Comments
 (0)