Merge pull request #608 from nobodyiam/rename-apollo-profile

apollo-adminservice/src/main/resources/adminservice.properties

+#Used for apollo-assembly
 spring.application.name= apollo-adminservice
 ctrip.appid= 100003172
 server.port= 8090

apollo-configservice/src/main/resources/configservice.properties

+#Used for apollo-assembly
 spring.application.name= apollo-configservice
 ctrip.appid= 100003171
 server.port= 8080

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>

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 ===="