From e515ba836cd74bdb8bea1a48a9403779181474d0 Mon Sep 17 00:00:00 2001
From: Mario Kotoy <kotoy@symptoma.com>
Date: Tue, 7 Jul 2020 09:06:59 +0200
Subject: [PATCH] Update to Elastic 7.8.0

---
 extra-analysis-esperanto/pom.xml                              | 2 +-
 .../extra/analysis/esperanto/EsperantoStemmerESTest.java      | 4 ++--
 extra-analysis-serbian/pom.xml                                | 2 +-
 .../extra/analysis/serbian/SerbianStemmerFilterESTest.java    | 4 ++--
 pom.xml                                                       | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/extra-analysis-esperanto/pom.xml b/extra-analysis-esperanto/pom.xml
index 7f386db..abed975 100644
--- a/extra-analysis-esperanto/pom.xml
+++ b/extra-analysis-esperanto/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.wikimedia.search</groupId>
         <artifactId>extra-analysis</artifactId>
-        <version>7.7.1.0-SNAPSHOT</version>
+        <version>7.8.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>extra-analysis-esperanto</artifactId>
diff --git a/extra-analysis-esperanto/src/test/java/org/wikimedia/search/extra/analysis/esperanto/EsperantoStemmerESTest.java b/extra-analysis-esperanto/src/test/java/org/wikimedia/search/extra/analysis/esperanto/EsperantoStemmerESTest.java
index 328f681..d671535 100644
--- a/extra-analysis-esperanto/src/test/java/org/wikimedia/search/extra/analysis/esperanto/EsperantoStemmerESTest.java
+++ b/extra-analysis-esperanto/src/test/java/org/wikimedia/search/extra/analysis/esperanto/EsperantoStemmerESTest.java
@@ -8,7 +8,7 @@
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 import org.elasticsearch.Version;
-import org.elasticsearch.cluster.metadata.IndexMetaData;
+import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.index.IndexSettings;
@@ -25,7 +25,7 @@ public class EsperantoStemmerESTest extends ESTestCase {
     public void testPrebuilt() throws IOException {
         Settings indexSettings = settings(Version.CURRENT)
                 .loadFromStream("prebuilt.json", this.getClass().getResourceAsStream("prebuilt.json"), false)
-                .put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)
+                .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
                 .build();
         IndexSettings indexProps = IndexSettingsModule.newIndexSettings("test", indexSettings);
         Settings settings = Settings.builder()
diff --git a/extra-analysis-serbian/pom.xml b/extra-analysis-serbian/pom.xml
index 20d3c3d..350da42 100644
--- a/extra-analysis-serbian/pom.xml
+++ b/extra-analysis-serbian/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.wikimedia.search</groupId>
         <artifactId>extra-analysis</artifactId>
-        <version>7.7.1.0-SNAPSHOT</version>
+        <version>7.8.0.0-SNAPSHOT</version>
     </parent>
 
     <artifactId>extra-analysis-serbian</artifactId>
diff --git a/extra-analysis-serbian/src/test/java/org/wikimedia/search/extra/analysis/serbian/SerbianStemmerFilterESTest.java b/extra-analysis-serbian/src/test/java/org/wikimedia/search/extra/analysis/serbian/SerbianStemmerFilterESTest.java
index d5d202a..b72ecea 100644
--- a/extra-analysis-serbian/src/test/java/org/wikimedia/search/extra/analysis/serbian/SerbianStemmerFilterESTest.java
+++ b/extra-analysis-serbian/src/test/java/org/wikimedia/search/extra/analysis/serbian/SerbianStemmerFilterESTest.java
@@ -8,7 +8,7 @@
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
 import org.elasticsearch.Version;
-import org.elasticsearch.cluster.metadata.IndexMetaData;
+import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.index.IndexSettings;
@@ -34,7 +34,7 @@ public void testRedefined() throws IOException {
     private void assertAnalyzerAvailable(String analyzerName, String analysisResource) throws IOException {
         Settings indexSettings = settings(Version.CURRENT)
                 .loadFromStream(analysisResource, this.getClass().getResourceAsStream(analysisResource), false)
-                .put(IndexMetaData.SETTING_VERSION_CREATED, Version.CURRENT)
+                .put(IndexMetadata.SETTING_VERSION_CREATED, Version.CURRENT)
                 .build();
         IndexSettings indexProps = IndexSettingsModule.newIndexSettings("test", indexSettings);
         Settings settings = Settings.builder()
diff --git a/pom.xml b/pom.xml
index d5aeb1e..80113cc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
 
     <groupId>org.wikimedia.search</groupId>
     <artifactId>extra-analysis</artifactId>
-    <version>7.7.1.0-SNAPSHOT</version>
+    <version>7.8.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>Elasticsearch extra plugins (GPL)</name>
     <description>Extra (GPL) Analysis Modules for Elasticsearch.</description>
@@ -41,7 +41,7 @@
     </issueManagement>
 
     <properties>
-        <elasticsearch.version>7.7.1</elasticsearch.version>
+        <elasticsearch.version>7.8.0</elasticsearch.version>
         <hamcrest.version>2.2</hamcrest.version>
         <log4j.version>2.13.3</log4j.version>
         <lucene.version>8.5.1</lucene.version>