Merge branch 'master' into 2.0.x

circle.yml

@@ -0,0 +1,20 @@
+general:
+  branches:
+    ignore:
+      - gh-pages # list of branches to ignore
+machine:
+  java:
+    version: openjdk8 #Open JDK has the JCE extentions installed by default
+  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 install 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/ghpages.sh

@@ -59,6 +59,7 @@ function retrieve_current_branch() {
     fi
     echo "Current branch is [${CURRENT_BRANCH}]"
     git checkout ${CURRENT_BRANCH} || echo "Failed to check the branch... continuing with the script"
+    PREVIOUS_BRANCH=${CURRENT_BRANCH}
 }
 
 # Switches to the provided value of the release version. We always prefix it with `v`
@@ -248,7 +249,7 @@ function commit_changes_if_applicable() {
 function checkout_previous_branch() {
     # If -version was provided we need to come back to root project
     cd ${ROOT_FOLDER}
-    git checkout ${CURRENT_BRANCH} || echo "Failed to check the branch... continuing with the script"
+    git checkout ${PREVIOUS_BRANCH} || echo "Failed to check the branch... continuing with the script"
     if [ "$dirty" != "0" ]; then git stash pop; fi
     exit 0
 }
@@ -344,11 +345,11 @@ done
 assert_properties
 set_default_props
 check_if_anything_to_sync
+retrieve_current_branch
 if echo $VERSION | egrep -q 'SNAPSHOT' || [[ -z "${VERSION}" ]]; then
     CLONE=""
     VERSION=""
     echo "You've provided a version variable but it's a snapshot one. Due to this will not clone spring-cloud-static and publish docs over there"
-    retrieve_current_branch
 else
     switch_to_tag
 fi