Commit 17b05bd3 authored by nobodyiam's avatar nobodyiam

rename default profile from 'dev' to 'github' to avoid confusion

parent bd1832bf
#Used for apollo-assembly
spring.application.name= apollo-adminservice spring.application.name= apollo-adminservice
ctrip.appid= 100003172 ctrip.appid= 100003172
server.port= 8090 server.port= 8090
......
#Used for apollo-assembly
spring.application.name= apollo-configservice spring.application.name= apollo-configservice
ctrip.appid= 100003171 ctrip.appid= 100003171
server.port= 8080 server.port= 8080
......
...@@ -586,9 +586,9 @@ ...@@ -586,9 +586,9 @@
</profile> </profile>
<profile> <profile>
<!-- for open source usage --> <!-- for open source usage -->
<id>dev</id> <id>github</id>
<properties> <properties>
<package.environment>dev</package.environment> <package.environment>github</package.environment>
</properties> </properties>
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
...@@ -598,7 +598,7 @@ ...@@ -598,7 +598,7 @@
<!-- for ctrip development --> <!-- for ctrip development -->
<id>ctrip-dev</id> <id>ctrip-dev</id>
<properties> <properties>
<package.environment>dev</package.environment> <package.environment>ctrip</package.environment>
</properties> </properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
...@@ -703,6 +703,9 @@ ...@@ -703,6 +703,9 @@
<profile> <profile>
<!-- for ctrip production --> <!-- for ctrip production -->
<id>ctrip</id> <id>ctrip</id>
<properties>
<package.environment>ctrip</package.environment>
</properties>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
......
...@@ -24,13 +24,13 @@ cd .. ...@@ -24,13 +24,13 @@ cd ..
# package config-service and admin-service # package config-service and admin-service
echo "==== starting to build 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 "==== building config-service and admin-service finished ===="
echo "==== starting to build portal ====" 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 ====" echo "==== building portal finished ===="
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment