Merge branch 'dev' of github.com:ctripcorp/zeus into dev

This commit is contained in:
xingchaowang 2015-03-12 13:17:36 +08:00
commit 015b53b520
3 changed files with 33 additions and 3 deletions

5
.travis.yml Normal file
View file

@ -0,0 +1,5 @@
language: java
install:
mvn install -Dmaven.test.skip -B -fae
script:
mvn test -B -fae

View file

@ -1,2 +1,2 @@
# zeus
# Zeus [![Build Status](https://travis-ci.org/ctripcorp/zeus.png?branch=dev)](https://travis-ci.org/ctripcorp/zeus)
Soft Load Balancer at ctrip.com

29
pom.xml
View file

@ -261,7 +261,7 @@
<plugin>
<groupId>org.unidal.maven.plugins</groupId>
<artifactId>plexus-maven-plugin</artifactId>
<version>2.1.1</version>
<version>2.1.2</version>
<executions>
<execution>
<id>generate plexus component descriptor</id>
@ -307,7 +307,32 @@
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>central</id>
<url>http://repo1.maven.org/maven2</url>
</repository>
<repository>
<id>frameworks</id>
<url>https://raw.githubusercontent.com/unidal/frameworks/mvn-repo</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>central</id>
<url>http://repo1.maven.org/maven2</url>
</pluginRepository>
<pluginRepository>
<id>maven-plugins</id>
<url>https://raw.githubusercontent.com/unidal/maven-plugins/mvn-repo</url>
<releases>
<checksumPolicy>ignore</checksumPolicy>
</releases>
</pluginRepository>
</pluginRepositories>
<properties>
<jersey.version>2.16</jersey.version>
<spring.version>4.1.5.RELEASE</spring.version>