From d0e8b15f93a19dfa23cc3346003d2c7b275e87e1 Mon Sep 17 00:00:00 2001 From: Raffael Tancman Date: Thu, 1 Dec 2022 13:39:07 -0300 Subject: [PATCH] Add support for elastic 8.5.1 (#2777) --- .github/workflows/master.yml | 6 +++--- build.sbt | 2 +- docker-compose.yml | 2 +- project/Dependencies.scala | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 28cb4f063..7157e6bbc 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -26,7 +26,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.5.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.5.1 - name: run tests run: sbt ++2.12.12 test @@ -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.5.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.5.1 - name: run tests run: sbt ++2.13.4 test @@ -105,7 +105,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.5.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.5.1 - name: run tests run: sbt ++3.2.0 elastic4s-scala3/test diff --git a/build.sbt b/build.sbt index 6eb3f78c4..508448cd8 100644 --- a/build.sbt +++ b/build.sbt @@ -15,7 +15,7 @@ def releaseVersion: String = sys.env.getOrElse("RELEASE_VERSION", "") def isRelease = releaseVersion != "" // the version to use to publish - either from release version or a snapshot run number -def publishVersion = if (isRelease) releaseVersion else "8.5.0." + githubRunNumber + "-SNAPSHOT" +def publishVersion = if (isRelease) releaseVersion else "8.5.1." + githubRunNumber + "-SNAPSHOT" // set by github actions and used as the snapshot build number def githubRunNumber = sys.env.getOrElse("GITHUB_RUN_NUMBER", "local") diff --git a/docker-compose.yml b/docker-compose.yml index 97b0168ba..f267c8e25 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.3' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:8.5.0 + image: docker.elastic.co/elasticsearch/elasticsearch:8.5.1 environment: discovery.type: single-node network.host: 0.0.0.0 diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8f5748a02..09f8abc38 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -9,7 +9,7 @@ object Dependencies { val CatsVersion = "2.0.0" val CirceVersion = "0.14.3" val CommonsIoVersion = "2.11.0" - val ElasticsearchVersion = "8.5.0" + val ElasticsearchVersion = "8.5.1" val ExtsVersion = "1.61.1" val JacksonVersion = "2.14.1" val Json4sVersion = "4.0.6"