Skip to content

A
apollo
Commit 2998db81 by Jason Song
Options

Merge pull request #86 from yiming187/maven_update

Update framework-foundation to 1.1.4
parents e705aacf b8affdc8
Showing with 89 additions and 56 deletions
README.md
# Apollo Apollo
================
[![Build Status](https://travis-ci.org/ctripcorp/apollo.svg?branch=master)](https://travis-ci.org/ctripcorp/apollo) [![Build Status](https://travis-ci.org/ctripcorp/apollo.svg?branch=master)](https://travis-ci.org/ctripcorp/apollo)
[![GitHub release](https://img.shields.io/github/release/ctripcorp/apollo.svg)](https://github.com/ctripcorp/apollo/releases) [![GitHub release](https://img.shields.io/github/release/ctripcorp/apollo.svg)](https://github.com/ctripcorp/apollo/releases)
[![Coverage Status](https://coveralls.io/repos/github/ctripcorp/apollo/badge.svg?branch=master)](https://coveralls.io/github/ctripcorp/apollo?branch=master) [![Coverage Status](https://coveralls.io/repos/github/ctripcorp/apollo/badge.svg?branch=master)](https://coveralls.io/github/ctripcorp/apollo?branch=master)
...@@ -11,3 +13,26 @@ ...@@ -11,3 +13,26 @@
[![codecov.io](https://codecov.io/github/ctripcorp/apollo/coverage.svg?branch=master)](https://codecov.io/github/ctripcorp/apollo?branch=master) [![codecov.io](https://codecov.io/github/ctripcorp/apollo/coverage.svg?branch=master)](https://codecov.io/github/ctripcorp/apollo?branch=master)
[Project Site](http://ctripcorp.github.io/apollo/) [Project Site](http://ctripcorp.github.io/apollo/)
Quickstart
----------
Installation
------------
Deployment
----------
Development
-----------
Contribute
----------
- Source Code: https://github.com/ctripcorp/apollo
- Issue Tracker: https://github.com/ctripcorp/apollo/issues
License
-------
The project is licensed under the Apache 2 license.
\ No newline at end of file
apollo-client/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.apollo</groupId> <groupId>com.ctrip.apollo</groupId>
<artifactId>apollo</artifactId> <artifactId>apollo</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>apollo-client</artifactId> <artifactId>apollo-client</artifactId>
<name>Apollo Client</name> <name>Apollo Client</name>
<properties> <properties>
<java.version>1.7</java.version> <java.version>1.7</java.version>
</properties> </properties>
<dependencies> <dependencies>
<!-- apollo --> <!-- apollo -->
<dependency> <dependency>
<groupId>com.ctrip.apollo</groupId> <groupId>com.ctrip.apollo</groupId>
<artifactId>apollo-core</artifactId> <artifactId>apollo-core</artifactId>
</dependency> </dependency>
<!-- end of apollo --> <!-- end of apollo -->
<dependency> <dependency>
<groupId>com.dianping.cat</groupId> <groupId>com.ctrip.framework</groupId>
<artifactId>cat-client</artifactId> <artifactId>framework-foundation</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>com.dianping.cat</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>cat-client</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId> <artifactId>slf4j-api</artifactId>
<exclusions> </dependency>
<exclusion> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.apache.logging.log4j</groupId>
<artifactId>slf4j-api</artifactId> <artifactId>log4j-slf4j-impl</artifactId>
</exclusion> <exclusions>
<exclusion> <exclusion>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>log4j-api</artifactId> <artifactId>slf4j-api</artifactId>
</exclusion> </exclusion>
</exclusions> <exclusion>
<scope>provided</scope> <groupId>org.apache.logging.log4j</groupId>
</dependency> <artifactId>log4j-api</artifactId>
<dependency> </exclusion>
<groupId>org.apache.logging.log4j</groupId> </exclusions>
<artifactId>log4j-core</artifactId> <scope>provided</scope>
<scope>provided</scope> </dependency>
</dependency> <dependency>
</dependencies> <groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project> </project>
pom.xml
...@@ -109,6 +109,11 @@ ...@@ -109,6 +109,11 @@
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.ctrip.framework</groupId>
<artifactId>framework-foundation</artifactId>
<version>1.1.4</version>
</dependency>
<dependency>
<groupId>com.dianping.cat</groupId> <groupId>com.dianping.cat</groupId>
<artifactId>cat-client</artifactId> <artifactId>cat-client</artifactId>
<version>1.4.6</version> <version>1.4.6</version>
...@@ -272,12 +277,6 @@ ...@@ -272,12 +277,6 @@
</plugin> </plugin>
</plugins> </plugins>
</build> </build>
<repositories>
<repository>
<id>cat.repo</id>
<url>https://raw.github.com/ctripcorp/apollo/mvn-repo/</url>
</repository>
</repositories>
</profile> </profile>
<profile> <profile>
<id>ctrip</id> <id>ctrip</id>
...@@ -314,6 +313,10 @@ ...@@ -314,6 +313,10 @@
<enabled>false</enabled> <enabled>false</enabled>
</snapshots> </snapshots>
</repository> </repository>
<repository>
<id>internal.repo</id>
<url>https://raw.github.com/ctripcorp/apollo/mvn-repo/</url>
</repository>
</repositories> </repositories>
<reporting> <reporting>
......
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