From 0d8cc598f7e3f3324aa50d74bf4b5cdf57b3ac6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Tue, 3 Nov 2020 15:13:07 +0100
Subject: [PATCH 1/3] Upgrade to Hibernate Search 6.0.0.CR1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Yoann Rodière <yoann@hibernate.org>
---
 bom/application/pom.xml                                         | 2 +-
 .../runtime/HibernateSearchElasticsearchRecorder.java           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index eef67e6d9a13f..9c47c08ae4d11 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -90,7 +90,7 @@
         <hibernate-orm.version>5.4.23.Final</hibernate-orm.version>
         <hibernate-reactive.version>1.0.0.Alpha11</hibernate-reactive.version>
         <hibernate-validator.version>6.1.6.Final</hibernate-validator.version>
-        <hibernate-search.version>6.0.0.Beta11</hibernate-search.version>
+        <hibernate-search.version>6.0.0.CR1</hibernate-search.version>
         <narayana.version>5.10.6.Final</narayana.version>
         <jboss-transaction-api_1.2_spec.version>1.1.1.Final</jboss-transaction-api_1.2_spec.version>
         <agroal.version>1.9</agroal.version>
diff --git a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java
index e4eada04259f7..cda9ca37bdbc0 100644
--- a/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java
+++ b/extensions/hibernate-search-orm-elasticsearch/runtime/src/main/java/io/quarkus/hibernate/search/elasticsearch/runtime/HibernateSearchElasticsearchRecorder.java
@@ -168,7 +168,7 @@ private void contributeBackendRuntimeProperties(BiConsumer<String, Object> prope
         private void contributeBackendIndexBuildTimeProperties(BiConsumer<String, Object> propertyCollector,
                 String backendName, String indexName, ElasticsearchIndexBuildTimeConfig indexConfig) {
             addBackendIndexConfig(propertyCollector, backendName, indexName,
-                    ElasticsearchBackendSettings.ANALYSIS_CONFIGURER,
+                    ElasticsearchIndexSettings.ANALYSIS_CONFIGURER,
                     indexConfig.analysis.configurer,
                     Optional::isPresent, c -> c.get().getName());
         }

From 46c469632707a318a5689e9f0593a0a315efc8e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Wed, 4 Nov 2020 11:34:18 +0100
Subject: [PATCH 2/3] Upgrade to Elasticsearch clients 7.9.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Yoann Rodière <yoann@hibernate.org>
---
 bom/application/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 9c47c08ae4d11..637def43c77dc 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -95,7 +95,7 @@
         <jboss-transaction-api_1.2_spec.version>1.1.1.Final</jboss-transaction-api_1.2_spec.version>
         <agroal.version>1.9</agroal.version>
         <jboss-transaction-spi.version>7.6.0.Final</jboss-transaction-spi.version>
-        <elasticsearch-rest-client.version>7.9.0</elasticsearch-rest-client.version>
+        <elasticsearch-rest-client.version>7.9.2</elasticsearch-rest-client.version>
         <rxjava1.version>1.3.8</rxjava1.version>
         <rxjava.version>2.2.20</rxjava.version>
         <wildfly.openssl.version>1.0.6.Final</wildfly.openssl.version>

From 219cfb4888d83434b4faaa2d2b50197af24b0e0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yoann=20Rodi=C3=A8re?= <yoann@hibernate.org>
Date: Wed, 4 Nov 2020 11:34:24 +0100
Subject: [PATCH 3/3] Upgrade Elasticsearch server used in tests to 7.9.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Yoann Rodière <yoann@hibernate.org>
---
 .github/workflows/ci-actions.yml | 2 +-
 build-parent/pom.xml             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci-actions.yml b/.github/workflows/ci-actions.yml
index 7e1e1bfa20340..6d1769af057e8 100644
--- a/.github/workflows/ci-actions.yml
+++ b/.github/workflows/ci-actions.yml
@@ -594,7 +594,7 @@ jobs:
         run: |
           docker run --rm --publish 9200:9200 --name build-elasticsearch \
           -e discovery.type=single-node \
-          -d docker.elastic.co/elasticsearch/elasticsearch-oss:7.9.0
+          -d docker.elastic.co/elasticsearch/elasticsearch-oss:7.9.2
         if: matrix.elasticsearch
       - uses: actions/checkout@v2
       - name: Set up JDK 11
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index c2ee66a99b3ea..a1214f3d150a0 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -75,7 +75,7 @@
         <antlr.version>4.7.2</antlr.version>
 
         <!-- Defaults for integration tests -->
-        <elasticsearch-server.version>7.9.0</elasticsearch-server.version>
+        <elasticsearch-server.version>7.9.2</elasticsearch-server.version>
         <elasticsearch.image>docker.elastic.co/elasticsearch/elasticsearch-oss:${elasticsearch-server.version}</elasticsearch.image>
         <elasticsearch.protocol>http</elasticsearch.protocol>