Bläddra i källkod

upgrade elasticsearch 6.8.11

zhou-hao 4 år sedan
förälder
incheckning
16c66c09ab
3 ändrade filer med 25 tillägg och 6 borttagningar
  1. 2 2
      docker/dev-env/docker-compose.yml
  2. 2 2
      docker/run-all/docker-compose.yml
  3. 21 2
      pom.xml

+ 2 - 2
docker/dev-env/docker-compose.yml

@@ -11,7 +11,7 @@ services:
     environment:
       - TZ=Asia/Shanghai
   elasticsearch:
-    image: elasticsearch:6.8.6
+    image: elasticsearch:6.8.11
     container_name: jetlinks-ce-elasticsearch
     environment:
       ES_JAVA_OPTS: -Djava.net.preferIPv4Stack=true -Xms1g -Xmx1g
@@ -24,7 +24,7 @@ services:
       - "9200:9200"
       - "9300:9300"
   kibana:
-    image: kibana:6.8.6
+    image: kibana:6.8.11
     container_name: jetlinks-ce-kibana
     environment:
       ELASTICSEARCH_URL: http://elasticsearch:9200

+ 2 - 2
docker/run-all/docker-compose.yml

@@ -11,7 +11,7 @@ services:
     environment:
       - TZ=Asia/Shanghai
   elasticsearch:
-    image: elasticsearch:6.8.6
+    image: elasticsearch:6.8.11
     container_name: jetlinks-ce-elasticsearch
     environment:
       ES_JAVA_OPTS: -Djava.net.preferIPv4Stack=true -Xms1g -Xmx1g
@@ -26,7 +26,7 @@ services:
   #      - "9200:9200"
   #      - "9300:9300"
   kibana:
-    image: kibana:6.8.6
+    image: kibana:6.8.11
     container_name: jetlinks-ce-kibana
     environment:
       ELASTICSEARCH_URL: http://elasticsearch:9200

+ 21 - 2
pom.xml

@@ -26,9 +26,9 @@
         <r2dbc.version>Arabba-SR6</r2dbc.version>
         <vertx.version>3.8.5</vertx.version>
         <netty.version>4.1.50.Final</netty.version>
-        <elasticsearch.version>6.8.10</elasticsearch.version>
+        <elasticsearch.version>6.8.11</elasticsearch.version>
         <reactor.excel.version>1.0-RC</reactor.excel.version>
-        <reactor.ql.version>1.0.3</reactor.ql.version>
+        <reactor.ql.version>1.0.4</reactor.ql.version>
         <fastjson.version>1.2.70</fastjson.version>
     </properties>
 
@@ -274,6 +274,25 @@
                 <artifactId>elasticsearch-rest-high-level-client</artifactId>
                 <version>${elasticsearch.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.elasticsearch</groupId>
+                <artifactId>elasticsearch</artifactId>
+                <version>${elasticsearch.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.elasticsearch.client</groupId>
+                <artifactId>elasticsearch-rest-client</artifactId>
+                <version>${elasticsearch.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.elasticsearch.plugin</groupId>
+                <artifactId>transport-netty4-client</artifactId>
+                <version>${elasticsearch.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.hswebframework</groupId>
                 <artifactId>hsweb-easy-orm-core</artifactId>