Merge branch 'master' into 2.0.x

.travis.yml

@@ -1,28 +0,0 @@
-sudo: false
-cache:
-  directories:
-    - $HOME/.m2
-language: java
-before_install:
-  - git config user.name "$GIT_NAME"
-  - git config user.email "$GIT_EMAIL"
-  - git config credential.helper "store --file=.git/credentials"
-  - echo "https://$GH_TOKEN:@github.com" > .git/credentials
-  - gem install asciidoctor
-install:
-- ./mvnw install -P docs -q -U -DskipTests=true -Dmaven.test.redirectTestOutputToFile=true
-- '[ "${MVN_GOAL}" == "deploy" ] && ./docs/src/main/asciidoc/ghpages.sh || echo "Not updating docs"'
-script:
-- './mvnw -s .settings.xml $MVN_GOAL $MVN_PROFILE -nsu -Dmaven.test.redirectTestOutputToFile=true'
-env:
-  global:
-  - GIT_NAME="Dave Syer"
-  - GIT_EMAIL=dsyer@pivotal.io
-  - CI_DEPLOY_USERNAME=buildmaster
-  - FEATURE_BRANCH=$(echo ${TRAVIS_BRANCH} | grep -q "^.*/.*$" && echo true || echo false)
-  - SPRING_CLOUD_BUILD=$(echo ${TRAVIS_REPO_SLUG} | grep -q "^spring-cloud/.*$" && echo true || echo false)
-  - MVN_GOAL=$([ "${TRAVIS_PULL_REQUEST}" == "false" -a "${TRAVIS_TAG}" == "" -a "${FEATURE_BRANCH}" == "false" -a "${SPRING_CLOUD_BUILD}" == "true" ] && echo deploy || echo install)
-  - VERSION=$(mvn validate | grep Building | head -1 | sed -e 's/.* //')
-  - MILESTONE=$(echo ${VERSION} | egrep 'M|RC' && echo true || echo false)
-  - MVN_PROFILE=$([ "${MILESTONE}" == "true" ] && echo -P milestone)
-  - secure: ISIGqKfTGO+kOT4ZssyG/MevbTsuKg6BhwxyWshqFshrA7f1uOBjP3tN7P28lazNK7+H0e3JS5uDx+tupZQtkMCV5/mxUGwZa5Vgi8R2Kdtc6/wE0sy01phz8Z05TNlq7ZJ4Ig4Uo5QBPhFrKCdBYKuQvwPqkbFnooCH981w11U=

README.adoc

@@ -2,7 +2,7 @@
 
 = Spring Cloud for Cloudfoundry
 
-image:https://travis-ci.org/spring-cloud/spring-cloud-cloudfoundry.svg?branch=master["Build Status", link="https://travis-ci.org/spring-cloud/spring-cloud-cloudfoundry"]
+image:https://circleci.com/gh/spring-cloud/spring-cloud-cloudfoundry.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-cloudfoundry"]
 
 Spring Cloud for Cloudfoundry makes it easy to run
 https://github.com/spring-cloud[Spring Cloud] apps in

circle.yml

@@ -0,0 +1,20 @@
+general:
+  branches:
+    ignore:
+      - gh-pages # list of branches to ignore
+machine:
+  java:
+    version: oraclejdk8
+  environment:
+    _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
+dependencies:
+  override:
+    - ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true
+test:
+  override:
+    - ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+  post:
+    - find . -type f -regex ".*/spring-cloud-*.*/target/*.*" | cpio -pdm $CIRCLE_ARTIFACTS
+    - mkdir -p $CIRCLE_TEST_REPORTS/junit/
+    - find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
+    - bash <(curl -s https://codecov.io/bash)

docs/src/main/asciidoc/README.adoc

@@ -1,6 +1,6 @@
 = Spring Cloud for Cloudfoundry
 
-image:https://travis-ci.org/spring-cloud/spring-cloud-cloudfoundry.svg?branch=master["Build Status", link="https://travis-ci.org/spring-cloud/spring-cloud-cloudfoundry"]
+image:https://circleci.com/gh/spring-cloud/spring-cloud-cloudfoundry.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-cloudfoundry"]
 
 include::intro.adoc[]
 
@@ -12,4 +12,4 @@ include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/maste
 
 == Contributing
 
-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]