diff --git a/README.md b/README.md index a1cf0a9f8dd9e103fa31bcb8bef90b7cdbff5e0a..b1d1cff618611f27dc253311be2a381a40e098d7 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 -<seata.version>0.6.1</seata.version> +<seata.version>0.7.1</seata.version> <dependency> <groupId>io.seata</groupId> @@ -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/all/pom.xml b/all/pom.xml index 7f9a5aebf1cdc2e43f05bf5d9db5d249840b8c6a..4a2178e0675c2b9b7ce723402c53c9df692957a9 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -21,7 +21,7 @@ <groupId>io.seata</groupId> <artifactId>seata-all</artifactId> - <version>0.7.0</version> + <version>0.7.1</version> <name>Seata All-in-one ${project.version}</name> <url>http://seata.io</url> diff --git a/bom/pom.xml b/bom/pom.xml index 139fe81449280c6ef1817ea17a4fa7200265c5c0..04a2448443049ef349e28922274049199e9941d5 100644 --- a/bom/pom.xml +++ b/bom/pom.xml @@ -20,7 +20,7 @@ <groupId>io.seata</groupId> <artifactId>seata-bom</artifactId> - <version>0.7.0</version> + <version>0.7.1</version> <modelVersion>4.0.0</modelVersion> <packaging>pom</packaging> 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 db9f85cc10f61fce2b4c5868f7e4f23ac74e6a9f..c514aaa3647933cda59afd664defd11ca5b4538d 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"; /** * The constant VERSION_MAP. diff --git a/pom.xml b/pom.xml index 85b8d19d432da9bec80fe3fba42cbde95a20ec76..04c51037354a55c0c0714010913d960ee29d7a40 100644 --- a/pom.xml +++ b/pom.xml @@ -85,7 +85,7 @@ <properties> <!-- seata version --> - <revision>0.7.0</revision> + <revision>0.7.1</revision> <!-- Compiler settings properties --> <maven.compiler.source>1.8</maven.compiler.source> diff --git a/spring/pom.xml b/spring/pom.xml index 8bfd78e3d57b33c4637b72e8ac63a8a5e4fbb77d..f7b4c7325e643229e1e2c2da1047704e0a1d8e10 100644 --- a/spring/pom.xml +++ b/spring/pom.xml @@ -48,6 +48,11 @@ <artifactId>seata-rm</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>seata-codec-all</artifactId> + <version>${project.version}</version> + </dependency> <dependency> <groupId>cglib</groupId> <artifactId>cglib</artifactId> 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 703946b0bf716426ed6c7bbdd83001b2480e9f0d..c6c3fe686416ce33759d5486d7efe48bcc876541 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.aop.support.AopUtils; 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 @@ import org.springframework.core.PriorityOrdered; */ public class GlobalTransactionScanner extends AbstractAutoProxyCreator implements InitializingBean, ApplicationContextAware, - DisposableBean, BeanFactoryPostProcessor, PriorityOrdered { + DisposableBean { /** * @@ -300,13 +297,4 @@ public class GlobalTransactionScanner extends AbstractAutoProxyCreator this.setBeanFactory(applicationContext); } - @Override - public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException { - //do nothing - } - - @Override - public int getOrder() { - return HIGHEST_PRECEDENCE; - } }