From 74911887bc96886dce741e02af39dc36f29f591a Mon Sep 17 00:00:00 2001 From: jimin Date: Mon, 15 Jul 2019 11:37:49 +0800 Subject: [PATCH 1/4] version:change version to 0.7.1-SNAPSHOT (#1300) --- all/pom.xml | 2 +- bom/pom.xml | 2 +- core/src/main/java/io/seata/core/protocol/Version.java | 2 +- pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/all/pom.xml b/all/pom.xml index 7f9a5aebf1c..db76ad308a0 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -21,7 +21,7 @@ io.seata seata-all - 0.7.0 + 0.7.1-SNAPSHOT Seata All-in-one ${project.version} http://seata.io diff --git a/bom/pom.xml b/bom/pom.xml index 139fe814492..d006766e6e0 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -20,7 +20,7 @@ io.seata seata-bom - 0.7.0 + 0.7.1-SNAPSHOT 4.0.0 pom diff --git a/core/src/main/java/io/seata/core/protocol/Version.java b/core/src/main/java/io/seata/core/protocol/Version.java index db9f85cc10f..95ef8999fe8 100644 --- a/core/src/main/java/io/seata/core/protocol/Version.java +++ b/core/src/main/java/io/seata/core/protocol/Version.java @@ -31,7 +31,7 @@ public class Version { /** * The constant CURRENT. */ - public static final String CURRENT = "0.7.0"; + public static final String CURRENT = "0.7.1-SNAPSHOT"; /** * The constant VERSION_MAP. diff --git a/pom.xml b/pom.xml index 85b8d19d432..f386ba005f7 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ - 0.7.0 + 0.7.1-SNAPSHOT 1.8 From ad072fc38558d3fdea2174af6aafff5f79972f5c Mon Sep 17 00:00:00 2001 From: zjinlei <75718677@qq.com> Date: Mon, 15 Jul 2019 15:15:04 +0800 Subject: [PATCH 2/4] seata-spring add dependency seata-codec-all (#1297) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * seata-spring add dependency seata-codec * seata-codec is pom，use seata-codec-all --- README.md | 2 +- spring/pom.xml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index a1cf0a9f8dd..1ba4f49bf86 100644 --- a/README.md +++ b/README.md @@ -127,7 +127,7 @@ Contributors are welcomed to join the FEATS project. Please check [CONTRIBUTING] * [Seata Docker](https://github.com/seata/seata-docker) - Seata integration with docker * [Seata K8s](https://github.com/seata/seata-k8s) - Seata integration with k8s * [Awesome Seata](https://github.com/seata/awesome-seata) - Description of Seata related projects -* [Seata Website](https://github.com/seata/seata.github.io) - Seata official website （***In the process of design***） +* [Seata Website](https://github.com/seata/seata.github.io) - Seata official website ## Contributors diff --git a/spring/pom.xml b/spring/pom.xml index 8bfd78e3d57..f7b4c7325e6 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -48,6 +48,11 @@ seata-rm ${project.version} + + ${project.groupId} + seata-codec-all + ${project.version} + cglib cglib From e0fff8f8cdf84d4583155595b43c57d6cf3788a9 Mon Sep 17 00:00:00 2001 From: jimin Date: Mon, 15 Jul 2019 17:19:59 +0800 Subject: [PATCH 3/4] bugfix:failed to instantiate org.springframework.cloud.alibaba.seata.GlobalTransactionAutoConfiguration (#1305) bugfix:failed to instantiate org.springframework.cloud.alibaba.seata.GlobalTransactionAutoConfiguration (#1305) --- .../annotation/GlobalTransactionScanner.java | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/spring/src/main/java/io/seata/spring/annotation/GlobalTransactionScanner.java b/spring/src/main/java/io/seata/spring/annotation/GlobalTransactionScanner.java index 703946b0bf7..c6c3fe68641 100644 --- a/spring/src/main/java/io/seata/spring/annotation/GlobalTransactionScanner.java +++ b/spring/src/main/java/io/seata/spring/annotation/GlobalTransactionScanner.java @@ -42,12 +42,9 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; -import org.springframework.beans.factory.config.BeanFactoryPostProcessor; -import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.core.PriorityOrdered; /** * The type Global transaction scanner. @@ -57,7 +54,7 @@ */ public class GlobalTransactionScanner extends AbstractAutoProxyCreator implements InitializingBean, ApplicationContextAware, - DisposableBean, BeanFactoryPostProcessor, PriorityOrdered { + DisposableBean { /** * @@ -300,13 +297,4 @@ public void setApplicationContext(ApplicationContext applicationContext) throws this.setBeanFactory(applicationContext); } - @Override - public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { - //do nothing - } - - @Override - public int getOrder() { - return HIGHEST_PRECEDENCE; - } } From 7584cfd932324e4685d78473f4d6aeaa7d550771 Mon Sep 17 00:00:00 2001 From: jimin Date: Mon, 15 Jul 2019 18:43:09 +0800 Subject: [PATCH 4/4] release 0.7.1 (#1306) --- README.md | 2 +- all/pom.xml | 2 +- bom/pom.xml | 2 +- core/src/main/java/io/seata/core/protocol/Version.java | 2 +- pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 1ba4f49bf86..b1d1cff6186 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ For more details about principle and design, please go to [Seata wiki page](http ## Maven dependency ```xml -0.6.1 +0.7.1 io.seata diff --git a/all/pom.xml b/all/pom.xml index db76ad308a0..4a2178e0675 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -21,7 +21,7 @@ io.seata seata-all - 0.7.1-SNAPSHOT + 0.7.1 Seata All-in-one ${project.version} http://seata.io diff --git a/bom/pom.xml b/bom/pom.xml index d006766e6e0..04a24484430 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -20,7 +20,7 @@ io.seata seata-bom - 0.7.1-SNAPSHOT + 0.7.1 4.0.0 pom diff --git a/core/src/main/java/io/seata/core/protocol/Version.java b/core/src/main/java/io/seata/core/protocol/Version.java index 95ef8999fe8..c514aaa3647 100644 --- a/core/src/main/java/io/seata/core/protocol/Version.java +++ b/core/src/main/java/io/seata/core/protocol/Version.java @@ -31,7 +31,7 @@ public class Version { /** * The constant CURRENT. */ - public static final String CURRENT = "0.7.1-SNAPSHOT"; + public static final String CURRENT = "0.7.1"; /** * The constant VERSION_MAP. diff --git a/pom.xml b/pom.xml index f386ba005f7..04c51037354 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ - 0.7.1-SNAPSHOT + 0.7.1 1.8