From 12ea3d68d4062a472ff9052ac7d2c57176e6cb0f Mon Sep 17 00:00:00 2001
From: Albumen Kevin <jhq0812@gmail.com>
Date: Mon, 7 Jun 2021 20:36:24 +0800
Subject: [PATCH 1/3] prepare 2.7.12 release

---
 dubbo-dependencies-bom/pom.xml                          | 2 +-
 dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml | 2 +-
 pom.xml                                                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 9eb0b8b4def..f06ba732f56 100644
--- 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.12</revision>
     </properties>
 
     <dependencyManagement>
diff --git a/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml b/dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml
index 5ccd48acad0..5f5f72c0525 100644
--- 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.12</revision>
         <maven_flatten_version>1.1.0</maven_flatten_version>
     </properties>
 
diff --git a/pom.xml b/pom.xml
index 407b226bd84..776b6f39b64 100644
--- 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.12</revision>
     </properties>
 
     <modules>

From e8eeddbf42952e7dd4ba4428548f91006900ea5c Mon Sep 17 00:00:00 2001
From: Albumen Kevin <jhq0812@gmail.com>
Date: Tue, 8 Jun 2021 11:14:23 +0800
Subject: [PATCH 2/3] Fix ut for AbstractConfigTest

---
 .../test/java/org/apache/dubbo/config/AbstractConfigTest.java   | 2 ++
 1 file changed, 2 insertions(+)

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
index 8fdbffcaf8e..92bfc9cf230 100644
--- 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();
 

From 50d88d7285bd96f2a11af4efd7881c3e7320e0ef Mon Sep 17 00:00:00 2001
From: Albumen Kevin <jhq0812@gmail.com>
Date: Fri, 11 Jun 2021 17:40:51 +0800
Subject: [PATCH 3/3] upgrade to 2.7.13-SNAPSHOT

---
 dubbo-dependencies-bom/pom.xml                          | 2 +-
 dubbo-dependencies/dubbo-dependencies-zookeeper/pom.xml | 2 +-
 pom.xml                                                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index f06ba732f56..988ae46b12e 100644
--- 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</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
index 5f5f72c0525..f4534a6844d 100644
--- 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</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
index 776b6f39b64..da32899482c 100644
--- 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</revision>
+        <revision>2.7.13-SNAPSHOT</revision>
     </properties>
 
     <modules>