diff --git a/src/core/pom.xml b/src/core/pom.xml index 9ca65f3d..f81b3233 100644 --- a/src/core/pom.xml +++ b/src/core/pom.xml @@ -8,7 +8,7 @@ org.t-io tio-parent - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE ../parent/pom.xml diff --git a/src/core/src/main/java/org/tio/server/TioServer.java b/src/core/src/main/java/org/tio/server/TioServer.java index 9cd58bc0..6b26c72c 100644 --- 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 index 7d43adb5..95f0ac27 100644 --- a/src/parent/pom.xml +++ b/src/parent/pom.xml @@ -5,7 +5,7 @@ org.t-io tio-parent pom - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE ${project.artifactId} http://maven.apache.org @@ -35,13 +35,7 @@ 3.1.0 - 3.6.0.v20200315-RELEASE - ${tio-utils.version} - ${tio-utils.version} - - ${tio-utils.version} - ${tio-utils.version} - + 3.6.1.v20200512-RELEASE UTF-8 UTF-8 true @@ -114,6 +108,8 @@ 3.2.10 2.6.4 3.12.2 + + 2.2.7.RELEASE @@ -127,32 +123,30 @@ - - org.t-io tio-utils - ${tio-utils.version} + ${tio.version} org.t-io tio-core - ${tio-core.version} + ${tio.version} org.t-io tio-flash-policy-server - ${tio-flash-policy-server.version} + ${tio.version} org.t-io tio-webpack-core - ${tio-core.version} + ${tio.version} @@ -160,34 +154,34 @@ org.t-io tio-websocket-common - ${tio-websocket.version} + ${tio.version} org.t-io tio-websocket-server - ${tio-websocket.version} + ${tio.version} org.t-io tio-http-common - ${tio-http.version} + ${tio.version} org.t-io tio-http-server - ${tio-http.version} + ${tio.version} org.t-io tio-http-client - ${tio-http.version} + ${tio.version} org.t-io tio-umeng - ${tio-core.version} + ${tio.version} @@ -223,7 +217,7 @@ org.t-io jfinal-activerecord - ${tio-utils.version} + ${tio.version} @@ -925,13 +919,7 @@ 2.5.1 - - org.springframework.boot - spring-boot-dependencies - 2.2.7.RELEASE - pom - import - + net.bytebuddy diff --git a/src/utils/pom.xml b/src/utils/pom.xml index 5f382dfb..db0f3105 100644 --- a/src/utils/pom.xml +++ b/src/utils/pom.xml @@ -8,7 +8,7 @@ org.t-io tio-parent - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE ../parent/pom.xml diff --git a/src/utils/src/main/java/org/tio/utils/SysConst.java b/src/utils/src/main/java/org/tio/utils/SysConst.java index 171c610c..d47c0d1e 100644 --- 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 index 947aacc4..7ed5b7fe 100644 --- a/src/zoo/flash-policy-server/pom.xml +++ b/src/zoo/flash-policy-server/pom.xml @@ -8,7 +8,7 @@ org.t-io tio-parent - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE ../../parent/pom.xml diff --git a/src/zoo/http/client/pom.xml b/src/zoo/http/client/pom.xml index 3f8d1289..2634161e 100644 --- a/src/zoo/http/client/pom.xml +++ b/src/zoo/http/client/pom.xml @@ -8,7 +8,7 @@ org.t-io tio-http-parent - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE ../parent/pom.xml diff --git a/src/zoo/http/common/pom.xml b/src/zoo/http/common/pom.xml index e29e7b60..6cf07e4c 100644 --- a/src/zoo/http/common/pom.xml +++ b/src/zoo/http/common/pom.xml @@ -7,7 +7,7 @@ org.t-io tio-http-parent - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE ../parent/pom.xml diff --git a/src/zoo/http/parent/pom.xml b/src/zoo/http/parent/pom.xml index 6acfb407..c6781599 100644 --- a/src/zoo/http/parent/pom.xml +++ b/src/zoo/http/parent/pom.xml @@ -11,7 +11,7 @@ org.t-io tio-zoo-parent - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE ../../parent/pom.xml diff --git a/src/zoo/http/server/pom.xml b/src/zoo/http/server/pom.xml index 7b87c510..de1eefef 100644 --- a/src/zoo/http/server/pom.xml +++ b/src/zoo/http/server/pom.xml @@ -8,7 +8,7 @@ org.t-io tio-http-parent - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE ../parent/pom.xml diff --git a/src/zoo/parent/pom.xml b/src/zoo/parent/pom.xml index 28ec5471..94f29791 100644 --- a/src/zoo/parent/pom.xml +++ b/src/zoo/parent/pom.xml @@ -11,7 +11,7 @@ org.t-io tio-parent - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE ../../parent/pom.xml diff --git a/src/zoo/spring-boot/parent/pom.xml b/src/zoo/spring-boot/parent/pom.xml index 6cdfcfbf..55d5e422 100644 --- a/src/zoo/spring-boot/parent/pom.xml +++ b/src/zoo/spring-boot/parent/pom.xml @@ -12,8 +12,20 @@ org.t-io tio-zoo-parent - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE ../../parent/pom.xml + + + + org.springframework.boot + spring-boot-dependencies + ${spring.boot.version} + pom + import + + + + \ No newline at end of file diff --git a/src/zoo/spring-boot/tio-common/pom.xml b/src/zoo/spring-boot/tio-common/pom.xml index 841e4578..c3f0a796 100644 --- a/src/zoo/spring-boot/tio-common/pom.xml +++ b/src/zoo/spring-boot/tio-common/pom.xml @@ -5,7 +5,7 @@ tio-spring-boot-parent org.t-io - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE ../parent/pom.xml 4.0.0 diff --git a/src/zoo/spring-boot/tio-core/pom.xml b/src/zoo/spring-boot/tio-core/pom.xml index 55816bbc..736fde30 100644 --- a/src/zoo/spring-boot/tio-core/pom.xml +++ b/src/zoo/spring-boot/tio-core/pom.xml @@ -5,7 +5,7 @@ tio-spring-boot-parent org.t-io - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE ../parent/pom.xml 4.0.0 @@ -48,7 +48,7 @@ org.t-io tio-spring-boot-common - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE \ No newline at end of file diff --git a/src/zoo/spring-boot/tio-http/pom.xml b/src/zoo/spring-boot/tio-http/pom.xml index 3532fe9e..5746c30b 100644 --- a/src/zoo/spring-boot/tio-http/pom.xml +++ b/src/zoo/spring-boot/tio-http/pom.xml @@ -1,43 +1,41 @@ - - tio-spring-boot-parent - org.t-io - 3.6.0.v20200315-RELEASE - ../parent/pom.xml - - 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"> + + tio-spring-boot-parent + org.t-io + 3.6.1.v20200512-RELEASE + ../parent/pom.xml + + 4.0.0 - tio-http-spring-boot-starter + tio-http-spring-boot-starter - - - - - org.springframework.boot - spring-boot-autoconfigure - true - - - org.springframework.boot - spring-boot-configuration-processor - true - - - org.t-io - tio-http-server - - - junit - junit - test - - - org.testng - testng - test - - + + + org.springframework.boot + spring-boot-autoconfigure + true + + + org.springframework.boot + spring-boot-configuration-processor + true + + + org.t-io + tio-http-server + + + junit + junit + test + + + org.testng + testng + test + + \ No newline at end of file diff --git a/src/zoo/spring-boot/tio-websocket/pom.xml b/src/zoo/spring-boot/tio-websocket/pom.xml index 757c701f..0f9a0124 100644 --- a/src/zoo/spring-boot/tio-websocket/pom.xml +++ b/src/zoo/spring-boot/tio-websocket/pom.xml @@ -5,7 +5,7 @@ tio-spring-boot-parent org.t-io - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE ../parent/pom.xml 4.0.0 @@ -46,7 +46,7 @@ org.t-io tio-spring-boot-common - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE \ No newline at end of file diff --git a/src/zoo/webpack/core/pom.xml b/src/zoo/webpack/core/pom.xml index 9e089a09..0c04bfa4 100644 --- a/src/zoo/webpack/core/pom.xml +++ b/src/zoo/webpack/core/pom.xml @@ -7,7 +7,7 @@ org.t-io tio-webpack-parent - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE ../parent/pom.xml diff --git a/src/zoo/webpack/parent/pom.xml b/src/zoo/webpack/parent/pom.xml index 504de972..e56c6bb5 100644 --- a/src/zoo/webpack/parent/pom.xml +++ b/src/zoo/webpack/parent/pom.xml @@ -20,7 +20,7 @@ org.t-io tio-zoo-parent - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE ../../parent/pom.xml diff --git a/src/zoo/websocket/client/pom.xml b/src/zoo/websocket/client/pom.xml index 92755529..c2d83b2b 100644 --- a/src/zoo/websocket/client/pom.xml +++ b/src/zoo/websocket/client/pom.xml @@ -9,7 +9,7 @@ org.t-io tio-websocket-parent - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE ../parent/pom.xml diff --git a/src/zoo/websocket/common/pom.xml b/src/zoo/websocket/common/pom.xml index 00cefe0e..6b09ccb5 100644 --- a/src/zoo/websocket/common/pom.xml +++ b/src/zoo/websocket/common/pom.xml @@ -8,7 +8,7 @@ org.t-io tio-websocket-parent - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE ../parent/pom.xml diff --git a/src/zoo/websocket/parent/pom.xml b/src/zoo/websocket/parent/pom.xml index 92993737..fdadc57c 100644 --- a/src/zoo/websocket/parent/pom.xml +++ b/src/zoo/websocket/parent/pom.xml @@ -11,7 +11,7 @@ org.t-io tio-zoo-parent - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE ../../parent/pom.xml diff --git a/src/zoo/websocket/server/pom.xml b/src/zoo/websocket/server/pom.xml index 58dce685..ab29fe0d 100644 --- a/src/zoo/websocket/server/pom.xml +++ b/src/zoo/websocket/server/pom.xml @@ -7,7 +7,7 @@ org.t-io tio-websocket-parent - 3.6.0.v20200315-RELEASE + 3.6.1.v20200512-RELEASE ../parent/pom.xml