From 8640072e50945d1be6af15d0317542f2965827d6 Mon Sep 17 00:00:00 2001 From: philippus Date: Sat, 30 Nov 2024 12:24:42 +0100 Subject: [PATCH 01/68] Set version to next snapshot --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 93b1fd68a1..558c1f03d4 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "8.16.0" +ThisBuild / version := "8.16.1-SNAPSHOT" From 30445d1ecbfa60c55f2f35435a95f2cde4d5bd89 Mon Sep 17 00:00:00 2001 From: philippus Date: Sat, 30 Nov 2024 12:33:38 +0100 Subject: [PATCH 02/68] Fix version numbers --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 98ef6d4839..3f0f424183 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Note that starting from versions 7.17.25 and 8.12.0 the group id has changed fro | Elastic Version | Scala 2.12 | Scala 2.13 | Scala 3 | |-----------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| -| 8.16.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_3) | +| 8.16.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_3) | | 8.15.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_3) | | 8.14.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_3) | | 8.13.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_3) | From 5b5d2c96fca0521c85a00d00be89209fb71d9e66 Mon Sep 17 00:00:00 2001 From: philippus Date: Sun, 1 Dec 2024 11:38:08 +0100 Subject: [PATCH 03/68] Remove releases prior to 7.17.x from table --- README.md | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 3f0f424183..01f810beb4 100644 --- a/README.md +++ b/README.md @@ -53,25 +53,8 @@ Note that starting from versions 7.17.25 and 8.12.0 the group id has changed fro | 8.1.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | | 8.0.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | | 7.17.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | -| 7.16.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | -| 7.15.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | -| 7.14.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | -| 7.13.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | -| 7.12.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | -| 7.11.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | -| 7.10.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | -| 7.9.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | -| 7.8.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | -| 7.7.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | -| 7.6.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | -| 7.5.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | -| 7.4.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | -| 7.3.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | -| 7.2.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | -| 7.1.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | -| 7.0.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | - -For releases prior to 7.0 [search maven central](https://search.maven.org/search?q=elastic4s). + +For releases prior to 7.17.x [search maven central](https://search.maven.org/search?q=elastic4s). ## Quick Start From f1eca2162f9cd4bc8c5473662cb46fc9bce78688 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 2 Dec 2024 07:13:56 +0100 Subject: [PATCH 04/68] Update sbt, scripted-plugin to 1.10.6 (#3235) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index db1723b086..e88a0d817d 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.5 +sbt.version=1.10.6 From cd3c3d44900c58be884940847db5d58292ef7013 Mon Sep 17 00:00:00 2001 From: philippus Date: Mon, 2 Dec 2024 07:14:54 +0100 Subject: [PATCH 05/68] Remove unneeded plugins --- project/plugins.sbt | 6 ------ 1 file changed, 6 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index b176f772a9..7b35747842 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,9 +1,3 @@ addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") - -addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.3") - -addSbtPlugin("nl.gn0s1s" % "sbt-jackson-version-check" % "0.0.2") - -addSbtPlugin("nl.gn0s1s" % "sbt-pekko-version-check" % "0.0.7") From 128bbbb554861463eafed06efb0928db903a4b07 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 6 Dec 2024 08:20:31 +0100 Subject: [PATCH 06/68] Update http4s-client, http4s-ember-client to 0.23.30 (#3236) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index c7933e9247..882d4c7197 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -10,7 +10,7 @@ object Dependencies { val CommonsIoVersion = "2.18.0" val ElasticsearchVersion = "8.16.1" val ExtsVersion = "1.61.1" - val Http4sVersion = "0.23.29" + val Http4sVersion = "0.23.30" val JacksonVersion = "2.18.2" val Json4sVersion = "4.0.7" val Log4jVersion = "2.24.2" From 84e8780e44c5abdac86e0ea6310334b74fde282f Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 13 Dec 2024 19:29:57 +0100 Subject: [PATCH 07/68] Update sbt-bloop to 2.0.6 (#3238) --- project/metals.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/metals.sbt b/project/metals.sbt index 43bc609000..ae69e56af9 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.5") +addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "2.0.6") From 18b68f1776ab0688a5ef3a8242111bc405135937 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 13 Dec 2024 19:30:12 +0100 Subject: [PATCH 08/68] Update log4j-api, log4j-core, ... to 2.24.3 (#3239) --- build.sbt | 6 +++--- project/Dependencies.scala | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index d2b0b13272..db141d1abd 100644 --- a/build.sbt +++ b/build.sbt @@ -371,9 +371,9 @@ lazy val tests = (project in file("elastic4s-tests")) "org.scala-lang", "scala-library" ), - "org.apache.logging.log4j" % "log4j-api" % "2.24.2" % Test, - "org.apache.logging.log4j" % "log4j-slf4j-impl" % "2.24.2" % Test, - "org.apache.logging.log4j" % "log4j-core" % "2.24.2" % Test + "org.apache.logging.log4j" % "log4j-api" % "2.24.3" % Test, + "org.apache.logging.log4j" % "log4j-slf4j-impl" % "2.24.3" % Test, + "org.apache.logging.log4j" % "log4j-core" % "2.24.3" % Test ), Test / fork := false, Test / parallelExecution := false, diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 882d4c7197..362fb5f09e 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -13,7 +13,7 @@ object Dependencies { val Http4sVersion = "0.23.30" val JacksonVersion = "2.18.2" val Json4sVersion = "4.0.7" - val Log4jVersion = "2.24.2" + val Log4jVersion = "2.24.3" val MockitoVersion = "5.14.2" val MonixVersion = "3.4.1" val PekkoHttpVersion = "1.1.0" From 12b40088259b79d3e6e539919574fcfa87165934 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 16 Dec 2024 21:35:25 +0100 Subject: [PATCH 09/68] Update elasticsearch-rest-client, ... to 8.16.2 (#3240) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 362fb5f09e..ae5660d5b4 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -8,7 +8,7 @@ object Dependencies { val CatsEffectVersion = "3.5.7" val CirceVersion = "0.14.10" val CommonsIoVersion = "2.18.0" - val ElasticsearchVersion = "8.16.1" + val ElasticsearchVersion = "8.16.2" val ExtsVersion = "1.61.1" val Http4sVersion = "0.23.30" val JacksonVersion = "2.18.2" From 86db89b1324e39469eff23dee613a7d44e73a52f Mon Sep 17 00:00:00 2001 From: Philippus Baalman Date: Tue, 17 Dec 2024 20:49:57 +0100 Subject: [PATCH 10/68] Update docker images to 8.16.2 (#3242) --- .github/actions/launch-elasticsearch/action.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/launch-elasticsearch/action.yml b/.github/actions/launch-elasticsearch/action.yml index e3c078881d..1f64ebd4df 100644 --- a/.github/actions/launch-elasticsearch/action.yml +++ b/.github/actions/launch-elasticsearch/action.yml @@ -7,7 +7,7 @@ runs: - name: 'Launch elastic docker' shell: bash run: | - docker run -d -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.16.1 + docker run -d -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.16.2 - name: 'Wait for cluster to start' shell: bash run: | diff --git a/docker-compose.yml b/docker-compose.yml index 8142f06a89..a5316629e8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.16.1 + image: docker.elastic.co/elasticsearch/elasticsearch:8.16.2 environment: discovery.type: single-node network.host: 0.0.0.0 From c1c7abc9211a7b3b5a43942be1a38377806ae249 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 17 Dec 2024 21:07:06 +0100 Subject: [PATCH 11/68] Update elasticsearch-rest-client, ... to 8.17.0 (#3241) Co-authored-by: Philippus Baalman --- .github/actions/launch-elasticsearch/action.yml | 2 +- docker-compose.yml | 2 +- project/Dependencies.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/launch-elasticsearch/action.yml b/.github/actions/launch-elasticsearch/action.yml index 1f64ebd4df..f2b64cbc6e 100644 --- a/.github/actions/launch-elasticsearch/action.yml +++ b/.github/actions/launch-elasticsearch/action.yml @@ -7,7 +7,7 @@ runs: - name: 'Launch elastic docker' shell: bash run: | - docker run -d -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.16.2 + docker run -d -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.17.0 - name: 'Wait for cluster to start' shell: bash run: | diff --git a/docker-compose.yml b/docker-compose.yml index a5316629e8..08827b46e4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.16.2 + image: docker.elastic.co/elasticsearch/elasticsearch:8.17.0 environment: discovery.type: single-node network.host: 0.0.0.0 diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ae5660d5b4..6879aef020 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -8,7 +8,7 @@ object Dependencies { val CatsEffectVersion = "3.5.7" val CirceVersion = "0.14.10" val CommonsIoVersion = "2.18.0" - val ElasticsearchVersion = "8.16.2" + val ElasticsearchVersion = "8.17.0" val ExtsVersion = "1.61.1" val Http4sVersion = "0.23.30" val JacksonVersion = "2.18.2" From 353401912ef94c93cefd65bc4cef5be0355a583e Mon Sep 17 00:00:00 2001 From: philippus Date: Tue, 17 Dec 2024 21:08:30 +0100 Subject: [PATCH 12/68] Align next version with elasticsearch client --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 558c1f03d4..a98c661683 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "8.16.1-SNAPSHOT" +ThisBuild / version := "8.17.0-SNAPSHOT" From d617e8fad1e0b8cee1f78968487108e27b0c2268 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 19 Dec 2024 18:03:39 +0100 Subject: [PATCH 13/68] Update sbt-ci-release to 1.9.2 (#3243) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 7b35747842..14af449161 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") From 397b2099e739dfe649a27e3951835068895f1dd6 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 19 Dec 2024 18:18:50 +0100 Subject: [PATCH 14/68] Update zio to 2.1.14 (#3244) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 6879aef020..b5275ca48d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -29,7 +29,7 @@ object Dependencies { val SttpVersion = "3.10.1" val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" - val ZIOVersion = "2.1.13" + val ZIOVersion = "2.1.14" val ZIOJsonVersion = "0.7.3" lazy val commonDeps = Seq( From 70b989bede537b34c4c9afa12d5fb7e1e0e1db77 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 23 Dec 2024 23:34:05 +0100 Subject: [PATCH 15/68] Update sbt, scripted-plugin to 1.10.7 (#3245) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index e88a0d817d..73df629ac1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.6 +sbt.version=1.10.7 From d4de5126bda2aac29d4f8cb3b4868ec724270d16 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 31 Dec 2024 23:36:04 +0100 Subject: [PATCH 16/68] Update client3:core to 3.10.2 (#3270) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b5275ca48d..f77601e475 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -26,7 +26,7 @@ object Dependencies { val ScalatestVersion = "3.2.19" val Slf4jVersion = "2.0.16" val SprayJsonVersion = "1.3.6" - val SttpVersion = "3.10.1" + val SttpVersion = "3.10.2" val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" val ZIOVersion = "2.1.14" From 9a4bddc7b6087d4c59bb1285810db36104b3515a Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 4 Jan 2025 17:27:32 +0100 Subject: [PATCH 17/68] Update mockito-core to 5.15.2 (#3273) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f77601e475..8562c1e903 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -14,7 +14,7 @@ object Dependencies { val JacksonVersion = "2.18.2" val Json4sVersion = "4.0.7" val Log4jVersion = "2.24.3" - val MockitoVersion = "5.14.2" + val MockitoVersion = "5.15.2" val MonixVersion = "3.4.1" val PekkoHttpVersion = "1.1.0" val PekkoVersion = "1.1.2" From 2c7f36c0b9299f9c0f7d39c72a20cdac7d2c7e89 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 8 Jan 2025 20:12:29 +0100 Subject: [PATCH 18/68] Update zio-json to 0.7.4 (#3278) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8562c1e903..ca18fb8b2c 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -30,7 +30,7 @@ object Dependencies { val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" val ZIOVersion = "2.1.14" - val ZIOJsonVersion = "0.7.3" + val ZIOJsonVersion = "0.7.4" lazy val commonDeps = Seq( libraryDependencies ++= Seq( From 2d420c177fa3231ae0bc1bf7689786c7a0b2e818 Mon Sep 17 00:00:00 2001 From: Adam Seres Date: Wed, 8 Jan 2025 20:20:20 +0100 Subject: [PATCH 19/68] Add pitId to SearchResponse if available (#3277) --- .../sksamuel/elastic4s/requests/searches/SearchResponse.scala | 1 + 1 file changed, 1 insertion(+) diff --git a/elastic4s-domain/src/main/scala/com/sksamuel/elastic4s/requests/searches/SearchResponse.scala b/elastic4s-domain/src/main/scala/com/sksamuel/elastic4s/requests/searches/SearchResponse.scala index 79a0e3de27..b7efc9f2d3 100644 --- a/elastic4s-domain/src/main/scala/com/sksamuel/elastic4s/requests/searches/SearchResponse.scala +++ b/elastic4s-domain/src/main/scala/com/sksamuel/elastic4s/requests/searches/SearchResponse.scala @@ -22,6 +22,7 @@ case class SearchResponse( private val suggest: Map[String, Seq[SuggestionResult]], @JsonProperty("_shards") private val _shards: Shards, @JsonProperty("_scroll_id") scrollId: Option[String], + @JsonProperty("pit_id") pitId: Option[String], @JsonProperty("aggregations") private val _aggregationsAsMap: Map[String, Any], hits: SearchHits ) { From fb520a2da744ba72a554c3dd5a8f86516329cab4 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 10 Jan 2025 21:06:33 +0100 Subject: [PATCH 20/68] Update pekko-actor, pekko-stream to 1.1.3 (#3280) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ca18fb8b2c..4ed7a9221d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -17,7 +17,7 @@ object Dependencies { val MockitoVersion = "5.15.2" val MonixVersion = "3.4.1" val PekkoHttpVersion = "1.1.0" - val PekkoVersion = "1.1.2" + val PekkoVersion = "1.1.3" val PlayJsonVersion = "3.0.4" val ReactiveStreamsVersion = "1.0.4" val ScalatestPlusMockitoArtifactId = "mockito-5-12" From 40aee147b467a0c98d6678e90c5f58674849d219 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 19 Jan 2025 02:28:02 +0000 Subject: [PATCH 21/68] Update scalafmt-core to 3.8.5 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 7a6097704f..9fb818eb18 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.3 +version = 3.8.5 align.preset = most literals.double = Upper From fb60074fc43b054aab8aa17c4d5bc87106c7ae9e Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 19 Jan 2025 02:28:48 +0000 Subject: [PATCH 22/68] Reformat with scalafmt 3.8.5 Executed command: scalafmt --non-interactive --- .../elastic4s/ScriptBuilderFnTest.scala | 5 ++- .../SourceAsContentBuilderTest.scala | 4 +- .../analysis/NormalizerBuilderTest.scala | 4 +- .../UpdateIndexLevelSettingsBuilderTest.scala | 4 +- .../searches/MultiSearchBuilderFnTest.scala | 4 +- .../FingerprintAnalyzerBuilderTest.scala | 5 ++- .../PatternAnalyzerBuilderTest.scala | 5 ++- .../EdgeNGramTokenizerBuilderTest.scala | 5 ++- .../elastic4s/json/XContentBuilderTest.scala | 39 +++++++++++++++---- .../CompoundWordTokenFilterTest.scala | 38 ++++++++++++++---- .../analyzers/EdgeNGramTokenizerTest.scala | 5 ++- .../KeywordMarkerTokenFilterTest.scala | 17 ++++++-- .../LimitTokenCountTokenFilterTest.scala | 8 +++- .../analyzers/PatternTokenizerTest.scala | 4 +- .../analyzers/ShingleTokenFilterTest.scala | 12 ++++-- .../analyzers/StopTokenFilterTest.scala | 5 ++- .../analyzers/UniqueTokenFilterTest.scala | 4 +- .../requests/indexes/IndexTest.scala | 5 ++- .../requests/update/UpdateByQueryTest.scala | 5 ++- .../elastic4s/search/InnerHitTest.scala | 5 ++- .../samples/HttpClientExampleApp.scala | 2 +- .../samples/HttpClientExampleApp.scala | 2 +- .../samples/HttpClientExampleApp.scala | 2 +- 23 files changed, 146 insertions(+), 43 deletions(-) diff --git a/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/ScriptBuilderFnTest.scala b/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/ScriptBuilderFnTest.scala index 5518505815..bd76edc9be 100755 --- a/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/ScriptBuilderFnTest.scala +++ b/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/ScriptBuilderFnTest.scala @@ -9,7 +9,10 @@ import org.scalatest.matchers.should.Matchers class ScriptBuilderFnTest extends AnyFunSuite with Matchers { test("should handle recursive maps") { - ScriptBuilderFn(Script("myscript", params = Map("a" -> 1.2, "b" -> Map("c" -> true, "d" -> List(Map("e" -> 3)))))).string shouldBe + ScriptBuilderFn(Script( + "myscript", + params = Map("a" -> 1.2, "b" -> Map("c" -> true, "d" -> List(Map("e" -> 3)))) + )).string shouldBe """{"source":"myscript","params":{"a":1.2,"b":{"c":true,"d":[{"e":3}]}}}""" } diff --git a/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/SourceAsContentBuilderTest.scala b/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/SourceAsContentBuilderTest.scala index 6635c2c2cc..492e3d9603 100644 --- a/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/SourceAsContentBuilderTest.scala +++ b/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/SourceAsContentBuilderTest.scala @@ -8,7 +8,9 @@ class SourceAsContentBuilderTest extends AnyFunSuite with Matchers { test("source as content builder should handle tuples") { val map = Map("name" -> "sammy", "teams" -> Seq(("football", "boro"), ("baseball", "phillies")), "projects" -> null) - SourceAsContentBuilder(map).string shouldBe """{"name":"sammy","teams":[["football","boro"],["baseball","phillies"]],"projects":null}""" + SourceAsContentBuilder( + map + ).string shouldBe """{"name":"sammy","teams":[["football","boro"],["baseball","phillies"]],"projects":null}""" } test("source as content builder should handle bigdecimals") { diff --git a/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/analysis/NormalizerBuilderTest.scala b/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/analysis/NormalizerBuilderTest.scala index e9b1f0dd0f..3767daa90b 100644 --- a/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/analysis/NormalizerBuilderTest.scala +++ b/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/analysis/NormalizerBuilderTest.scala @@ -7,6 +7,8 @@ class NormalizerBuilderTest extends AnyFunSuite with Matchers { test("should build normalizer to spec") { val n = CustomNormalizer("my_normalizer", List("quote"), List("lowercase", "asciifolding")) - NormalizerBuilder.build(n).string shouldBe """{"type":"custom","filter":["lowercase","asciifolding"],"char_filter":["quote"]}""" + NormalizerBuilder.build( + n + ).string shouldBe """{"type":"custom","filter":["lowercase","asciifolding"],"char_filter":["quote"]}""" } } diff --git a/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/requests/indexes/UpdateIndexLevelSettingsBuilderTest.scala b/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/requests/indexes/UpdateIndexLevelSettingsBuilderTest.scala index 4e7d881e12..e66ba587d6 100644 --- a/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/requests/indexes/UpdateIndexLevelSettingsBuilderTest.scala +++ b/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/requests/indexes/UpdateIndexLevelSettingsBuilderTest.scala @@ -43,6 +43,8 @@ class UpdateIndexLevelSettingsBuilderTest extends AnyFunSuite with Matchers { settings = Map("index.blocks.write" -> true.toString) ) - UpdateIndexLevelSettingsBuilder(definition).string shouldBe """{"settings":{"index.blocks.write":"true","index.number_of_replicas":0}}""" + UpdateIndexLevelSettingsBuilder( + definition + ).string shouldBe """{"settings":{"index.blocks.write":"true","index.number_of_replicas":0}}""" } } diff --git a/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/requests/searches/MultiSearchBuilderFnTest.scala b/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/requests/searches/MultiSearchBuilderFnTest.scala index 3b5416fecc..cea9d35637 100644 --- a/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/requests/searches/MultiSearchBuilderFnTest.scala +++ b/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/requests/searches/MultiSearchBuilderFnTest.scala @@ -20,7 +20,9 @@ class MultiSearchBuilderFnTest extends AnyWordSpec with Matchers { } "build multisearch request with ignore_unavailable indices option" in { val req = searchRequest indicesOptions IndicesOptionsRequest(ignoreUnavailable = true) - MultiSearchBuilderFn(multi(req)).linesIterator.next shouldBe """{"index":"someIndex","ignore_unavailable":"true"}""" + MultiSearchBuilderFn( + multi(req) + ).linesIterator.next shouldBe """{"index":"someIndex","ignore_unavailable":"true"}""" } } diff --git a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/analysis/analyzers/FingerprintAnalyzerBuilderTest.scala b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/analysis/analyzers/FingerprintAnalyzerBuilderTest.scala index 87487b3b20..18190ddaf2 100644 --- a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/analysis/analyzers/FingerprintAnalyzerBuilderTest.scala +++ b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/analysis/analyzers/FingerprintAnalyzerBuilderTest.scala @@ -8,7 +8,10 @@ class FingerprintAnalyzerBuilderTest extends AnyWordSpec with Matchers { "FingerprintAnalyzer" should { "build json" in { - FingerprintAnalyzer("testy").separator("-").maxOutputSize(123).stopwords("a", "z").build.string shouldBe """{"type":"fingerprint","separator":"-","stopwords":["a","z"],"max_output_size":123}""" + FingerprintAnalyzer("testy").separator("-").maxOutputSize(123).stopwords( + "a", + "z" + ).build.string shouldBe """{"type":"fingerprint","separator":"-","stopwords":["a","z"],"max_output_size":123}""" } } } diff --git a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/analysis/analyzers/PatternAnalyzerBuilderTest.scala b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/analysis/analyzers/PatternAnalyzerBuilderTest.scala index c0613e95e3..56d4413b91 100644 --- a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/analysis/analyzers/PatternAnalyzerBuilderTest.scala +++ b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/analysis/analyzers/PatternAnalyzerBuilderTest.scala @@ -8,7 +8,10 @@ class PatternAnalyzerBuilderTest extends AnyWordSpec with Matchers { "PatternAnalyzer" should { "build json" in { - PatternAnalyzer("testy", regex = "21.*").lowercase(true).build.string shouldBe """{"type":"pattern","lowercase":true,"pattern":"21.*"}""" + PatternAnalyzer( + "testy", + regex = "21.*" + ).lowercase(true).build.string shouldBe """{"type":"pattern","lowercase":true,"pattern":"21.*"}""" } } } diff --git a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/analysis/tokenizers/EdgeNGramTokenizerBuilderTest.scala b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/analysis/tokenizers/EdgeNGramTokenizerBuilderTest.scala index 3fac0d4887..d56eabd598 100644 --- a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/analysis/tokenizers/EdgeNGramTokenizerBuilderTest.scala +++ b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/analysis/tokenizers/EdgeNGramTokenizerBuilderTest.scala @@ -9,7 +9,10 @@ class EdgeNGramTokenizerBuilderTest extends AnyWordSpec with Matchers with Elast "EdgeNGramTokenizer" should { "build json" in { - EdgeNGramTokenizer("testy").minMaxGrams(2, 3).tokenChars("a", "z").build.string shouldBe """{"type":"edge_ngram","min_gram":2,"max_gram":3,"token_chars":["a","z"]}""" + EdgeNGramTokenizer("testy").minMaxGrams(2, 3).tokenChars( + "a", + "z" + ).build.string shouldBe """{"type":"edge_ngram","min_gram":2,"max_gram":3,"token_chars":["a","z"]}""" } } } diff --git a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/json/XContentBuilderTest.scala b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/json/XContentBuilderTest.scala index 1f3af86592..fb844eb973 100644 --- a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/json/XContentBuilderTest.scala +++ b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/json/XContentBuilderTest.scala @@ -26,15 +26,23 @@ class XContentBuilderTest extends AnyFunSuite with Matchers { } test("should support raw fields in objects") { - XContentFactory.obj().rawField("nested", """{"test":true,"name":"foo"}""").string shouldBe """{"nested":{"test":true,"name":"foo"}}""" + XContentFactory.obj().rawField( + "nested", + """{"test":true,"name":"foo"}""" + ).string shouldBe """{"nested":{"test":true,"name":"foo"}}""" } test("should support raw values in arrays") { - XContentFactory.array().rawValue("""{"test":true,"name":"foo"}""").string shouldBe """[{"test":true,"name":"foo"}]""" + XContentFactory.array().rawValue( + """{"test":true,"name":"foo"}""" + ).string shouldBe """[{"test":true,"name":"foo"}]""" } test("should support boolean arrays") { - XContentFactory.obj().array("booleans", Array(true, false, true)).string shouldBe """{"booleans":[true,false,true]}""" + XContentFactory.obj().array( + "booleans", + Array(true, false, true) + ).string shouldBe """{"booleans":[true,false,true]}""" } test("should support double arrays") { @@ -42,11 +50,17 @@ class XContentBuilderTest extends AnyFunSuite with Matchers { } test("should support biginteger arrays") { - XContentFactory.obj().autoarray("bigintegers", Seq(new BigInteger("123"), new BigInteger("456"))).string shouldBe """{"bigintegers":[123,456]}""" + XContentFactory.obj().autoarray( + "bigintegers", + Seq(new BigInteger("123"), new BigInteger("456")) + ).string shouldBe """{"bigintegers":[123,456]}""" } test("should support long arrays") { - XContentFactory.obj().array("longs", Array(345345435345L, 3257059014L)).string shouldBe """{"longs":[345345435345,3257059014]}""" + XContentFactory.obj().array( + "longs", + Array(345345435345L, 3257059014L) + ).string shouldBe """{"longs":[345345435345,3257059014]}""" } test("should support string arrays") { @@ -58,15 +72,24 @@ class XContentBuilderTest extends AnyFunSuite with Matchers { } test("should support bigdecimal fields") { - XContentFactory.obj().field("dec", BigDecimal("291839123.12321312")).string shouldBe """{"dec":291839123.12321312}""" + XContentFactory.obj().field( + "dec", + BigDecimal("291839123.12321312") + ).string shouldBe """{"dec":291839123.12321312}""" } test("should support bigint fields") { - XContentFactory.obj().field("bigint", BigInt("98123981231982361893619")).string shouldBe """{"bigint":98123981231982361893619}""" + XContentFactory.obj().field( + "bigint", + BigInt("98123981231982361893619") + ).string shouldBe """{"bigint":98123981231982361893619}""" } test("should support biginteger fields") { - XContentFactory.obj().autofield("biginteger", new BigInteger("98123981231982361893619")).string shouldBe """{"biginteger":98123981231982361893619}""" + XContentFactory.obj().autofield( + "biginteger", + new BigInteger("98123981231982361893619") + ).string shouldBe """{"biginteger":98123981231982361893619}""" } test("should support iterable fields") { diff --git a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/CompoundWordTokenFilterTest.scala b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/CompoundWordTokenFilterTest.scala index 14656f0adc..13214bf491 100644 --- a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/CompoundWordTokenFilterTest.scala +++ b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/CompoundWordTokenFilterTest.scala @@ -8,28 +8,50 @@ class CompoundWordTokenFilterTest extends AnyWordSpec with TokenFilterApi with M "CompoundWordTokenFilter builder" should { "set type" in { - compoundWordTokenFilter("testy", DictionaryDecompounder).json.string shouldBe """{"type":"dictionary_decompounder"}""" + compoundWordTokenFilter( + "testy", + DictionaryDecompounder + ).json.string shouldBe """{"type":"dictionary_decompounder"}""" } "set word list" in { - compoundWordTokenFilter("testy", HyphenationDecompounder).wordList("boo", "foo").json.string shouldBe """{"type":"hyphenation_decompounder","word_list":["boo","foo"]}""" + compoundWordTokenFilter( + "testy", + HyphenationDecompounder + ).wordList("boo", "foo").json.string shouldBe """{"type":"hyphenation_decompounder","word_list":["boo","foo"]}""" } "set word list path" in { - compoundWordTokenFilter("testy", HyphenationDecompounder).wordListPath("config/word.txt").json.string shouldBe """{"type":"hyphenation_decompounder","word_list_path":"config/word.txt"}""" + compoundWordTokenFilter("testy", HyphenationDecompounder).wordListPath( + "config/word.txt" + ).json.string shouldBe """{"type":"hyphenation_decompounder","word_list_path":"config/word.txt"}""" } "set hyphenation patterns path" in { - compoundWordTokenFilter("testy", HyphenationDecompounder).wordListPath("config/hyphens.txt").json.string shouldBe """{"type":"hyphenation_decompounder","word_list_path":"config/hyphens.txt"}""" + compoundWordTokenFilter("testy", HyphenationDecompounder).wordListPath( + "config/hyphens.txt" + ).json.string shouldBe """{"type":"hyphenation_decompounder","word_list_path":"config/hyphens.txt"}""" } "set min word size" in { - compoundWordTokenFilter("testy", HyphenationDecompounder).minWordSize(7).json.string shouldBe """{"type":"hyphenation_decompounder","min_word_size":7}""" + compoundWordTokenFilter( + "testy", + HyphenationDecompounder + ).minWordSize(7).json.string shouldBe """{"type":"hyphenation_decompounder","min_word_size":7}""" } "set min subword size" in { - compoundWordTokenFilter("testy", HyphenationDecompounder).minSubwordSize(3).json.string shouldBe """{"type":"hyphenation_decompounder","min_subword_size":3}""" + compoundWordTokenFilter( + "testy", + HyphenationDecompounder + ).minSubwordSize(3).json.string shouldBe """{"type":"hyphenation_decompounder","min_subword_size":3}""" } "set max subword size" in { - compoundWordTokenFilter("testy", HyphenationDecompounder).maxSubwordSize(18).json.string shouldBe """{"type":"hyphenation_decompounder","max_subword_size":18}""" + compoundWordTokenFilter( + "testy", + HyphenationDecompounder + ).maxSubwordSize(18).json.string shouldBe """{"type":"hyphenation_decompounder","max_subword_size":18}""" } "set only longest match" in { - compoundWordTokenFilter("testy", HyphenationDecompounder).onlyLongestMatch(true).json.string shouldBe """{"type":"hyphenation_decompounder","only_longest_match":true}""" + compoundWordTokenFilter( + "testy", + HyphenationDecompounder + ).onlyLongestMatch(true).json.string shouldBe """{"type":"hyphenation_decompounder","only_longest_match":true}""" } } } diff --git a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/EdgeNGramTokenizerTest.scala b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/EdgeNGramTokenizerTest.scala index 29b1e192f1..e2b5d74c1e 100644 --- a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/EdgeNGramTokenizerTest.scala +++ b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/EdgeNGramTokenizerTest.scala @@ -8,7 +8,10 @@ class EdgeNGramTokenizerTest extends AnyWordSpec with TokenizerApi with Matchers "EdgeNGramTokenizer builder" should { "set min and max ngrams" in { - edgeNGramTokenizer("testy").minMaxGrams(3, 4).json.string shouldBe """{"type":"edgeNGram","min_gram":3,"max_gram":4}""" + edgeNGramTokenizer("testy").minMaxGrams( + 3, + 4 + ).json.string shouldBe """{"type":"edgeNGram","min_gram":3,"max_gram":4}""" } "set token chars" in { edgeNGramTokenizer("testy") diff --git a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/KeywordMarkerTokenFilterTest.scala b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/KeywordMarkerTokenFilterTest.scala index ac2be4c534..611bd88b99 100644 --- a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/KeywordMarkerTokenFilterTest.scala +++ b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/KeywordMarkerTokenFilterTest.scala @@ -11,16 +11,25 @@ class KeywordMarkerTokenFilterTest extends AnyWordSpec with TokenFilterApi with keywordMarkerTokenFilter("testy").json.string shouldBe """{"type":"keyword_marker"}""" } "set keywords" in { - keywordMarkerTokenFilter("testy").keywords("foo", "bar").json.string shouldBe """{"type":"keyword_marker","keywords":["foo","bar"]}""" + keywordMarkerTokenFilter("testy").keywords( + "foo", + "bar" + ).json.string shouldBe """{"type":"keyword_marker","keywords":["foo","bar"]}""" } "set keywords path" in { - keywordMarkerTokenFilter("testy").keywordsPath("config/keywords.txt").json.string shouldBe """{"type":"keyword_marker","keywords_path":"config/keywords.txt"}""" + keywordMarkerTokenFilter("testy").keywordsPath( + "config/keywords.txt" + ).json.string shouldBe """{"type":"keyword_marker","keywords_path":"config/keywords.txt"}""" } "set keywords pattern" in { - keywordMarkerTokenFilter("testy").keywordsPattern("pattern").json.string shouldBe """{"type":"keyword_marker","keywords_pattern":"pattern"}""" + keywordMarkerTokenFilter( + "testy" + ).keywordsPattern("pattern").json.string shouldBe """{"type":"keyword_marker","keywords_pattern":"pattern"}""" } "set ignore case" in { - keywordMarkerTokenFilter("testy").ignoreCase(true).json.string shouldBe """{"type":"keyword_marker","ignore_case":true}""" + keywordMarkerTokenFilter( + "testy" + ).ignoreCase(true).json.string shouldBe """{"type":"keyword_marker","ignore_case":true}""" } } } diff --git a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/LimitTokenCountTokenFilterTest.scala b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/LimitTokenCountTokenFilterTest.scala index 198ee7e970..eab8544b89 100644 --- a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/LimitTokenCountTokenFilterTest.scala +++ b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/LimitTokenCountTokenFilterTest.scala @@ -11,10 +11,14 @@ class LimitTokenCountTokenFilterTest extends AnyWordSpec with TokenFilterApi wit limitTokenCountTokenFilter("testy").json.string shouldBe """{"type":"limit"}""" } "set max token count" in { - limitTokenCountTokenFilter("testy").maxTokenCount(7).json.string shouldBe """{"type":"limit","max_token_count":7}""" + limitTokenCountTokenFilter( + "testy" + ).maxTokenCount(7).json.string shouldBe """{"type":"limit","max_token_count":7}""" } "set consume all tokens" in { - limitTokenCountTokenFilter("testy").consumeAllTokens(true).json.string shouldBe """{"type":"limit","consume_all_tokens":true}""" + limitTokenCountTokenFilter( + "testy" + ).consumeAllTokens(true).json.string shouldBe """{"type":"limit","consume_all_tokens":true}""" } } } diff --git a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/PatternTokenizerTest.scala b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/PatternTokenizerTest.scala index 8118172130..b335d2bd7e 100644 --- a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/PatternTokenizerTest.scala +++ b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/PatternTokenizerTest.scala @@ -8,7 +8,9 @@ class PatternTokenizerTest extends AnyWordSpec with TokenizerApi with Matchers { "PatternTokenizer builder" should { "set flags" in { - patternTokenizer("testy").flags("abc").json.string shouldBe """{"type":"pattern","flags":"abc","pattern":"\\W+"}""" + patternTokenizer( + "testy" + ).flags("abc").json.string shouldBe """{"type":"pattern","flags":"abc","pattern":"\\W+"}""" } "not set flags if not specified" in { patternTokenizer("testy").json.string shouldBe """{"type":"pattern","pattern":"\\W+"}""" diff --git a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/ShingleTokenFilterTest.scala b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/ShingleTokenFilterTest.scala index ee32394623..8ac57b2e2a 100644 --- a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/ShingleTokenFilterTest.scala +++ b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/ShingleTokenFilterTest.scala @@ -17,13 +17,19 @@ class ShingleTokenFilterTest extends AnyWordSpec with TokenFilterApi with Matche shingleTokenFilter("testy").minShingleSize(11).json.string shouldBe """{"type":"shingle","min_shingle_size":11}""" } "set output unigrams" in { - shingleTokenFilter("testy").outputUnigrams(false).json.string shouldBe """{"type":"shingle","output_unigrams":false}""" + shingleTokenFilter( + "testy" + ).outputUnigrams(false).json.string shouldBe """{"type":"shingle","output_unigrams":false}""" } "set output unigrams if no shingles" in { - shingleTokenFilter("testy").outputUnigramsIfNoShingles(true).json.string shouldBe """{"type":"shingle","output_unigrams_if_no_shingles":true}""" + shingleTokenFilter("testy").outputUnigramsIfNoShingles( + true + ).json.string shouldBe """{"type":"shingle","output_unigrams_if_no_shingles":true}""" } "set token separator" in { - shingleTokenFilter("testy").tokenSeparator("/").json.string shouldBe """{"type":"shingle","token_separator":"/"}""" + shingleTokenFilter( + "testy" + ).tokenSeparator("/").json.string shouldBe """{"type":"shingle","token_separator":"/"}""" } "set filler token" in { shingleTokenFilter("testy").fillerToken("-").json.string shouldBe """{"type":"shingle","filler_token":"-"}""" diff --git a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/StopTokenFilterTest.scala b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/StopTokenFilterTest.scala index f7a01af2e3..86e1f0776b 100644 --- a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/StopTokenFilterTest.scala +++ b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/StopTokenFilterTest.scala @@ -8,7 +8,10 @@ class StopTokenFilterTest extends AnyWordSpec with TokenFilterApi with Matchers "StopTokenFilter builder" should { "set stop words" in { - stopTokenFilter("testy").stopwords("boo", "foo").json.string shouldBe """{"type":"stop","stopwords":["boo","foo"]}""" + stopTokenFilter("testy").stopwords( + "boo", + "foo" + ).json.string shouldBe """{"type":"stop","stopwords":["boo","foo"]}""" } "set ignore case" in { stopTokenFilter("testy").ignoreCase(true).json.string shouldBe """{"type":"stop","ignore_case":true}""" diff --git a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/UniqueTokenFilterTest.scala b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/UniqueTokenFilterTest.scala index a9326a1839..deefaa9716 100644 --- a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/UniqueTokenFilterTest.scala +++ b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/analyzers/UniqueTokenFilterTest.scala @@ -11,7 +11,9 @@ class UniqueTokenFilterTest extends AnyWordSpec with AnalyzerApi with Matchers w uniqueTokenFilter("testy").json.string shouldBe """{"type":"unique"}""" } "set only same position" in { - uniqueTokenFilter("testy").onlyOnSamePosition(true).json.string shouldBe """{"type":"unique","only_on_same_position":true}""" + uniqueTokenFilter( + "testy" + ).onlyOnSamePosition(true).json.string shouldBe """{"type":"unique","only_on_same_position":true}""" } } } diff --git a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/indexes/IndexTest.scala b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/indexes/IndexTest.scala index ec2916f3de..259c4db835 100644 --- a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/indexes/IndexTest.scala +++ b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/indexes/IndexTest.scala @@ -31,7 +31,10 @@ class IndexTest extends AnyWordSpec with Matchers with DockerTests { client.execute { bulk( - indexInto("electronics").fields(Map("name" -> "galaxy", "screensize" -> 5)).withId("55A").version(42L).versionType( + indexInto("electronics").fields(Map( + "name" -> "galaxy", + "screensize" -> 5 + )).withId("55A").version(42L).versionType( VersionType.External ), indexInto("electronics").fields(Map("name" -> "razor", "colours" -> Array("white", "blue"))), diff --git a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/update/UpdateByQueryTest.scala b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/update/UpdateByQueryTest.scala index dd0a25a661..9a81f7581e 100644 --- a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/update/UpdateByQueryTest.scala +++ b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/requests/update/UpdateByQueryTest.scala @@ -95,7 +95,10 @@ class UpdateByQueryTest }.await val task = client.execute { - updateByQueryAsync("pop", termsQuery("name", "coca")).script(script("ctx._source.foo = 'h'").lang("painless")).refreshImmediately + updateByQueryAsync( + "pop", + termsQuery("name", "coca") + ).script(script("ctx._source.foo = 'h'").lang("painless")).refreshImmediately }.await.result.task // A bit ugly way to poll the task until it's complete diff --git a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/search/InnerHitTest.scala b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/search/InnerHitTest.scala index 7594d9e27a..3525075ce2 100644 --- a/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/search/InnerHitTest.scala +++ b/elastic4s-tests/src/test/scala/com/sksamuel/elastic4s/search/InnerHitTest.scala @@ -23,7 +23,10 @@ class InnerHitTest extends AnyWordSpec with Matchers with DockerTests { client.execute { bulk( indexInto(indexName).fields(Map("name" -> "boro", "affiliation" -> "club")).id("1").routing("1"), - indexInto(indexName).fields(Map("name" -> "traore", "affiliation" -> Map("name" -> "player", "parent" -> "1"))).id( + indexInto(indexName).fields(Map( + "name" -> "traore", + "affiliation" -> Map("name" -> "player", "parent" -> "1") + )).id( "2" ).routing("1") ).refreshImmediately diff --git a/samples/elastic4s-http-client-gradle/src/main/scala/com/sksamuel/elastic4s/samples/HttpClientExampleApp.scala b/samples/elastic4s-http-client-gradle/src/main/scala/com/sksamuel/elastic4s/samples/HttpClientExampleApp.scala index 42ecbf4f6c..58c936cff4 100644 --- a/samples/elastic4s-http-client-gradle/src/main/scala/com/sksamuel/elastic4s/samples/HttpClientExampleApp.scala +++ b/samples/elastic4s-http-client-gradle/src/main/scala/com/sksamuel/elastic4s/samples/HttpClientExampleApp.scala @@ -15,7 +15,7 @@ object HttpClientExampleApp extends App { client.execute { bulk( indexInto("myindex" / "mytype").fields("country" -> "Mongolia", "capital" -> "Ulaanbaatar"), - indexInto("myindex" / "mytype").fields("country" -> "Namibia", "capital" -> "Windhoek") + indexInto("myindex" / "mytype").fields("country" -> "Namibia", "capital" -> "Windhoek") ).refresh(RefreshPolicy.WaitFor) }.await diff --git a/samples/elastic4s-http-client-maven/src/main/scala/com/sksamuel/elastic4s/samples/HttpClientExampleApp.scala b/samples/elastic4s-http-client-maven/src/main/scala/com/sksamuel/elastic4s/samples/HttpClientExampleApp.scala index 42ecbf4f6c..58c936cff4 100644 --- a/samples/elastic4s-http-client-maven/src/main/scala/com/sksamuel/elastic4s/samples/HttpClientExampleApp.scala +++ b/samples/elastic4s-http-client-maven/src/main/scala/com/sksamuel/elastic4s/samples/HttpClientExampleApp.scala @@ -15,7 +15,7 @@ object HttpClientExampleApp extends App { client.execute { bulk( indexInto("myindex" / "mytype").fields("country" -> "Mongolia", "capital" -> "Ulaanbaatar"), - indexInto("myindex" / "mytype").fields("country" -> "Namibia", "capital" -> "Windhoek") + indexInto("myindex" / "mytype").fields("country" -> "Namibia", "capital" -> "Windhoek") ).refresh(RefreshPolicy.WaitFor) }.await diff --git a/samples/elastic4s-http-client-sbt/src/main/scala/com/sksamuel/elastic4s/samples/HttpClientExampleApp.scala b/samples/elastic4s-http-client-sbt/src/main/scala/com/sksamuel/elastic4s/samples/HttpClientExampleApp.scala index 42ecbf4f6c..58c936cff4 100644 --- a/samples/elastic4s-http-client-sbt/src/main/scala/com/sksamuel/elastic4s/samples/HttpClientExampleApp.scala +++ b/samples/elastic4s-http-client-sbt/src/main/scala/com/sksamuel/elastic4s/samples/HttpClientExampleApp.scala @@ -15,7 +15,7 @@ object HttpClientExampleApp extends App { client.execute { bulk( indexInto("myindex" / "mytype").fields("country" -> "Mongolia", "capital" -> "Ulaanbaatar"), - indexInto("myindex" / "mytype").fields("country" -> "Namibia", "capital" -> "Windhoek") + indexInto("myindex" / "mytype").fields("country" -> "Namibia", "capital" -> "Windhoek") ).refresh(RefreshPolicy.WaitFor) }.await From e30792fcc321e9b81dd07a8d3eba094f0294d7a3 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 19 Jan 2025 02:28:48 +0000 Subject: [PATCH 23/68] Add 'Reformat with scalafmt 3.8.5' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 5cd2f6ac0b..e39981521f 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,2 +1,5 @@ # Initial applied scalafmtAll and scalafmtSbt c1a068b59a36f88401ea646577e4ed61df1e1b4a + +# Scala Steward: Reformat with scalafmt 3.8.5 +fb60074fc43b054aab8aa17c4d5bc87106c7ae9e From 321577e83bc2b72ef10ef95685e23b17c9f8b47e Mon Sep 17 00:00:00 2001 From: Philippus Baalman Date: Sun, 19 Jan 2025 09:36:11 +0100 Subject: [PATCH 24/68] Add sbt/setup-sbt action (#3288) --- .github/workflows/build.yml | 9 +++++++++ .github/workflows/lint.yml | 3 +++ .github/workflows/pr.yml | 9 +++++++++ .github/workflows/release.yml | 1 + 4 files changed, 22 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0d47a4c299..a559205fc1 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -26,6 +26,9 @@ jobs: distribution: temurin java-version: 11 + - name: set up sbt + uses: sbt/setup-sbt@v1 + - name: Launch elastic docker uses: ./.github/actions/launch-elasticsearch @@ -46,6 +49,9 @@ jobs: distribution: temurin java-version: 11 + - name: set up sbt + uses: sbt/setup-sbt@v1 + - name: Launch elastic docker uses: ./.github/actions/launch-elasticsearch @@ -66,6 +72,9 @@ jobs: distribution: temurin java-version: 11 + - name: set up sbt + uses: sbt/setup-sbt@v1 + - name: Launch elastic docker uses: ./.github/actions/launch-elasticsearch diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 6e1ab3e3d8..e4794b0cc9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -22,5 +22,8 @@ jobs: distribution: temurin java-version: 11 + - name: set up sbt + uses: sbt/setup-sbt@v1 + - name: run lint run: sbt -v "+scalafmtCheckAll;scalafmtSbtCheck" diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b4486f9913..a8da23590f 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -22,6 +22,9 @@ jobs: distribution: temurin java-version: 11 + - name: set up sbt + uses: sbt/setup-sbt@v1 + - name: Launch elastic docker uses: ./.github/actions/launch-elasticsearch @@ -43,6 +46,9 @@ jobs: distribution: temurin java-version: 11 + - name: set up sbt + uses: sbt/setup-sbt@v1 + - name: Launch elastic docker uses: ./.github/actions/launch-elasticsearch @@ -64,6 +70,9 @@ jobs: distribution: temurin java-version: 11 + - name: set up sbt + uses: sbt/setup-sbt@v1 + - name: Launch elastic docker uses: ./.github/actions/launch-elasticsearch diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 87a6c11d7a..72181b6dec 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,6 +13,7 @@ jobs: with: distribution: temurin java-version: 11 + - uses: sbt/setup-sbt@v1 - run: sbt ci-release env: PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} From 54ae5ce28cc038d95f46ab948975c851f8656e1d Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 19 Jan 2025 09:43:57 +0100 Subject: [PATCH 25/68] Update sbt-bloop to 2.0.7 (#3281) Co-authored-by: Philippus Baalman --- project/metals.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/metals.sbt b/project/metals.sbt index ae69e56af9..c2c6b53df7 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.6") +addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "2.0.7") From 86325b486544a8628ecd8027f5c9a1ffc12f62a8 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 19 Jan 2025 09:51:30 +0100 Subject: [PATCH 26/68] Update scala-library to 2.13.16 (#3282) Co-authored-by: Philippus Baalman --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index db141d1abd..6a8a5d6b27 100644 --- a/build.sbt +++ b/build.sbt @@ -15,7 +15,7 @@ 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.15") +val scala2Versions = Seq("2.12.20", "2.13.16") val scalaAllVersions = scala2Versions :+ "3.3.4" lazy val commonScalaVersionSettings = Seq( From eef2d750dc5f54c093c24d15ea9faa36ad5a6c60 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 19 Jan 2025 09:51:40 +0100 Subject: [PATCH 27/68] Update sbt-scalafmt to 2.5.4 (#3283) Co-authored-by: Philippus Baalman --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 14af449161..49c89ef979 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") From 42d1141da0812eaefa8480aa159edc49442a5bff Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 22 Jan 2025 20:19:09 +0100 Subject: [PATCH 28/68] Update sbt-bloop to 2.0.8 (#3290) --- project/metals.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/metals.sbt b/project/metals.sbt index c2c6b53df7..3edbb828fb 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.7") +addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "2.0.8") From 4440c476f4753a016a4177f42ac4d70f8c989ae5 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 22 Jan 2025 20:31:06 +0100 Subject: [PATCH 29/68] Update elasticsearch-rest-client, ... to 8.17.1 (#3291) --- .github/actions/launch-elasticsearch/action.yml | 2 +- docker-compose.yml | 2 +- project/Dependencies.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/launch-elasticsearch/action.yml b/.github/actions/launch-elasticsearch/action.yml index f2b64cbc6e..28d067b6a2 100644 --- a/.github/actions/launch-elasticsearch/action.yml +++ b/.github/actions/launch-elasticsearch/action.yml @@ -7,7 +7,7 @@ runs: - name: 'Launch elastic docker' shell: bash run: | - docker run -d -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.17.0 + docker run -d -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.17.1 - name: 'Wait for cluster to start' shell: bash run: | diff --git a/docker-compose.yml b/docker-compose.yml index 08827b46e4..d9489c7db9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.17.0 + image: docker.elastic.co/elasticsearch/elasticsearch:8.17.1 environment: discovery.type: single-node network.host: 0.0.0.0 diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 4ed7a9221d..dcfbd67a25 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -8,7 +8,7 @@ object Dependencies { val CatsEffectVersion = "3.5.7" val CirceVersion = "0.14.10" val CommonsIoVersion = "2.18.0" - val ElasticsearchVersion = "8.17.0" + val ElasticsearchVersion = "8.17.1" val ExtsVersion = "1.61.1" val Http4sVersion = "0.23.30" val JacksonVersion = "2.18.2" From ec4fb03e373ddc82e6f01a6f05e2556ca31b1565 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 25 Jan 2025 11:27:51 +0100 Subject: [PATCH 30/68] Update zio-json to 0.7.6 (#3294) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index dcfbd67a25..3601ebdf64 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -30,7 +30,7 @@ object Dependencies { val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" val ZIOVersion = "2.1.14" - val ZIOJsonVersion = "0.7.4" + val ZIOJsonVersion = "0.7.6" lazy val commonDeps = Seq( libraryDependencies ++= Seq( From 476f502fd6a83acc730323e5c72e01cafdd999c6 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 25 Jan 2025 12:18:48 +0100 Subject: [PATCH 31/68] Update scalafmt-core to 3.8.6 (#3295) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 9fb818eb18..5f87e7b75b 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.5 +version = 3.8.6 align.preset = most literals.double = Upper From 1a7a2bcc8d32e73e64cea51ea95ab9717f593bee Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 4 Feb 2025 08:16:00 +0100 Subject: [PATCH 32/68] Update zio-json to 0.7.14 (#3297) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 3601ebdf64..f4fdf2f962 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -30,7 +30,7 @@ object Dependencies { val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" val ZIOVersion = "2.1.14" - val ZIOJsonVersion = "0.7.6" + val ZIOJsonVersion = "0.7.14" lazy val commonDeps = Seq( libraryDependencies ++= Seq( From 39f38bc392ecff5ddd3eb0f5677869cdbb94fddf Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 4 Feb 2025 08:38:46 +0100 Subject: [PATCH 33/68] Update scala3-library to 3.3.5 (#3298) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6a8a5d6b27..ce57607f7f 100644 --- a/build.sbt +++ b/build.sbt @@ -16,7 +16,7 @@ def isRelease = releaseVersion != "" def githubRunNumber = sys.env.getOrElse("GITHUB_RUN_NUMBER", "local") val scala2Versions = Seq("2.12.20", "2.13.16") -val scalaAllVersions = scala2Versions :+ "3.3.4" +val scalaAllVersions = scala2Versions :+ "3.3.5" lazy val commonScalaVersionSettings = Seq( scalaVersion := "2.12.20", From 9b84cef355706d46065908a7c5b0851218d18124 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 5 Feb 2025 23:23:28 +0100 Subject: [PATCH 34/68] Update client3:core to 3.10.3 (#3300) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f4fdf2f962..2e81cc47da 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -26,7 +26,7 @@ object Dependencies { val ScalatestVersion = "3.2.19" val Slf4jVersion = "2.0.16" val SprayJsonVersion = "1.3.6" - val SttpVersion = "3.10.2" + val SttpVersion = "3.10.3" val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" val ZIOVersion = "2.1.14" From e6f927e5ef30c8c8e89be47c273774aa1576bd06 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 5 Feb 2025 23:24:34 +0100 Subject: [PATCH 35/68] Update zio to 2.1.15 (#3301) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 2e81cc47da..b4e9f88cf7 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -29,7 +29,7 @@ object Dependencies { val SttpVersion = "3.10.3" val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" - val ZIOVersion = "2.1.14" + val ZIOVersion = "2.1.15" val ZIOJsonVersion = "0.7.14" lazy val commonDeps = Seq( From 24b8b7389fe8084b7a2d24b0a1dde86a836a3510 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 5 Feb 2025 23:36:26 +0100 Subject: [PATCH 36/68] Update zio-json to 0.7.15 (#3302) Co-authored-by: Philippus Baalman --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index b4e9f88cf7..d31e50f331 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -30,7 +30,7 @@ object Dependencies { val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" val ZIOVersion = "2.1.15" - val ZIOJsonVersion = "0.7.14" + val ZIOJsonVersion = "0.7.15" lazy val commonDeps = Seq( libraryDependencies ++= Seq( From f67f22fcc55f6be01a8ec78133f4771b36f06f85 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 9 Feb 2025 18:26:27 +0100 Subject: [PATCH 37/68] Update zio-json to 0.7.16 (#3306) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index d31e50f331..2c17bdcee8 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -30,7 +30,7 @@ object Dependencies { val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" val ZIOVersion = "2.1.15" - val ZIOJsonVersion = "0.7.15" + val ZIOJsonVersion = "0.7.16" lazy val commonDeps = Seq( libraryDependencies ++= Seq( From ca4b12e2ff3d823abc5283125717183536f02ad5 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 11 Feb 2025 22:44:04 +0100 Subject: [PATCH 38/68] Update elasticsearch-rest-client, ... to 8.17.2 (#3310) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 2c17bdcee8..cc813011f9 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -8,7 +8,7 @@ object Dependencies { val CatsEffectVersion = "3.5.7" val CirceVersion = "0.14.10" val CommonsIoVersion = "2.18.0" - val ElasticsearchVersion = "8.17.1" + val ElasticsearchVersion = "8.17.2" val ExtsVersion = "1.61.1" val Http4sVersion = "0.23.30" val JacksonVersion = "2.18.2" From c64d2ea29e0795a2f08b5bbadcb1aec84845a596 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 11 Feb 2025 22:57:51 +0100 Subject: [PATCH 39/68] Update zio-json to 0.7.17 (#3309) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index cc813011f9..56d32b3f4f 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -30,7 +30,7 @@ object Dependencies { val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" val ZIOVersion = "2.1.15" - val ZIOJsonVersion = "0.7.16" + val ZIOJsonVersion = "0.7.17" lazy val commonDeps = Seq( libraryDependencies ++= Seq( From 9c7e0118f0f15561184b853365e79b0456bd10de Mon Sep 17 00:00:00 2001 From: q-martindurchov Date: Fri, 14 Feb 2025 14:01:30 +0000 Subject: [PATCH 40/68] Add a handling for the null case when flattening over the map of settings, for example when initial_recovery = null after copying or recovering an index (#3308) * Add a handling for the null case when flattening over the map of settings, for example when initial_recovery = null after copying or recovering an index * add tests for null edge case of the Maps class flatten function * formatting new MapsTest file --- .../com/sksamuel/elastic4s/ext/Maps.scala | 1 + .../com/sksamuel/elastic4s/MapsTest.scala | 58 +++++++++++++++++++ 2 files changed, 59 insertions(+) create mode 100644 elastic4s-domain/src/test/scala/com/sksamuel/elastic4s/MapsTest.scala diff --git a/elastic4s-domain/src/main/scala/com/sksamuel/elastic4s/ext/Maps.scala b/elastic4s-domain/src/main/scala/com/sksamuel/elastic4s/ext/Maps.scala index 46a7b05b96..2b4293a5a8 100644 --- a/elastic4s-domain/src/main/scala/com/sksamuel/elastic4s/ext/Maps.scala +++ b/elastic4s-domain/src/main/scala/com/sksamuel/elastic4s/ext/Maps.scala @@ -12,6 +12,7 @@ object Maps { case (key, value: java.util.Map[String, V]) => flatten(value.asScala.toMap[String, V]).map { case (k, v) => s"$key$separator$k" -> v } + case (key, null) => Map(key -> null.asInstanceOf[V]) case (key, value: V) => Map(key -> value) } diff --git a/elastic4s-domain/src/test/scala/com/sksamuel/elastic4s/MapsTest.scala b/elastic4s-domain/src/test/scala/com/sksamuel/elastic4s/MapsTest.scala new file mode 100644 index 0000000000..2281b5d44e --- /dev/null +++ b/elastic4s-domain/src/test/scala/com/sksamuel/elastic4s/MapsTest.scala @@ -0,0 +1,58 @@ +package com.sksamuel.elastic4s + +import com.sksamuel.elastic4s.ext.Maps +import org.scalatest +import org.scalatest.matchers.should.Matchers + +class MapsTest extends scalatest.flatspec.AnyFlatSpec with Matchers { + "Maps flatten function" should "support null values" in { + val jsonMap: Map[String, Any] = Map( + "settings" -> Map( + "index" -> Map( + "routing" -> Map( + "allocation" -> Map( + "include" -> Map( + "_tier_preference" -> "data_content" + ), + "initial_recovery" -> Map( + "_id" -> null + ) + ) + ), + "number_of_shards" -> "1", + "routing_partition_size" -> "1", + "blocks" -> Map( + "write" -> "true" + ), + "provided_name" -> "test-two", + "resize" -> Map( + "source" -> Map( + "name" -> "test-index", + "uuid" -> "1234" + ) + ), + "creation_date" -> "1234", + "number_of_replicas" -> "1", + "uuid" -> "1234", + "version" -> Map( + "created" -> "1234" + ) + ) + ) + ) + Maps.flatten(jsonMap) shouldBe Map( + "settings.index.resize.source.name" -> "test-index", + "settings.index.resize.source.uuid" -> "1234", + "settings.index.provided_name" -> "test-two", + "settings.index.blocks.write" -> "true", + "settings.index.routing_partition_size" -> "1", + "settings.index.routing.allocation.include._tier_preference" -> "data_content", + "settings.index.routing.allocation.initial_recovery._id" -> null, + "settings.index.number_of_replicas" -> "1", + "settings.index.version.created" -> "1234", + "settings.index.number_of_shards" -> "1", + "settings.index.creation_date" -> "1234", + "settings.index.uuid" -> "1234" + ) + } +} From 1ffc9a0dfb68c812feb68091191b21b303f1bb3b Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 15 Feb 2025 16:37:03 +0100 Subject: [PATCH 41/68] Update zio-json to 0.7.21 (#3313) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 56d32b3f4f..938a2e59e1 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -30,7 +30,7 @@ object Dependencies { val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" val ZIOVersion = "2.1.15" - val ZIOJsonVersion = "0.7.17" + val ZIOJsonVersion = "0.7.21" lazy val commonDeps = Seq( libraryDependencies ++= Seq( From a07dfcdaeb74030d33d1355fe5f0f442dd6ed1b4 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 18 Feb 2025 08:50:20 +0100 Subject: [PATCH 42/68] Update scalafmt-core to 3.9.0 (#3316) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 5f87e7b75b..a737245758 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.6 +version = 3.9.0 align.preset = most literals.double = Upper From 32bef36c494703eaf3a230746375c3cfb3ec139f Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 19 Feb 2025 09:03:39 +0100 Subject: [PATCH 43/68] Update zio-json to 0.7.23 (#3317) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 938a2e59e1..f16cb23aa0 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -30,7 +30,7 @@ object Dependencies { val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" val ZIOVersion = "2.1.15" - val ZIOJsonVersion = "0.7.21" + val ZIOJsonVersion = "0.7.23" lazy val commonDeps = Seq( libraryDependencies ++= Seq( From ac515b9294e48707105406219241bba3fa6d1986 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 19 Feb 2025 17:41:59 +0100 Subject: [PATCH 44/68] Update zio-json to 0.7.25 (#3319) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index f16cb23aa0..d45e0717ba 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -30,7 +30,7 @@ object Dependencies { val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" val ZIOVersion = "2.1.15" - val ZIOJsonVersion = "0.7.23" + val ZIOJsonVersion = "0.7.25" lazy val commonDeps = Seq( libraryDependencies ++= Seq( From 59609382e7afdf6dd82c75b117d961533ca7e1db Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 21 Feb 2025 15:27:41 +0100 Subject: [PATCH 45/68] Update zio-json to 0.7.26 (#3321) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index d45e0717ba..64fb23a44a 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -30,7 +30,7 @@ object Dependencies { val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" val ZIOVersion = "2.1.15" - val ZIOJsonVersion = "0.7.25" + val ZIOJsonVersion = "0.7.26" lazy val commonDeps = Seq( libraryDependencies ++= Seq( From aebd171203253cf5cd758c54e2863524fb4de2fa Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 23 Feb 2025 23:44:19 +0100 Subject: [PATCH 46/68] Update zio-json to 0.7.29 (#3323) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 64fb23a44a..bf52cede39 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -30,7 +30,7 @@ object Dependencies { val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" val ZIOVersion = "2.1.15" - val ZIOJsonVersion = "0.7.26" + val ZIOJsonVersion = "0.7.29" lazy val commonDeps = Seq( libraryDependencies ++= Seq( From 6d8e86c42745f20e628d6f9cc8c16d92290764b2 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 23 Feb 2025 23:44:30 +0100 Subject: [PATCH 47/68] Update scalafmt-core to 3.9.1 (#3324) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index a737245758..05d8073bae 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.9.0 +version = 3.9.1 align.preset = most literals.double = Upper From 53a1b013e25998f791f5099bff091e3b2d8c05d1 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 25 Feb 2025 21:57:56 +0100 Subject: [PATCH 48/68] Update zio-json to 0.7.32 (#3326) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index bf52cede39..de3152eff0 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -30,7 +30,7 @@ object Dependencies { val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" val ZIOVersion = "2.1.15" - val ZIOJsonVersion = "0.7.29" + val ZIOJsonVersion = "0.7.32" lazy val commonDeps = Seq( libraryDependencies ++= Seq( From 9d5453fbbcb8e2675d5cf084552423495c120dd4 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Tue, 25 Feb 2025 22:01:30 +0100 Subject: [PATCH 49/68] Update slf4j-api to 2.0.17 (#3327) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index de3152eff0..6ac07c700b 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -24,7 +24,7 @@ object Dependencies { val ScalatestPlusVersion = "3.2.19.0" val ScalazVersion = "7.2.36" val ScalatestVersion = "3.2.19" - val Slf4jVersion = "2.0.16" + val Slf4jVersion = "2.0.17" val SprayJsonVersion = "1.3.6" val SttpVersion = "3.10.3" val ZIOJson1Version = "0.1.5" From 3319f84063f922dc87bd5dd58f824daed0ecacf9 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 28 Feb 2025 08:12:10 +0100 Subject: [PATCH 50/68] Update zio to 2.1.16 (#3331) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 6ac07c700b..a8e7bed63e 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -29,7 +29,7 @@ object Dependencies { val SttpVersion = "3.10.3" val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" - val ZIOVersion = "2.1.15" + val ZIOVersion = "2.1.16" val ZIOJsonVersion = "0.7.32" lazy val commonDeps = Seq( From c2480b64058685d6c26bd66f04caddeb41f2d106 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 28 Feb 2025 08:32:34 +0100 Subject: [PATCH 51/68] Update zio-json to 0.7.36 (#3332) Co-authored-by: Philippus Baalman --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index a8e7bed63e..aaaa44492b 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -30,7 +30,7 @@ object Dependencies { val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" val ZIOVersion = "2.1.16" - val ZIOJsonVersion = "0.7.32" + val ZIOJsonVersion = "0.7.36" lazy val commonDeps = Seq( libraryDependencies ++= Seq( From 21d068e8bb442e57baa384df5bbe569ea7f22d91 Mon Sep 17 00:00:00 2001 From: Philippus Baalman Date: Fri, 28 Feb 2025 09:22:51 +0100 Subject: [PATCH 52/68] Update docker images to 8.17.2 (#3335) --- .github/actions/launch-elasticsearch/action.yml | 2 +- docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/launch-elasticsearch/action.yml b/.github/actions/launch-elasticsearch/action.yml index 28d067b6a2..97a0836f51 100644 --- a/.github/actions/launch-elasticsearch/action.yml +++ b/.github/actions/launch-elasticsearch/action.yml @@ -7,7 +7,7 @@ runs: - name: 'Launch elastic docker' shell: bash run: | - docker run -d -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.17.1 + docker run -d -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.17.2 - name: 'Wait for cluster to start' shell: bash run: | diff --git a/docker-compose.yml b/docker-compose.yml index d9489c7db9..707583a4c9 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.17.1 + image: docker.elastic.co/elasticsearch/elasticsearch:8.17.2 environment: discovery.type: single-node network.host: 0.0.0.0 From 92acc41a427929ed65bf02924b72053220553ef4 Mon Sep 17 00:00:00 2001 From: Claudio Marins Date: Fri, 28 Feb 2025 06:44:59 -0300 Subject: [PATCH 53/68] feat: adds boost support into interval queries (#3315) --- .../queries/IntervalsQueryBuilderFnTest.scala | 54 +++++++++++++++++++ .../searches/queries/IntervalsQuery.scala | 2 +- .../queries/IntervalsQueryBuilderFn.scala | 8 ++- 3 files changed, 62 insertions(+), 2 deletions(-) diff --git a/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/requests/searches/queries/IntervalsQueryBuilderFnTest.scala b/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/requests/searches/queries/IntervalsQueryBuilderFnTest.scala index 21ea4c9005..881376c51b 100644 --- a/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/requests/searches/queries/IntervalsQueryBuilderFnTest.scala +++ b/elastic4s-core/src/test/scala/com/sksamuel/elastic4s/requests/searches/queries/IntervalsQueryBuilderFnTest.scala @@ -188,4 +188,58 @@ class IntervalsQueryBuilderFnTest extends AnyFunSuite with Matchers with GivenWh Then("query should have right fields") queryBody.string should matchJson(expected) } + + test("Should correctly build intervals boosted query") { + Given("An intervals query with boost set") + val query = IntervalsQuery( + "my_text", + AllOf(List( + Match(query = "my favorite food").maxGaps(0).ordered(true), + AnyOf(intervals = + List( + Match(query = "hot water"), + Match(query = "cold porridge") + ) + ) + )).ordered(true), + Some(2.5D) + ) + + When("Intervals query is built") + val queryBody = IntervalsQueryBuilderFn(query) + + Then("query should have right fields and boost set") + queryBody.string should matchJson(intervalsBoostedQuery) + } + + def intervalsBoostedQuery: String = + """ + |{ + | "intervals" : { + | "my_text" : { + | "boost": 2.5, + | "all_of" : { + | "ordered" : true, + | "intervals" : [ + | { + | "match" : { + | "query" : "my favorite food", + | "max_gaps" : 0, + | "ordered" : true + | } + | }, + | { + | "any_of" : { + | "intervals" : [ + | { "match" : { "query" : "hot water" } }, + | { "match" : { "query" : "cold porridge" } } + | ] + | } + | } + | ] + | } + | } + | } + |} + """.stripMargin.replace("\n", "") } diff --git a/elastic4s-domain/src/main/scala/com/sksamuel/elastic4s/requests/searches/queries/IntervalsQuery.scala b/elastic4s-domain/src/main/scala/com/sksamuel/elastic4s/requests/searches/queries/IntervalsQuery.scala index bea4cd1db0..fb966b7bd5 100644 --- a/elastic4s-domain/src/main/scala/com/sksamuel/elastic4s/requests/searches/queries/IntervalsQuery.scala +++ b/elastic4s-domain/src/main/scala/com/sksamuel/elastic4s/requests/searches/queries/IntervalsQuery.scala @@ -3,7 +3,7 @@ package com.sksamuel.elastic4s.requests.searches.queries import com.sksamuel.elastic4s.requests.script.Script import com.sksamuel.elastic4s.ext.OptionImplicits._ -case class IntervalsQuery(field: String, rule: IntervalsRule) extends Query +case class IntervalsQuery(field: String, rule: IntervalsRule, boost: Option[Double] = None) extends Query sealed trait IntervalsRule case class Match( diff --git a/elastic4s-handlers/src/main/scala/com/sksamuel/elastic4s/handlers/searches/queries/IntervalsQueryBuilderFn.scala b/elastic4s-handlers/src/main/scala/com/sksamuel/elastic4s/handlers/searches/queries/IntervalsQueryBuilderFn.scala index c47ac28f7d..110e5a0ff5 100644 --- a/elastic4s-handlers/src/main/scala/com/sksamuel/elastic4s/handlers/searches/queries/IntervalsQueryBuilderFn.scala +++ b/elastic4s-handlers/src/main/scala/com/sksamuel/elastic4s/handlers/searches/queries/IntervalsQueryBuilderFn.scala @@ -143,7 +143,13 @@ object IntervalsQueryBuilderFn { def apply(q: IntervalsQuery): XContentBuilder = { val builder = XContentFactory.jsonBuilder() builder.startObject("intervals") - builder.rawField(q.field, IntervalsRuleBuilderFn(q.rule)) + builder.rawField( + q.field, { + val ruleBuilder = IntervalsRuleBuilderFn(q.rule) + q.boost.foreach(ruleBuilder.field("boost", _)) + ruleBuilder + } + ) builder.endObject() } } From 954a4ebf099ffefd65dfe2f6c5cb22b6430a6440 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 2 Mar 2025 07:37:36 +0100 Subject: [PATCH 54/68] Update jackson-module-scala to 2.18.3 (#3337) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index aaaa44492b..ceec021b01 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -11,7 +11,7 @@ object Dependencies { val ElasticsearchVersion = "8.17.2" val ExtsVersion = "1.61.1" val Http4sVersion = "0.23.30" - val JacksonVersion = "2.18.2" + val JacksonVersion = "2.18.3" val Json4sVersion = "4.0.7" val Log4jVersion = "2.24.3" val MockitoVersion = "5.15.2" From 01df53afabad91be770c6196ad3682b8d1400bca Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 2 Mar 2025 07:37:48 +0100 Subject: [PATCH 55/68] Update jackson-core, jackson-databind to 2.18.3 (#3336) From 09f17ea39af4f20eaaeae89bbc702280ee5e2d20 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sun, 2 Mar 2025 10:28:50 +0100 Subject: [PATCH 56/68] Update scalafmt-core to 3.9.2 (#3338) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 05d8073bae..0764fce463 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.9.1 +version = 3.9.2 align.preset = most literals.double = Upper From 1e5370e6e176a1cf3e97384dae4956315a18d191 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 3 Mar 2025 22:25:55 +0100 Subject: [PATCH 57/68] Update mockito-core to 5.16.0 (#3342) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ceec021b01..188116ff19 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -14,7 +14,7 @@ object Dependencies { val JacksonVersion = "2.18.3" val Json4sVersion = "4.0.7" val Log4jVersion = "2.24.3" - val MockitoVersion = "5.15.2" + val MockitoVersion = "5.16.0" val MonixVersion = "3.4.1" val PekkoHttpVersion = "1.1.0" val PekkoVersion = "1.1.3" From ef27337200540b11b2c269dab9d29156c7da2c0b Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 3 Mar 2025 22:26:22 +0100 Subject: [PATCH 58/68] Update zio-json to 0.7.37 (#3341) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 188116ff19..8e5eb3f53d 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -30,7 +30,7 @@ object Dependencies { val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" val ZIOVersion = "2.1.16" - val ZIOJsonVersion = "0.7.36" + val ZIOJsonVersion = "0.7.37" lazy val commonDeps = Seq( libraryDependencies ++= Seq( From 559227716001d8b1a80c379cce572fad1826f345 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Mon, 3 Mar 2025 22:49:36 +0100 Subject: [PATCH 59/68] Update sbt, scripted-plugin to 1.10.9 (#3343) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 73df629ac1..96d8db79a1 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.7 +sbt.version=1.10.9 From 2405887d68b4345f888d183fa4702fce08cb3227 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 5 Mar 2025 21:50:46 +0100 Subject: [PATCH 60/68] Update zio-json to 0.7.38 (#3347) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8e5eb3f53d..9af8dedba3 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -30,7 +30,7 @@ object Dependencies { val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" val ZIOVersion = "2.1.16" - val ZIOJsonVersion = "0.7.37" + val ZIOJsonVersion = "0.7.38" lazy val commonDeps = Seq( libraryDependencies ++= Seq( From be1d8b20d391509936e3fab280d82742c2da4e5a Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Wed, 5 Mar 2025 21:51:09 +0100 Subject: [PATCH 61/68] Update sbt, scripted-plugin to 1.10.10 (#3349) --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 96d8db79a1..e97b27220f 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.9 +sbt.version=1.10.10 From d841a4b0c24b87b981652eb4d34346ad932d1cd0 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Thu, 6 Mar 2025 08:12:38 +0100 Subject: [PATCH 62/68] Update elasticsearch-rest-client, ... to 8.17.3 (#3348) --- .github/actions/launch-elasticsearch/action.yml | 2 +- docker-compose.yml | 2 +- project/Dependencies.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/launch-elasticsearch/action.yml b/.github/actions/launch-elasticsearch/action.yml index 97a0836f51..93854cadef 100644 --- a/.github/actions/launch-elasticsearch/action.yml +++ b/.github/actions/launch-elasticsearch/action.yml @@ -7,7 +7,7 @@ runs: - name: 'Launch elastic docker' shell: bash run: | - docker run -d -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.17.2 + docker run -d -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.17.3 - name: 'Wait for cluster to start' shell: bash run: | diff --git a/docker-compose.yml b/docker-compose.yml index 707583a4c9..298c895b03 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.17.2 + image: docker.elastic.co/elasticsearch/elasticsearch:8.17.3 environment: discovery.type: single-node network.host: 0.0.0.0 diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 9af8dedba3..ba339e4f59 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -8,7 +8,7 @@ object Dependencies { val CatsEffectVersion = "3.5.7" val CirceVersion = "0.14.10" val CommonsIoVersion = "2.18.0" - val ElasticsearchVersion = "8.17.2" + val ElasticsearchVersion = "8.17.3" val ExtsVersion = "1.61.1" val Http4sVersion = "0.23.30" val JacksonVersion = "2.18.3" From 589cd06e72850d980a77ebe599315451443df0e5 Mon Sep 17 00:00:00 2001 From: Philippus Baalman Date: Thu, 6 Mar 2025 14:13:11 +0100 Subject: [PATCH 63/68] Remove unused files (#3353) --- .../json/search/search_numeric_filter.json | 14 -------------- .../json/search/search_numeric_filter2.json | 14 -------------- .../json/search/search_numeric_filter3.json | 15 --------------- 3 files changed, 43 deletions(-) delete mode 100644 elastic4s-tests/src/test/resources/json/search/search_numeric_filter.json delete mode 100644 elastic4s-tests/src/test/resources/json/search/search_numeric_filter2.json delete mode 100644 elastic4s-tests/src/test/resources/json/search/search_numeric_filter3.json diff --git a/elastic4s-tests/src/test/resources/json/search/search_numeric_filter.json b/elastic4s-tests/src/test/resources/json/search/search_numeric_filter.json deleted file mode 100644 index 08151249ad..0000000000 --- a/elastic4s-tests/src/test/resources/json/search/search_numeric_filter.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "post_filter": { - "numeric_range": { - "years": { - "from": 1900, - "to": 2100, - "include_lower": true, - "include_upper": true - }, - "_cache": true, - "_cache_key": "key" - } - } -} diff --git a/elastic4s-tests/src/test/resources/json/search/search_numeric_filter2.json b/elastic4s-tests/src/test/resources/json/search/search_numeric_filter2.json deleted file mode 100644 index effb2bcab0..0000000000 --- a/elastic4s-tests/src/test/resources/json/search/search_numeric_filter2.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "post_filter": { - "numeric_range": { - "years": { - "from": 12.4, - "to": 45.5, - "include_lower": true, - "include_upper": true - }, - "_cache": true, - "_cache_key": "key" - } - } -} diff --git a/elastic4s-tests/src/test/resources/json/search/search_numeric_filter3.json b/elastic4s-tests/src/test/resources/json/search/search_numeric_filter3.json deleted file mode 100644 index 1c2874803a..0000000000 --- a/elastic4s-tests/src/test/resources/json/search/search_numeric_filter3.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "post_filter": { - "numeric_range": { - "years": { - "from": "12.4", - "to": "45.5", - "include_lower": false, - "include_upper": false - }, - "_name": "superfilter", - "_cache": true, - "_cache_key": "key" - } - } -} From 37414ab2f76dd721c81f197c9c4c6631f145a3c2 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 8 Mar 2025 10:51:21 +0100 Subject: [PATCH 64/68] Update scalafmt-core to 3.9.3 (#3355) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 0764fce463..0ddd2d47bf 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.9.2 +version = 3.9.3 align.preset = most literals.double = Upper From 78320395616bf4fb3344b1860506286242687a99 Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Sat, 8 Mar 2025 10:51:33 +0100 Subject: [PATCH 65/68] Update zio-json to 0.7.39 (#3354) --- project/Dependencies.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index ba339e4f59..a57b152a3e 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -30,7 +30,7 @@ object Dependencies { val ZIOJson1Version = "0.1.5" val ZIO1Version = "1.0.18" val ZIOVersion = "2.1.16" - val ZIOJsonVersion = "0.7.38" + val ZIOJsonVersion = "0.7.39" lazy val commonDeps = Seq( libraryDependencies ++= Seq( From 74ccb1ccc076e85eee86a36d6b1828c067bb7c3c Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 14 Mar 2025 07:49:03 +0100 Subject: [PATCH 66/68] Update sbt-ci-release to 1.9.3 (#3358) --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 49c89ef979..a72abe6295 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,3 @@ -addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2") +addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.3") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4") From 08322dcb25523b5d2c1551532bb72c7968be823c Mon Sep 17 00:00:00 2001 From: Scala Steward <43047562+scala-steward@users.noreply.github.com> Date: Fri, 14 Mar 2025 07:56:58 +0100 Subject: [PATCH 67/68] Update scalafmt-core to 3.9.4 (#3359) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 0ddd2d47bf..6a4c5fa968 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.9.3 +version = 3.9.4 align.preset = most literals.double = Upper From dad6cbc5631b4b78c1abad7651325000d8c163c6 Mon Sep 17 00:00:00 2001 From: philippus Date: Fri, 14 Mar 2025 13:56:08 +0100 Subject: [PATCH 68/68] Release version 8.17.0 --- README.md | 3 ++- version.sbt | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 01f810beb4..fd910eab8d 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.16.0-brightgreen.svg?style=flat "8.16.0") +![Current Version](https://img.shields.io/badge/version-8.17.0-brightgreen.svg?style=flat "8.17.0") [![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) @@ -35,6 +35,7 @@ Note that starting from versions 7.17.25 and 8.12.0 the group id has changed fro | Elastic Version | Scala 2.12 | Scala 2.13 | Scala 3 | |-----------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| +| 8.17.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_3) | | 8.16.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_3) | | 8.15.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_3) | | 8.14.x | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.12%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_2.13%22) | [](http://search.maven.org/#search%7Cga%7C1%7Ca%3A%22elastic4s-core_3) | diff --git a/version.sbt b/version.sbt index a98c661683..f940ff2aff 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "8.17.0-SNAPSHOT" +ThisBuild / version := "8.17.0"