From b901961e5de9cec2a0a773750200404f57b01f89 Mon Sep 17 00:00:00 2001
From: pili <wangxm@>
Date: Mon, 29 Jun 2020 15:25:05 +0800
Subject: [PATCH] change static version number to ${revision} variable

---
 .gitignore                   |  1 +
 apollo-adminservice/pom.xml  |  2 +-
 apollo-assembly/pom.xml      |  2 +-
 apollo-biz/pom.xml           |  2 +-
 apollo-buildtools/pom.xml    |  2 +-
 apollo-client/pom.xml        |  2 +-
 apollo-common/pom.xml        |  2 +-
 apollo-configservice/pom.xml |  2 +-
 apollo-core/pom.xml          |  2 +-
 apollo-demo/pom.xml          |  2 +-
 apollo-mockserver/pom.xml    |  2 +-
 apollo-openapi/pom.xml       |  2 +-
 apollo-portal/pom.xml        |  2 +-
 pom.xml                      | 28 +++++++++++++++++++++++++++-
 14 files changed, 40 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5878691caff..ece055a1612 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,4 +25,5 @@ target
 
 # git
 *.orig
+.flattened-pom.xml
 
diff --git a/apollo-adminservice/pom.xml b/apollo-adminservice/pom.xml
index 8b3cfcf4e56..6be4094df23 100644
--- a/apollo-adminservice/pom.xml
+++ b/apollo-adminservice/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>${revision}</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/apollo-assembly/pom.xml b/apollo-assembly/pom.xml
index 07da6dfac00..b26adb18cc8 100644
--- a/apollo-assembly/pom.xml
+++ b/apollo-assembly/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>${revision}</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/apollo-biz/pom.xml b/apollo-biz/pom.xml
index ac96888f666..986e5ff1433 100644
--- a/apollo-biz/pom.xml
+++ b/apollo-biz/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>${revision}</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>apollo-biz</artifactId>
diff --git a/apollo-buildtools/pom.xml b/apollo-buildtools/pom.xml
index 2faeeeb161e..6a0b510f63e 100644
--- a/apollo-buildtools/pom.xml
+++ b/apollo-buildtools/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>${revision}</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/apollo-client/pom.xml b/apollo-client/pom.xml
index 3c397196899..2bfcde34d18 100644
--- a/apollo-client/pom.xml
+++ b/apollo-client/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>${revision}</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/apollo-common/pom.xml b/apollo-common/pom.xml
index fb4aaf3da82..d63380ab523 100644
--- a/apollo-common/pom.xml
+++ b/apollo-common/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ctrip.framework.apollo</groupId>
         <artifactId>apollo</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>${revision}</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
diff --git a/apollo-configservice/pom.xml b/apollo-configservice/pom.xml
index 0facac43d7c..52e4d12c41a 100644
--- a/apollo-configservice/pom.xml
+++ b/apollo-configservice/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>${revision}</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/apollo-core/pom.xml b/apollo-core/pom.xml
index ad5a57a4c96..64b7a656df8 100644
--- a/apollo-core/pom.xml
+++ b/apollo-core/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>${revision}</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/apollo-demo/pom.xml b/apollo-demo/pom.xml
index f1cd40c825f..0951d9e32c5 100644
--- a/apollo-demo/pom.xml
+++ b/apollo-demo/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<artifactId>apollo</artifactId>
 		<groupId>com.ctrip.framework.apollo</groupId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>${revision}</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>apollo-demo</artifactId>
diff --git a/apollo-mockserver/pom.xml b/apollo-mockserver/pom.xml
index 76065e33e57..ea24b4315f6 100644
--- a/apollo-mockserver/pom.xml
+++ b/apollo-mockserver/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>apollo</artifactId>
     <groupId>com.ctrip.framework.apollo</groupId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/apollo-openapi/pom.xml b/apollo-openapi/pom.xml
index 2bcc7281738..a9b5d1fca80 100644
--- a/apollo-openapi/pom.xml
+++ b/apollo-openapi/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <artifactId>apollo</artifactId>
     <groupId>com.ctrip.framework.apollo</groupId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>${revision}</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/apollo-portal/pom.xml b/apollo-portal/pom.xml
index 683a5fb4536..94816ab7813 100644
--- a/apollo-portal/pom.xml
+++ b/apollo-portal/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>com.ctrip.framework.apollo</groupId>
 		<artifactId>apollo</artifactId>
-		<version>1.7.0-SNAPSHOT</version>
+		<version>${revision}</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index bd76ddb4ee5..a41a5582e26 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.ctrip.framework.apollo</groupId>
 	<artifactId>apollo</artifactId>
-	<version>1.7.0-SNAPSHOT</version>
+	<version>${revision}</version>
 	<name>Apollo</name>
 	<packaging>pom</packaging>
 	<description>Ctrip Configuration Center</description>
@@ -73,6 +73,7 @@
 	</developers>
 
 	<properties>
+		<revision>1.7.0-SNAPSHOT</revision>
 		<java.version>1.8</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<platform-bom.version>Cairo-SR4</platform-bom.version>
@@ -582,6 +583,31 @@
 					<failOnNoGitDirectory>false</failOnNoGitDirectory>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
+				<version>1.1.0</version>
+				<configuration>
+					<updatePomFile>true</updatePomFile>
+					<flattenMode>resolveCiFriendliesOnly</flattenMode>
+				</configuration>
+				<executions>
+					<execution>
+						<id>flatten</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>flatten</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>flatten.clean</id>
+						<phase>clean</phase>
+						<goals>
+							<goal>clean</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 		<resources>
 			<resource>