diff --git a/.settings.xml b/.settings.xml index 006f51ef..270181b3 100644 --- a/.settings.xml +++ b/.settings.xml @@ -1,60 +1,60 @@ - - - repo.spring.io - ${env.CI_DEPLOY_USERNAME} - ${env.CI_DEPLOY_PASSWORD} - - - - - spring - true - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/libs-snapshot-local - - true - - - - spring-milestones - Spring Milestones - http://repo.spring.io/libs-milestone-local - - false - - - - spring-releases - Spring Releases - http://repo.spring.io/release - - false - - - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/libs-snapshot-local - - true - - - - spring-milestones - Spring Milestones - http://repo.spring.io/libs-milestone-local - - false - - - - - + + + repo.spring.io + ${env.CI_DEPLOY_USERNAME} + ${env.CI_DEPLOY_PASSWORD} + + + + + spring + true + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/libs-snapshot-local + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/libs-milestone-local + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/libs-snapshot-local + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/libs-milestone-local + + false + + + + + diff --git a/.travis.yml b/.travis.yml index ed819423..942ad6e5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,13 +1,13 @@ 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 +- 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: - mvn --settings .settings.xml install -P docs -q -U -DskipTests=true -Dmaven.test.redirectTestOutputToFile=true -- ./docs/src/main/asciidoc/ghpages.sh +- "./docs/src/main/asciidoc/ghpages.sh" script: - '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || mvn --settings .settings.xml deploy -nsu -Dmaven.test.redirectTestOutputToFile=true' - '[ "${TRAVIS_PULL_REQUEST}" = "false" ] || mvn --settings .settings.xml install -nsu -Dmaven.test.redirectTestOutputToFile=true' @@ -16,4 +16,4 @@ env: - GIT_NAME="Spencer Gibb" - GIT_EMAIL=sgibb@pivotal.io - CI_DEPLOY_USERNAME=sgibb - - secure: MX+bQxI10+lHI1rbX/xPSH+Ybey08YwfUQeiJIc2L7wymY5zFtOB63Hf2Iy9sf4FXmM+nNj/OWtg/ROPZNqjcNHNoqF7L8Kz2g/S2T+bHUI7KvMzcSdqief+Z1ywk8XfcEVAjPjUYS6wo6kPFUQy7SDRPOxFO9II1+zdKv4vI80= + - secure: GvDCjRQD5OWk4vUkNZBpSuKqkiO6hqia0DQrig9TICcf/iFL2TQnflpjPHejslqc0pB+38uqgSXESmjuFLxVXnFdMriehYi+ORG/O1JXzT6p41NMDwuO6fWzMYEbwbHw6j2JhVKcALnE4nJBN6mflTjuNA12aX8mqziwIpfoewM=