发布3.6.1.v20200512-RELEASE

tywo45 · May 13, 2020 · 61fdbc0 · 61fdbc0
1 parent 995f3b4
commit 61fdbc0
Show file tree

Hide file tree

Showing 22 changed files with 86 additions and 88 deletions.
diff --git a/src/core/pom.xml b/src/core/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.t-io</groupId>
 		<artifactId>tio-parent</artifactId>
-		<version>3.6.0.v20200315-RELEASE</version>
+		<version>3.6.1.v20200512-RELEASE</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 

diff --git a/src/core/src/main/java/org/tio/server/TioServer.java b/src/core/src/main/java/org/tio/server/TioServer.java
@@ -433,7 +433,7 @@ public void run() {
 									log.info("The version you are using is the latest");
 								} else {
 									log.info("t-io latest version:{}，your version:{}", result, SysConst.TIO_CORE_VERSION);
-									//3.6.0.v20200315-RELEASE
+									//3.6.1.v20200512-RELEASE
 									String myVersionDateStr = SysConst.TIO_CORE_VERSION.substring(SysConst.TIO_CORE_VERSION.length() - 16, SysConst.TIO_CORE_VERSION.length() - 8);
 									String latestVersionDateStr = result.substring(result.length() - 16, result.length() - 8);
 

diff --git a/src/parent/pom.xml b/src/parent/pom.xml
@@ -5,7 +5,7 @@
 	<groupId>org.t-io</groupId>
 	<artifactId>tio-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>3.6.0.v20200315-RELEASE</version>
+	<version>3.6.1.v20200512-RELEASE</version>
 	<name>${project.artifactId}</name>
 	<url>http://maven.apache.org</url>
 
@@ -35,13 +35,7 @@
 
 	<properties>
 		<maven-jar-plugin.version>3.1.0</maven-jar-plugin.version>
-		<tio-utils.version>3.6.0.v20200315-RELEASE</tio-utils.version>
-		<tio-core.version>${tio-utils.version}</tio-core.version>
-		<tio-flash-policy-server.version>${tio-utils.version}</tio-flash-policy-server.version>
-
-		<tio-http.version>${tio-utils.version}</tio-http.version>
-		<tio-websocket.version>${tio-utils.version}</tio-websocket.version>
-
+		<tio.version>3.6.1.v20200512-RELEASE</tio.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.test.skip>true</maven.test.skip>
@@ -114,6 +108,8 @@
 		<neo4j.version>3.2.10</neo4j.version>
 		<xmlunit.version>2.6.4</xmlunit.version>
 		<mongodb.version>3.12.2</mongodb.version>
+
+		<spring.boot.version>2.2.7.RELEASE</spring.boot.version>
 
 	</properties>
 
@@ -127,67 +123,65 @@
 	</developers>
 
 
-
-
 	<dependencyManagement>
 		<dependencies>
 
 			<dependency>
 				<groupId>org.t-io</groupId>
 				<artifactId>tio-utils</artifactId>
-				<version>${tio-utils.version}</version>
+				<version>${tio.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.t-io</groupId>
 				<artifactId>tio-core</artifactId>
-				<version>${tio-core.version}</version>
+				<version>${tio.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.t-io</groupId>
 				<artifactId>tio-flash-policy-server</artifactId>
-				<version>${tio-flash-policy-server.version}</version>
+				<version>${tio.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.t-io</groupId>
 				<artifactId>tio-webpack-core</artifactId>
-				<version>${tio-core.version}</version>
+				<version>${tio.version}</version>
 			</dependency>
 
 
 
 			<dependency>
 				<groupId>org.t-io</groupId>
 				<artifactId>tio-websocket-common</artifactId>
-				<version>${tio-websocket.version}</version>
+				<version>${tio.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.t-io</groupId>
 				<artifactId>tio-websocket-server</artifactId>
-				<version>${tio-websocket.version}</version>
+				<version>${tio.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.t-io</groupId>
 				<artifactId>tio-http-common</artifactId>
-				<version>${tio-http.version}</version>
+				<version>${tio.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.t-io</groupId>
 				<artifactId>tio-http-server</artifactId>
-				<version>${tio-http.version}</version>
+				<version>${tio.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.t-io</groupId>
 				<artifactId>tio-http-client</artifactId>
-				<version>${tio-http.version}</version>
+				<version>${tio.version}</version>
 			</dependency>
 
 			<dependency>
 				<groupId>org.t-io</groupId>
 				<artifactId>tio-umeng</artifactId>
-				<version>${tio-core.version}</version>
+				<version>${tio.version}</version>
 			</dependency>
 
 			<dependency>
@@ -223,7 +217,7 @@
 			<dependency>
 				<groupId>org.t-io</groupId>
 				<artifactId>jfinal-activerecord</artifactId>
-				<version>${tio-utils.version}</version>
+				<version>${tio.version}</version>
 			</dependency>
 
 			<dependency>
@@ -925,13 +919,7 @@
 				<version>2.5.1</version>
 			</dependency>
 
-			<dependency>
-				<groupId>org.springframework.boot</groupId>
-				<artifactId>spring-boot-dependencies</artifactId>
-				<version>2.2.7.RELEASE</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
+
 
 			<dependency>
 				<groupId>net.bytebuddy</groupId>

diff --git a/src/utils/pom.xml b/src/utils/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.t-io</groupId>
 		<artifactId>tio-parent</artifactId>
-		<version>3.6.0.v20200315-RELEASE</version>
+		<version>3.6.1.v20200512-RELEASE</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 

diff --git a/src/utils/src/main/java/org/tio/utils/SysConst.java b/src/utils/src/main/java/org/tio/utils/SysConst.java
@@ -200,7 +200,7 @@ recommend that a file or class name and description of purpose be included on
  * 2018年7月1日 下午10:51:59
  */
 public interface SysConst {
-	String	TIO_CORE_VERSION		= "3.6.0.v20200315-RELEASE";
+	String	TIO_CORE_VERSION		= "3.6.1.v20200512-RELEASE";
 	String	TIO_URL_GITEE			= "https://gitee.com/tywo45/t-io";
 	String	TIO_URL_GITHUB			= "https://github.com/tywo45/t-io";
 	String	TIO_URL_SITE			= "https://www.t-io.org";

diff --git a/src/zoo/flash-policy-server/pom.xml b/src/zoo/flash-policy-server/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.t-io</groupId>
 		<artifactId>tio-parent</artifactId>
-		<version>3.6.0.v20200315-RELEASE</version>
+		<version>3.6.1.v20200512-RELEASE</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 

diff --git a/src/zoo/http/client/pom.xml b/src/zoo/http/client/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.t-io</groupId>
 		<artifactId>tio-http-parent</artifactId>
-		<version>3.6.0.v20200315-RELEASE</version>
+		<version>3.6.1.v20200512-RELEASE</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 

diff --git a/src/zoo/http/common/pom.xml b/src/zoo/http/common/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.t-io</groupId>
 		<artifactId>tio-http-parent</artifactId>
-		<version>3.6.0.v20200315-RELEASE</version>
+		<version>3.6.1.v20200512-RELEASE</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 

diff --git a/src/zoo/http/parent/pom.xml b/src/zoo/http/parent/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.t-io</groupId>
 		<artifactId>tio-zoo-parent</artifactId>
-		<version>3.6.0.v20200315-RELEASE</version>
+		<version>3.6.1.v20200512-RELEASE</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 

diff --git a/src/zoo/http/server/pom.xml b/src/zoo/http/server/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.t-io</groupId>
 		<artifactId>tio-http-parent</artifactId>
-		<version>3.6.0.v20200315-RELEASE</version>
+		<version>3.6.1.v20200512-RELEASE</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 

diff --git a/src/zoo/parent/pom.xml b/src/zoo/parent/pom.xml
@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.t-io</groupId>
 		<artifactId>tio-parent</artifactId>
-		<version>3.6.0.v20200315-RELEASE</version>
+		<version>3.6.1.v20200512-RELEASE</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 

diff --git a/src/zoo/spring-boot/parent/pom.xml b/src/zoo/spring-boot/parent/pom.xml
@@ -12,8 +12,20 @@
 	<parent>
 		<groupId>org.t-io</groupId>
 		<artifactId>tio-zoo-parent</artifactId>
-		<version>3.6.0.v20200315-RELEASE</version>
+		<version>3.6.1.v20200512-RELEASE</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>
 
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>org.springframework.boot</groupId>
+				<artifactId>spring-boot-dependencies</artifactId>
+				<version>${spring.boot.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+
 </project>
diff --git a/src/zoo/spring-boot/tio-common/pom.xml b/src/zoo/spring-boot/tio-common/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tio-spring-boot-parent</artifactId>
         <groupId>org.t-io</groupId>
-        <version>3.6.0.v20200315-RELEASE</version>
+        <version>3.6.1.v20200512-RELEASE</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/src/zoo/spring-boot/tio-core/pom.xml b/src/zoo/spring-boot/tio-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>tio-spring-boot-parent</artifactId>
         <groupId>org.t-io</groupId>
-        <version>3.6.0.v20200315-RELEASE</version>
+        <version>3.6.1.v20200512-RELEASE</version>
         <relativePath>../parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -48,7 +48,7 @@
         <dependency>
             <groupId>org.t-io</groupId>
             <artifactId>tio-spring-boot-common</artifactId>
-            <version>3.6.0.v20200315-RELEASE</version>
+            <version>3.6.1.v20200512-RELEASE</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/src/zoo/spring-boot/tio-http/pom.xml b/src/zoo/spring-boot/tio-http/pom.xml
@@ -1,43 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>tio-spring-boot-parent</artifactId>
-        <groupId>org.t-io</groupId>
-        <version>3.6.0.v20200315-RELEASE</version>
-        <relativePath>../parent/pom.xml</relativePath>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<artifactId>tio-spring-boot-parent</artifactId>
+		<groupId>org.t-io</groupId>
+		<version>3.6.1.v20200512-RELEASE</version>
+		<relativePath>../parent/pom.xml</relativePath>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
 
-    <artifactId>tio-http-spring-boot-starter</artifactId>
+	<artifactId>tio-http-spring-boot-starter</artifactId>
 
-
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-autoconfigure</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-configuration-processor</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.t-io</groupId>
-            <artifactId>tio-http-server</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-autoconfigure</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.t-io</groupId>
+			<artifactId>tio-http-server</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.testng</groupId>
+			<artifactId>testng</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
 </project>
diff --git a/src/zoo/spring-boot/tio-websocket/pom.xml b/src/zoo/spring-boot/tio-websocket/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>tio-spring-boot-parent</artifactId>
 		<groupId>org.t-io</groupId>
-		<version>3.6.0.v20200315-RELEASE</version>
+		<version>3.6.1.v20200512-RELEASE</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
@@ -46,7 +46,7 @@
 		<dependency>
 			<groupId>org.t-io</groupId>
 			<artifactId>tio-spring-boot-common</artifactId>
-			<version>3.6.0.v20200315-RELEASE</version>
+			<version>3.6.1.v20200512-RELEASE</version>
 		</dependency>
 	</dependencies>
 </project>
diff --git a/src/zoo/webpack/core/pom.xml b/src/zoo/webpack/core/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>org.t-io</groupId>
 		<artifactId>tio-webpack-parent</artifactId>
-		<version>3.6.0.v20200315-RELEASE</version>
+		<version>3.6.1.v20200512-RELEASE</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 

diff --git a/src/zoo/webpack/parent/pom.xml b/src/zoo/webpack/parent/pom.xml
@@ -20,7 +20,7 @@
 	<parent>
 		<groupId>org.t-io</groupId>
 		<artifactId>tio-zoo-parent</artifactId>
-		<version>3.6.0.v20200315-RELEASE</version>
+		<version>3.6.1.v20200512-RELEASE</version>
 		<relativePath>../../parent/pom.xml</relativePath>
 	</parent>