You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2019/05/20 13:43:11 UTC

[plc4x] 01/04: PLC4X-125 - Update the ElasticSearch example to a more recent ElasticSearch version

This is an automated email from the ASF dual-hosted git repository.

cdutz pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit f832e535b3f011914d111e2bfa1e99aaf82a6030
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Mon May 20 15:14:24 2019 +0200

    PLC4X-125 - Update the ElasticSearch example to a more recent ElasticSearch version
    
    - Updated the ElasticSearch example to the newest version (7.0.1)
---
 .../java/examples/storage/elasticsearch/ElasticsearchStorage.java    | 5 +++--
 pom.xml                                                              | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/plc4j/examples/hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/ElasticsearchStorage.java b/plc4j/examples/hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/ElasticsearchStorage.java
index 7cf704f..18ca35e 100644
--- a/plc4j/examples/hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/ElasticsearchStorage.java
+++ b/plc4j/examples/hello-storage-elasticsearch/src/main/java/org/apache/plc4x/java/examples/storage/elasticsearch/ElasticsearchStorage.java
@@ -68,7 +68,8 @@ public class ElasticsearchStorage {
 
     private static class MyNode extends Node {
         private MyNode(Settings preparedSettings, Collection<Class<? extends Plugin>> classpathPlugins) {
-            super(InternalSettingsPreparer.prepareEnvironment(preparedSettings, null), classpathPlugins);
+            super(InternalSettingsPreparer.prepareEnvironment(
+                preparedSettings, Collections.emptyMap(), null, () -> "hello-es"), classpathPlugins, true);
         }
     }
 
@@ -79,7 +80,7 @@ public class ElasticsearchStorage {
             Node node = new MyNode(Settings.builder()
                 .put("transport.type", "netty4")
                 .put("http.type", "netty4")
-                .put("http.enabled", "true")
+                .put("http.cors.enabled", "true")
                 .put("path.home", "elasticsearch-data")
                 .build(), Collections.singletonList(Netty4Plugin.class));
             node.start();
diff --git a/pom.xml b/pom.xml
index d14ea55..8786d0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
     <commons-text.version>1.4</commons-text.version>
     <crc.version>1.0.1</crc.version>
     <daffodil.version>2.3.0</daffodil.version>
-    <elasticsearch.version>6.4.2</elasticsearch.version>
+    <elasticsearch.version>7.0.1</elasticsearch.version>
     <equalsverifier.version>3.0.2</equalsverifier.version>
     <findbugs.version>3.0.1</findbugs.version>
     <groovy.version>2.5.3</groovy.version>
@@ -139,7 +139,7 @@
     <junit.version>4.12</junit.version>
     <log4j.version>2.11.1</log4j.version>
     <logback.version>1.2.3</logback.version>
-    <lucene.version>7.4.0</lucene.version>
+    <lucene.version>8.0.0</lucene.version>
     <metrics-core.version>3.1.2</metrics-core.version>
     <mockito.version>2.24.5</mockito.version>
     <netty.version>4.1.35.Final</netty.version>