Skip to content

Commit

Permalink
[update]Upgrade version to 1.6.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@TimmyYu
TimmyYu committed Jan 9, 2020
1 parent ae9514e commit 29dd8c7
Show file tree
Hide file tree
Showing 34 changed files with 64 additions and 60 deletions.
2 changes: 1 addition & 1 deletion core/client.pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-parent</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</parent>
<artifactId>tars-client</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-parent</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</parent>
<artifactId>tars-core</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion core/server.pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-parent</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</parent>
<artifactId>tars-server</artifactId>
<name>${project.artifactId}</name>
Expand Down
6 changes: 5 additions & 1 deletion core/src/main/java/com/qq/tars/common/ClientVersion.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}




2 changes: 1 addition & 1 deletion distributedContext/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<parent>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-parent</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</parent>

<artifactId>tars-context</artifactId>
Expand Down
10 changes: 5 additions & 5 deletions docs-en/tars_java_quickstart.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Add a dependency jar package by modifying pom.xml
<dependency>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-server</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
<type>jar</type>
</dependency>
```
Expand All @@ -59,7 +59,7 @@ Add a dependency jar package by modifying pom.xml
<plugin>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-maven-plugin</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
<configuration>
<tars2JavaConfig>
<tarsFiles>
Expand Down Expand Up @@ -102,7 +102,7 @@ Tars provides plugins to compile and generate java code, only need to add java f
<plugin>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-maven-plugin</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
<configuration>
<tars2JavaConfig>
<!-- tars file location -->
Expand Down Expand Up @@ -179,7 +179,7 @@ Execute "mvn package" in the project root directory to generate the war package,
<dependency>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-client</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
<type>jar</type>
</dependency>
```
Expand All @@ -190,7 +190,7 @@ Execute "mvn package" in the project root directory to generate the war package,
<plugin>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-maven-plugin</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
<configuration>
<tars2JavaConfig>
<!-- tars file location -->
Expand Down
2 changes: 1 addition & 1 deletion docs-en/tars_java_spring.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Using this function requires adding a dependency jar package and adding the foll
<dependency>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-spring</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</dependency>
```

Expand Down
4 changes: 2 additions & 2 deletions docs-en/tars_java_spring_cloud.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Here are the steps to create and publish a service:
<dependency>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-spring-cloud-starter</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</dependency>
```

Expand Down Expand Up @@ -109,7 +109,7 @@ Here's how to discover and access a service.
<dependency>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-spring-cloud-starter</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</dependency>
```

Expand Down
6 changes: 3 additions & 3 deletions docs-en/tars_java_user_guide.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Add dependent jar packages in the build project **pom.xml**
<dependency>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-server</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
<type>jar</type>
</dependency>
```
Expand All @@ -30,7 +30,7 @@ Add dependent jar packages in the build project **pom.xml**
<plugin>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-maven-plugin</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
<configuration>
<tars2JavaConfig>
<tarsFiles>
Expand Down Expand Up @@ -65,7 +65,7 @@ Provide plug-in compile to generate java code, add java file configuration in ta
<plugin>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-maven-plugin</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
<configuration>
<tars2JavaConfig>
<!-- Tars file location -->
Expand Down
4 changes: 2 additions & 2 deletions docs-en/tars_tracing.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -137,7 +137,7 @@ Notes:
> <dependency>
> <groupId>com.tencent.tars</groupId>
> <artifactId>tars-core</artifactId>
> <version>1.6.1</version>
> <version>1.6.2</version>
> <exclusions>
> <exclusion>
> <groupId>org.apache.kafka</groupId>
Expand Down
10 changes: 5 additions & 5 deletions docs/tars_java_quickstart.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<dependency>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-server</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
<type>jar</type>
</dependency>
```
Expand All @@ -55,7 +55,7 @@
<plugin>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-maven-plugin</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
<configuration>
<tars2JavaConfig>
<tarsFiles>
Expand Down Expand Up @@ -91,7 +91,7 @@ module TestApp
<plugin>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-maven-plugin</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
<configuration>
<tars2JavaConfig>
<!-- tars文件位置 -->
Expand Down Expand Up @@ -159,7 +159,7 @@ public class HelloServantImpl implements HelloServant {
<dependency>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-client</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
<type>jar</type>
</dependency>
```
Expand All @@ -168,7 +168,7 @@ public class HelloServantImpl implements HelloServant {
<plugin>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-maven-plugin</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
<configuration>
<tars2JavaConfig>
<!-- tars文件位置 -->
Expand Down
2 changes: 1 addition & 1 deletion docs/tars_java_spring.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Tars支持使用Spring配置servant，使用此功能需要依赖tars-spring.jar
<dependency>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-spring</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</dependency>
```

Expand Down
4 changes: 2 additions & 2 deletions docs/tars_java_spring_boot.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ demo工程参考[demo工程](https://github.com/Tencent/Tars/tree/master/java/ex
<dependency>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-spring-boot-starter</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</dependency>
</dependencies>
```
Expand Down Expand Up @@ -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，内容如下：
Expand Down
4 changes: 2 additions & 2 deletions docs/tars_java_spring_cloud.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<dependency>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-spring-cloud-starter</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</dependency>
```

Expand Down Expand Up @@ -110,7 +110,7 @@ tars:
<dependency>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-spring-cloud-starter</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</dependency>
```

Expand Down
6 changes: 3 additions & 3 deletions docs/tars_java_user_guide.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<dependency>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-server</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
<type>jar</type>
</dependency>
```
Expand All @@ -30,7 +30,7 @@
<plugin>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-maven-plugin</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
<configuration>
<tars2JavaConfig>
<tarsFiles>
Expand Down Expand Up @@ -65,7 +65,7 @@ module TestApp
<plugin>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-maven-plugin</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
<configuration>
<tars2JavaConfig>
<!-- tars文件位置 -->
Expand Down
4 changes: 2 additions & 2 deletions docs/tars_tracing.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ tars框架内部采用opentracing api来封装调用链数据采集功能，并

## tars-java 使用方法

目前tars -java从1.6.1版本开始支持调用链，cpp 版本即将放出，下面以集成zipkin为例介绍。
目前tars -java从1.6.2版本开始支持调用链，cpp 版本即将放出，下面以集成zipkin为例介绍。

### 开启调用链

Expand Down Expand Up @@ -136,7 +136,7 @@ tars框架内部采用opentracing api来封装调用链数据采集功能，并
> <dependency>
> <groupId>com.tencent.tars</groupId>
> <artifactId>tars-core</artifactId>
> <version>1.6.1</version>
> <version>1.6.2</version>
> <exclusions>
> <exclusion>
> <groupId>org.apache.kafka</groupId>
Expand Down
2 changes: 1 addition & 1 deletion examples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-parent</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</parent>
<artifactId>tars-examples</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-parent</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</parent>
<artifactId>tars-quickstart-client</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion examples/quickstart-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-parent</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</parent>
<artifactId>tars-quickstart-server</artifactId>
<name>${project.artifactId}</name>
Expand Down
2 changes: 1 addition & 1 deletion examples/stress-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-parent</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</parent>
<artifactId>tars-stress-server</artifactId>
<name>${project.artifactId}</name>
Expand Down
4 changes: 2 additions & 2 deletions examples/tars-spring-boot-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<artifactId>tars-examples</artifactId>
<groupId>com.tencent.tars</groupId>
<version>1.6.1</version>
<version>1.6.2</version>
</parent>
<modelVersion>4.0.0</modelVersion>

Expand All @@ -31,7 +31,7 @@
<dependency>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-spring-boot-starter</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</dependency>
</dependencies>

Expand Down
10 changes: 5 additions & 5 deletions examples/tars-spring-cloud-client/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.tencent.tars</groupId>
<artifactId>tars-spring-cloud-client</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
<packaging>war</packaging>

<name>tars-spring-cloud-client</name>
Expand All @@ -23,22 +23,22 @@
<dependency>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-core</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</dependency>
<dependency>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-spring</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</dependency>
<dependency>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-protobuf</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</dependency>
<dependency>
<groupId>com.tencent.tars</groupId>
<artifactId>tars-spring-cloud-starter</artifactId>
<version>1.6.1</version>
<version>1.6.2</version>
</dependency>
</dependencies>
</project>
Loading

0 comments on commit 29dd8c7

Please sign in to comment.