From f4991ecd58a725429e7d3d1aa0e0bf3e8262fb02 Mon Sep 17 00:00:00 2001
From: Yiming Liu <liuyiming.vip@gmail.com>
Date: Mon, 14 Mar 2016 13:32:15 +0800
Subject: [PATCH] set repo by properties

---
 .../pom.xml                                   | 24 +++++++------------
 pom.xml                                       |  5 ++--
 2 files changed, 10 insertions(+), 19 deletions(-)
 rename {framework-bom-parent => framework-parent}/pom.xml (86%)

diff --git a/framework-bom-parent/pom.xml b/framework-parent/pom.xml
similarity index 86%
rename from framework-bom-parent/pom.xml
rename to framework-parent/pom.xml
index 55e3ac361..ae4aa792c 100644
--- a/framework-bom-parent/pom.xml
+++ b/framework-parent/pom.xml
@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.ctrip.framework</groupId>
-	<artifactId>framework-bom-parent</artifactId>
+	<artifactId>framework-parent</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Ctrip Framework Parent</name>
@@ -16,22 +16,14 @@
 		<java.version>1.7</java.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<maven.compiler.source>${java.version}</maven.compiler.source>
-		<maven.compiler.target>${java.version}</maven.compiler.target>
 	</properties>
-	<repositories>
-		<repository>
-			<id>public</id>
-			<name>Public repositories</name>
-			<url>http://maven.dev.sh.ctripcorp.com:8081/nexus/content/groups/public</url>
-		</repository>
-	</repositories>
 	<build>
 		<pluginManagement>
 			<plugins>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
+					<version>2.19.1</version>
 					<configuration>
 						<includes>
 							<include>**/*Tests.java</include>
@@ -58,8 +50,8 @@
 						<configuration>
 							<rules>
 								<requireMavenVersion>
-									<version>[3.2.5,)</version>
-									<message>** projects must use Maven 3.2.5 or later version.</message>
+									<version>[3.3.9,)</version>
+									<message>** projects must use Maven 3.3.9 or later version.</message>
 								</requireMavenVersion>
 							</rules>
 						</configuration>
@@ -164,12 +156,12 @@
 	</build>
 	<distributionManagement>
 		<repository>
-			<id>releases</id>
-			<url>http://maven.dev.sh.ctripcorp.com:8081/nexus/content/repositories/fxrelease</url>
+			<id>ctrip_fx_release</id>
+			<url>${ctrip.fx.release.repo}</url>
 		</repository>
 		<snapshotRepository>
-			<id>snapshots</id>
-			<url>http://maven.dev.sh.ctripcorp.com:8081/nexus/content/repositories/fxsnapshot</url>
+			<id>ctrip_fx_snapshot</id>
+			<url>${ctrip.fx.snapshot.repo}</url>
 		</snapshotRepository>
 	</distributionManagement>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f12a75d73..860157f4a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,9 +11,9 @@
 	<url>https://github.com/ctripcorp/apollo</url>
 	<parent>
 		<groupId>com.ctrip.framework</groupId>
-		<artifactId>framework-bom-parent</artifactId>
+		<artifactId>framework-parent</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>framework-bom-parent</relativePath>
+		<relativePath>framework-parent</relativePath>
 	</parent>
 	<organization>
 		<name>Ctrip, Inc.</name>
@@ -61,7 +61,6 @@
 		</developer>
 	</developers>
 	<properties>
-		<project.build.sourceEncoding>utf-8</project.build.sourceEncoding>
 		<java.version>1.8</java.version>
 	</properties>
 	<modules>
-- 
GitLab