Merge pull request #2546 from misselvexu/upgrade/2543

Upgrade Seata to 1.4.2.

spring-cloud-alibaba-dependencies/pom.xml

@@ -20,7 +20,7 @@
     <properties>
         <revision>2.2.8-SNAPSHOT</revision>
         <sentinel.version>1.8.1</sentinel.version>
-        <seata.version>1.3.0</seata.version>
+        <seata.version>1.4.2</seata.version>
         <nacos.client.version>2.0.3</nacos.client.version>
         <nacos.config.version>0.8.0</nacos.config.version>
         <spring.context.support.version>1.0.11</spring.context.support.version>

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/pom.xml

@@ -23,13 +23,7 @@
 
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-actuator</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-actuator-autoconfigure</artifactId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
             <optional>true</optional>
         </dependency>
 
@@ -39,30 +33,12 @@
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-autoconfigure</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
             <optional>true</optional>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-            <optional>true</optional>
-        </dependency>
-
         <dependency>
             <groupId>io.seata</groupId>
             <artifactId>seata-spring-boot-starter</artifactId>
@@ -88,7 +64,7 @@
 
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-loadbalancer</artifactId>
+            <artifactId>spring-cloud-starter-loadbalancer</artifactId>
             <optional>true</optional>
         </dependency>
 

spring-cloud-alibaba-starters/spring-cloud-starter-alibaba-seata/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateAutoConfiguration.java

@@ -35,11 +35,6 @@ import org.springframework.web.client.RestTemplate;
 @Configuration(proxyBeanMethods = false)
 public class SeataRestTemplateAutoConfiguration {
 
-	@Bean
-	public SeataRestTemplateInterceptor seataRestTemplateInterceptor() {
-		return new SeataRestTemplateInterceptor();
-	}
-
 	@Autowired(required = false)
 	private Collection<RestTemplate> restTemplates;
 
@@ -58,4 +53,14 @@ public class SeataRestTemplateAutoConfiguration {
 		}
 	}
 
+	@Configuration(proxyBeanMethods = false)
+	static class SeataRestTemplateInterceptorConfiguration {
+
+		@Bean
+		public SeataRestTemplateInterceptor seataRestTemplateInterceptor() {
+			return new SeataRestTemplateInterceptor();
+		}
+
+	}
+
 }