diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 02a9897a5..ee6ef926c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,10 +27,10 @@ jobs: java-version: 11 - name: Launch elastic docker - run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.0 + run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.1 - name: run tests - run: sbt ++2.12.19 test + run: sbt ++2.12.20 test scala-2_13: runs-on: ubuntu-latest @@ -47,7 +47,7 @@ jobs: java-version: 11 - name: Launch elastic docker - run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.0 + run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.1 - name: run tests run: sbt ++2.13.14 test @@ -67,7 +67,7 @@ jobs: java-version: 11 - name: Launch elastic docker - run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.0 + run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.1 - name: run tests run: sbt ++3.3.3 elastic4s-scala3/test diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 442c3941a..e29cfd1f2 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -23,11 +23,11 @@ jobs: java-version: 11 - name: Launch elastic docker - run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.0 + run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.1 - name: run tests timeout-minutes: 30 - run: sbt ++2.12.19 test + run: sbt ++2.12.20 test scala-2_13: runs-on: ubuntu-latest @@ -44,7 +44,7 @@ jobs: java-version: 11 - name: Launch elastic docker - run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.0 + run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.1 - name: run tests timeout-minutes: 30 @@ -65,7 +65,7 @@ jobs: java-version: 11 - name: Launch elastic docker - run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.0 + run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" -v /home/runner/work/elastic4s/elastic4s/elastic4s-tests/src/test/resources/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml docker.elastic.co/elasticsearch/elasticsearch:8.15.1 - name: run tests run: sbt ++3.3.3 elastic4s-scala3/test diff --git a/README.md b/README.md index 4fd2135f0..aa157aa49 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # elastic4s - Elasticsearch Scala Client [![build](https://github.com/Philippus/elastic4s/workflows/build/badge.svg)](https://github.com/Philippus/elastic4s/actions/workflows/build.yml?query=workflow%3Abuild+branch%3Amain) -![Current Version](https://img.shields.io/badge/version-8.15.0-brightgreen.svg?style=flat "8.15.0") +![Current Version](https://img.shields.io/badge/version-8.15.1-brightgreen.svg?style=flat "8.15.1") [![Scala Steward badge](https://img.shields.io/badge/Scala_Steward-helping-blue.svg?style=flat&logo=data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAA4AAAAQCAMAAAARSr4IAAAAVFBMVEUAAACHjojlOy5NWlrKzcYRKjGFjIbp293YycuLa3pYY2LSqql4f3pCUFTgSjNodYRmcXUsPD/NTTbjRS+2jomhgnzNc223cGvZS0HaSD0XLjbaSjElhIr+AAAAAXRSTlMAQObYZgAAAHlJREFUCNdNyosOwyAIhWHAQS1Vt7a77/3fcxxdmv0xwmckutAR1nkm4ggbyEcg/wWmlGLDAA3oL50xi6fk5ffZ3E2E3QfZDCcCN2YtbEWZt+Drc6u6rlqv7Uk0LdKqqr5rk2UCRXOk0vmQKGfc94nOJyQjouF9H/wCc9gECEYfONoAAAAASUVORK5CYII=)](https://scala-steward.org) [![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg?style=flat "Apache 2.0")](LICENSE) diff --git a/build.sbt b/build.sbt index 2e7266e0f..237c1034a 100644 --- a/build.sbt +++ b/build.sbt @@ -15,11 +15,11 @@ 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.19", "2.13.14") +val scala2Versions = Seq("2.12.20", "2.13.14") val scalaAllVersions = scala2Versions :+ "3.3.3" lazy val commonScalaVersionSettings = Seq( - scalaVersion := "2.12.19", + scalaVersion := "2.12.20", crossScalaVersions := Nil ) @@ -302,7 +302,7 @@ lazy val clientsttp = (project in file("elastic4s-client-sttp")) .dependsOn(core, testkit % "test") .settings(name := "elastic4s-client-sttp") .settings(scala3Settings) - .settings(libraryDependencies ++= Seq(sttp, asyncHttpClientBackendFuture)) + .settings(libraryDependencies ++= Seq(sttp)) lazy val clientakka = (project in file("elastic4s-client-akka")) .dependsOn(core, testkit % "test") @@ -329,9 +329,9 @@ lazy val tests = (project in file("elastic4s-tests")) "com.fasterxml.jackson.core" % "jackson-core" % JacksonVersion % "test", "com.fasterxml.jackson.core" % "jackson-databind" % JacksonVersion % "test", "com.fasterxml.jackson.module" %% "jackson-module-scala" % JacksonVersion % "test" exclude("org.scala-lang", "scala-library"), - "org.apache.logging.log4j" % "log4j-api" % "2.23.1" % "test", - "org.apache.logging.log4j" % "log4j-slf4j-impl" % "2.23.1" % "test", - "org.apache.logging.log4j" % "log4j-core" % "2.23.1" % "test" + "org.apache.logging.log4j" % "log4j-api" % "2.24.0" % "test", + "org.apache.logging.log4j" % "log4j-slf4j-impl" % "2.24.0" % "test", + "org.apache.logging.log4j" % "log4j-core" % "2.24.0" % "test" ), Test / fork := false, Test / parallelExecution := false, diff --git a/docker-compose.yml b/docker-compose.yml index 76d24684f..65342404d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.15.0 + image: docker.elastic.co/elasticsearch/elasticsearch:8.15.1 environment: discovery.type: single-node network.host: 0.0.0.0 diff --git a/elastic4s-client-sttp/src/main/scala/com/sksamuel/elastic4s/sttp/SttpRequestHttpClient.scala b/elastic4s-client-sttp/src/main/scala/com/sksamuel/elastic4s/sttp/SttpRequestHttpClient.scala index e2898bf80..460518a85 100644 --- a/elastic4s-client-sttp/src/main/scala/com/sksamuel/elastic4s/sttp/SttpRequestHttpClient.scala +++ b/elastic4s-client-sttp/src/main/scala/com/sksamuel/elastic4s/sttp/SttpRequestHttpClient.scala @@ -10,7 +10,6 @@ import scala.concurrent.{ExecutionContext, Future} import scala.io.Source import scala.util.{Failure, Success} import sttp.client3._ -import sttp.client3.asynchttpclient.future.AsyncHttpClientFutureBackend import sttp.model.Uri import sttp.model.Uri.{PathSegments, QuerySegment} @@ -94,7 +93,7 @@ class SttpRequestHttpClient(nodeEndpoint: ElasticNodeEndpoint)( object SttpRequestHttpClient { private def defaultEc: ExecutionContext = ExecutionContext.global - private def defaultSttpBackend: SttpBackend[Future, Any] = AsyncHttpClientFutureBackend() + private def defaultSttpBackend: SttpBackend[Future, Any] = HttpClientFutureBackend() /** Instantiate an [[SttpRequestHttpClient]] with reasonable defaults for the implicit parameters. */ def apply(nodeEndpoint: ElasticNodeEndpoint): SttpRequestHttpClient = new SttpRequestHttpClient(nodeEndpoint)( diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 2d99f8bfa..94f216407 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -7,9 +7,9 @@ object Dependencies { val CatsEffect2Version = "2.5.5" val CatsEffectVersion = "3.5.4" val CatsVersion = "2.0.0" - val CirceVersion = "0.14.9" + val CirceVersion = "0.14.10" val CommonsIoVersion = "2.16.1" - val ElasticsearchVersion = "8.15.0" + val ElasticsearchVersion = "8.15.1" val ExtsVersion = "1.61.1" val JacksonVersion = "2.17.2" val Json4sVersion = "4.0.7" @@ -17,7 +17,7 @@ object Dependencies { val MockitoVersion = "5.13.0" val MonixVersion = "3.4.1" val PekkoHttpVersion = "1.0.1" - val PekkoVersion = "1.0.3" + val PekkoVersion = "1.1.1" val PlayJsonVersion = "3.0.4" val ReactiveStreamsVersion = "1.0.3" val ScalatestPlusMockitoArtifactId = "mockito-3-4" @@ -61,7 +61,6 @@ object Dependencies { lazy val akkaActor = "com.typesafe.akka" %% "akka-actor" % AkkaVersion lazy val akkaHTTP = "com.typesafe.akka" %% "akka-http" % AkkaHttpVersion lazy val akkaStream = "com.typesafe.akka" %% "akka-stream" % AkkaVersion - lazy val asyncHttpClientBackendFuture = "com.softwaremill.sttp.client3" %% "async-http-client-backend-future" % SttpVersion lazy val cats = "org.typelevel" %% "cats-effect" % CatsEffectVersion lazy val cats2 = "org.typelevel" %% "cats-effect" % CatsEffect2Version lazy val elasticsearchRestClient = "org.elasticsearch.client" % "elasticsearch-rest-client" % ElasticsearchVersion diff --git a/project/build.properties b/project/build.properties index ee4c672cd..0b699c305 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.1 +sbt.version=1.10.2 diff --git a/project/metals.sbt b/project/metals.sbt index 4de79118e..163b4afdc 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.0") +addSbtPlugin("ch.epfl.scala" % "sbt-bloop" % "2.0.2") diff --git a/version.sbt b/version.sbt index bf0e3d7ab..f69017247 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -ThisBuild / version := "8.15.0" +ThisBuild / version := "8.15.1"