Skip to content
This repository has been archived by the owner on Jun 10, 2020. It is now read-only.

Commit

Permalink
Merge pull request #190 from eed3si9n/bport/log4j
Browse files Browse the repository at this point in the history
[1.2.x] bump JLine and log4j 2
  • Loading branch information
eed3si9n authored Nov 26, 2018
2 parents a57eb63 + a1f8a5e commit 016858d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
6 changes: 3 additions & 3 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ object Dependencies {

def addSbtIO(p: Project): Project = addSbtModule(p, sbtIoPath, "io", sbtIO)

val jline = "jline" % "jline" % "2.14.4"
val jline = "jline" % "jline" % "2.14.6"

val scalaCompiler = Def.setting { "org.scala-lang" % "scala-compiler" % scalaVersion.value }
val scalaReflect = Def.setting { "org.scala-lang" % "scala-reflect" % scalaVersion.value }
Expand All @@ -54,8 +54,8 @@ object Dependencies {
"com.eed3si9n" %% "sjson-new-murmurhash" % contrabandSjsonNewVersion.value
}

def log4jVersion = "2.8.1"
def log4jVersion = "2.11.1"
val log4jApi = "org.apache.logging.log4j" % "log4j-api" % log4jVersion
val log4jCore = "org.apache.logging.log4j" % "log4j-core" % log4jVersion
val disruptor = "com.lmax" % "disruptor" % "3.3.6"
val disruptor = "com.lmax" % "disruptor" % "3.4.2"
}
1 change: 1 addition & 0 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.7")
addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.4.0")
addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.9")
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.4")

0 comments on commit 016858d

Please sign in to comment.