diff --git a/core/client.pom.xml b/core/client.pom.xml index 7d22b910..7feb2837 100644 --- a/core/client.pom.xml +++ b/core/client.pom.xml @@ -6,7 +6,7 @@ com.tencent.tars tars-parent - 1.6.1 + 1.6.2 tars-client ${project.artifactId} diff --git a/core/pom.xml b/core/pom.xml index 0f9636ee..48479a83 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -6,7 +6,7 @@ com.tencent.tars tars-parent - 1.6.1 + 1.6.2 tars-core ${project.artifactId} diff --git a/core/server.pom.xml b/core/server.pom.xml index 8988240e..964e0b4c 100644 --- a/core/server.pom.xml +++ b/core/server.pom.xml @@ -6,7 +6,7 @@ com.tencent.tars tars-parent - 1.6.1 + 1.6.2 tars-server ${project.artifactId} diff --git a/core/src/main/java/com/qq/tars/common/ClientVersion.java b/core/src/main/java/com/qq/tars/common/ClientVersion.java index 03794249..96ed2e6c 100644 --- a/core/src/main/java/com/qq/tars/common/ClientVersion.java +++ b/core/src/main/java/com/qq/tars/common/ClientVersion.java @@ -23,10 +23,14 @@ public final class ClientVersion { // public static final String build = "1"; public static String getVersion() { - return "1.6.1"; + return "1.6.2"; } public String toString() { return getVersion(); } } + + + + diff --git a/distributedContext/pom.xml b/distributedContext/pom.xml index 03e52ac7..cabfda13 100644 --- a/distributedContext/pom.xml +++ b/distributedContext/pom.xml @@ -6,7 +6,7 @@ com.tencent.tars tars-parent - 1.6.1 + 1.6.2 tars-context diff --git a/docs-en/tars_java_quickstart.md b/docs-en/tars_java_quickstart.md index 0aa32c43..bb5723fc 100644 --- a/docs-en/tars_java_quickstart.md +++ b/docs-en/tars_java_quickstart.md @@ -48,7 +48,7 @@ Add a dependency jar package by modifying pom.xml com.tencent.tars tars-server - 1.6.1 + 1.6.2 jar ``` @@ -59,7 +59,7 @@ Add a dependency jar package by modifying pom.xml com.tencent.tars tars-maven-plugin - 1.6.1 + 1.6.2 @@ -102,7 +102,7 @@ Tars provides plugins to compile and generate java code, only need to add java f com.tencent.tars tars-maven-plugin - 1.6.1 + 1.6.2 @@ -179,7 +179,7 @@ Execute "mvn package" in the project root directory to generate the war package, com.tencent.tars tars-client - 1.6.1 + 1.6.2 jar ``` @@ -190,7 +190,7 @@ Execute "mvn package" in the project root directory to generate the war package, com.tencent.tars tars-maven-plugin - 1.6.1 + 1.6.2 diff --git a/docs-en/tars_java_spring.md b/docs-en/tars_java_spring.md index 1218ab00..deabff18 100644 --- a/docs-en/tars_java_spring.md +++ b/docs-en/tars_java_spring.md @@ -12,7 +12,7 @@ Using this function requires adding a dependency jar package and adding the foll com.tencent.tars tars-spring - 1.6.1 + 1.6.2 ``` diff --git a/docs-en/tars_java_spring_cloud.md b/docs-en/tars_java_spring_cloud.md index 1e6c048d..2e3fe233 100644 --- a/docs-en/tars_java_spring_cloud.md +++ b/docs-en/tars_java_spring_cloud.md @@ -21,7 +21,7 @@ Here are the steps to create and publish a service: com.tencent.tars tars-spring-cloud-starter - 1.6.1 + 1.6.2 ``` @@ -109,7 +109,7 @@ Here's how to discover and access a service. com.tencent.tars tars-spring-cloud-starter - 1.6.1 + 1.6.2 ``` diff --git a/docs-en/tars_java_user_guide.md b/docs-en/tars_java_user_guide.md index 248b03e9..d134fff4 100644 --- a/docs-en/tars_java_user_guide.md +++ b/docs-en/tars_java_user_guide.md @@ -21,7 +21,7 @@ Add dependent jar packages in the build project **pom.xml** com.tencent.tars tars-server - 1.6.1 + 1.6.2 jar ``` @@ -30,7 +30,7 @@ Add dependent jar packages in the build project **pom.xml** com.tencent.tars tars-maven-plugin - 1.6.1 + 1.6.2 @@ -65,7 +65,7 @@ Provide plug-in compile to generate java code, add java file configuration in ta com.tencent.tars tars-maven-plugin - 1.6.1 + 1.6.2 diff --git a/docs-en/tars_tracing.md b/docs-en/tars_tracing.md index 9fd5b78c..d4755386 100644 --- a/docs-en/tars_tracing.md +++ b/docs-en/tars_tracing.md @@ -93,7 +93,7 @@ The integrated zipkin system is built in the framework, users can query call cha ## Tars-java Usage -At present, tars-java supports the call chain from version 1.6.1, and the cpp version is about to be released. The following is an example of integrated zipkin. +At present, tars-java supports the call chain from version 1.6.2, and the cpp version is about to be released. The following is an example of integrated zipkin. ### Enable the call chain @@ -137,7 +137,7 @@ Notes: > > com.tencent.tars > tars-core -> 1.6.1 +> 1.6.2 > > > org.apache.kafka diff --git a/docs/tars_java_quickstart.md b/docs/tars_java_quickstart.md index 9b410939..d89b4457 100644 --- a/docs/tars_java_quickstart.md +++ b/docs/tars_java_quickstart.md @@ -46,7 +46,7 @@ com.tencent.tars tars-server - 1.6.1 + 1.6.2 jar ``` @@ -55,7 +55,7 @@ com.tencent.tars tars-maven-plugin - 1.6.1 + 1.6.2 @@ -91,7 +91,7 @@ module TestApp com.tencent.tars tars-maven-plugin - 1.6.1 + 1.6.2 @@ -159,7 +159,7 @@ public class HelloServantImpl implements HelloServant { com.tencent.tars tars-client - 1.6.1 + 1.6.2 jar ``` @@ -168,7 +168,7 @@ public class HelloServantImpl implements HelloServant { com.tencent.tars tars-maven-plugin - 1.6.1 + 1.6.2 diff --git a/docs/tars_java_spring.md b/docs/tars_java_spring.md index 55a013ac..eb432a17 100644 --- a/docs/tars_java_spring.md +++ b/docs/tars_java_spring.md @@ -12,7 +12,7 @@ Tars支持使用Spring配置servant，使用此功能需要依赖tars-spring.jar com.tencent.tars tars-spring - 1.6.1 + 1.6.2 ``` diff --git a/docs/tars_java_spring_boot.md b/docs/tars_java_spring_boot.md index ae7d9957..7b2ad112 100644 --- a/docs/tars_java_spring_boot.md +++ b/docs/tars_java_spring_boot.md @@ -31,7 +31,7 @@ demo工程参考[demo工程](https://github.com/Tencent/Tars/tree/master/java/ex com.tencent.tars tars-spring-boot-starter - 1.6.1 + 1.6.2 ``` @@ -167,7 +167,7 @@ public @interface TarsClient { ## 版本升级指南 -如需使用tars-spring-boot的新功能需要将tars升级到1.6.1版本及以上版本，本次改动相对较大，附上版本升级指南： +如需使用tars-spring-boot的新功能需要将tars升级到1.6.2版本及以上版本，本次改动相对较大，附上版本升级指南： 1. 管理平台需要重新编译升级。 2. tars-node需要升级到新版本。 3. 模板选择需要选tars.tarsjava.springboot模版。如果不是重新搭建环境可自行添加模板，父模板选择tars.tarsjava.default，内容如下： diff --git a/docs/tars_java_spring_cloud.md b/docs/tars_java_spring_cloud.md index c342461c..c17526e9 100644 --- a/docs/tars_java_spring_cloud.md +++ b/docs/tars_java_spring_cloud.md @@ -22,7 +22,7 @@ com.tencent.tars tars-spring-cloud-starter - 1.6.1 + 1.6.2 ``` @@ -110,7 +110,7 @@ tars: com.tencent.tars tars-spring-cloud-starter - 1.6.1 + 1.6.2 ``` diff --git a/docs/tars_java_user_guide.md b/docs/tars_java_user_guide.md index d3c9634b..2a8416ba 100644 --- a/docs/tars_java_user_guide.md +++ b/docs/tars_java_user_guide.md @@ -21,7 +21,7 @@ com.tencent.tars tars-server - 1.6.1 + 1.6.2 jar ``` @@ -30,7 +30,7 @@ com.tencent.tars tars-maven-plugin - 1.6.1 + 1.6.2 @@ -65,7 +65,7 @@ module TestApp com.tencent.tars tars-maven-plugin - 1.6.1 + 1.6.2 diff --git a/docs/tars_tracing.md b/docs/tars_tracing.md index ebabcc85..52b960d5 100644 --- a/docs/tars_tracing.md +++ b/docs/tars_tracing.md @@ -92,7 +92,7 @@ tars框架内部采用opentracing api来封装调用链数据采集功能，并 ## tars-java 使用方法 -目前tars -java从1.6.1版本开始支持调用链，cpp 版本即将放出，下面以集成zipkin为例介绍。 +目前tars -java从1.6.2版本开始支持调用链，cpp 版本即将放出，下面以集成zipkin为例介绍。 ### 开启调用链 @@ -136,7 +136,7 @@ tars框架内部采用opentracing api来封装调用链数据采集功能，并 > > com.tencent.tars > tars-core -> 1.6.1 +> 1.6.2 > > > org.apache.kafka diff --git a/examples/pom.xml b/examples/pom.xml index d4fddea4..5158b022 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -5,7 +5,7 @@ com.tencent.tars tars-parent - 1.6.1 + 1.6.2 tars-examples ${project.artifactId} diff --git a/examples/quickstart-client/pom.xml b/examples/quickstart-client/pom.xml index dc4674b7..cb3cbeac 100644 --- a/examples/quickstart-client/pom.xml +++ b/examples/quickstart-client/pom.xml @@ -4,7 +4,7 @@ com.tencent.tars tars-parent - 1.6.1 + 1.6.2 tars-quickstart-client ${project.artifactId} diff --git a/examples/quickstart-server/pom.xml b/examples/quickstart-server/pom.xml index c9f80440..17d1f9d5 100644 --- a/examples/quickstart-server/pom.xml +++ b/examples/quickstart-server/pom.xml @@ -4,7 +4,7 @@ com.tencent.tars tars-parent - 1.6.1 + 1.6.2 tars-quickstart-server ${project.artifactId} diff --git a/examples/stress-server/pom.xml b/examples/stress-server/pom.xml index 1a884c40..15e7c82e 100644 --- a/examples/stress-server/pom.xml +++ b/examples/stress-server/pom.xml @@ -4,7 +4,7 @@ com.tencent.tars tars-parent - 1.6.1 + 1.6.2 tars-stress-server ${project.artifactId} diff --git a/examples/tars-spring-boot-server/pom.xml b/examples/tars-spring-boot-server/pom.xml index b9c848b1..fca52893 100644 --- a/examples/tars-spring-boot-server/pom.xml +++ b/examples/tars-spring-boot-server/pom.xml @@ -5,7 +5,7 @@ tars-examples com.tencent.tars - 1.6.1 + 1.6.2 4.0.0 @@ -31,7 +31,7 @@ com.tencent.tars tars-spring-boot-starter - 1.6.1 + 1.6.2 diff --git a/examples/tars-spring-cloud-client/pom.xml b/examples/tars-spring-cloud-client/pom.xml index a4804591..3b5ec1de 100644 --- a/examples/tars-spring-cloud-client/pom.xml +++ b/examples/tars-spring-cloud-client/pom.xml @@ -4,7 +4,7 @@ com.tencent.tars tars-spring-cloud-client - 1.6.1 + 1.6.2 war tars-spring-cloud-client @@ -23,22 +23,22 @@ com.tencent.tars tars-core - 1.6.1 + 1.6.2 com.tencent.tars tars-spring - 1.6.1 + 1.6.2 com.tencent.tars tars-protobuf - 1.6.1 + 1.6.2 com.tencent.tars tars-spring-cloud-starter - 1.6.1 + 1.6.2 diff --git a/examples/tars-spring-cloud-server/pom.xml b/examples/tars-spring-cloud-server/pom.xml index f311b542..813dee8c 100644 --- a/examples/tars-spring-cloud-server/pom.xml +++ b/examples/tars-spring-cloud-server/pom.xml @@ -4,7 +4,7 @@ com.tencent.tars tars-spring-cloud-server war - 1.6.1 + 1.6.2 tars-spring-cloud-server http://maven.apache.org @@ -43,22 +43,22 @@ com.tencent.tars tars-core - 1.6.1 + 1.6.2 com.tencent.tars tars-spring - 1.6.1 + 1.6.2 com.tencent.tars tars-protobuf - 1.6.1 + 1.6.2 com.tencent.tars tars-spring-cloud-starter - 1.6.1 + 1.6.2 diff --git a/examples/tars-spring-server/pom.xml b/examples/tars-spring-server/pom.xml index 4f01b242..e51c98d9 100644 --- a/examples/tars-spring-server/pom.xml +++ b/examples/tars-spring-server/pom.xml @@ -5,7 +5,7 @@ tars-examples com.tencent.tars - 1.6.1 + 1.6.2 4.0.0 war diff --git a/net/pom.xml b/net/pom.xml index 018c3cbd..a6fa7677 100644 --- a/net/pom.xml +++ b/net/pom.xml @@ -6,7 +6,7 @@ com.tencent.tars tars-parent - 1.6.1 + 1.6.2 tars-net jar diff --git a/pom.xml b/pom.xml index b9042883..73910b6b 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ com.tencent.tars tars-parent - 1.6.1 + 1.6.2 pom Tars Super POM For Projects diff --git a/protobuf/README.md b/protobuf/README.md index 5d78e1c8..7ebe78ee 100644 --- a/protobuf/README.md +++ b/protobuf/README.md @@ -6,7 +6,7 @@ com.tencent.tars tars-protobuf - 1.6.1 + 1.6.2 ``` 然后使用java-protobuf-plugin插件配合pb生成代码，详细使用方式参见 diff --git a/protobuf/pom.xml b/protobuf/pom.xml index 379f59ae..21d481c6 100644 --- a/protobuf/pom.xml +++ b/protobuf/pom.xml @@ -5,7 +5,7 @@ tars-parent com.tencent.tars - 1.6.1 + 1.6.2 4.0.0 diff --git a/spring/pom.xml b/spring/pom.xml index 0751ac21..f6b15894 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -4,7 +4,7 @@ tars-parent com.tencent.tars - 1.6.1 + 1.6.2 4.0.0 diff --git a/spring/tars-spring-boot-starter/pom.xml b/spring/tars-spring-boot-starter/pom.xml index 0fa35b00..8d53fff5 100644 --- a/spring/tars-spring-boot-starter/pom.xml +++ b/spring/tars-spring-boot-starter/pom.xml @@ -5,7 +5,7 @@ tars-spring-parent com.tencent.tars - 1.6.1 + 1.6.2 4.0.0 diff --git a/spring/tars-spring-cloud-starter/pom.xml b/spring/tars-spring-cloud-starter/pom.xml index a7f8d0c9..d42de4aa 100644 --- a/spring/tars-spring-cloud-starter/pom.xml +++ b/spring/tars-spring-cloud-starter/pom.xml @@ -5,7 +5,7 @@ tars-spring-parent com.tencent.tars - 1.6.1 + 1.6.2 tars-spring-cloud-starter diff --git a/spring/tars-spring/pom.xml b/spring/tars-spring/pom.xml index 85f1d4ea..4da9cf61 100644 --- a/spring/tars-spring/pom.xml +++ b/spring/tars-spring/pom.xml @@ -4,7 +4,7 @@ tars-spring-parent com.tencent.tars - 1.6.1 + 1.6.2 4.0.0 diff --git a/tools/pom.xml b/tools/pom.xml index 291bb10a..0d8899a2 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -5,7 +5,7 @@ com.tencent.tars tars-parent - 1.6.1 + 1.6.2 tars-tools ${project.artifactId} diff --git a/tools/tars-maven-plugin/pom.xml b/tools/tars-maven-plugin/pom.xml index cff2f20c..16e48323 100644 --- a/tools/tars-maven-plugin/pom.xml +++ b/tools/tars-maven-plugin/pom.xml @@ -6,7 +6,7 @@ com.tencent.tars tars-tools - 1.6.1 + 1.6.2 tars-maven-plugin ${project.artifactId}