Merge branch 'apache:master' into master

zhangjiezhang · Jun 15, 2021 · 1e3e5f5 · 1e3e5f5
2 parents f067e44 + 50d88d7
commit 1e3e5f5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java
@@ -416,6 +416,7 @@ public void testRefreshExternal() {
             ApplicationModel.getEnvironment().setExternalConfigMap(external);
             ApplicationModel.getEnvironment().initialize();
 
+            ApplicationModel.getEnvironment().setConfigCenterFirst(true);
             overrideConfig.refresh();
 
             Assertions.assertEquals("external://127.0.0.1:2181", overrideConfig.getAddress());
@@ -453,6 +454,7 @@ public void testRefreshById() {
 
             ConfigCenterConfig configCenter = new ConfigCenterConfig();
             overrideConfig.setConfigCenter(configCenter);
+            ApplicationModel.getEnvironment().setConfigCenterFirst(true);
             // Load configuration from  system properties -> externalConfiguration -> RegistryConfig -> dubbo.properties
             overrideConfig.refresh();
 

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
@@ -168,7 +168,7 @@
         <mortbay_jetty_version>6.1.26</mortbay_jetty_version>
         <portlet_version>2.0</portlet_version>
         <maven_flatten_version>1.1.0</maven_flatten_version>
-        <revision>2.7.12-SNAPSHOT</revision>
+        <revision>2.7.13-SNAPSHOT</revision>
     </properties>
 
     <dependencyManagement>

diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
@@ -32,7 +32,7 @@
     <packaging>pom</packaging>
 
     <properties>
-        <revision>2.7.12-SNAPSHOT</revision>
+        <revision>2.7.13-SNAPSHOT</revision>
         <maven_flatten_version>1.1.0</maven_flatten_version>
     </properties>
 

diff --git a/pom.xml b/pom.xml
@@ -126,7 +126,7 @@
         <arguments />
         <checkstyle.skip>true</checkstyle.skip>
         <rat.skip>true</rat.skip>
-        <revision>2.7.12-SNAPSHOT</revision>
+        <revision>2.7.13-SNAPSHOT</revision>
     </properties>
 
     <modules>