Merge remote-tracking branch 'origin/master'

pom.xml

@@ -16,30 +16,37 @@
         <module>byit-myth-rpc</module>
     </modules>
 
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.0.6.RELEASE</version>
+        <relativePath/>
+    </parent>
+
     <properties>
 
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+    <java.version>1.8</java.version>
+
     <slf4j-api.version>1.7.28</slf4j-api.version>
     <junit.version>4.12</junit.version>
 
-
     <netty.version>4.1.41.Final</netty.version>
     <mina.version>2.1.3</mina.version>
     <jetty-server.version>9.2.28.v20190418</jetty-server.version>
 
-
     <hessian.version>4.0.62</hessian.version>
     <protostuff.version>1.6.0</protostuff.version>
     <objenesis.version>2.6</objenesis.version>
     <kryo.version>4.0.2</kryo.version>
     <jackson.version>2.9.10</jackson.version>
 
-
     <zookeeper.version>3.5.5</zookeeper.version>
 
-
     <spring.version>4.3.24.RELEASE</spring.version>
-    <spring-boot.version>2.0.4.RELEASE</spring-boot.version>
-    <spring-cloud.version>Finchley.SR1</spring-cloud.version>
+    <spring-boot.version>2.0.6.RELEASE</spring-boot.version>
+    <spring-cloud.version>Finchley.SR2</spring-cloud.version>
     <lombok.version>1.18.4</lombok.version>
 
     <maven-source-plugin.version>3.1.0</maven-source-plugin.version>
@@ -48,4 +55,16 @@
 
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>spring-cloud-dependencies</artifactId>
+                <version>${spring-cloud.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
 </project>
\ No newline at end of file