apache
diff --git a/‎.github/workflows/dubbo-2.yml
+103 b/‎.github/workflows/dubbo-2.yml
+103
diff --git a/‎.mvn/wrapper/maven-wrapper.properties
+1-1 b/‎.mvn/wrapper/maven-wrapper.properties
+1-1
diff --git a/‎NOTICE
+1-1 b/‎NOTICE
+1-1
diff --git a/‎dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java
+13 b/‎dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointAnnotationAutoConfigurationTest.java
+13
diff --git a/‎dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboEndpointTest.java
+16 b/‎dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboEndpointTest.java
+16
diff --git a/‎dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DelegatingPropertyResolver.java
-83 b/‎dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DelegatingPropertyResolver.java
-83
diff --git a/‎dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java
+20-3 b/‎dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfiguration.java
+20-3
diff --git a/‎dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfigurationTest.java
+10-12 b/‎dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboRelaxedBinding2AutoConfigurationTest.java
+10-12
@@ -0,0 +1,103 @@
+name: Dubbo 2
+
+on:
+  pull_request:
+    paths:
+      - "**"
+      - "!**/*.md"
+      - "!docs/**"
+  push:
+    paths:
+      - '**'
+      - "!**/*.md"
+      - "!docs/**"
+  workflow_dispatch:
+
+env:
+  DUBBO_REF: 'master'
+
+jobs:
+  build-dubbo:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+    # Map a step output to a job output
+    outputs:
+      commit_id: ${{ steps.git-checker.outputs.commit_id }}
+      cache-hit: ${{ steps.dubbocache.outputs.cache-hit }}
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          repository: 'apache/dubbo'
+          ref: ${{env.DUBBO_REF}}
+      - name: Get commit id and dubbo version
+        id: git-checker
+        run: |
+          #compare dubbo commit id
+          last_commit_id=`git log --format="%H" -n 1`
+          echo "::set-output name=commit_id::$last_commit_id"
+          echo "commit_id: $last_commit_id"
+          # Calculate Dubbo Version
+          REVISION=`awk '/<revision>[^<]+<\/revision>/{gsub(/<revision>|<\/revision>/,"",$1);print $1;exit;}' pom.xml`
+          mkdir dubbo-version
+          echo $REVISION > dubbo-version/dubbo-version
+          echo "dubbo version: $REVISION"
+      - name: Upload Dubbo version
+        uses: actions/upload-artifact@v2
+        with:
+          name: dubbo-version
+          path: dubbo-version
+      - name: Dubbo cache
+        id: dubbocache
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository/org/apache/dubbo
+          key: ${{ runner.os }}-dubbo-snapshot-${{steps.git-checker.outputs.commit_id}}
+      - name: Cache local Maven repository
+        if: steps.dubbocache.outputs.cache-hit != 'true'
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-dubbo-${{env.DUBBO_REF}}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-dubbo-${{env.DUBBO_REF}}-maven-
+      - name: Set up JDK 8
+        if: steps.dubbocache.outputs.cache-hit != 'true'
+        uses: actions/setup-java@v1
+        with:
+          java-version: 8
+      - name: Build dubbo
+        if: steps.dubbocache.outputs.cache-hit != 'true'
+        run: |
+          ./mvnw -U --batch-mode --no-transfer-progress -Dmaven.wagon.http.retryHandler.count=3 clean install -Dmaven.test.skip=true -Dmaven.test.skip.exec=true
+
+  build-dubbo-spring-boot:
+    needs: [build-dubbo]
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        java: [8, 11]
+    steps:
+      - uses: actions/checkout@v2
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-dubbo-spring-boot-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-dubbo-spring-boot-maven-
+      - name: Dubbo cache
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository/org/apache/dubbo
+          key: ${{ runner.os }}-dubbo-snapshot-${{needs.build-dubbo.outputs.commit_id}}
+      - name: Set up JDK ${{matrix.java}}
+        uses: actions/setup-java@v1
+        with:
+          java-version: ${{matrix.java}}
+      - name: Build dubbo-spring-boot
+        run: |
+          ./mvnw -U --batch-mode --no-transfer-progress -Dmaven.wagon.http.retryHandler.count=3 clean package
+      - name: Codecov
+        run: bash <(curl -s https://codecov.io/bash)
@@ -1 +1 @@
-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip
+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip
@@ -1,5 +1,5 @@
 Apache Dubbo
-Copyright 2018-2020 The Apache Software Foundation
+Copyright 2018-2021 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).
@@ -17,6 +17,7 @@
 package org.apache.dubbo.spring.boot.actuate.autoconfigure;
 
 import org.apache.dubbo.config.annotation.DubboService;
+import org.apache.dubbo.rpc.model.ApplicationModel;
 import org.apache.dubbo.spring.boot.actuate.endpoint.DubboConfigsMetadataEndpoint;
 import org.apache.dubbo.spring.boot.actuate.endpoint.DubboMetadataEndpoint;
 import org.apache.dubbo.spring.boot.actuate.endpoint.DubboPropertiesMetadataEndpoint;
@@ -26,7 +27,9 @@
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -102,6 +105,16 @@ public class DubboEndpointAnnotationAutoConfigurationTest {
     @Value("http://127.0.0.1:${local.management.port}${management.endpoints.web.base-path:/actuator}")
     private String actuatorBaseURL;
 
+    @Before
+    public void init() {
+        ApplicationModel.reset();
+    }
+
+    @After
+    public void destroy() {
+        ApplicationModel.reset();
+    }
+
     @Test
     public void testShutdown() throws Exception {
 
 
@@ -16,9 +16,12 @@
  */
 package org.apache.dubbo.spring.boot.actuate.endpoint;
 
+import org.apache.dubbo.rpc.model.ApplicationModel;
 import org.apache.dubbo.spring.boot.util.DubboUtils;
 
+import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +43,9 @@
 @SpringBootTest(
         classes = {
                 DubboMetadataEndpoint.class
+        },
+        properties = {
+                "dubbo.application.name = dubbo-demo-application"
         }
 )
 @EnableAutoConfiguration
@@ -49,6 +55,16 @@ public class DubboEndpointTest {
     @Autowired
     private DubboMetadataEndpoint dubboEndpoint;
 
+    @Before
+    public void init() {
+        ApplicationModel.reset();
+    }
+
+    @After
+    public void destroy() {
+        ApplicationModel.reset();
+    }
+
     @Test
     public void testInvoke() {
 
 
@@ -27,14 +27,18 @@
 import org.springframework.context.annotation.Scope;
 import org.springframework.core.env.AbstractEnvironment;
 import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.Environment;
 import org.springframework.core.env.MapPropertySource;
 import org.springframework.core.env.MutablePropertySources;
 import org.springframework.core.env.PropertyResolver;
 
 import java.util.Map;
+import java.util.Set;
 
 import static com.alibaba.spring.util.PropertySourcesUtils.getSubProperties;
-import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_PROPERTY_RESOLVER_BEAN_NAME;
+import static java.util.Collections.emptySet;
+import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_BEAN_NAME;
+import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_PROPERTY_NAME;
 import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_PREFIX;
 import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_SCAN_PREFIX;
 import static org.apache.dubbo.spring.boot.util.DubboUtils.RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME;
@@ -52,7 +56,6 @@
 @AutoConfigureBefore(DubboRelaxedBindingAutoConfiguration.class)
 public class DubboRelaxedBinding2AutoConfiguration {
 
-    @Bean(name = BASE_PACKAGES_PROPERTY_RESOLVER_BEAN_NAME)
     public PropertyResolver dubboScanBasePackagesPropertyResolver(ConfigurableEnvironment environment) {
         ConfigurableEnvironment propertyResolver = new AbstractEnvironment() {
             @Override
@@ -62,7 +65,21 @@ protected void customizePropertySources(MutablePropertySources propertySources)
             }
         };
         ConfigurationPropertySources.attach(propertyResolver);
-        return new DelegatingPropertyResolver(propertyResolver);
+        return propertyResolver;
+    }
+
+    /**
+     * The bean is used to scan the packages of Dubbo Service classes
+     *
+     * @param environment {@link Environment} instance
+     * @return non-null {@link Set}
+     * @since 2.7.8
+     */
+    @ConditionalOnMissingBean(name = BASE_PACKAGES_BEAN_NAME)
+    @Bean(name = BASE_PACKAGES_BEAN_NAME)
+    public Set<String> dubboBasePackages(ConfigurableEnvironment environment) {
+        PropertyResolver propertyResolver = dubboScanBasePackagesPropertyResolver(environment);
+        return propertyResolver.getProperty(BASE_PACKAGES_PROPERTY_NAME, Set.class, emptySet());
     }
 
     @ConditionalOnMissingBean(name = RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME, value = ConfigurationBeanBinder.class)
 
@@ -17,7 +17,7 @@
 package org.apache.dubbo.spring.boot.autoconfigure;
 
 import org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor;
-import org.apache.dubbo.config.spring.beans.factory.annotation.ServiceAnnotationBeanPostProcessor;
+import org.apache.dubbo.config.spring.beans.factory.annotation.ServiceClassPostProcessor;
 
 import com.alibaba.spring.context.config.ConfigurationBeanBinder;
 import org.junit.Test;
@@ -34,7 +34,9 @@
 import org.springframework.util.ClassUtils;
 
 import java.util.Map;
+import java.util.Set;
 
+import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_BEAN_NAME;
 import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_PROPERTY_RESOLVER_BEAN_NAME;
 import static org.apache.dubbo.spring.boot.util.DubboUtils.RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME;
 import static org.junit.Assert.assertEquals;
@@ -53,25 +55,22 @@
 public class DubboRelaxedBinding2AutoConfigurationTest {
 
     @Autowired
-    @Qualifier(BASE_PACKAGES_PROPERTY_RESOLVER_BEAN_NAME)
-    private PropertyResolver propertyResolver;
+    @Qualifier(BASE_PACKAGES_BEAN_NAME)
+    private Set<String> packagesToScan;
 
     @Autowired
     @Qualifier(RELAXED_DUBBO_CONFIG_BINDER_BEAN_NAME)
     private ConfigurationBeanBinder dubboConfigBinder;
 
     @Autowired
-    private ObjectProvider<ServiceAnnotationBeanPostProcessor> serviceAnnotationBeanPostProcessor;
+    private ObjectProvider<ServiceClassPostProcessor> serviceClassPostProcessor;
 
     @Autowired
     private ObjectProvider<ReferenceAnnotationBeanPostProcessor> referenceAnnotationBeanPostProcessor;
 
     @Autowired
     private Environment environment;
 
-    @Autowired
-    private PropertyResolver primaryPropertyResolver;
-
     @Autowired
     private Map<String, Environment> environments;
 
@@ -80,17 +79,16 @@ public void testBeans() {
 
         assertTrue(ClassUtils.isAssignableValue(BinderDubboConfigBinder.class, dubboConfigBinder));
 
-        assertNotNull(serviceAnnotationBeanPostProcessor);
-        assertNotNull(serviceAnnotationBeanPostProcessor.getIfAvailable());
+        assertNotNull(serviceClassPostProcessor);
+        assertNotNull(serviceClassPostProcessor.getIfAvailable());
         assertNotNull(referenceAnnotationBeanPostProcessor);
         assertNotNull(referenceAnnotationBeanPostProcessor.getIfAvailable());
 
         assertNotNull(environment);
-        assertNotNull(primaryPropertyResolver);
         assertNotNull(environments);
 
-        assertEquals(primaryPropertyResolver, environment);
-        assertEquals(2, environments.size());
+
+        assertEquals(1, environments.size());
 
         assertTrue(environments.containsValue(environment));
     }
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.5.0/apache-maven-3.5.0-bin.zip`
	`1`	`+distributionUrl=https://repo1.maven.org/maven2/org/apache/maven/apache-maven/3.6.1/apache-maven-3.6.1-bin.zip`