Skip to content

Commit a1ea603

Browse files
authored
Merge pull request scala#9830 from SethTisue/upgrade-all-the-loggers
upgrade sbt, logback, slf4j
2 parents 0233cac + 6c35ebb commit a1ea603

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

build.sbt

+3-3
Original file line numberDiff line numberDiff line change
@@ -741,9 +741,9 @@ def osgiTestProject(p: Project, framework: ModuleID) = p
741741
"org.ops4j.pax.exam" % "pax-exam-link-assembly" % paxExamVersion,
742742
"org.ops4j.pax.url" % "pax-url-aether" % "2.4.1",
743743
"org.ops4j.pax.swissbox" % "pax-swissbox-tracker" % "1.8.1",
744-
"ch.qos.logback" % "logback-core" % "1.1.3",
745-
"ch.qos.logback" % "logback-classic" % "1.1.3",
746-
"org.slf4j" % "slf4j-api" % "1.7.12",
744+
"ch.qos.logback" % "logback-core" % "1.2.8",
745+
"ch.qos.logback" % "logback-classic" % "1.2.8",
746+
"org.slf4j" % "slf4j-api" % "1.7.32",
747747
framework % "test"
748748
)
749749
},

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.5.5
1+
sbt.version=1.5.6

project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.8.1")
2222

2323
libraryDependencies ++= Seq(
2424
"org.eclipse.jgit" % "org.eclipse.jgit" % "4.6.0.201612231935-r",
25-
"org.slf4j" % "slf4j-nop" % "1.7.31",
25+
"org.slf4j" % "slf4j-nop" % "1.7.32",
2626
"com.googlecode.java-diff-utils" % "diffutils" % "1.3.0"
2727
)
2828

scripts/common

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ rm -rf "$WORKSPACE/resolutionScratch_"
1515
mkdir -p "$WORKSPACE/resolutionScratch_"
1616

1717
SBT_CMD=${SBT_CMD-sbt}
18-
SBT_CMD="$SBT_CMD -sbt-version 1.5.5"
18+
SBT_CMD="$SBT_CMD -sbt-version 1.5.6"
1919

2020
# repo to publish builds
2121
integrationRepoUrl=${integrationRepoUrl-"https://scala-ci.typesafe.com/artifactory/scala-integration/"}

0 commit comments

Comments
 (0)