Skip to content

A
apollo
Commit a15b7eb7 by Jason Song
Options

update framework parent

parent 57c0e019
Showing with 355 additions and 333 deletions
apollo-client/pom.xml
...@@ -38,9 +38,10 @@ ...@@ -38,9 +38,10 @@
<artifactId>jetty-server</artifactId> <artifactId>jetty-server</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<!-- take over jcl -->
<dependency> <dependency>
<groupId>commons-logging</groupId> <groupId>org.slf4j</groupId>
<artifactId>commons-logging</artifactId> <artifactId>jcl-over-slf4j</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
......
apollo-common/pom.xml
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent> <parent>
<groupId>com.ctrip.framework.apollo</groupId> <groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId> <artifactId>apollo</artifactId>
<version>0.4.0</version> <version>0.4.0</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>apollo-common</artifactId> <artifactId>apollo-common</artifactId>
<name>Apollo Common</name> <name>Apollo Common</name>
<properties> <properties>
<github.path>${project.artifactId}</github.path> <github.path>${project.artifactId}</github.path>
</properties> </properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.ctrip.framework.apollo</groupId> <groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo-core</artifactId> <artifactId>apollo-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-actuator</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId> <artifactId>spring-boot-starter-web</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId> <artifactId>spring-boot-starter-security</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.cloud</groupId> <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-spectator</artifactId> <artifactId>spring-cloud-starter-spectator</artifactId>
</dependency> <!-- duplicated with spring-security-core -->
<dependency> <exclusions>
<groupId>org.springframework.boot</groupId> <exclusion>
<artifactId>spring-boot-starter-data-jpa</artifactId> <groupId>org.springframework.security</groupId>
</dependency> <artifactId>spring-security-crypto</artifactId>
<dependency> </exclusion>
<groupId>mysql</groupId> </exclusions>
<artifactId>mysql-connector-java</artifactId> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.springframework.boot</groupId>
<groupId>org.springframework.data</groupId> <artifactId>spring-boot-starter-data-jpa</artifactId>
<artifactId>spring-data-commons</artifactId> </dependency>
</dependency> <dependency>
<dependency> <groupId>mysql</groupId>
<groupId>org.apache.httpcomponents</groupId> <artifactId>mysql-connector-java</artifactId>
<artifactId>httpclient</artifactId> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.springframework.data</groupId>
<groupId>ch.qos.logback</groupId> <artifactId>spring-data-commons</artifactId>
<artifactId>logback-classic</artifactId> </dependency>
</dependency> <dependency>
<dependency> <groupId>org.apache.httpcomponents</groupId>
<groupId>commons-lang</groupId> <artifactId>httpclient</artifactId>
<artifactId>commons-lang</artifactId> <exclusions>
</dependency> <exclusion>
</dependencies> <groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
</dependencies>
</project> </project>
apollo-configservice/pom.xml
...@@ -59,6 +59,11 @@ ...@@ -59,6 +59,11 @@
<artifactId>aws-java-sdk-route53</artifactId> <artifactId>aws-java-sdk-route53</artifactId>
<groupId>com.amazonaws</groupId> <groupId>com.amazonaws</groupId>
</exclusion> </exclusion>
<!-- duplicated with spring-security-core -->
<exclusion>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<!-- end of eureka --> <!-- end of eureka -->
......
apollo-demo/pom.xml
...@@ -31,9 +31,10 @@ ...@@ -31,9 +31,10 @@
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId> <artifactId>log4j-slf4j-impl</artifactId>
</dependency> </dependency>
<!-- take over jcl -->
<dependency> <dependency>
<groupId>commons-logging</groupId> <groupId>org.slf4j</groupId>
<artifactId>commons-logging</artifactId> <artifactId>jcl-over-slf4j</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
......
apollo-portal/pom.xml
...@@ -56,9 +56,6 @@ ...@@ -56,9 +56,6 @@
<profiles> <profiles>
<profile> <profile>
<id>ctrip</id> <id>ctrip</id>
<properties>
<package.environment>ctrip</package.environment>
</properties>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.ctrip.framework.apollo-sso</groupId> <groupId>com.ctrip.framework.apollo-sso</groupId>
......
framework-parent/pom.xml deleted 100644 → 0
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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-parent</artifactId>
<version>1.0</version>
<packaging>pom</packaging>
<name>Ctrip Framework Parent</name>
<description>Ctrip Framework Parent</description>
<organization>
<name>Ctrip, Inc.</name>
<url>http://www.ctrip.com</url>
</organization>
<properties>
<java.version>1.7</java.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit.version>4.12</junit.version>
<guava.version>19.0</guava.version>
<slf4j-api.version>1.7.19</slf4j-api.version>
<httpclient.version>4.5.2</httpclient.version>
<httpcore.version>4.4.4</httpcore.version>
<fastjson.version>1.2.8</fastjson.version>
<netty-all.version>4.0.34.Final</netty-all.version>
<commons-codec.version>1.10</commons-codec.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j-api.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
<version>${httpcore.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>${fastjson.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>${netty-all.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<build>
<pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.19.1</version>
<configuration>
<includes>
<include>**/AllTests.java</include>
</includes>
</configuration>
</plugin>
</plugins>
</pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>1.4.1</version>
<executions>
<execution>
<id>enforce-maven3</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireMavenVersion>
<version>[3.2.5,)</version>
<message>** projects must use Maven 3.2.5 or later version.</message>
</requireMavenVersion>
</rules>
</configuration>
</execution>
<execution>
<id>enforce-java7</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireJavaVersion>
<version>[1.7.0,)</version>
<message>** Projects must use Java 7 or later version</message>
</requireJavaVersion>
</rules>
</configuration>
</execution>
<execution>
<id>enforce-src-main-java</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<fail>true</fail>
<rules>
<requireFilesDontExist>
<files>
<file>src/java</file>
<file>src/java.test</file>
<file>src/conf</file>
<file>src/conf.test</file>
</files>
<message>** projects must use standard Maven directory layout
(src/main/java etc.)</message>
</requireFilesDontExist>
</rules>
</configuration>
</execution>
<execution>
<id>enforce-banned-dependencies</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<fail>true</fail>
<rules>
<bannedDependencies>
<excludes>
<exclude>javax.servlet:servlet-api</exclude>
<exclude>org.mortbay.jetty:servlet-api-2.5</exclude>
</excludes>
<message>** prefer javax.servlet:javax.servlet-api</message>
</bannedDependencies>
</rules>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.5.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>attach-sources</id>
<goals>
<goal>jar-no-fork</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>2.2.0</version>
<executions>
<execution>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
<configuration>
<verbose>true</verbose>
<dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<failOnNoGitDirectory>false</failOnNoGitDirectory>
</configuration>
</plugin>
</plugins>
</build>
<distributionManagement>
<repository>
<id>releases</id>
<url>${releases.repo}</url>
</repository>
<snapshotRepository>
<id>snapshots</id>
<url>${snapshots.repo}</url>
</snapshotRepository>
</distributionManagement>
</project>
\ No newline at end of file
pom.xml
...@@ -2,6 +2,12 @@ ...@@ -2,6 +2,12 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.ctrip.framework</groupId>
<artifactId>framework-parent</artifactId>
<version>1.3.0</version>
</parent>
<groupId>com.ctrip.framework.apollo</groupId> <groupId>com.ctrip.framework.apollo</groupId>
<artifactId>apollo</artifactId> <artifactId>apollo</artifactId>
<version>0.4.0</version> <version>0.4.0</version>
...@@ -10,13 +16,6 @@ ...@@ -10,13 +16,6 @@
<description>Ctrip Configuration Center</description> <description>Ctrip Configuration Center</description>
<url>https://ctripcorp.github.io/apollo</url> <url>https://ctripcorp.github.io/apollo</url>
<parent>
<groupId>com.ctrip.framework</groupId>
<artifactId>framework-parent</artifactId>
<version>1.0</version>
<relativePath>framework-parent</relativePath>
</parent>
<organization> <organization>
<name>Ctrip, Inc.</name> <name>Ctrip, Inc.</name>
<url>http://www.ctrip.com</url> <url>http://www.ctrip.com</url>
...@@ -81,6 +80,8 @@ ...@@ -81,6 +80,8 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version> <java.version>1.8</java.version>
<spring-boot.version>1.3.8.RELEASE</spring-boot.version>
<spring-cloud.version>1.2.3.RELEASE</spring-cloud.version>
<github.global.server>github</github.global.server> <github.global.server>github</github.global.server>
<github.global.oauth2Token>${env.GITHUB_OAUTH_TOKEN}</github.global.oauth2Token> <github.global.oauth2Token>${env.GITHUB_OAUTH_TOKEN}</github.global.oauth2Token>
</properties> </properties>
...@@ -138,17 +139,12 @@ ...@@ -138,17 +139,12 @@
<dependency> <dependency>
<groupId>com.ctrip.framework</groupId> <groupId>com.ctrip.framework</groupId>
<artifactId>framework-foundation</artifactId> <artifactId>framework-foundation</artifactId>
<version>1.4.0</version> <version>1.5.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.dianping.cat</groupId> <groupId>com.dianping.cat</groupId>
<artifactId>cat-client</artifactId> <artifactId>cat-client</artifactId>
<version>2.2.1</version> <version>2.2.3</version>
</dependency>
<dependency>
<groupId>org.unidal.framework</groupId>
<artifactId>foundation-service</artifactId>
<version>2.5.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.ctrip.platform</groupId> <groupId>com.ctrip.platform</groupId>
...@@ -163,6 +159,25 @@ ...@@ -163,6 +159,25 @@
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
</exclusion> </exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<!-- duplicated with xpp3:xpp3_min -->
<exclusion>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
</exclusion>
<!-- duplicated with bcpkix-jdk15on -->
<exclusion>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk16</artifactId>
</exclusion>
<!-- duplicated with hibernate-jpa-2.1-api -->
<exclusion>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
...@@ -178,17 +193,53 @@ ...@@ -178,17 +193,53 @@
<artifactId>logback-classic</artifactId> <artifactId>logback-classic</artifactId>
<groupId>ch.qos.logback</groupId> <groupId>ch.qos.logback</groupId>
</exclusion> </exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.ctrip.credis</groupId>
<artifactId>credis</artifactId>
<version>2.4.11</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework</groupId>
<artifactId>vi</artifactId>
<version>0.9.1</version>
</dependency>
<dependency>
<groupId>com.ctrip.framework.apollo-sso</groupId> <groupId>com.ctrip.framework.apollo-sso</groupId>
<artifactId>apollo-sso-ctrip</artifactId> <artifactId>apollo-sso-ctrip</artifactId>
<version>1.1.0</version> <version>1.1.0</version>
<exclusions>
<!-- partially duplicated with org.ow2.asm:asm -->
<exclusion>
<groupId>asm</groupId>
<artifactId>asm</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.ctrip.framework.apollo-ctrip-service</groupId> <groupId>com.ctrip.framework.apollo-ctrip-service</groupId>
<artifactId>apollo-email-service</artifactId> <artifactId>apollo-email-service</artifactId>
<version>1.0.0</version> <version>1.0.0</version>
<exclusions>
<exclusion>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
</exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</exclusion>
<!-- duplicated with commons-collections and commons-beanutils -->
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<!--third party --> <!--third party -->
<dependency> <dependency>
...@@ -196,16 +247,6 @@ ...@@ -196,16 +247,6 @@
<artifactId>mysql-connector-java</artifactId> <artifactId>mysql-connector-java</artifactId>
<version>5.1.39</version> <version>5.1.39</version>
</dependency> </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>19.0</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.1.7</version>
</dependency>
<!--for test --> <!--for test -->
<dependency> <dependency>
<groupId>com.h2database</groupId> <groupId>com.h2database</groupId>
...@@ -227,6 +268,19 @@ ...@@ -227,6 +268,19 @@
<type>pom</type> <type>pom</type>
<scope>import</scope> <scope>import</scope>
</dependency> </dependency>
<!-- ctrip modified -->
<!-- removed duplicated javax/persistence classes -->
<dependency>
<groupId>com.ctrip.3rdparty.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
<version>8.0.37</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies> </dependencies>
</dependencyManagement> </dependencyManagement>
...@@ -255,14 +309,6 @@ ...@@ -255,14 +309,6 @@
</plugin> </plugin>
<plugin> <plugin>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId> <artifactId>maven-checkstyle-plugin</artifactId>
<version>2.17</version> <version>2.17</version>
<dependencies> <dependencies>
...@@ -317,17 +363,7 @@ ...@@ -317,17 +363,7 @@
<artifactId>versions-maven-plugin</artifactId> <artifactId>versions-maven-plugin</artifactId>
<version>2.2</version> <version>2.2</version>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
</plugin>
<!-- Need to set releases.repo and snapshots.repo properties in your .m2/settings.xml --> <!-- Need to set releases.repo and snapshots.repo properties in your .m2/settings.xml -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.8.2</version>
</plugin>
</plugins> </plugins>
</pluginManagement> </pluginManagement>
<plugins> <plugins>
...@@ -355,6 +391,24 @@ ...@@ -355,6 +391,24 @@
</archive> </archive>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>2.2.0</version>
<executions>
<execution>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
<configuration>
<verbose>true</verbose>
<dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<failOnNoGitDirectory>false</failOnNoGitDirectory>
</configuration>
</plugin>
</plugins> </plugins>
<resources> <resources>
<resource> <resource>
...@@ -428,6 +482,12 @@ ...@@ -428,6 +482,12 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<repositories>
<repository>
<id>internal.repo</id>
<url>https://raw.github.com/ctripcorp/apollo/mvn-repo/</url>
</repository>
</repositories>
</profile> </profile>
<profile> <profile>
<id>dev</id> <id>dev</id>
...@@ -437,48 +497,204 @@ ...@@ -437,48 +497,204 @@
<activation> <activation>
<activeByDefault>true</activeByDefault> <activeByDefault>true</activeByDefault>
</activation> </activation>
<repositories>
<repository>
<id>internal.repo</id>
<url>https://raw.github.com/ctripcorp/apollo/mvn-repo/</url>
</repository>
</repositories>
</profile> </profile>
<profile> <profile>
<id>ctrip-dev</id> <id>ctrip-dev</id>
<properties> <properties>
<package.environment>dev</package.environment> <package.environment>dev</package.environment>
</properties> </properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
</exclusion>
<!-- use ctrip modified version instead -->
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka</artifactId>
<version>${spring-cloud.version}</version>
<exclusions>
<!-- already in java -->
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<!-- duplicated with spring-security-core -->
<exclusion>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
</exclusion>
<!-- duplicated with xpp3:xpp3_min -->
<exclusion>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
</exclusion>
<!-- duplicated with netty-all -->
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
</exclusion>
<!-- duplicated with commons-collections and commons-beanutils -->
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- end of eureka -->
</dependencies>
</dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.dianping.cat</groupId> <groupId>com.dianping.cat</groupId>
<artifactId>cat-client</artifactId> <artifactId>cat-client</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.ctrip.3rdparty.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.framework.clogging</groupId>
<artifactId>clogging-agent</artifactId>
</dependency>
</dependencies> </dependencies>
</profile> </profile>
<profile> <profile>
<id>ctrip</id> <id>ctrip</id>
<properties> <dependencyManagement>
<package.environment>ctrip</package.environment> <dependencies>
</properties> <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>${spring-boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-logging-juli</artifactId>
</exclusion>
<!-- use ctrip modified version instead -->
<exclusion>
<groupId>org.apache.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- eureka -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-eureka</artifactId>
<version>${spring-cloud.version}</version>
<exclusions>
<!-- already in java -->
<exclusion>
<groupId>stax</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<exclusion>
<groupId>javax.xml.stream</groupId>
<artifactId>stax-api</artifactId>
</exclusion>
<!-- duplicated with spring-security-core -->
<exclusion>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-crypto</artifactId>
</exclusion>
<!-- duplicated with xpp3:xpp3_min -->
<exclusion>
<groupId>xmlpull</groupId>
<artifactId>xmlpull</artifactId>
</exclusion>
<!-- duplicated with netty-all -->
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
</exclusion>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
</exclusion>
<!-- duplicated with commons-collections and commons-beanutils -->
<exclusion>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils-core</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- end of eureka -->
</dependencies>
</dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>com.ctrip.platform</groupId> <groupId>com.dianping.cat</groupId>
<artifactId>ctrip-dal-client</artifactId> <artifactId>cat-client</artifactId>
</dependency>
<dependency>
<groupId>com.ctrip.3rdparty.tomcat.embed</groupId>
<artifactId>tomcat-embed-core</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.ctrip.framework.clogging</groupId> <groupId>com.ctrip.framework.clogging</groupId>
<artifactId>clogging-agent</artifactId> <artifactId>clogging-agent</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.dianping.cat</groupId> <groupId>com.ctrip.platform</groupId>
<artifactId>cat-client</artifactId> <artifactId>ctrip-dal-client</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
</profile> </profile>
</profiles> </profiles>
<repositories>
<repository>
<id>internal.repo</id>
<url>https://raw.github.com/ctripcorp/apollo/mvn-repo/</url>
</repository>
</repositories>
<reporting> <reporting>
<plugins> <plugins>
<plugin> <plugin>
......
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