Merge branch 'master' into update/akka-http-10.1.11

valerylobachev · Dec 7, 2019 · 7a18ccc · 7a18ccc
2 parents 857d9a8 + 7260d44
commit 7a18ccc
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/...in/scala/com/sksamuel/elastic4s/requests/searches/queries/validate/ValidateHandlers.scala b/...in/scala/com/sksamuel/elastic4s/requests/searches/queries/validate/ValidateHandlers.scala
@@ -26,7 +26,7 @@ trait ValidateHandlers {
 
     override def build(request: ValidateRequest): ElasticRequest = {
 
-      val endpoint = s"${request.indexes.values.mkString(",")}/_validate/query"
+      val endpoint = s"/${request.indexes.values.mkString(",")}/_validate/query"
 
       val params = scala.collection.mutable.Map.empty[String, String]
       request.explain.map(_.toString).foreach(params.put("explain", _))

diff --git a/project/Build.scala b/project/Build.scala
@@ -11,8 +11,8 @@ object Build extends AutoPlugin {
 
   object autoImport {
     val org                    = "com.sksamuel.elastic4s"
-    val AkkaVersion            = "2.6.0"
-    val AkkaHttpVersion        = "10.1.11"
+    val AkkaVersion            = "2.6.1"
+    val AkkaHttpVersion        = "10.1.10"
     val CatsVersion            = "2.0.0"
     val CirceVersion           = "0.12.3"
     val CatsEffectVersion      = "2.0.0"
@@ -25,12 +25,12 @@ object Build extends AutoPlugin {
     val Log4jVersion           = "2.12.1"
     val MockitoVersion         = "3.2.0"
     val MonixVersion           = "3.1.0"
-    val PlayJsonVersion        = "2.7.4"
+    val PlayJsonVersion        = "2.8.0"
     val ReactiveStreamsVersion = "1.0.3"
     val ScalatestVersion       = "3.0.8"
     val ScalamockVersion       = "4.4.0"
     val ScalazVersion          = "7.2.29"
-    val ZIOVersion             = "1.0.0-RC16"
+    val ZIOVersion             = "1.0.0-RC17"
     val SprayJsonVersion       = "1.3.5"
     val SttpVersion            = "1.7.2"
     val Slf4jVersion           = "1.7.29"

diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.3.3
+sbt.version=1.3.4
diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,4 +2,4 @@ resolvers += Classpaths.sbtPluginReleases
 
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
 
-addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8")
+addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ resolvers += Classpaths.sbtPluginReleases

		addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")

		addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8")
		addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.8.1")