Release 6.2.4

esplugin/.gitignore

@@ -4,6 +4,7 @@ out/
 *.swp
 *-execution-hints.log
 *-execution-times.log
+jdk*
 
 # ignore the downloaded model files in git
 src/test/resources/models/

esplugin/README.md

@@ -1,6 +1,6 @@
 # Elasticsearch `analysis-emoji` plugin
 
-This plugin create a new Tokenizer called `emoji_tokenizer` based on `icu_tokenizer` and the latest (59.1) ICU data.
+This plugin create a new Tokenizer called `emoji_tokenizer` based on `icu_tokenizer` and the ICU 59.1.
 
 ## Installation
 
@@ -11,8 +11,8 @@ The plugin version must match your Elasticsearch version.
 ```
 bin/elasticsearch-plugin install URL
 
-# For 6.1.3:
-bin/elasticsearch-plugin install https://github.com/jolicode/emoji-search/releases/download/6.1.3/analysis-emoji-6.1.3.zip
+# For 6.2.4:
+bin/elasticsearch-plugin install https://github.com/jolicode/emoji-search/releases/download/6.2.4/analysis-emoji-6.2.4.zip
 ```
 
 ## Versions
@@ -23,6 +23,7 @@ We _may_ jump some Elasticsearch release from time to time... feel free to open
 
 analysis-emoji version and ES version  | Install URL
 -----------|-----------
+6.2.4 | https://github.com/jolicode/emoji-search/releases/download/6.2.4/analysis-emoji-6.2.4.zip
 6.1.3 | https://github.com/jolicode/emoji-search/releases/download/6.1.3/analysis-emoji-6.1.3.zip
 6.1.2 | https://github.com/jolicode/emoji-search/releases/download/6.1.2/analysis-emoji-6.1.2.zip
 5.6.6 | https://github.com/jolicode/emoji-search/releases/download/5.6.6/analysis-emoji-5.6.6.zip

esplugin/build.gradle

@@ -8,26 +8,27 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath "org.elasticsearch.gradle:build-tools:6.1.3"
+        classpath "org.elasticsearch.gradle:build-tools:6.2.4"
     }
 }
 
 group = 'org.elasticsearch.plugin'
-version = '6.1.3'
+version = '6.2.4'
 
 apply plugin: 'java'
 apply plugin: 'elasticsearch.esplugin'
 apply plugin: 'idea'
 
 esplugin {
   name 'analysis-emoji'
-  description 'Add support for emoji in Elasticsearch'
+  description 'Add support for emoji in Elasticsearch with a new Tokenizer'
   classname 'org.elasticsearch.plugin.analysis.emoji.EmojiPlugin'
 }
 
 dependencies {
     compile "org.elasticsearch:elasticsearch:${versions.elasticsearch}"
     compile "org.apache.lucene:lucene-analyzers-icu:${versions.lucene}"
+    // Can't update properly yet
     compile 'com.ibm.icu:icu4j:59.1'
     testCompile "org.elasticsearch.test:framework:${versions.elasticsearch}"
 }
@@ -41,11 +42,11 @@ licenseHeaders.enabled = false
 // use elasticsearch checkstyle rules
 checkstyleTest.enabled = true
 
-// FIXME dependency license check needs to be enabled
+// FIXME dependency license check needs to be enabled.
 licenseFile = rootProject.file('../LICENSE')
 noticeFile = rootProject.file('README.md')
 dependencyLicenses.enabled = false
 
-// FIXME thirdparty audit needs to be enabled
+// FIXME thirdparty audit needs to be enabled.
 thirdPartyAudit.enabled = false
 

esplugin/src/test/java/org/elasticsearch/index/analysis/EmojiIT.java

@@ -39,7 +39,7 @@ public void testSimpleIcuTokenizer() throws IOException {
         // Real tests
         Reader reader = new StringReader("向日葵, one-two");
         tokenizer.setReader(reader);
-        assertTokenStreamContents(tokenizer, new String[]{"向日葵", "one", "two"});
+        assertTokenStreamContents(tokenizer, new String[] {"向日葵", "one", "two"});
 
         Reader reader2 = new StringReader("Simple: \uD83D\uDE02, Modified: \uD83D\uDC66\uD83C\uDFFD " +
                 "and composed rainbow: \uD83C\uDFF3️\u200D\uD83C\uDF08 and \uD83C\uDDF8\uD83C\uDDEA Sweden flag.");