Skip to content

Commit

Permalink
test with slf4jv2 (#539)
Browse files Browse the repository at this point in the history 
* try to test with slf4jv2

Update Dependencies.scala

* Update Dependencies.scala

* try again

* Update Dependencies.scala

* try again
  • Loading branch information
@pjfanning
pjfanning committed Apr 18, 2024
1 parent 773d8a1 commit a209388
Showing 1 changed file with 30 additions and 18 deletions.
48 changes: 30 additions & 18 deletions project/Dependencies.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,11 @@ object Dependencies {
val hoverflyVersion = "0.14.1"
val scalaCheckVersion = "1.17.0"

val LogbackForSlf4j1Version = "1.2.13"
val LogbackForSlf4j2Version = "1.3.14"
val LogbackVersion = if (PekkoBinaryVersion == "1.0") LogbackForSlf4j1Version else LogbackForSlf4j2Version
// Legacy versions support Slf4J v1 for compatibility with older libs
val Slf4jVersion = "2.0.13"
val Slf4jLegacyVersion = "1.7.36"
val LogbackVersion = "1.3.14"
val LogbackLegacyVersion = "1.2.13"

/**
* Calculates the scalatest version in a format that is used for `org.scalatestplus` scalacheck artifacts
Expand All @@ -63,9 +65,6 @@ object Dependencies {
val GoogleAuthVersion = "1.23.0"
val JwtScalaVersion = "10.0.0"

val log4jOverSlf4jVersion = "1.7.36"
val jclOverSlf4jVersion = "1.7.36"

val CommonSettings = Seq(
// These libraries are added to all modules via the `Common` AutoPlugin
libraryDependencies ++= Seq(
Expand All @@ -77,6 +76,7 @@ object Dependencies {
"org.apache.pekko" %% "pekko-stream" % PekkoVersion,
"org.apache.pekko" %% "pekko-stream-testkit" % PekkoVersion,
"org.apache.pekko" %% "pekko-slf4j" % PekkoVersion,
"org.slf4j" % "slf4j-api" % Slf4jVersion,
"ch.qos.logback" % "logback-classic" % LogbackVersion,
"org.scalatest" %% "scalatest" % ScalaTestVersion,
"com.dimafeng" %% "testcontainers-scala-scalatest" % TestContainersScalaTestVersion,
Expand Down Expand Up @@ -154,7 +154,7 @@ object Dependencies {
libraryDependencies ++= Seq(
"org.apache.pekko" %% "pekko-http" % PekkoHttpVersion,
"org.apache.pekko" %% "pekko-http-spray-json" % PekkoHttpVersion,
"org.slf4j" % "jcl-over-slf4j" % jclOverSlf4jVersion % Test) ++ JacksonDatabindDependencies)
"org.slf4j" % "jcl-over-slf4j" % Slf4jVersion % Test) ++ JacksonDatabindDependencies)

val File = Seq(
libraryDependencies ++= Seq(
Expand All @@ -173,13 +173,15 @@ object Dependencies {
"com.sksamuel.avro4s" %% "avro4s-core" % avro4sVersion.value % Test,
"org.scalacheck" %% "scalacheck" % scalaCheckVersion % Test,
"org.specs2" %% "specs2-core" % "4.20.5" % Test,
"org.slf4j" % "log4j-over-slf4j" % log4jOverSlf4jVersion % Test))
"org.slf4j" % "slf4j-api" % Slf4jVersion % Test,
"org.slf4j" % "log4j-over-slf4j" % Slf4jVersion % Test))

val Ftp = Seq(
libraryDependencies ++= Seq(
"commons-net" % "commons-net" % "3.10.0",
"com.hierynomus" % "sshj" % "0.38.0",
"ch.qos.logback" % "logback-classic" % LogbackForSlf4j2Version % Test) ++ Mockito)
"org.slf4j" % "slf4j-api" % Slf4jVersion % Test,
"ch.qos.logback" % "logback-classic" % LogbackVersion % Test) ++ Mockito)

val GeodeVersion = "1.15.1"
val GeodeVersionForDocs = "115"
Expand All @@ -192,7 +194,8 @@ object Dependencies {
"com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % JacksonDatabindVersion,
"com.fasterxml.jackson.datatype" % "jackson-datatype-jsr310" % JacksonDatabindVersion,
"org.apache.logging.log4j" % "log4j-to-slf4j" % "2.23.1" % Test,
"ch.qos.logback" % "logback-classic" % LogbackForSlf4j2Version % Test) ++ JacksonDatabindDependencies ++
"org.slf4j" % "slf4j-api" % Slf4jVersion % Test,
"ch.qos.logback" % "logback-classic" % LogbackVersion % Test) ++ JacksonDatabindDependencies ++
(if (isScala3.value)
Seq.empty // Equivalent and relevant shapeless functionality has been mainlined into Scala 3 language/stdlib
else Seq(
Expand Down Expand Up @@ -233,7 +236,8 @@ object Dependencies {
"org.apache.pekko" %% "pekko-http" % PekkoHttpVersion,
"org.apache.pekko" %% "pekko-parsing" % PekkoHttpVersion,
"org.apache.arrow" % "arrow-memory-netty" % ArrowVersion % Test,
"ch.qos.logback" % "logback-classic" % LogbackForSlf4j2Version % Test) ++ Mockito)
"org.slf4j" % "slf4j-api" % Slf4jVersion % Test,
"ch.qos.logback" % "logback-classic" % LogbackVersion % Test) ++ Mockito)

val GooglePubSub = Seq(
libraryDependencies ++= Seq(
Expand Down Expand Up @@ -276,7 +280,7 @@ object Dependencies {
"slf4j-log4j12"),
("org.apache.hadoop" % "hadoop-mapreduce-client-core" % hadoopVersion).exclude("log4j", "log4j").exclude(
"org.slf4j", "slf4j-log4j12"),
"org.slf4j" % "log4j-over-slf4j" % log4jOverSlf4jVersion % Test))
"org.slf4j" % "log4j-over-slf4j" % Slf4jVersion % Test))
}

val HadoopVersion = "3.3.6"
Expand All @@ -291,7 +295,7 @@ object Dependencies {
"slf4j-log4j12"),
("org.apache.hadoop" % "hadoop-minicluster" % HadoopVersion % Test).exclude("log4j", "log4j").exclude("org.slf4j",
"slf4j-log4j12"),
"org.slf4j" % "log4j-over-slf4j" % log4jOverSlf4jVersion % Test) ++ Mockito)
"org.slf4j" % "log4j-over-slf4j" % Slf4jVersion % Test) ++ Mockito)

val HuaweiPushKit = Seq(
libraryDependencies ++= Seq(
Expand Down Expand Up @@ -333,13 +337,17 @@ object Dependencies {
_.excludeAll(
ExclusionRule("software.amazon.awssdk", "apache-client"),
ExclusionRule("software.amazon.awssdk", "netty-nio-client"))) ++ Seq(
"ch.qos.logback" % "logback-classic" % LogbackForSlf4j2Version % Test) ++ Mockito)
"org.slf4j" % "slf4j-api" % Slf4jVersion % Test,
"ch.qos.logback" % "logback-classic" % LogbackVersion % Test) ++ Mockito)

val KuduVersion = "1.10.1"
val Kudu = Seq(
libraryDependencies ++= Seq(
"org.apache.kudu" % "kudu-client-tools" % KuduVersion,
"org.apache.kudu" % "kudu-client" % KuduVersion % Test))
"org.apache.kudu" % "kudu-client" % KuduVersion % Test),
dependencyOverrides ++= Seq(
"org.slf4j" % "slf4j-api" % Slf4jLegacyVersion,
"ch.qos.logback" % "logback-classic" % LogbackLegacyVersion))

val MongoDb = Seq(
crossScalaVersions -= Scala3,
Expand Down Expand Up @@ -370,7 +378,8 @@ object Dependencies {
Seq(
libraryDependencies ++= Seq(
"io.pravega" % "pravega-client" % PravegaVersion,
"org.slf4j" % "log4j-over-slf4j" % log4jOverSlf4jVersion % Test))
"org.slf4j" % "slf4j-api" % Slf4jVersion % Test,
"org.slf4j" % "log4j-over-slf4j" % Slf4jVersion % Test))
}

val Reference = Seq(
Expand Down Expand Up @@ -407,7 +416,7 @@ object Dependencies {
libraryDependencies ++= Seq(
"com.typesafe.slick" %% "slick" % SlickVersion,
"com.typesafe.slick" %% "slick-hikaricp" % SlickVersion,
"ch.qos.logback" % "logback-classic" % LogbackForSlf4j2Version % Test,
"ch.qos.logback" % "logback-classic" % LogbackVersion % Test,
"com.h2database" % "h2" % "2.2.224" % Test))

val Eventbridge = Seq(
Expand Down Expand Up @@ -436,7 +445,10 @@ object Dependencies {
"org.apache.solr" % "solr-solrj" % SolrjVersion,
("org.apache.solr" % "solr-test-framework" % SolrjVersion % Test).exclude("org.apache.logging.log4j",
"log4j-slf4j-impl"),
"org.slf4j" % "log4j-over-slf4j" % log4jOverSlf4jVersion % Test))
"org.slf4j" % "log4j-over-slf4j" % Slf4jLegacyVersion % Test),
dependencyOverrides ++= Seq(
"org.slf4j" % "slf4j-api" % Slf4jLegacyVersion,
"ch.qos.logback" % "logback-classic" % LogbackLegacyVersion))

val Sqs = Seq(
libraryDependencies ++= Seq(
Expand Down

0 comments on commit a209388

Please sign in to comment.