From 17b05bd3756a90aa2213dfceb69564b5469676ff Mon Sep 17 00:00:00 2001
From: nobodyiam <nobodyiam@gmail.com>
Date: Sun, 30 Apr 2017 09:33:09 +0800
Subject: [PATCH] rename default profile from 'dev' to 'github' to avoid
 confusion

---
 .../src/main/resources/adminservice.properties           | 1 +
 ...tion-dev.properties => application-github.properties} | 0
 .../src/main/resources/configservice.properties          | 1 +
 pom.xml                                                  | 9 ++++++---
 scripts/build.sh                                         | 4 ++--
 5 files changed, 10 insertions(+), 5 deletions(-)
 rename apollo-common/src/main/resources/{application-dev.properties => application-github.properties} (100%)

diff --git a/apollo-adminservice/src/main/resources/adminservice.properties b/apollo-adminservice/src/main/resources/adminservice.properties
index b31a99c86..f897c54d3 100644
--- a/apollo-adminservice/src/main/resources/adminservice.properties
+++ b/apollo-adminservice/src/main/resources/adminservice.properties
@@ -1,3 +1,4 @@
+#Used for apollo-assembly
 spring.application.name= apollo-adminservice
 ctrip.appid= 100003172
 server.port= 8090
diff --git a/apollo-common/src/main/resources/application-dev.properties b/apollo-common/src/main/resources/application-github.properties
similarity index 100%
rename from apollo-common/src/main/resources/application-dev.properties
rename to apollo-common/src/main/resources/application-github.properties
diff --git a/apollo-configservice/src/main/resources/configservice.properties b/apollo-configservice/src/main/resources/configservice.properties
index 83d78b498..ab427394c 100644
--- a/apollo-configservice/src/main/resources/configservice.properties
+++ b/apollo-configservice/src/main/resources/configservice.properties
@@ -1,3 +1,4 @@
+#Used for apollo-assembly
 spring.application.name= apollo-configservice
 ctrip.appid= 100003171
 server.port= 8080
diff --git a/pom.xml b/pom.xml
index c89ebc23f..3029a0d0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -586,9 +586,9 @@
 		</profile>
 		<profile>
 			<!-- for open source usage -->
-			<id>dev</id>
+			<id>github</id>
 			<properties>
-				<package.environment>dev</package.environment>
+				<package.environment>github</package.environment>
 			</properties>
 			<activation>
 				<activeByDefault>true</activeByDefault>
@@ -598,7 +598,7 @@
       <!-- for ctrip development -->
 			<id>ctrip-dev</id>
 			<properties>
-				<package.environment>dev</package.environment>
+				<package.environment>ctrip</package.environment>
 			</properties>
 			<dependencyManagement>
 				<dependencies>
@@ -703,6 +703,9 @@
 		<profile>
 			<!-- for ctrip production -->
 			<id>ctrip</id>
+			<properties>
+				<package.environment>ctrip</package.environment>
+			</properties>
 			<dependencyManagement>
 				<dependencies>
 					<dependency>
diff --git a/scripts/build.sh b/scripts/build.sh
index 630dfbeb3..7629a91e6 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -24,13 +24,13 @@ cd ..
 # package config-service and admin-service
 echo "==== starting to build config-service and admin-service ===="
 
-mvn clean package -DskipTests -pl apollo-configservice,apollo-adminservice -am -Dapollo_profile=dev -Dspring_datasource_url=$apollo_config_db_url -Dspring_datasource_username=$apollo_config_db_username -Dspring_datasource_password=$apollo_config_db_password
+mvn clean package -DskipTests -pl apollo-configservice,apollo-adminservice -am -Dapollo_profile=github -Dspring_datasource_url=$apollo_config_db_url -Dspring_datasource_username=$apollo_config_db_username -Dspring_datasource_password=$apollo_config_db_password
 
 echo "==== building config-service and admin-service finished ===="
 
 echo "==== starting to build portal ===="
 
-mvn clean package -DskipTests -pl apollo-portal -am -Dapollo_profile=dev -Dspring_datasource_url=$apollo_portal_db_url -Dspring_datasource_username=$apollo_portal_db_username -Dspring_datasource_password=$apollo_portal_db_password $META_SERVERS_OPTS
+mvn clean package -DskipTests -pl apollo-portal -am -Dapollo_profile=github -Dspring_datasource_url=$apollo_portal_db_url -Dspring_datasource_username=$apollo_portal_db_username -Dspring_datasource_password=$apollo_portal_db_password $META_SERVERS_OPTS
 
 echo "==== building portal finished ===="
 
-- 
GitLab