From f793316eef8b5ae1e21a4a307fce4e12c1f0df69 Mon Sep 17 00:00:00 2001
From: Mark Khazin <mark_khazin@rapid7.com>
Date: Wed, 25 May 2022 12:27:07 +0300
Subject: [PATCH] bump Elasticsearch version to 8.2.0 (and lucene to 9.1.0 and
 java to 18)

---
 .github/workflows/create-release.yml                        | 6 +++---
 .github/workflows/run-tests.yml                             | 2 +-
 pom.xml                                                     | 4 ++--
 .../index/analysis/TestHomoglyphTokenFilter.java            | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml
index 31820ba..5b60b86 100644
--- a/.github/workflows/create-release.yml
+++ b/.github/workflows/create-release.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '18'
         distribution: 'temurin'
     - name: Build with Maven
       run: mvn -B package --file pom.xml
@@ -35,6 +35,6 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
-        asset_path: ./target/releases/analysis-homoglyph-8.1.3.zip
-        asset_name: analysis-homoglyph-8.1.3.zip
+        asset_path: ./target/releases/analysis-homoglyph-8.2.0.zip
+        asset_name: analysis-homoglyph-8.2.0.zip
         asset_content_type: application/zip
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 1e01b34..5ece951 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Set up JDK
       uses: actions/setup-java@v3
       with:
-        java-version: '17'
+        java-version: '18'
         distribution: 'temurin'
     - name: Test with Maven
       run: mvn -B test --file pom.xml
diff --git a/pom.xml b/pom.xml
index a8619ab..d3c7ba0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,8 +6,8 @@
 	<version>${elasticsearch.version}</version>
 	<packaging>jar</packaging>
 	<properties>
-	    <elasticsearch.version>8.1.3</elasticsearch.version>
-		<lucene.version>9.0.0</lucene.version>
+	    <elasticsearch.version>8.2.0</elasticsearch.version>
+		<lucene.version>9.1.0</lucene.version>
 		<maven.compiler.source>1.8</maven.compiler.source>
 		<maven.compiler.target>1.8</maven.compiler.target>
 	</properties>
diff --git a/src/test/java/com/intsights/elasticsearch/index/analysis/TestHomoglyphTokenFilter.java b/src/test/java/com/intsights/elasticsearch/index/analysis/TestHomoglyphTokenFilter.java
index c00428d..b45df01 100644
--- a/src/test/java/com/intsights/elasticsearch/index/analysis/TestHomoglyphTokenFilter.java
+++ b/src/test/java/com/intsights/elasticsearch/index/analysis/TestHomoglyphTokenFilter.java
@@ -1,8 +1,8 @@
 package com.intsights.elasticsearch.index.analysis;
 
-import org.apache.lucene.analysis.BaseTokenStreamTestCase;
+import org.apache.lucene.tests.analysis.BaseTokenStreamTestCase;
+import org.apache.lucene.tests.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.analysis.MockTokenizer;
 
 import java.io.IOException;
 import java.io.StringReader;