From 915db3adec0d5e729dee214d1bac38b40beb0428 Mon Sep 17 00:00:00 2001
From: mercyblitz <mercyblitz@gmail.com>
Date: Mon, 10 Aug 2020 16:02:28 +0800
Subject: [PATCH 1/3] Polish alibaba/spring-cloud-alibaba#1624 : Upgrading the
 Dubbo Spring Boot to be 2.7.8

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index e96ed3544..9833feb61 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
         <slf4j-api.version>1.7.25</slf4j-api.version>
 
         <!-- Apache Dubbo -->
-        <dubbo.version>2.7.6</dubbo.version>
+        <dubbo.version>2.7.8</dubbo.version>
         <curator.version>4.0.1</curator.version>
 
         <!-- Apache RocketMQ -->

From 1a368ee6f82e8a04cd8242d0068235338b3ea5de Mon Sep 17 00:00:00 2001
From: mercyblitz <mercyblitz@gmail.com>
Date: Mon, 10 Aug 2020 16:04:01 +0800
Subject: [PATCH 2/3] Polish alibaba/spring-cloud-alibaba#1624 :
 [Infrastructure] Upgrading Alibaba's Spring Context Support to 1.0.9

---
 spring-cloud-alibaba-dependencies/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml
index 5228debe0..c7b9ec1e9 100644
--- a/spring-cloud-alibaba-dependencies/pom.xml
+++ b/spring-cloud-alibaba-dependencies/pom.xml
@@ -24,7 +24,7 @@
         <seata.version>1.2.0</seata.version>
         <nacos.client.version>1.2.1</nacos.client.version>
         <nacos.config.version>0.8.0</nacos.config.version>
-        <spring.context.support.version>1.0.6</spring.context.support.version>
+        <spring.context.support.version>1.0.9</spring.context.support.version>
 
         <!-- Maven Plugin Versions -->
         <maven-source-plugin.version>2.2.1</maven-source-plugin.version>

From 098919807b3f3c2f68d908184f1a06a5f09e8970 Mon Sep 17 00:00:00 2001
From: mercyblitz <mercyblitz@gmail.com>
Date: Mon, 10 Aug 2020 16:07:44 +0800
Subject: [PATCH 3/3] Polish alibaba/spring-cloud-alibaba#1611 : When openfeign
 and dubbo coexist, DubboServiceAutoConfiguration.primaryPropertyResolver
 configuration causes openfeign call to fail #728

---
 .../DubboServiceAutoConfiguration.java            | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceAutoConfiguration.java b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceAutoConfiguration.java
index 9de4a27d5..77764e900 100644
--- a/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceAutoConfiguration.java
+++ b/spring-cloud-alibaba-starters/spring-cloud-starter-dubbo/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceAutoConfiguration.java
@@ -24,15 +24,11 @@ import com.alibaba.cloud.dubbo.service.parameter.RequestBodyServiceParameterReso
 import com.alibaba.cloud.dubbo.service.parameter.RequestHeaderServiceParameterResolver;
 import com.alibaba.cloud.dubbo.service.parameter.RequestParamServiceParameterResolver;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
-import org.springframework.context.annotation.Primary;
-import org.springframework.core.env.Environment;
-import org.springframework.core.env.PropertyResolver;
 
 /**
  * Spring Boot Auto-Configuration class for Dubbo Service.
@@ -49,17 +45,6 @@ public class DubboServiceAutoConfiguration {
 		return new DubboGenericServiceFactory();
 	}
 
-	/**
-	 * Build a primary {@link PropertyResolver} bean to {@link Autowired @Autowired}.
-	 * @param environment {@link Environment}
-	 * @return alias bean for {@link Environment}
-	 */
-	@Bean
-	@Primary
-	public PropertyResolver primaryPropertyResolver(Environment environment) {
-		return environment;
-	}
-
 	@Configuration(proxyBeanMethods = false)
 	@Import({ DubboGenericServiceExecutionContextFactory.class,
 			RequestParamServiceParameterResolver.class,