From e920723b026326fd703358297a5c1b5114d3f35f Mon Sep 17 00:00:00 2001 From: jikyo Date: Sun, 26 Jan 2020 20:36:24 +0900 Subject: [PATCH] v7.5.1 --- README.md | 5 +++-- build.gradle | 21 +++++++++++++++------ 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 75ecd5d..dc62c84 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ Note that this token filter `jikyo_romaji` assumes to work with `tokenizer: keyw # Supported Elasticsearch versions -* 7.5: ~~7.5.0~~  +* 7.5: ~~7.5.0~~, [7.5.1](https://github.com/jikyo/elasticsearch-analysis-jikyo-romaji/releases/tag/v7.5.1) * 7.4: [7.4.2](https://github.com/jikyo/elasticsearch-analysis-jikyo-romaji/releases/tag/v7.4.2), [7.4.1](https://github.com/jikyo/elasticsearch-analysis-jikyo-romaji/releases/tag/v7.4.1), [7.4.0](https://github.com/jikyo/elasticsearch-analysis-jikyo-romaji/releases/tag/v7.4.0) * 7.3: [7.3.2](https://github.com/jikyo/elasticsearch-analysis-jikyo-romaji/releases/tag/v7.3.2), [7.3.1](https://github.com/jikyo/elasticsearch-analysis-jikyo-romaji/releases/tag/v7.3.1), [7.3.0](https://github.com/jikyo/elasticsearch-analysis-jikyo-romaji/releases/tag/v7.3.0) * 7.2: [7.2.1](https://github.com/jikyo/elasticsearch-analysis-jikyo-romaji/releases/tag/v7.2.1), [7.2.0](https://github.com/jikyo/elasticsearch-analysis-jikyo-romaji/releases/tag/v7.2.0) @@ -25,7 +25,7 @@ $ sudo bin/elasticsearch-plugin install https://github.com/jikyo/elasticsearch-a ### settings sample -```JSON +``` "your_analyzer": { "type": "custom", "tokenizer": "keyword", @@ -109,4 +109,5 @@ $ curl -H "Content-Type: application/json" -XGET "localhost:9200/_analyze?pretty $ gradle check -Dtests.security.manager=false # Build task $ gradle assemble +# see build/distributions/ ``` diff --git a/build.gradle b/build.gradle index e4fadaf..746b25f 100644 --- a/build.gradle +++ b/build.gradle @@ -1,25 +1,28 @@ // elasticsearch-analysis-jikyo-romaji +// A workaround for 7.5: https://github.com/elastic/elasticsearch/issues/49787#issuecomment-562720655 +import org.elasticsearch.gradle.testclusters.TestClustersRegistry +import org.elasticsearch.gradle.testclusters.TestClustersPlugin + buildscript { repositories { mavenCentral() jcenter() } dependencies { - classpath 'org.elasticsearch.gradle:build-tools:7.5.0' + classpath 'org.elasticsearch.gradle:build-tools:7.5.1' } } apply plugin: 'elasticsearch.esplugin' +// 7.5.0: (skipped) https://github.com/elastic/elasticsearch/issues/49787 def ver = [ - plugin: '7.5.0', - es: '7.5.0', - lucene: '8.3.0', + plugin: '7.5.1', + es: '7.5.1', + lucene: '8.3.0', // https://github.com/elastic/elasticsearch/blob/master/buildSrc/version.properties romaji: '0.0.4', ] -// 7.5.0: https://github.com/elastic/elasticsearch/blob/7.5/buildSrc/version.properties -// skipped: https://github.com/elastic/elasticsearch/issues/49787 esplugin { name 'analysis-jikyo-romaji' @@ -46,3 +49,9 @@ configurations.restSpec.withDependencies { dependencies -> dependencyLicenses.enabled = false thirdPartyAudit.enabled = false licenseHeaders.enabled = false + +// A workaround for 7.5: https://github.com/elastic/elasticsearch/issues/49787#issuecomment-562720655 +TestClustersRegistry registry = project.rootProject.extensions.create("testClustersRegistry", TestClustersRegistry) +TestClustersPlugin.configureClaimClustersHook(project.gradle, registry) +TestClustersPlugin.configureStartClustersHook(project.gradle, registry) +TestClustersPlugin.configureStopClustersHook(project.gradle, registry)