diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ee6ef926c..d897514c0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,7 +27,7 @@ jobs: java-version: 11 - name: Launch elastic docker - run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.1 + run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.3 - name: run tests run: sbt ++2.12.20 test @@ -47,7 +47,7 @@ jobs: java-version: 11 - name: Launch elastic docker - run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.1 + run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.3 - name: run tests run: sbt ++2.13.14 test @@ -67,7 +67,7 @@ jobs: java-version: 11 - name: Launch elastic docker - run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.1 + run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.3 - name: run tests run: sbt ++3.3.3 elastic4s-scala3/test diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index e29cfd1f2..0a8586241 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -23,7 +23,7 @@ jobs: java-version: 11 - name: Launch elastic docker - run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.1 + run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.3 - name: run tests timeout-minutes: 30 @@ -44,7 +44,7 @@ jobs: java-version: 11 - name: Launch elastic docker - run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.1 + run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.3 - name: run tests timeout-minutes: 30 @@ -65,7 +65,7 @@ jobs: java-version: 11 - name: Launch elastic docker - run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.1 + run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.3 - name: run tests run: sbt ++3.3.3 elastic4s-scala3/test diff --git a/README.md b/README.md index bbffa9d66..04b4e0e54 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # elastic4s - Elasticsearch Scala Client [![build](https://github.com/Philippus/elastic4s/workflows/build/badge.svg)](https://github.com/Philippus/elastic4s/actions/workflows/build.yml?query=workflow%3Abuild+branch%3Amain) -![Current Version](https://img.shields.io/badge/version-8.15.2-brightgreen.svg?style=flat "8.15.2") +![Current Version](https://img.shields.io/badge/version-8.15.3-brightgreen.svg?style=flat "8.15.3") [![Scala Steward badge](https://img.shields.io/badge/Scala_Steward-helping-blue.svg?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAMAAAARSr4IAAAAVFBMVEUAAACHjojlOy5NWlrKzcYRKjGFjIbp293YycuLa3pYY2LSqql4f3pCUFTgSjNodYRmcXUsPD/NTTbjRS+2jomhgnzNc223cGvZS0HaSD0XLjbaSjElhIr+AAAAAXRSTlMAQObYZgAAAHlJREFUCNdNyosOwyAIhWHAQS1Vt7a77/3fcxxdmv0xwmckutAR1nkm4ggbyEcg/wWmlGLDAA3oL50xi6fk5ffZ3E2E3QfZDCcCN2YtbEWZt+Drc6u6rlqv7Uk0LdKqqr5rk2UCRXOk0vmQKGfc94nOJyQjouF9H/wCc9gECEYfONoAAAAASUVORK5CYII=)](https://scala-steward.org) [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat "Apache 2.0")](LICENSE) diff --git a/build.sbt b/build.sbt index 237c1034a..a647de948 100644 --- a/build.sbt +++ b/build.sbt @@ -15,8 +15,8 @@ def isRelease = releaseVersion != "" // set by github actions and used as the snapshot build number def githubRunNumber = sys.env.getOrElse("GITHUB_RUN_NUMBER", "local") -val scala2Versions = Seq("2.12.20", "2.13.14") -val scalaAllVersions = scala2Versions :+ "3.3.3" +val scala2Versions = Seq("2.12.20", "2.13.15") +val scalaAllVersions = scala2Versions :+ "3.3.4" lazy val commonScalaVersionSettings = Seq( scalaVersion := "2.12.20", @@ -24,7 +24,7 @@ lazy val commonScalaVersionSettings = Seq( ) lazy val warnUnusedImport = Seq( - scalacOptions ++= Seq("-Ywarn-unused:imports"), + scalacOptions += "-Ywarn-unused:imports", Compile / console / scalacOptions ~= { _.filterNot(Set("-Ywarn-unused-import", "-Ywarn-unused:imports")) }, @@ -33,7 +33,7 @@ lazy val warnUnusedImport = Seq( lazy val commonSettings = Seq( organization := "nl.gn0s1s", - resolvers ++= Seq(Resolver.mavenLocal), + resolvers += Resolver.mavenLocal, Test / parallelExecution := false, Compile / doc / scalacOptions := (Compile / doc / scalacOptions).value.filter(_ != "-Xfatal-warnings"), scalacOptions ++= Seq("-unchecked", "-deprecation", "-encoding", "utf8") @@ -164,7 +164,7 @@ lazy val clientcore = (project in file("elastic4s-client-core")) .settings(name := "elastic4s-client-core") .dependsOn(handlers) .settings(scala3Settings) - .settings(libraryDependencies ++= Seq(log4jApi)) + .settings(libraryDependencies += log4jApi) lazy val clientesjava = (project in file("elastic4s-client-esjava")) .settings(name := "elastic4s-client-esjava") @@ -183,7 +183,7 @@ lazy val clientsSniffed = (project in file("elastic4s-client-sniffed")) .settings(name := "elastic4s-client-sniffed") .dependsOn(clientesjava) .settings(scala3Settings) - .settings(libraryDependencies ++= Seq(elasticsearchRestClientSniffer)) + .settings(libraryDependencies += elasticsearchRestClientSniffer) lazy val cats_effect = (project in file("elastic4s-effect-cats")) .dependsOn(core, testkit % "test") @@ -201,13 +201,13 @@ lazy val zio_1 = (project in file("elastic4s-effect-zio-1")) .dependsOn(core, testkit % "test") .settings(name := "elastic4s-effect-zio-1") .settings(scala3Settings) - .settings(libraryDependencies ++= Dependencies.zio1) + .settings(libraryDependencies += Dependencies.zio1) lazy val zio = (project in file("elastic4s-effect-zio")) .dependsOn(core, testkit % "test") .settings(name := "elastic4s-effect-zio") .settings(scala3Settings) - .settings(libraryDependencies ++= Dependencies.zio) + .settings(libraryDependencies += Dependencies.zio) lazy val scalaz = (project in file("elastic4s-effect-scalaz")) .dependsOn(core) @@ -278,13 +278,13 @@ lazy val playjson = (project in file("elastic4s-json-play")) .dependsOn(core) .settings(name := "elastic4s-json-play") .settings(scala3Settings) - .settings(libraryDependencies ++= Dependencies.playJson) + .settings(libraryDependencies += Dependencies.playJson) lazy val sprayjson = (project in file("elastic4s-json-spray")) .dependsOn(core) .settings(name := "elastic4s-json-spray") .settings(scala2Settings) // ProductFormats in spray json don't work with the cross-building mode, so this probably needs https://github.com/spray/spray-json/pull/342 - .settings(libraryDependencies ++= Dependencies.sprayJson) + .settings(libraryDependencies += Dependencies.sprayJson) lazy val ziojson_1 = (project in file("elastic4s-json-zio-1")) .dependsOn(core) @@ -299,19 +299,19 @@ lazy val ziojson = (project in file("elastic4s-json-zio")) .settings(libraryDependencies += Dependencies.zioJson) lazy val clientsttp = (project in file("elastic4s-client-sttp")) - .dependsOn(core, testkit % "test") + .dependsOn(core, testkit % Test) .settings(name := "elastic4s-client-sttp") .settings(scala3Settings) - .settings(libraryDependencies ++= Seq(sttp)) + .settings(libraryDependencies += sttp) lazy val clientakka = (project in file("elastic4s-client-akka")) - .dependsOn(core, testkit % "test") + .dependsOn(core, testkit % Test) .settings(name := "elastic4s-client-akka") .settings(scala2Settings) // We need akka-http to be cross-published, which depends on an akka bump with restrictive licensing changes .settings(libraryDependencies ++= Seq(akkaHTTP, akkaStream)) lazy val clientpekko = (project in file("elastic4s-client-pekko")) - .dependsOn(core, testkit % "test") + .dependsOn(core, testkit % Test) .settings(name := "elastic4s-client-pekko") .settings(scala3Settings) .settings(libraryDependencies ++= Seq(pekkoHTTP, pekkoStream)) @@ -319,19 +319,19 @@ lazy val clientpekko = (project in file("elastic4s-client-pekko")) lazy val tests = (project in file("elastic4s-tests")) .settings(name := "elastic4s-tests") - .dependsOn(core, jackson, testkit % "test") + .dependsOn(core, jackson, testkit % Test) .settings(scala3Settings) .settings(noPublishSettings) .settings( libraryDependencies ++= Seq( commonsIo, mockitoCore, - "com.fasterxml.jackson.core" % "jackson-core" % JacksonVersion % "test", - "com.fasterxml.jackson.core" % "jackson-databind" % JacksonVersion % "test", - "com.fasterxml.jackson.module" %% "jackson-module-scala" % JacksonVersion % "test" exclude("org.scala-lang", "scala-library"), - "org.apache.logging.log4j" % "log4j-api" % "2.24.0" % "test", - "org.apache.logging.log4j" % "log4j-slf4j-impl" % "2.24.0" % "test", - "org.apache.logging.log4j" % "log4j-core" % "2.24.0" % "test" + "com.fasterxml.jackson.core" % "jackson-core" % JacksonVersion % Test, + "com.fasterxml.jackson.core" % "jackson-databind" % JacksonVersion % Test, + "com.fasterxml.jackson.module" %% "jackson-module-scala" % JacksonVersion % Test exclude("org.scala-lang", "scala-library"), + "org.apache.logging.log4j" % "log4j-api" % "2.24.1" % Test, + "org.apache.logging.log4j" % "log4j-slf4j-impl" % "2.24.1" % Test, + "org.apache.logging.log4j" % "log4j-core" % "2.24.1" % Test ), Test / fork := false, Test / parallelExecution := false, diff --git a/docker-compose.yml b/docker-compose.yml index 65342404d..123f26eb0 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.15.1 + image: docker.elastic.co/elasticsearch/elasticsearch:8.15.3 environment: discovery.type: single-node network.host: 0.0.0.0 diff --git a/elastic4s-core/src/main/scala/com/sksamuel/elastic4s/requests/searches/aggs/TopHitsAggregation.scala b/elastic4s-core/src/main/scala/com/sksamuel/elastic4s/requests/searches/aggs/TopHitsAggregation.scala index 2439f3c8c..df6b8f950 100644 --- a/elastic4s-core/src/main/scala/com/sksamuel/elastic4s/requests/searches/aggs/TopHitsAggregation.scala +++ b/elastic4s-core/src/main/scala/com/sksamuel/elastic4s/requests/searches/aggs/TopHitsAggregation.scala @@ -18,7 +18,8 @@ case class TopHitsAggregation(name: String, storedFields: Seq[String] = Nil, subaggs: Seq[AbstractAggregation] = Nil, metadata: Map[String, AnyRef] = Map.empty, - highlight: Option[Highlight] = None) + highlight: Option[Highlight] = None, + docValueFields: Seq[String] = Nil) extends Aggregation { type T = TopHitsAggregation @@ -42,6 +43,9 @@ case class TopHitsAggregation(name: String, def storedFields(first: String, rest: String*): TopHitsAggregation = storedFields(first +: rest) def storedFields(fields: Iterable[String]): TopHitsAggregation = copy(storedFields = fields.toSeq) + def docValueFields(docValueFields: Iterable[String]): TopHitsAggregation = + copy(docValueFields = docValueFields.toSeq) + def version(version: Boolean): TopHitsAggregation = copy(version = version.some) def trackScores(trackScores: Boolean): TopHitsAggregation = copy(trackScores = trackScores.some) diff --git a/elastic4s-core/src/main/scala/com/sksamuel/elastic4s/requests/searches/aggs/builders/TopHitsAggregationBuilder.scala b/elastic4s-core/src/main/scala/com/sksamuel/elastic4s/requests/searches/aggs/builders/TopHitsAggregationBuilder.scala index db9aee9be..1156b0d8b 100644 --- a/elastic4s-core/src/main/scala/com/sksamuel/elastic4s/requests/searches/aggs/builders/TopHitsAggregationBuilder.scala +++ b/elastic4s-core/src/main/scala/com/sksamuel/elastic4s/requests/searches/aggs/builders/TopHitsAggregationBuilder.scala @@ -27,6 +27,12 @@ object TopHitsAggregationBuilder { agg.explain.foreach(builder.field("explain", _)) + if (agg.storedFields.nonEmpty) + builder.array("stored_fields", agg.storedFields.toArray) + + if (agg.docValueFields.nonEmpty) + builder.array("docvalue_fields", agg.docValueFields.toArray) + agg.highlight.foreach { highlight => builder.rawField("highlight", HighlightBuilderFn(highlight)) } diff --git a/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/requests/searches/TopHitsAggregationBuilderTest.scala b/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/requests/searches/TopHitsAggregationBuilderTest.scala index 63b3ac155..3c01b73aa 100644 --- a/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/requests/searches/TopHitsAggregationBuilderTest.scala +++ b/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/requests/searches/TopHitsAggregationBuilderTest.scala @@ -13,9 +13,11 @@ class TopHitsAggregationBuilderTest extends AnyFunSuite with Matchers { .from(10) .version(true) .explain(false) + .docValueFields(List("name")) + .storedFields(List("currency")) .sortBy(List(FieldSort("price").sortMode(SortMode.Median))) TopHitsAggregationBuilder(q).string shouldBe - """{"top_hits":{"size":5,"from":10,"sort":[{"price":{"mode":"median","order":"asc"}}],"explain":false,"version":true}}""" + """{"top_hits":{"size":5,"from":10,"sort":[{"price":{"mode":"median","order":"asc"}}],"explain":false,"stored_fields":["currency"],"docvalue_fields":["name"],"version":true}}""" } test("top hits aggregation builder should support highlighting") { diff --git a/elastic4s-domain/src/main/scala/com/sksamuel/elastic4s/requests/update/UpdateByQueryAsyncRequest.scala b/elastic4s-domain/src/main/scala/com/sksamuel/elastic4s/requests/update/UpdateByQueryAsyncRequest.scala index bfa048546..7d10fe03b 100644 --- a/elastic4s-domain/src/main/scala/com/sksamuel/elastic4s/requests/update/UpdateByQueryAsyncRequest.scala +++ b/elastic4s-domain/src/main/scala/com/sksamuel/elastic4s/requests/update/UpdateByQueryAsyncRequest.scala @@ -2,6 +2,7 @@ package com.sksamuel.elastic4s.requests.update import com.sksamuel.elastic4s.Indexes import com.sksamuel.elastic4s.ext.OptionImplicits._ +import com.sksamuel.elastic4s.requests.admin.IndicesOptionsRequest import com.sksamuel.elastic4s.requests.common.{RefreshPolicy, Slice, Slicing} import com.sksamuel.elastic4s.requests.script.Script import com.sksamuel.elastic4s.requests.searches.queries.Query @@ -23,7 +24,9 @@ case class UpdateByQueryAsyncRequest(indexes: Indexes, slice: Option[Slice] = None, timeout: Option[FiniteDuration] = None, shouldStoreResult: Option[Boolean] = None, - size: Option[Int] = None) extends BaseUpdateByQueryRequest { + size: Option[Int] = None, + indicesOptions: Option[IndicesOptionsRequest] = None) extends BaseUpdateByQueryRequest { + def proceedOnConflicts(proceedOnConflicts: Boolean): UpdateByQueryAsyncRequest = copy(proceedOnConflicts = proceedOnConflicts.some) @@ -62,5 +65,7 @@ case class UpdateByQueryAsyncRequest(indexes: Indexes, def shouldStoreResult(shouldStoreResult: Boolean): UpdateByQueryAsyncRequest = copy(shouldStoreResult = shouldStoreResult.some) + def indicesOptions(options: IndicesOptionsRequest): UpdateByQueryAsyncRequest = copy(indicesOptions = options.some) + override val waitForCompletion: Option[Boolean] = Some(false) } diff --git a/elastic4s-domain/src/main/scala/com/sksamuel/elastic4s/requests/update/UpdateByQueryRequest.scala b/elastic4s-domain/src/main/scala/com/sksamuel/elastic4s/requests/update/UpdateByQueryRequest.scala index f2d755b87..519fa0971 100644 --- a/elastic4s-domain/src/main/scala/com/sksamuel/elastic4s/requests/update/UpdateByQueryRequest.scala +++ b/elastic4s-domain/src/main/scala/com/sksamuel/elastic4s/requests/update/UpdateByQueryRequest.scala @@ -5,6 +5,7 @@ import com.sksamuel.elastic4s.requests.common.{RefreshPolicy, Slice, Slicing} import com.sksamuel.elastic4s.requests.script.Script import com.sksamuel.elastic4s.requests.searches.queries.Query import com.sksamuel.elastic4s.ext.OptionImplicits._ +import com.sksamuel.elastic4s.requests.admin.IndicesOptionsRequest import scala.concurrent.duration.FiniteDuration @@ -44,6 +45,8 @@ trait BaseUpdateByQueryRequest { val size: Option[Int] val waitForCompletion: Option[Boolean] + + val indicesOptions: Option[IndicesOptionsRequest] } case class UpdateByQueryRequest(indexes: Indexes, query: Query, @@ -63,7 +66,8 @@ case class UpdateByQueryRequest(indexes: Indexes, slice: Option[Slice] = None, timeout: Option[FiniteDuration] = None, shouldStoreResult: Option[Boolean] = None, - size: Option[Int] = None) extends BaseUpdateByQueryRequest { + size: Option[Int] = None, + indicesOptions: Option[IndicesOptionsRequest] = None) extends BaseUpdateByQueryRequest { def proceedOnConflicts(proceedOnConflicts: Boolean): UpdateByQueryRequest = copy(proceedOnConflicts = proceedOnConflicts.some) @@ -106,4 +110,5 @@ case class UpdateByQueryRequest(indexes: Indexes, def shouldStoreResult(shouldStoreResult: Boolean): UpdateByQueryRequest = copy(shouldStoreResult = shouldStoreResult.some) + def indicesOptions(options: IndicesOptionsRequest): UpdateByQueryRequest = copy(indicesOptions = options.some) } diff --git a/elastic4s-handlers/src/main/scala/com/sksamuel/elastic4s/handlers/update/UpdateHandlers.scala b/elastic4s-handlers/src/main/scala/com/sksamuel/elastic4s/handlers/update/UpdateHandlers.scala index 353912d06..11b63a757 100644 --- a/elastic4s-handlers/src/main/scala/com/sksamuel/elastic4s/handlers/update/UpdateHandlers.scala +++ b/elastic4s-handlers/src/main/scala/com/sksamuel/elastic4s/handlers/update/UpdateHandlers.scala @@ -6,7 +6,7 @@ import com.sksamuel.elastic4s.handlers.common.FetchSourceContextQueryParameterFn import com.sksamuel.elastic4s.handlers.script.ScriptBuilderFn import com.sksamuel.elastic4s.handlers.searches.queries import com.sksamuel.elastic4s.json.{XContentBuilder, XContentFactory} -import com.sksamuel.elastic4s.requests.common.{RefreshPolicyHttpValue, Slicing} +import com.sksamuel.elastic4s.requests.common.{IndicesOptionsParams, RefreshPolicyHttpValue, Slicing} import com.sksamuel.elastic4s.requests.task.GetTask import com.sksamuel.elastic4s.requests.update.{BaseUpdateByQueryRequest, UpdateByQueryAsyncRequest, UpdateByQueryAsyncResponse, UpdateByQueryRequest, UpdateByQueryResponse, UpdateByQueryTask, UpdateRequest, UpdateResponse} import com.sksamuel.elastic4s.{BulkIndexByScrollFailure, ElasticError, ElasticRequest, ElasticUrlEncoder, Handler, HttpEntity, HttpResponse, ResponseHandler} @@ -91,6 +91,10 @@ trait UpdateHandlers { if (s == Slicing.AutoSlices) params.put("slices", Slicing.AutoSlicesValue) else params.put("slices", s) ) + request.indicesOptions.foreach { opts => + IndicesOptionsParams(opts).foreach { case (key, value) => params.put(key, value) } + } + val body = UpdateByQueryBodyFn(request) logger.debug(s"Update by query ${body.string}") val entity = HttpEntity(body.string, "application/json") diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ad910ef6a..251378205 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -6,18 +6,16 @@ object Dependencies { val AkkaVersion = "2.6.20" val CatsEffect2Version = "2.5.5" val CatsEffectVersion = "3.5.4" - val CatsVersion = "2.0.0" val CirceVersion = "0.14.10" val CommonsIoVersion = "2.17.0" - val ElasticsearchVersion = "8.15.1" - val ExtsVersion = "1.61.1" - val JacksonVersion = "2.17.2" + val ElasticsearchVersion = "8.15.3" + val JacksonVersion = "2.18.0" val Json4sVersion = "4.0.7" val Log4jVersion = "2.15.0" - val MockitoVersion = "5.13.0" + val MockitoVersion = "5.14.2" val MonixVersion = "3.4.1" - val PekkoHttpVersion = "1.0.1" - val PekkoVersion = "1.1.1" + val PekkoHttpVersion = "1.1.0" + val PekkoVersion = "1.1.2" val PlayJsonVersion = "3.0.4" val ReactiveStreamsVersion = "1.0.3" val ScalatestPlusMockitoArtifactId = "mockito-3-4" @@ -26,19 +24,19 @@ object Dependencies { val ScalatestVersion = "3.2.19" val Slf4jVersion = "2.0.16" val SprayJsonVersion = "1.3.6" - val SttpVersion = "3.9.8" + val SttpVersion = "3.10.1" val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" - val ZIOVersion = "2.1.9" + val ZIOVersion = "2.1.11" val ZIOJsonVersion = "0.7.3" lazy val commonDeps = Seq( libraryDependencies ++= Seq( "com.typesafe" % "config" % "1.4.3", "org.slf4j" % "slf4j-api" % Slf4jVersion, - "org.scalatest" %% "scalatest" % ScalatestVersion % "test", - "org.mockito" % "mockito-core" % MockitoVersion % "test", - "org.scalatestplus" %% ScalatestPlusMockitoArtifactId % ScalatestPlusVersion % "test" + "org.scalatest" %% "scalatest" % ScalatestVersion % Test, + "org.mockito" % "mockito-core" % MockitoVersion % Test, + "org.scalatestplus" %% ScalatestPlusMockitoArtifactId % ScalatestPlusVersion % Test )) lazy val fasterXmlJacksonScala = Seq( @@ -47,8 +45,8 @@ object Dependencies { "com.fasterxml.jackson.module" %% "jackson-module-scala" % JacksonVersion ) - lazy val zio1 = Seq("dev.zio" %% "zio" % ZIO1Version) - lazy val zio = Seq("dev.zio" %% "zio" % ZIOVersion) + lazy val zio1 = "dev.zio" %% "zio" % ZIO1Version + lazy val zio = "dev.zio" %% "zio" % ZIOVersion lazy val scalaz = Seq("org.scalaz" %% "scalaz-core" % ScalazVersion, "org.scalaz" %% "scalaz-concurrent" % ScalazVersion) @@ -69,21 +67,21 @@ object Dependencies { lazy val pekkoActor = "org.apache.pekko" %% "pekko-actor" % PekkoVersion lazy val pekkoHTTP = "org.apache.pekko" %% "pekko-http" % PekkoHttpVersion lazy val pekkoStream = "org.apache.pekko" %% "pekko-stream" % PekkoVersion - lazy val playJson = Seq("org.playframework" %% "play-json" % PlayJsonVersion) - lazy val sprayJson = Seq("io.spray" %% "spray-json" % SprayJsonVersion) + lazy val playJson = "org.playframework" %% "play-json" % PlayJsonVersion + lazy val sprayJson = "io.spray" %% "spray-json" % SprayJsonVersion lazy val sttp = "com.softwaremill.sttp.client3" %% "core" % SttpVersion lazy val zioJson1 = "dev.zio" %% "zio-json" % ZIOJson1Version lazy val zioJson = "dev.zio" %% "zio-json" % ZIOJsonVersion lazy val elasticsearchRestClientSniffer = "org.elasticsearch.client" % "elasticsearch-rest-client-sniffer" % ElasticsearchVersion - lazy val commonsIo = "commons-io" % "commons-io" % CommonsIoVersion % "test" - lazy val log4jApi = "org.apache.logging.log4j" % "log4j-api" % Log4jVersion % "test" - lazy val mockitoCore = "org.mockito" % "mockito-core" % MockitoVersion % "test" - lazy val reactiveStreamsTck = "org.reactivestreams" % "reactive-streams-tck" % ReactiveStreamsVersion % "test" + lazy val commonsIo = "commons-io" % "commons-io" % CommonsIoVersion % Test + lazy val log4jApi = "org.apache.logging.log4j" % "log4j-api" % Log4jVersion % Test + lazy val mockitoCore = "org.mockito" % "mockito-core" % MockitoVersion % Test + lazy val reactiveStreamsTck = "org.reactivestreams" % "reactive-streams-tck" % ReactiveStreamsVersion % Test lazy val scalaTestMain = "org.scalatest" %% "scalatest" % ScalatestVersion - lazy val scalaTest = scalaTestMain % "test" + lazy val scalaTest = scalaTestMain % Test lazy val scalaTestPlusMokito = "org.scalatestplus" %% ScalatestPlusMockitoArtifactId % ScalatestPlusVersion - lazy val scalaTestPlusTestng67 = "org.scalatestplus" %% "testng-6-7" % ScalatestPlusVersion % "test" + lazy val scalaTestPlusTestng67 = "org.scalatestplus" %% "testng-6-7" % ScalatestPlusVersion % Test } diff --git a/project/build.properties b/project/build.properties index 0b699c305..bc7390601 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.2 +sbt.version=1.10.3 diff --git a/project/metals.sbt b/project/metals.sbt index 163b4afdc..6a1ba4079 100644 --- a/project/metals.sbt +++ b/project/metals.sbt @@ -1,4 +1,4 @@ // DO NOT EDIT! This file is auto-generated. // This file enables sbt-bloop to create bloop config files. -addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "2.0.2") +addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "2.0.3") diff --git a/project/plugins.sbt b/project/plugins.sbt index 2d654f713..45a8c2c50 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.6.1") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.8.0") diff --git a/version.sbt b/version.sbt index 8de7b3d40..a78348ae8 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "8.15.2" +ThisBuild / version := "8.15.3"