优化依赖

docker/dev-env/docker-compose.yml

@@ -11,7 +11,7 @@ services:
     environment:
       - TZ=Asia/Shanghai
   elasticsearch:
-    image: elasticsearch:6.7.2
+    image: elasticsearch:6.8.6
     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.7.2
+    image: kibana:6.8.6
     container_name: jetlinks-ce-kibana
     environment:
       ELASTICSEARCH_URL: http://elasticsearch:9200

docker/run-all/docker-compose.yml

@@ -11,7 +11,7 @@ services:
     environment:
       - TZ=Asia/Shanghai
   elasticsearch:
-    image: elasticsearch:6.7.2
+    image: elasticsearch:6.8.6
     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.7.2
+    image: kibana:6.8.6
     container_name: jetlinks-ce-kibana
     environment:
       ELASTICSEARCH_URL: http://elasticsearch:9200

jetlinks-manager/authentication-manager/pom.xml

@@ -17,7 +17,6 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>28.0-jre</version>
         </dependency>
 
         <dependency>

jetlinks-standalone/pom.xml

@@ -98,7 +98,6 @@
             <artifactId>commons-pool2</artifactId>
         </dependency>
 
-
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>gateway-component</artifactId>
@@ -157,18 +156,11 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
-<!--        <dependency>-->
-<!--            <groupId>io.micrometer</groupId>-->
-<!--            <artifactId>micrometer-registry-elastic</artifactId>-->
-<!--            <version>1.3.0</version>-->
-<!--        </dependency>-->
-
         <dependency>
             <groupId>org.springframework.boot.experimental</groupId>
             <artifactId>spring-boot-starter-data-r2dbc</artifactId>
         </dependency>
 
-
         <dependency>
             <groupId>dev.miku</groupId>
             <artifactId>r2dbc-mysql</artifactId>
@@ -226,13 +218,4 @@
     </dependencies>
 
 
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.elasticsearch.client</groupId>
-                <artifactId>elasticsearch-rest-high-level-client</artifactId>
-                <version>6.7.2</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
 </project>

pom.xml

@@ -24,6 +24,8 @@
         <jetlinks.version>1.0.1-BUILD-SNAPSHOT</jetlinks.version>
         <r2dbc.version>Arabba-RELEASE</r2dbc.version>
         <vertx.version>3.8.5</vertx.version>
+        <netty.version>4.1.46.Final</netty.version>
+        <elasticsearch.version>6.8.6</elasticsearch.version>
     </properties>
 
     <build>
@@ -182,10 +184,6 @@
                 <type>pom</type>
                 <scope>import</scope>
                 <exclusions>
-                    <exclusion>
-                        <groupId>org.redisson</groupId>
-                        <artifactId>redisson</artifactId>
-                    </exclusion>
                     <exclusion>
                         <groupId>org.springframework.boot</groupId>
                         <artifactId>spring-boot-dependencies</artifactId>
@@ -196,11 +194,12 @@
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty-bom</artifactId>
-                <version>4.1.32.Final</version>
+                <version>${netty.version}</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
 
+
             <dependency>
                 <groupId>org.jetlinks</groupId>
                 <artifactId>rule-engine-support</artifactId>
@@ -213,7 +212,6 @@
                 <version>${jetlinks.version}</version>
             </dependency>
 
-
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
@@ -240,6 +238,12 @@
                 <version>${vertx.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.elasticsearch.client</groupId>
+                <artifactId>elasticsearch-rest-high-level-client</artifactId>
+                <version>${elasticsearch.version}</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>