update dependencies including scope of testkits

Author: fupelaqu

build.sbt

@@ -134,7 +134,7 @@ lazy val es6rest = project.in(file("es6/rest"))
     es6bridge % "compile->compile;test->test;it->it"
   )
   .dependsOn(
-    es6testkit % "compile->compile;test->test;it->it"
+    es6testkit % "test->test;it->it"
   )
 
 lazy val es6jest = project.in(file("es6/jest"))
@@ -151,7 +151,7 @@ lazy val es6jest = project.in(file("es6/jest"))
     es6bridge % "compile->compile;test->test;it->it"
   )
   .dependsOn(
-    es6testkit % "compile->compile;test->test;it->it"
+    es6testkit % "test->test;it->it"
   )
 
 lazy val es6 = project.in(file("es6"))
@@ -209,7 +209,7 @@ lazy val es7rest = project.in(file("es7/rest"))
     es7bridge % "compile->compile;test->test;it->it"
   )
   .dependsOn(
-    es7testkit % "compile->compile;test->test;it->it"
+    es7testkit % "test->test;it->it"
   )
 
 lazy val es7 = project.in(file("es7"))
@@ -266,7 +266,7 @@ lazy val es8java = project.in(file("es8/java"))
     es8bridge % "compile->compile;test->test;it->it"
   )
   .dependsOn(
-    es8testkit % "compile->compile;test->test;it->it"
+    es8testkit % "test->test;it->it"
   )
 
 lazy val es8 = project.in(file("es8"))
@@ -332,7 +332,7 @@ lazy val es9java = project.in(file("es9/java"))
     es9bridge % "compile->compile;test->test;it->it"
   )
   .dependsOn(
-    es9testkit % "compile->compile;test->test;it->it"
+    es9testkit % "test->test;it->it"
   )
 
 lazy val es9 = project.in(file("es9"))

core/testkit/build.sbt

@@ -6,8 +6,7 @@ name := s"softclient4es${elasticSearchMajorVersion(elasticSearchVersion.value)}-
 
 target := baseDirectory.value / s"target-es${elasticSearchMajorVersion(elasticSearchVersion.value)}"
 
-libraryDependencies ++= elasticDependencies(elasticSearchVersion.value) ++
-elastic4sTestkitDependencies(elasticSearchVersion.value) ++ Seq(
+libraryDependencies ++= elasticClientDependencies(elasticSearchVersion.value) ++ Seq(
   "org.apache.logging.log4j" % "log4j-api" % Versions.log4j,
   //  "org.apache.logging.log4j" % "log4j-slf4j-impl"  % Versions.log4j,
   "org.apache.logging.log4j" % "log4j-core" % Versions.log4j,

es6/testkit/build.sbt

@@ -4,10 +4,11 @@ organization := "app.softnetwork.elastic"
 
 name := s"softclient4es${elasticSearchMajorVersion(elasticSearchVersion.value)}-core-testkit"
 
-libraryDependencies ++= elasticDependencies(elasticSearchVersion.value) ++ elastic4sTestkitDependencies(elasticSearchVersion.value) ++ Seq(
+libraryDependencies ++= elasticClientDependencies(elasticSearchVersion.value) ++
+elastic4sTestkitDependencies(elasticSearchVersion.value) ++ Seq(
   "org.apache.logging.log4j" % "log4j-api" % Versions.log4j,
   //  "org.apache.logging.log4j" % "log4j-slf4j-impl"  % Versions.log4j,
   "org.apache.logging.log4j" % "log4j-core" % Versions.log4j,
   "app.softnetwork.persistence" %% "persistence-core-testkit" % Versions.genericPersistence,
-  "org.testcontainers" % "elasticsearch" % Versions.testContainers excludeAll (jacksonExclusions: _*)
+  "org.testcontainers" % "elasticsearch" % Versions.testContainers excludeAll (jacksonExclusions *)
 )