version: update version to 1.1.0

QNJR-GROUP · Sep 16, 2018 · 60684ab · 60684ab
1 parent b9803dc
commit 60684ab
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 17 deletions.
diff --git a/easytrans-demo/interface-call/pom.xml b/easytrans-demo/interface-call/pom.xml
@@ -19,7 +19,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<revision>1.0.0</revision>
+		<revision>1.1.0</revision>
 	</properties>
 
 

diff --git a/easytrans-demo/rpc-dubbo/pom.xml b/easytrans-demo/rpc-dubbo/pom.xml
@@ -19,7 +19,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<revision>1.0.0</revision>
+		<revision>1.1.0</revision>
 	</properties>
 
 

diff --git a/easytrans-demo/sagatcc/pom.xml b/easytrans-demo/sagatcc/pom.xml
@@ -19,7 +19,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<revision>1.0.0</revision>
+		<revision>1.1.0</revision>
 	</properties>
 
 

diff --git a/easytrans-demo/tcc-and-msg/pom.xml b/easytrans-demo/tcc-and-msg/pom.xml
@@ -19,7 +19,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<revision>1.0.0</revision>
+		<revision>1.1.0</revision>
 	</properties>
 
 

diff --git a/easytrans-demo/tcc-only/pom.xml b/easytrans-demo/tcc-only/pom.xml
@@ -19,7 +19,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<revision>1.0.0</revision>
+		<revision>1.1.0</revision>
 	</properties>
 
 

diff --git a/easytrans-demo/tcc-only/tcconly-wallet-api/pom.xml b/easytrans-demo/tcc-only/tcconly-wallet-api/pom.xml
@@ -23,7 +23,6 @@
 		<dependency>
 			<groupId>com.yiqiniu.easytrans</groupId>
 			<artifactId>easytrans-core</artifactId>
-			<version>1.0.0</version>
 		</dependency>
 	</dependencies>
 

diff --git a/easytrans-starter/src/main/java/com/yiqiniu/easytrans/EasyTransCoreConfiguration.java b/easytrans-starter/src/main/java/com/yiqiniu/easytrans/EasyTransCoreConfiguration.java
@@ -77,7 +77,7 @@
 import com.yiqiniu.easytrans.stringcodec.StringCodec;
 import com.yiqiniu.easytrans.stringcodec.impl.EnableStringCodecZookeeperImpl;
 import com.yiqiniu.easytrans.util.ByteFormIdCodec;
-import com.yiqiniu.easytrans.util.CallWrappUtil;
+import com.yiqiniu.easytrans.util.CallWrapUtil;
 import com.yiqiniu.easytrans.util.DeafultByteFormIdCodec;
 
 /**
@@ -359,8 +359,8 @@ public ByteFormIdCodec byteFormIdCodec(StringCodec codecer) {
 	}
 
 	@Bean
-	public CallWrappUtil callWrappUtil(EasyTransFacade facade) {
-		return new CallWrappUtil(facade);
+	public CallWrapUtil callWrappUtil(EasyTransFacade facade) {
+		return new CallWrapUtil(facade);
 	}
 
 }
diff --git a/easytrans-starter/src/test/java/com/yiqiniu/easytrans/test/EasyTransTestConfiguration.java b/easytrans-starter/src/test/java/com/yiqiniu/easytrans/test/EasyTransTestConfiguration.java
@@ -18,7 +18,7 @@
 import com.yiqiniu.easytrans.queue.QueueTopicMapper;
 import com.yiqiniu.easytrans.test.mockservice.accounting.easytrans.AccountingApi;
 import com.yiqiniu.easytrans.test.mockservice.accounting.easytrans.AccountingCpsMethod.AccountingRequestCfg;
-import com.yiqiniu.easytrans.util.CallWrappUtil;
+import com.yiqiniu.easytrans.util.CallWrapUtil;
 
 @SpringBootApplication
 @EnableEasyTransaction
@@ -34,7 +34,7 @@
 public class EasyTransTestConfiguration {
 
 	@Bean
-	public AccountingApi accountingApi(CallWrappUtil util) {
+	public AccountingApi accountingApi(CallWrapUtil util) {
 		return util.createTransactionCallInstance(AccountingApi.class, AccountingRequestCfg.class);
 	}
 

diff --git a/pom.xml b/pom.xml
@@ -43,7 +43,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
-		<revision>1.0.0</revision>
+		<revision>1.1.0</revision>
 	</properties>
 
 
@@ -158,7 +158,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>2.2.1</version>
 				<executions>
 					<execution>
 						<id>attach-sources</id>
@@ -171,7 +170,6 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<version>2.9.1</version>
 				<configuration>
 					<additionalparam>-Xdoclint:none</additionalparam>
 				</configuration>

diff --git a/readme-en.md b/readme-en.md
@@ -46,6 +46,7 @@ Distributed business scenario
 	* applicable to businesses that require remote execution results to determine global-transaction status, and remote execution is able to make compensation.
 	* common
 	* Priority is given to compensation-based eventual consistency transactions if there's unsolvable problems with message queues are used
+	* In this framework, compensation pattern do not support nested transaction, you can use TCC instead when nested transaction is required
 * TCC pattern
 	* applicable to businesses that require remote execution results to determine global-transaction status, and remote execution is unable to make compensation.
 	* the least common.
@@ -103,7 +104,7 @@ Business code can introduce EasyTransaction by maven
 	  <dependency>
         <groupId>com.yiqiniu.easytrans</groupId>
         <artifactId>easytrans-starter</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
       </dependency>
 
 This Starter contains several default implement, included: RDBS based distributed transaction log，Netflix-ribbon based http RPC implement，KAFKA based queue，if you want to replace it ,just exclude it.

diff --git a/readme.md b/readme.md
@@ -20,7 +20,7 @@
 * 高性能,大多数业务系统瓶颈在业务数据库，若不启用框架的幂等功能，对业务数据库的额外消耗仅为写入25字节的一行
 * 可选的框架自带幂等实现及调用错乱次序处理，大幅减轻业务开发工作量,但启用的同时会在业务数据库增加一条幂等控制行
 * 业务代码可实现完全无入侵
-* 支持递归事务
+* 支持嵌套事务
 * 无需额外部署协调者，不同APP的服务协调自身发起的事务，也避免了单点故障
 	* 也可以对某个APP单独部署一个协调者
 * 分布式事务ID可关联业务ID，业务类型，APPID，便于监控各个业务的分布式事务执行情况
@@ -42,6 +42,7 @@
     * 适用于需要获取远程执行结果来决定逻辑事务走向 且 可以进行补偿的业务
     * 次常见
     * 若使用消息队列不能解决的事务问题优先考虑使用基于补偿的最终一致性事务
+    * 本框架中传统补偿不支持嵌套，若有需要，可改用TCC
 * 使用TCC完成最终一致性事务
     * 适用于需要获取远程执行结果来决定逻辑事务走向 且 不可以进行补偿的业务
     * 最不常见
@@ -89,7 +90,7 @@
 	  <dependency>
         <groupId>com.yiqiniu.easytrans</groupId>
         <artifactId>easytrans-starter</artifactId>
-        <version>1.0.0</version>
+        <version>1.1.0</version>
       </dependency>
 
 Starter里包含了若干默认的组件实现:基于mysql的分布式事务日志存储，基于ribbon-rest的RPC实现，基于KAFKA的消息队列，若不需要或者要替换，可以EXCLUDE掉