From b5b3a21a88652a600383b2893a114818888e72fd Mon Sep 17 00:00:00 2001 From: Spencer Gibb Date: Mon, 1 Jun 2015 11:40:17 -0600 Subject: [PATCH] updated readme and .travis --- .travis.yml | 5 ++--- README.adoc | 9 ++++++--- docs/src/main/asciidoc/README.adoc | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 485ed36e8..4f59c44c7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,12 +9,11 @@ install: - mvn --settings .settings.xml install -P docs -q -U -DskipTests=true -Dmaven.test.redirectTestOutputToFile=true - ./docs/src/main/asciidoc/ghpages.sh script: -#TODO: change install to deploy -- '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || mvn --settings .settings.xml install -nsu -Dmaven.test.redirectTestOutputToFile=true' +- '[ "${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' env: global: - GIT_NAME="Spencer Gibb" - GIT_EMAIL=sgibb@pivotal.io - CI_DEPLOY_USERNAME=sgibb - - secure: GvDCjRQD5OWk4vUkNZBpSuKqkiO6hqia0DQrig9TICcf/iFL2TQnflpjPHejslqc0pB+38uqgSXESmjuFLxVXnFdMriehYi+ORG/O1JXzT6p41NMDwuO6fWzMYEbwbHw6j2JhVKcALnE4nJBN6mflTjuNA12aX8mqziwIpfoewM= + - secure: dxec/7oFht2WMaw4GNFNvuWHlnkm1wmFagE3ZrtCcU2SHUW/P2FgG5tiNW9hT2eXHf2H0YUF1ROkL4BrH5qpIlOBtYd0J8Q/67vBqyB112IN2FqoB/F6Erkfp1FKMBBrXXYaGoSvqzmJs6zqS3JRpyr010W2aU8klK0QfqRoJ0g= diff --git a/README.adoc b/README.adoc index e2b143c57..a69bd793b 100644 --- a/README.adoc +++ b/README.adoc @@ -1,6 +1,6 @@ // Do not edit this file (e.g. go instead to src/main/asciidoc) -image::https://travis-ci.org/spring-cloud/spring-cloud-sleuth.svg?branch=master[Build Status, link=https://travis-ci.org/spring-cloud/spring-cloud-sleuth] +image::https://travis-ci.org/spring-cloud-incubator/spring-cloud-sleuth.svg?branch=master[Build Status, link=https://travis-ci.org/spring-cloud-incubator/spring-cloud-sleuth] TODO: intro Spring Cloud Sleuth @@ -25,10 +25,12 @@ TODO: intro Spring Cloud Sleuth == Building +:jdkversion: 1.7 + === Basic Compile and Test To build the source you will need to install -http://maven.apache.org/run-maven/index.html[Apache Maven] v3.0.6 or above and JDK 1.7. +http://maven.apache.org/run-maven/index.html[Apache Maven] v3.0.6 or above and JDK {jdkversion}. Spring Cloud uses Maven for most build-related activities, and you should be able to get off the ground quite quickly by cloning the @@ -155,6 +157,7 @@ The method getLocation() is undefined for the type ProxyRouteLocator.ProxyRouteS ==== Importing into other IDEs Maven is well supported by most Java IDEs. Refer to you vendor documentation. + == Contributing Spring Cloud is released under the non-restrictive Apache 2.0 license. If you would like @@ -193,4 +196,4 @@ added after the original pull request but before a merge. other target branch in the main project). * When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions], if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit - message (where XXXX is the issue number). + message (where XXXX is the issue number). \ No newline at end of file diff --git a/docs/src/main/asciidoc/README.adoc b/docs/src/main/asciidoc/README.adoc index 2ca746e16..39895eaf4 100644 --- a/docs/src/main/asciidoc/README.adoc +++ b/docs/src/main/asciidoc/README.adoc @@ -1,4 +1,4 @@ -image::https://travis-ci.org/spring-cloud/spring-cloud-sleuth.svg?branch=master[Build Status, link=https://travis-ci.org/spring-cloud/spring-cloud-sleuth] +image::https://travis-ci.org/spring-cloud-incubator/spring-cloud-sleuth.svg?branch=master[Build Status, link=https://travis-ci.org/spring-cloud-incubator/spring-cloud-sleuth] include::intro.adoc[]