luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #192 from eed3si9n/wip/bump 

log4j 2.11.2
This commit is contained in:
eugene yokota 2019-02-23 14:36:46 -05:00 committed by GitHub
parent 62471c6215 3a6aa57747
commit 15ea0109b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/util-logging/src/main/scala/sbt/internal/util/BufferedLogger.scala
View File

@ -34,7 +34,7 @@ object BufferedAppender {
* the level at the time 'play' is called. * the level at the time 'play' is called.
*/ */
class BufferedAppender private[BufferedAppender] (name: String, delegate: Appender) class BufferedAppender private[BufferedAppender] (name: String, delegate: Appender)
extends AbstractAppender(name, null, PatternLayout.createDefaultLayout(), true) { extends AbstractAppender(name, null, PatternLayout.createDefaultLayout(), true, Array.empty) {
private[this] val buffer = new ListBuffer[XLogEvent] private[this] val buffer = new ListBuffer[XLogEvent]
private[this] var recording = false private[this] var recording = false

2
internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala
View File

@ -333,7 +333,7 @@ class ConsoleAppender private[ConsoleAppender] (
ansiCodesSupported: Boolean, ansiCodesSupported: Boolean,
useFormat: Boolean, useFormat: Boolean,
suppressedMessage: SuppressedTraceContext => Option[String] suppressedMessage: SuppressedTraceContext => Option[String]
) extends AbstractAppender(name, null, LogExchange.dummyLayout, true) { ) extends AbstractAppender(name, null, LogExchange.dummyLayout, true, Array.empty) {
import scala.Console.{ BLUE, GREEN, RED, YELLOW } import scala.Console.{ BLUE, GREEN, RED, YELLOW }
private val reset: String = { private val reset: String = {

3
internal/util-logging/src/main/scala/sbt/util/LogExchange.scala
View File

@ -124,7 +124,8 @@ sealed abstract class LogExchange {
// CustomConsoleAppenderImpl.createAppender("Stdout", layout, null, null) // CustomConsoleAppenderImpl.createAppender("Stdout", layout, null, null)
appender.start appender.start
config.addAppender(appender) config.addAppender(appender)
val asyncAppender: AsyncAppender = (AsyncAppender.newBuilder(): AsyncAppender.Builder) val asyncAppender: AsyncAppender = AsyncAppender
.newBuilder()
.setName("AsyncStdout") .setName("AsyncStdout")
.setAppenderRefs(Array(AppenderRef.createAppenderRef("Stdout", XLevel.DEBUG, null))) .setAppenderRefs(Array(AppenderRef.createAppenderRef("Stdout", XLevel.DEBUG, null)))
.setBlocking(false) .setBlocking(false)

4
project/Dependencies.scala
View File

@ -5,7 +5,7 @@ import sbt.contraband.ContrabandPlugin.autoImport._
object Dependencies { object Dependencies {
val scala210 = "2.10.7" val scala210 = "2.10.7"
val scala211 = "2.11.12" val scala211 = "2.11.12"
val scala212 = "2.12.7" val scala212 = "2.12.8"
private val ioVersion = "1.2.1" private val ioVersion = "1.2.1"
@ -54,7 +54,7 @@ object Dependencies {
"com.eed3si9n" %% "sjson-new-murmurhash" % contrabandSjsonNewVersion.value "com.eed3si9n" %% "sjson-new-murmurhash" % contrabandSjsonNewVersion.value
} }
def log4jVersion = "2.11.1" def log4jVersion = "2.11.2"
val log4jApi = "org.apache.logging.log4j" % "log4j-api" % log4jVersion val log4jApi = "org.apache.logging.log4j" % "log4j-api" % log4jVersion
val log4jCore = "org.apache.logging.log4j" % "log4j-core" % log4jVersion val log4jCore = "org.apache.logging.log4j" % "log4j-core" % log4jVersion
val disruptor = "com.lmax" % "disruptor" % "3.4.2" val disruptor = "com.lmax" % "disruptor" % "3.4.2"