Update elasticsearch-rest-client, ... to 7.12.0 (#2358)

Philippus · Mar 24, 2021 · 07c95ce · 07c95ce
1 parent 3f7f2aa
commit 07c95ce
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 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" docker.elastic.co/elasticsearch/elasticsearch:7.11.2
+        run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch:7.12.0
 
       - name: Import GPG key
         id: import_gpg
@@ -62,7 +62,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" docker.elastic.co/elasticsearch/elasticsearch:7.11.2
+        run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch:7.12.0
 
       - name: Import GPG key
         id: import_gpg

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:7.11.2
+        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:7.12.0
 
       - name: run tests
         run: sbt ++2.12.12 test
@@ -41,7 +41,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:7.11.2
+        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:7.12.0
 
       - name: run tests
         run: sbt ++2.13.4 test
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" docker.elastic.co/elasticsearch/elasticsearch:7.11.2
+        run: docker run -d -it -p 39227:9200 -p 39337:9300 -e "discovery.type=single-node" docker.elastic.co/elasticsearch/elasticsearch:7.12.0
 
       - name: Import GPG key
         id: import_gpg

diff --git a/build.sbt b/build.sbt
@@ -5,7 +5,7 @@ val CatsVersion            = "2.0.0"
 val CatsEffectVersion      = "2.3.3"
 val CirceVersion           = "0.13.0"
 val CommonsIoVersion       = "2.8.0"
-val ElasticsearchVersion   = "7.11.2"
+val ElasticsearchVersion   = "7.12.0"
 val ExtsVersion            = "1.61.1"
 val JacksonVersion         = "2.12.2"
 val Json4sVersion          = "3.6.11"

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:7.11.2
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.12.0
     environment:
       discovery.type: single-node
       network.host: 0.0.0.0

diff --git a/elastic4s-core/src/main/scala/com/sksamuel/elastic4s/requests/mappings/Mapping.scala b/elastic4s-core/src/main/scala/com/sksamuel/elastic4s/requests/mappings/Mapping.scala
@@ -109,7 +109,7 @@ object MappingDefinition {
   def apply(fields: Seq[FieldDefinition]): MappingDefinition = MappingDefinition(None, fields = fields)
 }
 
-case class MappingDefinition(@deprecated("types are deprecated in elasticsearch", "7.11.2")
+case class MappingDefinition(@deprecated("types are deprecated in elasticsearch", "7.12.0")
                              `type`: Option[String] = None, // type is now deprecated and can largely be ignored, it will be removed completely in 8.0
                              all: Option[Boolean] = None,
                              source: Option[Boolean] = None,