You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pekko.apache.org by he...@apache.org on 2023/06/28 00:12:45 UTC
[incubator-pekko-connectors-kafka] 01/02: standardise on scalatest 3.2.14
This is an automated email from the ASF dual-hosted git repository.
hepin pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-pekko-connectors-kafka.git
commit 292d00ebc91cd57255080cd1f5aa03352a5bca90
Author: PJ Fanning <pj...@users.noreply.github.com>
AuthorDate: Tue Jun 27 18:06:54 2023 +0100
standardise on scalatest 3.2.14
---
project/Dependencies.scala | 6 +++---
project/ParadoxSettings.scala | 2 +-
project/Versions.scala | 10 ++--------
3 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index abaf5032..7308b2c5 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -19,7 +19,7 @@ object Dependencies {
"org.testcontainers" % "kafka" % testcontainersVersion % IntegrationTest,
"org.apache.pekko" %% "pekko-slf4j" % pekkoVersion % IntegrationTest,
"org.apache.pekko" %% "pekko-stream-testkit" % pekkoVersion % IntegrationTest,
- "org.scalatest" %% "scalatest" % scalaTestVersion.value % IntegrationTest))
+ "org.scalatest" %% "scalatest" % scalaTestVersion % IntegrationTest))
lazy val clusterShardingDependencies = Seq("org.apache.pekko" %% "pekko-cluster-sharding-typed" % pekkoVersion)
@@ -36,7 +36,7 @@ object Dependencies {
// See https://github.com/sbt/sbt/issues/3618#issuecomment-448951808
("javax.ws.rs" % "javax.ws.rs-api" % "2.1.1").artifacts(Artifact("javax.ws.rs-api", "jar", "jar")),
"org.testcontainers" % "kafka" % testcontainersVersion % Test,
- "org.scalatest" %% "scalatest" % scalaTestVersion.value % Test,
+ "org.scalatest" %% "scalatest" % scalaTestVersion % Test,
"io.spray" %% "spray-json" % "1.3.6" % Test,
"com.fasterxml.jackson.core" % "jackson-databind" % "2.14.3" % Test, // ApacheV2
// See http://hamcrest.org/JavaHamcrest/distributables#upgrading-from-hamcrest-1x
@@ -53,7 +53,7 @@ object Dependencies {
lazy val testKitDependencies = Def.setting(Seq(
"org.apache.pekko" %% "pekko-stream-testkit" % pekkoVersion,
"org.testcontainers" % "kafka" % testcontainersVersion % Provided,
- "org.scalatest" %% "scalatest" % scalaTestVersion.value % Provided,
+ "org.scalatest" %% "scalatest" % scalaTestVersion % Provided,
"junit" % "junit" % "4.13.2" % Provided))
}
diff --git a/project/ParadoxSettings.scala b/project/ParadoxSettings.scala
index d4345a4d..23cfaee7 100644
--- a/project/ParadoxSettings.scala
+++ b/project/ParadoxSettings.scala
@@ -28,7 +28,7 @@ object ParadoxSettings {
Compile / paradoxProperties ++= Map(
"image.base_url" -> "images/",
"confluent.version" -> confluentAvroSerializerVersion,
- "scalatest.version" -> scalaTestVersion.value,
+ "scalatest.version" -> scalaTestVersion,
"pekko.version" -> pekkoVersion,
"extref.pekko.base_url" -> s"$pekkoDocs/pekko/$pekkoVersionForDocs/%s",
"scaladoc.org.apache.pekko.base_url" -> s"$pekkoAPI/pekko/$pekkoVersionForDocs/",
diff --git a/project/Versions.scala b/project/Versions.scala
index 9c4a4a8b..6470ffe2 100644
--- a/project/Versions.scala
+++ b/project/Versions.scala
@@ -27,14 +27,8 @@ object Versions {
val kafkaVersion = "3.0.1"
val KafkaVersionForDocs = "30"
// This should align with the ScalaTest version used in the Apache Pekko 1.0.x testkit
- // https://github.com/apache/incubator-pekko/blob/main/project/Dependencies.scala#L70
- val scalaTestVersion = Def.setting {
- if (scalaVersion.value.startsWith("3.")) {
- "3.2.9"
- } else {
- "3.1.4"
- }
- }
+ // https://github.com/apache/incubator-pekko/blob/main/project/Dependencies.scala
+ val scalaTestVersion = "3.2.14"}
val scalaPBVersion = "0.11.13"
val testcontainersVersion = "1.16.3"
val slf4jVersion = "1.7.36"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pekko.apache.org
For additional commands, e-mail: commits-help@pekko.apache.org