diff --git a/build.sbt b/build.sbt index dfdeebb74..42634c290 100644 --- a/build.sbt +++ b/build.sbt @@ -6,7 +6,7 @@ val fs2Version = "3.2.5" val kafkaVersion = "2.8.1" -val testcontainersScalaVersion = "0.40.0" +val testcontainersScalaVersion = "0.40.3" val vulcanVersion = "1.8.0" @@ -99,10 +99,8 @@ lazy val docs = project lazy val dependencySettings = Seq( resolvers += "confluent" at "https://packages.confluent.io/maven/", libraryDependencies ++= Seq( - ("com.dimafeng" %% "testcontainers-scala-scalatest" % testcontainersScalaVersion) - .cross(CrossVersion.for3Use2_13), - ("com.dimafeng" %% "testcontainers-scala-kafka" % testcontainersScalaVersion) - .cross(CrossVersion.for3Use2_13), + "com.dimafeng" %% "testcontainers-scala-scalatest" % testcontainersScalaVersion, + "com.dimafeng" %% "testcontainers-scala-kafka" % testcontainersScalaVersion, "org.typelevel" %% "discipline-scalatest" % "2.1.5", "org.typelevel" %% "cats-effect-laws" % catsEffectVersion, "org.typelevel" %% "cats-effect-testkit" % catsEffectVersion, diff --git a/modules/core/src/test/resources/logback-test.xml b/modules/core/src/test/resources/logback-test.xml index 765daf771..840f42d31 100644 --- a/modules/core/src/test/resources/logback-test.xml +++ b/modules/core/src/test/resources/logback-test.xml @@ -6,7 +6,7 @@ - + diff --git a/modules/core/src/test/scala/fs2/kafka/BaseKafkaSpec.scala b/modules/core/src/test/scala/fs2/kafka/BaseKafkaSpec.scala index 0519b70a1..6de9508b3 100644 --- a/modules/core/src/test/scala/fs2/kafka/BaseKafkaSpec.scala +++ b/modules/core/src/test/scala/fs2/kafka/BaseKafkaSpec.scala @@ -66,6 +66,14 @@ abstract class BaseKafkaSpec extends BaseAsyncSpec with ForEachTestContainer { override def runTest(testName: String, args: Args) = super.runTest(testName, args) + private val imageVersion = "7.0.1" + + private lazy val imageName = Option(System.getProperty("os.arch")) match { + case Some("aarch64") => + "niciqy/cp-kafka-arm64" // no official docker image for ARM is available yet + case _ => "confluentinc/cp-kafka" + } + override val container: KafkaContainer = new KafkaContainer() .configure { container => container @@ -75,8 +83,9 @@ abstract class BaseKafkaSpec extends BaseAsyncSpec with ForEachTestContainer { transactionTimeoutInterval.toMillis.toString ) .withEnv("KAFKA_TRANSACTION_STATE_LOG_MIN_ISR", "1") - .withEnv("KAFKA_AUTHORIZER_CLASS_NAME", "kafka.security.auth.SimpleAclAuthorizer") + .withEnv("KAFKA_AUTHORIZER_CLASS_NAME", "kafka.security.authorizer.AclAuthorizer") .withEnv("KAFKA_ALLOW_EVERYONE_IF_NO_ACL_FOUND", "true") + .setDockerImageName(s"$imageName:$imageVersion") () }