diff --git a/apollo-client/pom.xml b/apollo-client/pom.xml
index f2d9a3b0fa6..456d8893dd7 100644
--- a/apollo-client/pom.xml
+++ b/apollo-client/pom.xml
@@ -38,9 +38,10 @@
jetty-server
test
+
- commons-logging
- commons-logging
+ org.slf4j
+ jcl-over-slf4j
test
diff --git a/apollo-common/pom.xml b/apollo-common/pom.xml
index 6591aa52aee..98fb7e82b6f 100644
--- a/apollo-common/pom.xml
+++ b/apollo-common/pom.xml
@@ -1,62 +1,75 @@
-
- com.ctrip.framework.apollo
- apollo
- 0.4.0
- ../pom.xml
-
- 4.0.0
- apollo-common
- Apollo Common
-
- ${project.artifactId}
-
-
-
- com.ctrip.framework.apollo
- apollo-core
-
-
- org.springframework.boot
- spring-boot-starter-web
-
-
- org.springframework.boot
- spring-boot-starter-actuator
-
-
- org.springframework.boot
- spring-boot-starter-security
-
-
- org.springframework.cloud
- spring-cloud-starter-spectator
-
-
- org.springframework.boot
- spring-boot-starter-data-jpa
-
-
- mysql
- mysql-connector-java
-
-
- org.springframework.data
- spring-data-commons
-
-
- org.apache.httpcomponents
- httpclient
-
-
- ch.qos.logback
- logback-classic
-
-
- commons-lang
- commons-lang
-
-
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ com.ctrip.framework.apollo
+ apollo
+ 0.4.0
+ ../pom.xml
+
+ 4.0.0
+ apollo-common
+ Apollo Common
+
+ ${project.artifactId}
+
+
+
+ com.ctrip.framework.apollo
+ apollo-core
+
+
+ org.springframework.boot
+ spring-boot-starter-actuator
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+ org.springframework.boot
+ spring-boot-starter-security
+
+
+ org.springframework.cloud
+ spring-cloud-starter-spectator
+
+
+
+ org.springframework.security
+ spring-security-crypto
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-data-jpa
+
+
+ mysql
+ mysql-connector-java
+
+
+ org.springframework.data
+ spring-data-commons
+
+
+ org.apache.httpcomponents
+ httpclient
+
+
+ commons-logging
+ commons-logging
+
+
+
+
+ ch.qos.logback
+ logback-classic
+
+
+ commons-lang
+ commons-lang
+
+
diff --git a/apollo-configservice/pom.xml b/apollo-configservice/pom.xml
index ab43fed2471..013c3ddc342 100644
--- a/apollo-configservice/pom.xml
+++ b/apollo-configservice/pom.xml
@@ -59,6 +59,11 @@
aws-java-sdk-route53
com.amazonaws
+
+
+ org.springframework.security
+ spring-security-crypto
+
diff --git a/apollo-demo/pom.xml b/apollo-demo/pom.xml
index d73ff0d0a11..343f587db04 100644
--- a/apollo-demo/pom.xml
+++ b/apollo-demo/pom.xml
@@ -31,9 +31,10 @@
org.apache.logging.log4j
log4j-slf4j-impl
+
- commons-logging
- commons-logging
+ org.slf4j
+ jcl-over-slf4j
diff --git a/apollo-portal/pom.xml b/apollo-portal/pom.xml
index 3631c8bbda2..02d9d6e58c8 100644
--- a/apollo-portal/pom.xml
+++ b/apollo-portal/pom.xml
@@ -56,9 +56,6 @@
ctrip
-
- ctrip
-
com.ctrip.framework.apollo-sso
diff --git a/framework-parent/pom.xml b/framework-parent/pom.xml
deleted file mode 100644
index 8ad7ca9685b..00000000000
--- a/framework-parent/pom.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-
-
- 4.0.0
- com.ctrip.framework
- framework-parent
- 1.0
- pom
- Ctrip Framework Parent
- Ctrip Framework Parent
-
- Ctrip, Inc.
- http://www.ctrip.com
-
-
- 1.7
- UTF-8
-
- 4.12
- 19.0
- 1.7.19
- 4.5.2
- 4.4.4
- 1.2.8
- 4.0.34.Final
- 1.10
-
-
-
-
- junit
- junit
- ${junit.version}
-
-
- com.google.guava
- guava
- ${guava.version}
-
-
- org.slf4j
- slf4j-api
- ${slf4j-api.version}
-
-
- org.apache.httpcomponents
- httpclient
- ${httpclient.version}
-
-
- org.apache.httpcomponents
- httpcore
- ${httpcore.version}
-
-
- com.alibaba
- fastjson
- ${fastjson.version}
-
-
- io.netty
- netty-all
- ${netty-all.version}
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-surefire-plugin
- 2.19.1
-
-
- **/AllTests.java
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-enforcer-plugin
- 1.4.1
-
-
- enforce-maven3
-
- enforce
-
-
-
-
- [3.2.5,)
- ** projects must use Maven 3.2.5 or later version.
-
-
-
-
-
- enforce-java7
-
- enforce
-
-
-
-
- [1.7.0,)
- ** Projects must use Java 7 or later version
-
-
-
-
-
- enforce-src-main-java
-
- enforce
-
-
- true
-
-
-
- src/java
- src/java.test
- src/conf
- src/conf.test
-
- ** projects must use standard Maven directory layout
- (src/main/java etc.)
-
-
-
-
-
- enforce-banned-dependencies
-
- enforce
-
-
- true
-
-
-
- javax.servlet:servlet-api
- org.mortbay.jetty:servlet-api-2.5
-
- ** prefer javax.servlet:javax.servlet-api
-
-
-
-
-
-
-
- org.apache.maven.plugins
- maven-compiler-plugin
- 3.5.1
-
-
- ${java.version}
- ${project.build.sourceEncoding}
-
-
-
- org.apache.maven.plugins
- maven-source-plugin
- 3.0.0
-
-
- attach-sources
-
- jar-no-fork
-
-
-
-
-
- pl.project13.maven
- git-commit-id-plugin
- 2.2.0
-
-
-
- revision
-
-
-
-
- true
- yyyy-MM-dd'T'HH:mm:ssZ
- true
- false
-
-
-
-
-
-
- releases
- ${releases.repo}
-
-
- snapshots
- ${snapshots.repo}
-
-
-
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index ad37ed4fad1..e7c98fd0cb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,6 +2,12 @@
4.0.0
+
+ com.ctrip.framework
+ framework-parent
+ 1.3.0
+
+
com.ctrip.framework.apollo
apollo
0.4.0
@@ -10,13 +16,6 @@
Ctrip Configuration Center
https://ctripcorp.github.io/apollo
-
- com.ctrip.framework
- framework-parent
- 1.0
- framework-parent
-
-
Ctrip, Inc.
http://www.ctrip.com
@@ -81,6 +80,8 @@
UTF-8
1.8
+ 1.3.8.RELEASE
+ 1.2.3.RELEASE
github
${env.GITHUB_OAUTH_TOKEN}
@@ -138,17 +139,12 @@
com.ctrip.framework
framework-foundation
- 1.4.0
+ 1.5.0
com.dianping.cat
cat-client
- 2.2.1
-
-
- org.unidal.framework
- foundation-service
- 2.5.0
+ 2.2.3
com.ctrip.platform
@@ -163,6 +159,25 @@
logback-classic
ch.qos.logback
+
+ commons-logging
+ commons-logging
+
+
+
+ xmlpull
+ xmlpull
+
+
+
+ org.bouncycastle
+ bcprov-jdk16
+
+
+
+ javax.persistence
+ persistence-api
+
@@ -178,17 +193,53 @@
logback-classic
ch.qos.logback
+
+ commons-logging
+ commons-logging
+
+
+ com.ctrip.credis
+ credis
+ 2.4.11
+
+
+ com.ctrip.framework
+ vi
+ 0.9.1
+
com.ctrip.framework.apollo-sso
apollo-sso-ctrip
1.1.0
+
+
+
+ asm
+ asm
+
+
com.ctrip.framework.apollo-ctrip-service
apollo-email-service
1.0.0
+
+
+ javax.servlet
+ javax.servlet-api
+
+
+ commons-logging
+ commons-logging
+
+
+
+ commons-beanutils
+ commons-beanutils-core
+
+
@@ -196,16 +247,6 @@
mysql-connector-java
5.1.39
-
- com.google.guava
- guava
- 19.0
-
-
- ch.qos.logback
- logback-classic
- 1.1.7
-
com.h2database
@@ -227,6 +268,19 @@
pom
import
+
+
+
+ com.ctrip.3rdparty.tomcat.embed
+ tomcat-embed-core
+ 8.0.37
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-logging-juli
+
+
+
@@ -253,14 +307,6 @@
-
- org.apache.maven.plugins
- maven-war-plugin
- 2.6
-
- false
-
-
org.apache.maven.plugins
maven-checkstyle-plugin
@@ -317,17 +363,7 @@
versions-maven-plugin
2.2
-
- org.apache.maven.plugins
- maven-jar-plugin
- 2.6
-
-
- org.apache.maven.plugins
- maven-deploy-plugin
- 2.8.2
-
@@ -355,6 +391,24 @@
+
+ pl.project13.maven
+ git-commit-id-plugin
+ 2.2.0
+
+
+
+ revision
+
+
+
+
+ true
+ yyyy-MM-dd'T'HH:mm:ssZ
+ true
+ false
+
+
@@ -428,6 +482,12 @@
+
+
+ internal.repo
+ https://raw.github.com/ctripcorp/apollo/mvn-repo/
+
+
dev
@@ -437,48 +497,204 @@
true
+
+
+ internal.repo
+ https://raw.github.com/ctripcorp/apollo/mvn-repo/
+
+
ctrip-dev
dev
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+ ${spring-boot.version}
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-logging-juli
+
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-core
+
+
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-eureka
+ ${spring-cloud.version}
+
+
+
+ stax
+ stax-api
+
+
+ javax.xml.stream
+ stax-api
+
+
+
+ org.springframework.security
+ spring-security-crypto
+
+
+
+ xmlpull
+ xmlpull
+
+
+
+ io.netty
+ netty-codec-http
+
+
+ io.netty
+ netty-buffer
+
+
+ io.netty
+ netty-common
+
+
+ io.netty
+ netty-transport-native-epoll
+
+
+ io.netty
+ netty-transport
+
+
+
+ commons-beanutils
+ commons-beanutils-core
+
+
+
+
+
+
com.dianping.cat
cat-client
+
+ com.ctrip.3rdparty.tomcat.embed
+ tomcat-embed-core
+
+
+ com.ctrip.framework.clogging
+ clogging-agent
+
ctrip
-
- ctrip
-
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+ ${spring-boot.version}
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-logging-juli
+
+
+
+ org.apache.tomcat.embed
+ tomcat-embed-core
+
+
+
+
+
+ org.springframework.cloud
+ spring-cloud-starter-eureka
+ ${spring-cloud.version}
+
+
+
+ stax
+ stax-api
+
+
+ javax.xml.stream
+ stax-api
+
+
+
+ org.springframework.security
+ spring-security-crypto
+
+
+
+ xmlpull
+ xmlpull
+
+
+
+ io.netty
+ netty-codec-http
+
+
+ io.netty
+ netty-buffer
+
+
+ io.netty
+ netty-common
+
+
+ io.netty
+ netty-transport-native-epoll
+
+
+ io.netty
+ netty-transport
+
+
+
+ commons-beanutils
+ commons-beanutils-core
+
+
+
+
+
+
- com.ctrip.platform
- ctrip-dal-client
+ com.dianping.cat
+ cat-client
+
+
+ com.ctrip.3rdparty.tomcat.embed
+ tomcat-embed-core
com.ctrip.framework.clogging
clogging-agent
- com.dianping.cat
- cat-client
+ com.ctrip.platform
+ ctrip-dal-client
-
-
- internal.repo
- https://raw.github.com/ctripcorp/apollo/mvn-repo/
-
-
-