Update to Elasticsearch 8.3.0

Dockerfile

@@ -1,4 +1,4 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:8.2.3
+FROM docker.elastic.co/elasticsearch/elasticsearch:8.3.0
 
 ADD ./src/test/resources/models/en-ner-persons.bin /usr/share/elasticsearch/config/ingest-opennlp/
 ADD ./src/test/resources/models/en-ner-locations.bin /usr/share/elasticsearch/config/ingest-opennlp/

README.md

@@ -10,6 +10,7 @@ This plugin is also intended to show you, that using gradle as a build system ma
 
 | ES | Command |
 | ----- | ------- |
+| 8.3.0 | `bin/elasticsearch-plugin install https://github.com/spinscale/elasticsearch-ingest-opennlp/releases/download/8.3.0.1/ingest-opennlp-8.3.0.1.zip` |
 | 8.2.3 | `bin/elasticsearch-plugin install https://github.com/spinscale/elasticsearch-ingest-opennlp/releases/download/8.2.3.1/ingest-opennlp-8.2.3.1.zip` |
 | 8.2.2 | `bin/elasticsearch-plugin install https://github.com/spinscale/elasticsearch-ingest-opennlp/releases/download/8.2.2.1/ingest-opennlp-8.2.2.1.zip` |
 | 8.2.1 | `bin/elasticsearch-plugin install https://github.com/spinscale/elasticsearch-ingest-opennlp/releases/download/8.2.1.1/ingest-opennlp-8.2.0.1.zip` |

build.gradle

@@ -118,7 +118,7 @@ dependencies {
  compileOnly "org.elasticsearch:elasticsearch:$elasticsearchVersion"
 
  testImplementation "org.elasticsearch:elasticsearch:$elasticsearchVersion"
- testImplementation 'co.elastic.clients:elasticsearch-java:8.2.0'
+ testImplementation "co.elastic.clients:elasticsearch-java:$elasticsearchVersion"
  testImplementation 'com.fasterxml.jackson.core:jackson-databind:2.12.3'
  testImplementation('org.testcontainers:elasticsearch:1.17.1') {
  exclude group: 'junit', module: 'junit'

gradle.properties

@@ -1 +1 @@
-elasticsearchVersion = 8.2.3
+elasticsearchVersion = 8.3.0

src/main/java/de/spinscale/elasticsearch/ingest/opennlp/OpenNlpModelDownloader.java

@@ -18,9 +18,10 @@
 package de.spinscale.elasticsearch.ingest.opennlp;
 
 import joptsimple.OptionSet;
-import org.elasticsearch.common.cli.EnvironmentAwareCommand;
-import org.elasticsearch.cli.SuppressForbidden;
+import org.elasticsearch.cli.ProcessInfo;
 import org.elasticsearch.cli.Terminal;
+import org.elasticsearch.common.cli.EnvironmentAwareCommand;
+import org.elasticsearch.core.SuppressForbidden;
 import org.elasticsearch.env.Environment;
 
 import java.io.InputStream;
@@ -32,15 +33,15 @@
 public class OpenNlpModelDownloader extends EnvironmentAwareCommand {
 
  public static void main(String[] args) throws Exception {
- exit(new OpenNlpModelDownloader().main(args, Terminal.DEFAULT));
+ exit(new OpenNlpModelDownloader().main(args, Terminal.DEFAULT, ProcessInfo.fromSystem()));
  }
 
  public OpenNlpModelDownloader() {
  super("Downloads three sample models for named entity recognition for dates, locations and persons");
  }
 
  @Override
- protected void execute(Terminal terminal, OptionSet options, Environment env) throws Exception {
+ public void execute(Terminal terminal, OptionSet options, Environment env, ProcessInfo processInfo) throws Exception {
  Path configDirectoryPath = env.configFile().resolve(IngestOpenNlpPlugin.NAME).normalize().toAbsolutePath();
  if (Files.exists(configDirectoryPath) == false) {
  Files.createDirectories(configDirectoryPath);

src/test/java/de/spinscale/elasticsearch/ingest/opennlp/OpenNlpPluginIntegrationTests.java

@@ -48,7 +48,7 @@ public static void startContainer() {
  container.addEnv("discovery.type", "single-node");
  container.withEnv("xpack.security.enabled", "false");
  container.addExposedPorts(9200);
- container.setWaitStrategy(new LogMessageWaitStrategy().withRegEx(".*(\"message\":\\s?\"started\".*|] started\n$)"));
+ container.setWaitStrategy(new LogMessageWaitStrategy().withRegEx(".*(\"message\":\\s?\"started[\\s?|\"].*|] started\n$)"));
 
  container.start();
  container.followOutput(new Slf4jLogConsumer(LoggerFactory.getLogger(OpenNlpPluginIntegrationTests.class)));