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 55e3ac36147d894f85d51e2ab4f2639355b2598e..ae4aa792cb29257c699fa8535da0fe7c998d0354 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"> 4.0.0 com.ctrip.framework - framework-bom-parent + framework-parent 0.0.1-SNAPSHOT pom Ctrip Framework Parent @@ -16,22 +16,14 @@ 1.7 UTF-8 UTF-8 - ${java.version} - ${java.version} - - - public - Public repositories - http://maven.dev.sh.ctripcorp.com:8081/nexus/content/groups/public - - org.apache.maven.plugins maven-surefire-plugin + 2.19.1 **/*Tests.java @@ -58,8 +50,8 @@ - [3.2.5,) - ** projects must use Maven 3.2.5 or later version. + [3.3.9,) + ** projects must use Maven 3.3.9 or later version. @@ -164,12 +156,12 @@ - releases - http://maven.dev.sh.ctripcorp.com:8081/nexus/content/repositories/fxrelease + ctrip_fx_release + ${ctrip.fx.release.repo} - snapshots - http://maven.dev.sh.ctripcorp.com:8081/nexus/content/repositories/fxsnapshot + ctrip_fx_snapshot + ${ctrip.fx.snapshot.repo} \ No newline at end of file diff --git a/pom.xml b/pom.xml index f12a75d731567d88ed52b1eb8fd1ab318d22564c..860157f4a26dfc22bbee76bfbd401976f123b966 100644 --- a/pom.xml +++ b/pom.xml @@ -11,9 +11,9 @@ https://github.com/ctripcorp/apollo com.ctrip.framework - framework-bom-parent + framework-parent 0.0.1-SNAPSHOT - framework-bom-parent + framework-parent Ctrip, Inc. @@ -61,7 +61,6 @@ - utf-8 1.8