Add support for elastic 8.1.x (#2651)

* Bump the elastic version to 8.0.0 * Fix the boosts parameter in IndexTemplateHttpTest - Breaking changes in mapping https://www.elastic.co/guide/en/elasticsearch/reference/current/migrating-8.0.html#breaking_80_mapping_changes * Fix the TermsLookupQuery - Remove field "type": "_doc" because of the parameters are ignored. * Fix intermitent spec in CatSegmentsTest * Change the delete by query parameter size to max_docs * Fix intermittent spec in NodeHotThreadsTest * Fix intermittent spec in IndexStatsRequestTest * Remove the interval parameter in DateHistogramAggregation - The date_histogram aggregation’s interval parameter is no longer valid. https://www.elastic.co/guide/en/elasticsearch/reference/current/migrating-8.0.html#breaking_80_rest_api_changes * Add the Moving function aggregation - Remove the Moving Average aggregation. - The moving_avg aggregation was deprecated in 6.4 and has been removed. To calculate moving averages, use the moving_fn aggregation instead. https://www.elastic.co/guide/en/elasticsearch/reference/current/migrating-8.0.html#breaking_80_rest_api_changes * Fix spec in ElasticJacksonIndexableTest because of the _type metadata field has been removed * Fix spec in CatThreadPoolTest because of the listener thread pool has been removed * Remove Common Query - The common query has been removed. https://www.elastic.co/guide/en/elasticsearch/reference/current/migrating-8.0.html#breaking-changes-8.0 * Fix spec in TermVectorsTest because of the _type metadata field has been removed * Fix spec in UpdateTest because of the _type metadata field has been removed * Remove the verbose parameter in _segments * Fix spec in GetTaskTest because of the _type metadata field has been removed * Fix spec in CompositeDateAggregationHttpTest - The date_histogram aggregation’s interval parameter is no longer valid. https://www.elastic.co/guide/en/elasticsearch/reference/current/migrating-8.0.html#breaking_80_rest_api_changes * Fix spec in TermVectorsTest because of the _type metadata field has been removed * Fix Reindex API - The outer level size parameter has now been renamed to max_docs to avoid confusion and clarify its semantics. - The type query parameter has been removed. * Add the timeout in githubactions * Fix the PercolateQuery - Field type has been removed. - Field document_type has been removed. * Fix TermsQuery to remove parameter type - The type query parameter has been removed https://www.elastic.co/guide/en/elasticsearch/reference/current/migrating-8.0.html#breaking-changes-8.0 * Fix spec in TermVectorTest - The _type field are no longer supported https://www.elastic.co/guide/en/elasticsearch/reference/current/migrating-8.0.html#breaking-changes-8.0 * Fix spec in ClusterInfoTest - The search.remote.* settings have been removed. https://www.elastic.co/guide/en/elasticsearch/reference/current/migrating-8.0.html#breaking-changes-8.0 * Remove _type in SearchHit - Searches on the _type field are no longer supported. https://www.elastic.co/guide/en/elasticsearch/reference/current/migrating-8.0.html#breaking-changes-8.0 * Bump the elastic version to 8.1.0 * Force re-run all jobs * Bump the elastic version to 8.1.2 Co-authored-by: Sam Sam <[email protected]>
Philippus · Apr 17, 2022 · 4682c8a · 4682c8a
1 parent 7ac9b0f
commit 4682c8a
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git 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.0.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.1.2
 
       - 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.0.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.1.2
 
       - name: run tests
         run: sbt ++2.13.4 test

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -22,7 +22,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.0.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.1.2
 
       - name: run tests
         timeout-minutes: 30
@@ -42,7 +42,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.0.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.1.2
 
       - name: run tests
         timeout-minutes: 30

diff --git a/.github/workflows/release.yml b/.github/workflows/release.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.0.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.1.2
 
       - name: Import GPG key
         id: import_gpg

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.3'
 
 services:
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.0.0
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.1.2
     environment:
       discovery.type: single-node
       network.host: 0.0.0.0

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -9,7 +9,7 @@ object Dependencies {
   val CatsVersion                    = "2.0.0"
   val CirceVersion                   = "0.14.1"
   val CommonsIoVersion               = "2.11.0"
-  val ElasticsearchVersion           = "8.0.0"
+  val ElasticsearchVersion           = "8.1.2"
   val ExtsVersion                    = "1.61.1"
   val JacksonVersion                 = "2.13.2"
   val Json4sVersion                  = "4.0.5"