Merge branch 'develop'

elkan1788 · Oct 14, 2015 · dba9bc6 · dba9bc6
2 parents ea79ede + 0670707
commit dba9bc6
Show file tree

Hide file tree

Showing 171 changed files with 9,355 additions and 6,984 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,7 @@
 target/
+.settings/
 *.iml
 *.class
 *.jar
+*.classpath
+*.project
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,16 @@
+sudo: false
+language: java
+script: mvn clean package -Dmaven.test.skip=true
+jdk:
+  - openjdk6
+  - openjdk7
+  - oraclejdk7
+# whitelist
+branches:
+  only:
+    - master
+    - develop
+notifications:
+  email: false
+before_install:
+  - export TZ=Asia/Shanghai