Merge pull request #115 from spring-operator/polish-urls-xml-1.1.x

URL Cleanup
Merge pull request #122 from spring-operator/polish-urls-remaining-1.1.x
2026-09-17 21:09:00 +00:00 · 2019-03-26 11:59:58 -04:00 · 2019-03-26 11:58:34 -04:00 · 2019-03-26 03:08:49 -05:00 · 2019-03-25 23:49:55 -05:00 · 2019-03-22 10:50:02 +01:00
19 changed files with 99 additions and 916 deletions
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<settings>
-  <servers>
-	<server>
-	  <id>repo.spring.io</id>
-	  <username>${env.CI_DEPLOY_USERNAME}</username>
-	  <password>${env.CI_DEPLOY_PASSWORD}</password>
-	</server>
-  </servers>
-  <profiles>
-	<profile>
-      <!--
-          N.B. this profile is only here to support users and IDEs that do not use Maven 3.3. 
-          It isn't needed on the command line if you use the wrapper script (mvnw) or if you use 
-          a native Maven with the right version. Eclipse users should points their Maven tooling to
-          this settings file, or copy the profile into their ~/.m2/settings.xml.
-      -->
-	  <id>spring</id>
-	  <activation><activeByDefault>true</activeByDefault></activation>
-	  <repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>http://repo.spring.io/libs-snapshot-local</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>http://repo.spring.io/libs-milestone-local</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-		<repository>
-			<id>spring-releases</id>
-			<name>Spring Releases</name>
-			<url>http://repo.spring.io/release</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</repository>
-	  </repositories>
-	  <pluginRepositories>
-		<pluginRepository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>http://repo.spring.io/libs-snapshot-local</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</pluginRepository>
-		<pluginRepository>
-			<id>spring-milestones</id>
-			<name>Spring Milestones</name>
-			<url>http://repo.spring.io/libs-milestone-local</url>
-			<snapshots>
-				<enabled>false</enabled>
-			</snapshots>
-		</pluginRepository>
-	  </pluginRepositories>
-    </profile>
-  </profiles>
-</settings>
@@ -11,7 +11,7 @@ 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'
+- './mvnw $MVN_GOAL $MVN_PROFILE -nsu -Dmaven.test.redirectTestOutputToFile=true'
 env:
  global:
  - GIT_NAME="Dave Syer"
@@ -19,8 +19,9 @@ env:
  - CI_DEPLOY_USERNAME=buildmaster
  - FEATURE_BRANCH=$(echo ${TRAVIS_BRANCH} | grep "^.*/.*$" && 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)
+  #- MVN_GOAL=$([ "${TRAVIS_PULL_REQUEST}" == "false" -a "${TRAVIS_TAG}" == "" -a "${FEATURE_BRANCH}" == "false" -a "${SPRING_CLOUD_BUILD}" == "true" ] && echo deploy || echo install)
+  - MVN_GOAL=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: "KRJQg6soMWudREJ11ocGK8I4OuhIehvy/ehTjBxvyATEwL6rXA9dKPGfb0OAscEgIpNxW1cezH8vUSaSZGFhx6LF5VnJ9Mh39pi9uYm9GMjQ61B4d5GaRjbGj/fXBd8kGubDO8kmjkDGGgkjWXfYZa/WIQ4kVWCIB5dVV9XJ0Lw="
+  - secure: "LJf0hWIf2CT5JGXyokvBLK7YcOR8jA/Ajy9JadW6XSIpcwOFnZ/ssuOV2V3ISdBfufEukfaK19WVO4th/UBvjQd9JhZwMoPpu37ybSjd62hZHuIRZnyVlXxvDM/+OYR2TCR5XXb7G86fXsmmY6u9IOJ8PIVRvskH9LCwSei9vBg="
@@ -1,7 +1,7 @@

                                 Apache License
                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

@@ -193,7 +193,7 @@
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -68,7 +68,7 @@ added after the original pull request but before a merge.
  `eclipse-code-formatter.xml` file from the
  https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring
  Cloud Build] project. If using IntelliJ, you can use the
-  http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
+  https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
  Plugin] to import the same file.
 * Make sure all new `.java` files to have a simple Javadoc class comment with at least an
  `@author` tag identifying you, and preferably at least a paragraph on what the class is
@@ -81,6 +81,6 @@ added after the original pull request but before a merge.
 * A few unit tests would help a lot as well -- someone has to do it.
 * If no-one else is using your branch, please rebase it against the current master (or
  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],
+* When writing a commit message please follow https://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).
@@ -24,9 +24,9 @@ $ mvn deploy -DaltReleaseDeploymentRepository=repo.spring.io::default::https://r

 and for jcenter use

----
+---
 $ mvn deploy -DaltReleaseDeploymentRepository=bintray::default::https://api.bintray.com/maven/spring/jars/org.springframework.cloud:build
----
+---

 and for Maven Central use

@@ -31,7 +31,7 @@ credentials and you already have those.

 The projects that require middleware generally include a
 `docker-compose.yml`, so consider using
-http://compose.docker.io/[Docker Compose] to run the middeware servers
+https://compose.docker.io/[Docker Compose] to run the middeware servers
 in Docker containers. See the README in the
 https://github.com/spring-cloud-samples/scripts[scripts demo
 repository] for specific instructions about the common cases of mongo,
@@ -53,13 +53,13 @@ a modified file in the correct place. Just commit it and push the change.

 === Working with the code
 If you don't have an IDE preference we would recommend that you use
-http://www.springsource.com/developer/sts[Spring Tools Suite] or
-http://eclipse.org[Eclipse] when working with the code. We use the
-http://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
+https://www.springsource.com/developer/sts[Spring Tools Suite] or
+https://eclipse.org[Eclipse] when working with the code. We use the
+https://eclipse.org/m2e/[m2eclipe] eclipse plugin for maven support. Other IDEs and tools
 should also work without issue as long as they use Maven 3.3.3 or better.

 ==== Importing into eclipse with m2eclipse
-We recommend the http://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with
+We recommend the https://eclipse.org/m2e/[m2eclipe] eclipse plugin when working with
 eclipse. If you don't already have m2eclipse installed it is available from the "eclipse
 marketplace".

@@ -1,6 +1,6 @@
 ==== Adding Project Lombok Agent

-Spring Cloud uses http://projectlombok.org/features/index.html[Project Lombok]
+Spring Cloud uses https://projectlombok.org/features/index.html[Project Lombok]
 to generate getters and setters etc. Compiling from the command line this
 shouldn't cause any problems, but in an IDE you need to add an agent
 to the JVM. Full instructions can be found in the Lombok website. The
@@ -41,5 +41,5 @@ appropriate to the circumstances. Maintainers are obligated to maintain confiden
 with regard to the reporter of an incident.

 This Code of Conduct is adapted from the
-http://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
-http://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]
+https://contributor-covenant.org[Contributor Covenant], version 1.3.0, available at
+https://contributor-covenant.org/version/1/3/0/[contributor-covenant.org/version/1/3/0/]
@@ -6,7 +6,7 @@ follow the guidelines below.

 === Sign the Contributor License Agreement
 Before we accept a non-trivial patch or pull request we will need you to sign the
-https://cla.pivotal.io/sign/spring[Contributor License Agreement].
+https://support.springsource.com/spring_committer_signup[contributor's agreement].
 Signing the contributor's agreement does not grant anyone commit rights to the main
 repository, but it does mean that we can accept your contributions, and you will get an
 author credit if we do.  Active contributors might be asked to join the core team, and
@@ -26,7 +26,7 @@ added after the original pull request but before a merge.
  `eclipse-code-formatter.xml` file from the
  https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring
  Cloud Build] project. If using IntelliJ, you can use the
-  http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
+  https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
  Plugin] to import the same file.
 * Make sure all new `.java` files to have a simple Javadoc class comment with at least an
  `@author` tag identifying you, and preferably at least a paragraph on what the class is
@@ -39,6 +39,6 @@ added after the original pull request but before a merge.
 * A few unit tests would help a lot as well -- someone has to do it.
 * If no-one else is using your branch, please rebase it against the current master (or
  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],
+* When writing a commit message please follow https://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).
@@ -1,356 +1,54 @@
 #!/bin/bash -x

-# Usage: (cd <project root>; ghpages.sh -v <version> -b -c)
+git remote set-url --push origin `git config remote.origin.url | sed -e 's/^git:/https:/'`

-set -e
+if ! (git remote set-branches --add origin gh-pages && git fetch -q); then
+    echo "No gh-pages, so not syncing"
+    exit 0
+fi

-# Set default props like MAVEN_PATH, ROOT_FOLDER etc.
-function set_default_props() {
-    # The script should be executed from the root folder
-    ROOT_FOLDER=`pwd`
-    echo "Current folder is ${ROOT_FOLDER}"
+if ! [ -d docs/target/generated-docs ]; then
+    echo "No gh-pages sources in docs/target/generated-docs, so not syncing"
+    exit 0
+fi

-    if [[ ! -e "${ROOT_FOLDER}/.git" ]]; then
-        echo "You're not in the root folder of the project!"
-        exit 1
-    fi
-
-    # Prop that will let commit the changes
-    COMMIT_CHANGES="no"
-    MAVEN_PATH=${MAVEN_PATH:-}
-    if [ -e "${ROOT_FOLDER}/mvnw" ]; then
-        MAVEN_EXEC="$ROOT_FOLDER/mvnw"
-    else
-        MAVEN_EXEC="${MAVEN_PATH}mvn"
-    fi
-    echo "Path to Maven is [${MAVEN_EXEC}]"
-    if [ -z $REPO_NAME ]; then
-        REPO_NAME=$(git remote -v | grep origin | head -1 | sed -e 's!.*/!!' -e 's/ .*//' -e 's/\.git.*//')
-    fi
-    echo "Repo name is [${REPO_NAME}]"
-    SPRING_CLOUD_STATIC_REPO=${SPRING_CLOUD_STATIC_REPO:-git@github.com:spring-cloud/spring-cloud-static.git}
-    echo "Spring Cloud Static repo is [${SPRING_CLOUD_STATIC_REPO}"
-}
-
-# Check if gh-pages exists and docs have been built
-function check_if_anything_to_sync() {
-    git remote set-url --push origin `git config remote.origin.url | sed -e 's/^git:/https:/'`
-
-    if ! (git remote set-branches --add origin gh-pages && git fetch -q) && [[ "${RELEASE_TRAIN}" != "yes" ]] ; then
-        echo "No gh-pages, so not syncing"
-        exit 0
-    fi
-
-    if ! [ -d docs/target/generated-docs ] && ! [ "${BUILD}" == "yes" ]; then
-        echo "No gh-pages sources in docs/target/generated-docs, so not syncing"
-        exit 0
-    fi
-}
-
-function retrieve_current_branch() {
-    # Code getting the name of the current branch. For master we want to publish as we did until now
-    # http://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch
-    # If there is a branch already passed will reuse it - otherwise will try to find it
-    CURRENT_BRANCH=${BRANCH}
-    if [[ -z "${CURRENT_BRANCH}" ]] ; then
-      CURRENT_BRANCH=$(git symbolic-ref -q HEAD)
-      CURRENT_BRANCH=${CURRENT_BRANCH##refs/heads/}
-      CURRENT_BRANCH=${CURRENT_BRANCH:-HEAD}
-    fi
-    echo "Current branch is [${CURRENT_BRANCH}]"
-    git checkout ${CURRENT_BRANCH} || echo "Failed to check the branch... continuing with the script"
-}
-
-# Switches to the provided value of the release version. We always prefix it with `v`
-function switch_to_tag() {
-    if [[ "${RELEASE_TRAIN}" != "yes" ]] ; then
-        git checkout v${VERSION}
-    fi
-}
-
-# Build the docs if switch is on
-function build_docs_if_applicable() {
-    if [[ "${BUILD}" == "yes" ]] ; then
-        ./mvnw clean install -P docs -pl docs -DskipTests
-    fi
-}
-
-# Get the name of the `docs.main` property
-# Get whitelisted branches - assumes that a `docs` module is available under `docs` profile
-function retrieve_doc_properties() {
-    MAIN_ADOC_VALUE=$("${MAVEN_EXEC}" -q \
-        -Dexec.executable="echo" \
-        -Dexec.args='${docs.main}' \
-        org.codehaus.mojo:exec-maven-plugin:1.3.1:exec \
-        -P docs \
-        -pl docs | tail -1 )
-    echo "Extracted 'main.adoc' from Maven build [${MAIN_ADOC_VALUE}]"
-
-
-    WHITELIST_PROPERTY=${WHITELIST_PROPERTY:-"docs.whitelisted.branches"}
-    WHITELISTED_BRANCHES_VALUE=$("${MAVEN_EXEC}" -q \
-        -Dexec.executable="echo" \
-        -Dexec.args="\${${WHITELIST_PROPERTY}}" \
-        org.codehaus.mojo:exec-maven-plugin:1.3.1:exec \
-        -P docs \
-        -pl docs | tail -1 )
-    echo "Extracted '${WHITELIST_PROPERTY}' from Maven build [${WHITELISTED_BRANCHES_VALUE}]"
-}
+# Find name of current branch
+###################################################################
+branch=$TRAVIS_BRANCH
+[ "$branch" == "" ] && branch=`git rev-parse --abbrev-ref HEAD`
+target=.
+if [ "$branch" != "master" ]; then target=./$branch; mkdir -p $target; fi

 # Stash any outstanding changes
-function stash_changes() {
-    git diff-index --quiet HEAD && dirty=$? || (echo "Failed to check if the current repo is dirty. Assuming that it is." && dirty="1")
-    if [ "$dirty" != "0" ]; then git stash; fi
-}
+###################################################################
+git diff-index --quiet HEAD
+dirty=$?
+if [ "$dirty" != "0" ]; then git stash; fi

 # Switch to gh-pages branch to sync it with current branch
-function add_docs_from_target() {
-    local DESTINATION_REPO_FOLDER
-    if [[ -z "${DESTINATION}" && -z "${CLONE}" ]] ; then
-        DESTINATION_REPO_FOLDER=${ROOT_FOLDER}
-    elif [[ "${CLONE}" == "yes" ]]; then
-        mkdir -p ${ROOT_FOLDER}/target
-        local clonedStatic=${ROOT_FOLDER}/target/spring-cloud-static
-        if [[ ! -e "${clonedStatic}/.git" ]]; then
-            echo "Cloning Spring Cloud Static to target"
-            git clone ${SPRING_CLOUD_STATIC_REPO} ${clonedStatic} && cd ${clonedStatic} && git checkout gh-pages
-        else
-            echo "Spring Cloud Static already cloned - will pull changes"
-            cd ${clonedStatic} && git checkout gh-pages && git pull origin gh-pages
-        fi
-        if [[ -z "${RELEASE_TRAIN}" ]] ; then
-            DESTINATION_REPO_FOLDER=${clonedStatic}/${REPO_NAME}
-        else
-            DESTINATION_REPO_FOLDER=${clonedStatic}
-        fi
-        mkdir -p ${DESTINATION_REPO_FOLDER}
-    else
-        if [[ ! -e "${DESTINATION}/.git" ]]; then
-            echo "[${DESTINATION}] is not a git repository"
-            exit 1
-        fi
-        if [[ -z "${RELEASE_TRAIN}" ]] ; then
-            DESTINATION_REPO_FOLDER=${DESTINATION}/${REPO_NAME}
-        else
-            DESTINATION_REPO_FOLDER=${DESTINATION}
-        fi
-        mkdir -p ${DESTINATION_REPO_FOLDER}
-        echo "Destination was provided [${DESTINATION}]"
-    fi
-    cd ${DESTINATION_REPO_FOLDER}
-    git checkout gh-pages
-    git pull origin gh-pages
+###################################################################
+git checkout gh-pages

-    # Add git branches
-    ###################################################################
-    if [[ -z "${VERSION}" && -z "${RELEASE_TRAIN}" ]] ; then
-        copy_docs_for_current_version
-    else
-        copy_docs_for_provided_version
-    fi
-    commit_changes_if_applicable
-}
-
-
-# Copies the docs by using the retrieved properties from Maven build
-function copy_docs_for_current_version() {
-    if [[ "${CURRENT_BRANCH}" == "master" ]] ; then
-        echo -e "Current branch is master - will copy the current docs only to the root folder"
-        for f in docs/target/generated-docs/*; do
-            file=${f#docs/target/generated-docs/*}
-            if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
-                # Not ignored...
-                cp -rf $f ${ROOT_FOLDER}/
-            fi
-        done
-        git add -A ${ROOT_FOLDER}
-        COMMIT_CHANGES="yes"
-    else
-        echo -e "Current branch is [${CURRENT_BRANCH}]"
-        # http://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
-        if [[ ",${WHITELISTED_BRANCHES_VALUE}," = *",${CURRENT_BRANCH},"* ]] ; then
-            mkdir -p ${ROOT_FOLDER}/${CURRENT_BRANCH}
-            echo -e "Branch [${CURRENT_BRANCH}] is whitelisted! Will copy the current docs to the [${CURRENT_BRANCH}] folder"
-            for f in docs/target/generated-docs/*; do
-                file=${f#docs/target/generated-docs/*}
-                if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
-                    # Not ignored...
-                    # We want users to access 1.0.0.RELEASE/ instead of 1.0.0.RELEASE/spring-cloud.sleuth.html
-                    if [[ "${file}" == "${MAIN_ADOC_VALUE}.html" ]] ; then
-                        # We don't want to copy the spring-cloud-sleuth.html
-                        # we want it to be converted to index.html
-                        cp -rf $f ${ROOT_FOLDER}/${CURRENT_BRANCH}/index.html
-                        git add -A ${ROOT_FOLDER}/${CURRENT_BRANCH}/index.html
-                    else
-                        cp -rf $f ${ROOT_FOLDER}/${CURRENT_BRANCH}
-                        git add -A ${ROOT_FOLDER}/${CURRENT_BRANCH}/$file
-                    fi
-                fi
-            done
-            COMMIT_CHANGES="yes"
-        else
-            echo -e "Branch [${CURRENT_BRANCH}] is not on the white list! Check out the Maven [${WHITELIST_PROPERTY}] property in
-             [docs] module available under [docs] profile. Won't commit any changes to gh-pages for this branch."
-        fi
-    fi
-}
-
-# Copies the docs by using the explicitly provided version
-function copy_docs_for_provided_version() {
-    local FOLDER=${DESTINATION_REPO_FOLDER}/${VERSION}
-    mkdir -p ${FOLDER}
-    echo -e "Current tag is [v${VERSION}] Will copy the current docs to the [${FOLDER}] folder"
-    for f in ${ROOT_FOLDER}/docs/target/generated-docs/*; do
-        file=${f#${ROOT_FOLDER}/docs/target/generated-docs/*}
-        copy_docs_for_branch ${file} ${FOLDER}
-    done
-    COMMIT_CHANGES="yes"
-    CURRENT_BRANCH="v${VERSION}"
-}
-
-# Copies the docs from target to the provided destination
-# Params:
-# $1 - file from target
-# $2 - destination to which copy the files
-function copy_docs_for_branch() {
-    local file=$1
-    local destination=$2
-    if ! git ls-files -i -o --exclude-standard --directory | grep -q ^${file}$; then
+for f in docs/target/generated-docs/*; do
+    file=${f#docs/target/generated-docs/*}
+    if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
        # Not ignored...
-        # We want users to access 1.0.0.RELEASE/ instead of 1.0.0.RELEASE/spring-cloud.sleuth.html
-        if [[ ("${file}" == "${MAIN_ADOC_VALUE}.html") || ("${file}" == "${REPO_NAME}.html") ]] ; then
-            # We don't want to copy the spring-cloud-sleuth.html
-            # we want it to be converted to index.html
-            cp -rf $f ${destination}/index.html
-        else
-            cp -rf $f ${destination}
-        fi
-        git add -A ${destination}
+        cp -rf $f $target
+        git add -A $target/$file
    fi
-}
-
-function commit_changes_if_applicable() {
-    if [[ "${COMMIT_CHANGES}" == "yes" ]] ; then
-        COMMIT_SUCCESSFUL="no"
-        git commit -a -m "Sync docs from ${CURRENT_BRANCH} to gh-pages" && COMMIT_SUCCESSFUL="yes" || echo "Failed to commit changes"
-
-        # Uncomment the following push if you want to auto push to
-        # the gh-pages branch whenever you commit to master locally.
-        # This is a little extreme. Use with care!
-        ###################################################################
-        if [[ "${COMMIT_SUCCESSFUL}" == "yes" ]] ; then
-            git push origin gh-pages
-        fi
-    fi
-}
-
-# Switch back to the previous branch and exit block
-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"
-    if [ "$dirty" != "0" ]; then git stash pop; fi
-    exit 0
-}
-
-# Assert if properties have been properly passed
-function assert_properties() {
-echo "VERSION [${VERSION}], RELEASE_TRAIN [${RELEASE_TRAIN}], DESTINATION [${DESTINATION}], CLONE [${CLONE}]"
-if [[ "${VERSION}" != "" && (-z "${DESTINATION}" && -z "${CLONE}") ]] ; then echo "Version was set but destination / clone was not!"; exit 1;fi
-if [[ ("${DESTINATION}" != "" && "${CLONE}" != "") && -z "${VERSION}" ]] ; then echo "Destination / clone was set but version was not!"; exit 1;fi
-if [[ "${DESTINATION}" != "" && "${CLONE}" == "yes" ]] ; then echo "Destination and clone was set. Pick one!"; exit 1;fi
-if [[ "${RELEASE_TRAIN}" != "" && -z "${VERSION}" ]] ; then echo "Release train was set but no version was passed!"; exit 1;fi
-}
-
-# Prints the usage
-function print_usage() {
-cat <<EOF
-The idea of this script is to update gh-pages branch with the generated docs. Without any options
-the script will work in the following manner:
-
- if there's no gh-pages / target for docs module then the script ends
- for master branch the generated docs are copied to the root of gh-pages branch
- for any other branch (if that branch is whitelisted) a subfolder with branch name is created
-    and docs are copied there
- if the version switch is passed (-v) then a tag with (v) prefix will be retrieved and a folder
-    with that version number will be created in the gh-pages branch. WARNING! No whitelist verification will take place
- if the destination switch is passed (-d) then the script will check if the provided dir is a git repo and then will
-    switch to gh-pages of that repo and copy the generated docs to `docs/<project-name>/<version>`
- if the destination switch is passed (-d) then the script will check if the provided dir is a git repo and then will
-    switch to gh-pages of that repo and copy the generated docs to `docs/<project-name>/<version>`
- if the release train switch is passed (-r) then the script will check if the provided dir is a git repo and then will
-    switch to gh-pages of that repo and copy the generated docs to `docs/<version>`
-
-USAGE:
-
-You can use the following options:
-
-v|--version        - the script will apply the whole procedure for a particular library version
-r|--releasetrain   - instead of nesting the docs under the project_name/version folder the docs will end up in version
-d|--destination    - the root of destination folder where the docs should be copied. You have to use the full path.
-                        E.g. point to spring-cloud-static folder. Can't be used with (-c)
-b|--build          - will run the standard build process after checking out the branch
-c|--clone          - will automatically clone the spring-cloud-static repo instead of providing the destination.
-                        Obviously can't be used with (-d)
-
-EOF
-}
-
-
-# ==========================================
-#    ____   ____ _____  _____ _____ _______
-#  / ____|/ ____|  __ \|_   _|  __ \__   __|
-# | (___ | |    | |__) | | | | |__) | | |
-#  \___ \| |    |  _  /  | | |  ___/  | |
-#  ____) | |____| | \ \ _| |_| |      | |
-# |_____/ \_____|_|  \_\_____|_|      |_|
-#
-# ==========================================
-
-while [[ $# > 0 ]]
-do
-key="$1"
-case ${key} in
-    -v|--version)
-    VERSION="$2"
-    shift # past argument
-    ;;
-    -r|--releasetrain)
-    RELEASE_TRAIN="yes"
-    ;;
-    -d|--destination)
-    DESTINATION="$2"
-    shift # past argument
-    ;;
-    -b|--build)
-    BUILD="yes"
-    ;;
-    -c|--clone)
-    CLONE="yes"
-    ;;
-    -h|--help)
-    print_usage
-    exit 0
-    ;;
-    *)
-    echo "Invalid option: [$1]"
-    print_usage
-    exit 1
-    ;;
-esac
-shift # past argument or value
 done

-assert_properties
-set_default_props
-check_if_anything_to_sync
-if [[ -z "${VERSION}" ]] ; then
-    retrieve_current_branch
-else
-    switch_to_tag
-fi
-build_docs_if_applicable
-retrieve_doc_properties
-stash_changes
-add_docs_from_target
-checkout_previous_branch
+git add -A README.adoc || echo "No change to README.adoc"
+git commit -a -m "Sync docs from $branch to gh-pages" || echo "Nothing committed"
+
+# Uncomment the following push if you want to auto push to
+# the gh-pages branch whenever you commit to branch locally.
+# This is a little extreme. Use with care!
+###################################################################
+git push origin gh-pages || echo "Cannot push gh-pages"
+
+# Finally, switch back to the current branch and exit block
+git checkout $branch
+if [ "$dirty" != "0" ]; then git stash pop; fi
+
+exit 0
@@ -1,211 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Either clones or pulls the repo for given project
-# Params:
-# $1 organization e.g. spring-cloud
-# $2 repo name e.g. spring-cloud-sleuth
-function clone_or_pull() {
-    if [ "$#" -ne 2 ]
-    then
-      echo "You haven't provided 2 args... \$1 organization e.g. spring-cloud; \$2 repo name e.g. spring-cloud-sleuth"
-      exit 1
-    fi
-    if [[ "${JUST_PUSH}" == "yes" ]] ; then
-        echo "Skipping cloning since the option to just push was provided"
-        exit 0
-    fi
-    local ORGANIZATION=$1
-    local REPO_NAME=$2
-    local LOCALREPO_VC_DIR=${REPO_NAME}/.git
-    if [ ! -d ${LOCALREPO_VC_DIR} ]
-    then
-        echo "Repo [${REPO_NAME}] doesn't exist - will clone it!"
-        git clone git@github.com:${ORGANIZATION}/${REPO_NAME}.git
-    else
-        echo "Repo [${REPO_NAME}] exists - will pull the changes"
-        cd ${REPO_NAME} && git pull || echo "Not pulling since repo is up to date"
-        cd ${ROOT_FOLDER}
-    fi
-}
-
-# For the given branch updates the docs/src/main/asciidoc/ghpages.sh
-# with the one from spring-cloud-build. Then commits and pushes the change
-# Params:
-# $1 repo name e.g. spring-cloud-sleuth
-# $2 branch name
-function update_ghpages_script() {
-    if [ "$#" -ne 2 ]
-    then
-      echo "You haven't provided 2 args... \$1 repo name e.g. spring-cloud-sleuth; \$2 branch name e.g. master"
-      exit 1
-    fi
-    local REPO_NAME=$1
-    local BRANCH_NAME=$2
-    echo "Updating ghpages script for [${REPO_NAME}] and branch [${BRANCH_NAME}]"
-    cd  ${REPO_NAME}
-    echo "Checking out [${BRANCH_NAME}]"
-    git checkout ${BRANCH_NAME}
-    echo "Resetting the repo and pulling before commiting"
-    git reset --hard origin/${BRANCH_NAME} && git pull origin ${BRANCH_NAME}
-    # If the user wants to just push we will not copy / add / commit files
-    if [[ "${JUST_PUSH}" != "yes" ]] ; then
-        echo "Copying [${GHPAGES_DOWNLOAD_PATH}] to [${GHPAGES_IN_REPO_PATH}]"
-        cp -rf ${GHPAGES_DOWNLOAD_PATH} ${GHPAGES_IN_REPO_PATH}
-        echo "Adding and committing [${GHPAGES_IN_REPO_PATH}] with message [${COMMIT_MESSAGE}]"
-        git add ${GHPAGES_IN_REPO_PATH}
-        git commit -m "${COMMIT_MESSAGE}" || echo "Proceeding to the next repo"
-    fi
-    if [[ "${AUTO_PUSH}" == "yes" ]] ; then
-        echo "Pushing the branch [${BRANCH_NAME}]"
-        wait_if_manual_proceed
-        git push origin ${BRANCH_NAME}
-    fi
-    cd ${ROOT_FOLDER}
-}
-
-# Downloads ghpages.sh
-function download_ghpages() {
-    rm -rf ${GHPAGES_DOWNLOAD_PATH}
-    echo "Downloading ghpages.sh from [${GHPAGES_URL}] to [${GHPAGES_DOWNLOAD_PATH}]"
-    curl ${GHPAGES_URL} -o ${GHPAGES_DOWNLOAD_PATH}
-    chmod +x ${GHPAGES_DOWNLOAD_PATH}
-}
-
-# Either clones or pulls the repo for given project and then updates gh-pages for the given project
-# Params:
-# $1 organization e.g. spring-cloud
-# $2 repo name e.g. spring-cloud-sleuth
-# $3 branch name e.g. master
-function clone_and_update_ghpages() {
-    if [ "$#" -ne 3 ]
-    then
-      echo "You haven't provided 3 args... \$1 organization e.g. spring-cloud; \$2 repo name e.g. spring-cloud-sleuth; \$3 branch name e.g. master"
-      exit 1
-    fi
-    local ORGANIZATION=$1
-    local REPO_NAME=$2
-    local BRANCH_NAME=$3
-    local VAR
-    echo -e "\n\nWill clone the repo and update scripts for org [${ORGANIZATION}], repo [${REPO_NAME}] and branch [${BRANCH_NAME}]\n\n"
-    clone_or_pull ${ORGANIZATION} ${REPO_NAME}
-    update_ghpages_script ${REPO_NAME} ${BRANCH_NAME}
-    echo "Proceeding to next project"
-    wait_if_manual_proceed
-}
-
-function wait_if_manual_proceed() {
-    if [[ "${AUTO_PROCEED}" != "yes" ]] ; then
-        echo -n "Press [ENTER] to continue..."
-        read VAR
-    fi
-}
-
-# Prints the provided parameters
-function print_parameters() {
-cat <<EOF
-Running the script with the following parameters
-GHPAGES_URL=${GHPAGES_URL}
-GHPAGES_DOWNLOAD_PATH=${GHPAGES_DOWNLOAD_PATH}
-COMMIT_MESSAGE=${COMMIT_MESSAGE}
-GHPAGES_IN_REPO_PATH=${GHPAGES_IN_REPO_PATH}
-AUTO_PROCEED=${AUTO_PROCEED}
-AUTO_PUSH=${AUTO_PUSH}
-JUST_PUSH=${JUST_PUSH}
-ROOT_FOLDER=${ROOT_FOLDER}
-EOF
-}
-
-# Prints the usage
-function print_usage() {
-cat <<EOF
-The idea of this script is to batch update all ghpages scripts for all projects that we have in Spring Cloud.
-If you don't provide any options by default the script will copy the latest ghpages.sh, commit it for each repo
-and then push it to the appropriate branch.
-
-USAGE:
-
-You can use the following options:
-
-p|--nopush         - the script will not push the changes
-m|--manualproceed  - if you want to do a manual proceed after every step
-x|--justpush       - if you want to go to every single repo and just push the changes
-h|--help           - present this help message
-
-EOF
-}
-
-# ==========================================
-#    ____   ____ _____  _____ _____ _______
-#  / ____|/ ____|  __ \|_   _|  __ \__   __|
-# | (___ | |    | |__) | | | | |__) | | |
-#  \___ \| |    |  _  /  | | |  ___/  | |
-#  ____) | |____| | \ \ _| |_| |      | |
-# |_____/ \_____|_|  \_\_____|_|      |_|
-#
-# ==========================================
-
-while [[ $# > 0 ]]
-do
-key="$1"
-case ${key} in
-    -p|--nopush)
-    AUTO_PUSH="no"
-    ;;
-    -m|--manualproceed)
-    AUTO_PROCEED="no"
-    ;;
-    -x|--justpush)
-    JUST_PUSH="yes"
-    ;;
-    -h|--help)
-    print_usage
-    exit 0
-    ;;
-    *)
-    echo "Invalid option: [$1]"
-    print_usage
-    exit 1
-    ;;
-esac
-shift # past argument or value
-done
-
-export GHPAGES_URL=${GHPAGES_URL:-https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/ghpages.sh}
-export GHPAGES_DOWNLOAD_PATH=${GHPAGES_DOWNLOAD_PATH:-/tmp/ghpages.sh}
-export COMMIT_MESSAGE=${COMMIT_MESSAGE:-Updating ghpages for all projects}
-export GHPAGES_IN_REPO_PATH=${GHPAGES_IN_REPO_PATH:-docs/src/main/asciidoc/ghpages.sh}
-export AUTO_PROCEED=${AUTO_PROCEED:-yes}
-export AUTO_PUSH=${AUTO_PUSH:-yes}
-export JUST_PUSH=${JUST_PUSH:-no}
-export ROOT_FOLDER=`pwd`
-
-
-print_parameters
-download_ghpages
-clone_and_update_ghpages spring-cloud spring-cloud-aws master
-clone_and_update_ghpages spring-cloud spring-cloud-aws 1.0.x
-clone_and_update_ghpages spring-cloud spring-cloud-aws 1.2.x
-clone_and_update_ghpages spring-cloud spring-cloud-bus master
-clone_and_update_ghpages spring-cloud spring-cloud-cli 1.0.x
-clone_and_update_ghpages spring-cloud spring-cloud-cli 1.1.x
-clone_and_update_ghpages spring-cloud spring-cloud-cli master
-clone_and_update_ghpages spring-cloud spring-cloud-cloudfoundry master
-clone_and_update_ghpages spring-cloud spring-cloud-cluster master
-clone_and_update_ghpages spring-cloud spring-cloud-commons master
-clone_and_update_ghpages spring-cloud spring-cloud-config master
-clone_and_update_ghpages spring-cloud spring-cloud-config 1.1.x
-clone_and_update_ghpages spring-cloud spring-cloud-consul 1.0.x
-clone_and_update_ghpages spring-cloud spring-cloud-consul master
-clone_and_update_ghpages spring-cloud spring-cloud-contract master
-clone_and_update_ghpages spring-cloud spring-cloud-netflix 1.0.x
-clone_and_update_ghpages spring-cloud spring-cloud-netflix 1.1.x
-clone_and_update_ghpages spring-cloud spring-cloud-netflix master
-clone_and_update_ghpages spring-cloud spring-cloud-security master
-clone_and_update_ghpages spring-cloud spring-cloud-sleuth 1.0.x
-clone_and_update_ghpages spring-cloud spring-cloud-sleuth master
-clone_and_update_ghpages spring-cloud spring-cloud-starters Brixton
-clone_and_update_ghpages spring-cloud spring-cloud-starters master
-clone_and_update_ghpages spring-cloud-incubator spring-cloud-vault-config master
-clone_and_update_ghpages spring-cloud spring-cloud-zookeeper master
@@ -8,7 +8,7 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#    https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
@@ -46,6 +46,15 @@ if [ -z "$MAVEN_SKIP_RC" ] ; then

 fi

+VERSION=$(awk '/<parent/ {l=4}; (l-- > 0) {$0=$0} 1' `dirname $0`/pom.xml| grep '<version' | head -1 | sed -e 's/.*>\(.*\)<.*/\1/')
+if echo $VERSION | egrep -q 'M|RC'; then
+    echo Activating \"milestone\" profile for version=\"$VERSION\"
+    echo $MAVEN_ARGS | grep -q milestone || MAVEN_ARGS="$MAVEN_ARGS -Pmilestone"
+else
+    echo Deactivating \"milestone\" profile for version=\"$VERSION\"
+    echo $MAVEN_ARGS | grep -q milestone && MAVEN_ARGS=$(echo $MAVEN_ARGS | sed -e 's/-Pmilestone//')
+fi
+
 # OS specific support.  $var _must_ be set to either true or false.
 cygwin=false;
 darwin=false;
@@ -57,27 +66,27 @@ case "`uname`" in
           #
           # Look for the Apple JDKs first to preserve the existing behaviour, and then look
           # for the new JDKs provided by Oracle.
-           #
+           # 
           if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK ] ; then
             #
             # Apple JDKs
             #
             export JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home
           fi
-
+           
           if [ -z "$JAVA_HOME" ] && [ -L /System/Library/Java/JavaVirtualMachines/CurrentJDK ] ; then
             #
             # Apple JDKs
             #
             export JAVA_HOME=/System/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
           fi
-
+             
           if [ -z "$JAVA_HOME" ] && [ -L "/Library/Java/JavaVirtualMachines/CurrentJDK" ] ; then
             #
             # Oracle JDKs
             #
             export JAVA_HOME=/Library/Java/JavaVirtualMachines/CurrentJDK/Contents/Home
-           fi
+           fi           

           if [ -z "$JAVA_HOME" ] && [ -x "/usr/libexec/java_home" ]; then
             #
@@ -219,27 +228,16 @@ concat_lines() {
 export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-$(find_maven_basedir)}
 MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"

-# Provide a "standardized" way to retrieve the CLI args that will
+# Provide a "standardized" way to retrieve the CLI args that will 
 # work with both Windows and non-Windows executions.
 MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
 export MAVEN_CMD_LINE_ARGS

 WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain

-echo "Running version check"
-VERSION=$( sed '\!<parent!,\!</parent!d' `dirname $0`/pom.xml | grep '<version' | head -1 | sed -e 's/.*<version>//' -e 's!</version>.*$!!' )
-echo "The found version is [${VERSION}]"
-
-if echo $VERSION | egrep -q 'M|RC'; then
-    echo Activating \"milestone\" profile for version=\"$VERSION\"
-    echo $MAVEN_ARGS | grep -q milestone || MAVEN_ARGS="$MAVEN_ARGS -Pmilestone"
-else
-    echo Deactivating \"milestone\" profile for version=\"$VERSION\"
-    echo $MAVEN_ARGS | grep -q milestone && MAVEN_ARGS=$(echo $MAVEN_ARGS | sed -e 's/-Pmilestone//')
-fi
-
 exec "$JAVACMD" \
  $MAVEN_OPTS \
  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
  ${WRAPPER_LAUNCHER} ${MAVEN_ARGS} "$@"
+
@@ -7,7 +7,7 @@
@REM "License"); you may not use this file except in compliance
@REM with the License.  You may obtain a copy of the License at
@REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM    https://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build</artifactId>
-	<version>1.3.1.RC1</version>
+	<version>1.1.4.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Parent</name>
 	<description>Spring Cloud parent pom, managing plugins and dependencies for Spring Cloud projects</description>
@@ -20,10 +20,10 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<maven.compiler.source>${java.version}</maven.compiler.source>
 		<maven.compiler.target>${java.version}</maven.compiler.target>
-		<lombok.version>1.16.14</lombok.version>
+		<lombok.version>1.16.6</lombok.version>
 		<main.basedir>${basedir}</main.basedir>
 		<docs.main>${project.artifactId}</docs.main>
-		<spring-boot.version>1.5.2.RELEASE</spring-boot.version>
+		<spring-boot.version>1.3.8.RELEASE</spring-boot.version>

 		<!-- Sonar -->
 		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -46,7 +46,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at

-	http://www.apache.org/licenses/LICENSE-2.0
+	https://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -70,9 +70,9 @@ limitations under the License.
 			<name>Dave Syer</name>
 			<email>dsyer at pivotal.io</email>
 			<organization>Pivotal Software, Inc.</organization>
-			<organizationUrl>http://www.spring.io</organizationUrl>
+			<organizationUrl>https://www.spring.io</organizationUrl>
 			<roles>
-				<role>lead</role>
+				<role>Project lead</role>
 			</roles>
 		</developer>
 		<developer>
@@ -80,29 +80,9 @@ limitations under the License.
 			<name>Spencer Gibb</name>
 			<email>sgibb at pivotal.io</email>
 			<organization>Pivotal Software, Inc.</organization>
-			<organizationUrl>http://www.spring.io</organizationUrl>
+			<organizationUrl>https://www.spring.io</organizationUrl>
 			<roles>
-				<role>lead</role>
-			</roles>
-		</developer>
-		<developer>
-			<id>mgrzejszczak</id>
-			<name>Marcin Grzejszczak</name>
-			<email>mgrzejszczak at pivotal.io</email>
-			<organization>Pivotal Software, Inc.</organization>
-			<organizationUrl>http://www.spring.io</organizationUrl>
-			<roles>
-				<role>developer</role>
-			</roles>
-		</developer>
-		<developer>
-			<id>rbaxter</id>
-			<name>Ryan Baxter</name>
-			<email>rbaxter at pivotal.io</email>
-			<organization>Pivotal Software, Inc.</organization>
-			<organizationUrl>http://www.spring.io</organizationUrl>
-			<roles>
-				<role>developer</role>
+				<role>Project lead</role>
 			</roles>
 		</developer>
 	</developers>
@@ -177,7 +157,7 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-jar-plugin</artifactId>
-					<version>3.0.0</version>
+					<version>2.6</version>
 					<configuration>
 						<archive>
 							<manifest>
@@ -187,11 +167,6 @@ limitations under the License.
 						</archive>
 					</configuration>
 				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-antrun-plugin</artifactId>
-					<version>1.7</version>
-				</plugin>
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-surefire-plugin</artifactId>
@@ -258,7 +233,6 @@ limitations under the License.
 				<plugin>
 					<groupId>org.springframework.boot</groupId>
 					<artifactId>spring-boot-maven-plugin</artifactId>
-					<version>${spring-boot.version}</version>
 					<executions>
 						<execution>
 							<goals>
@@ -274,7 +248,6 @@ limitations under the License.
 				<plugin>
 					<groupId>org.apache.maven.plugins</groupId>
 					<artifactId>maven-shade-plugin</artifactId>
-					<version>2.2</version>
 					<dependencies>
 						<dependency>
 							<groupId>org.springframework.boot</groupId>
@@ -1,211 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# Either clones or pulls the repo for given project
-# Params:
-# $1 organization e.g. spring-cloud
-# $2 repo name e.g. spring-cloud-sleuth
-function clone_or_pull() {
-    if [ "$#" -ne 2 ]
-    then
-      echo "You haven't provided 2 args... \$1 organization e.g. spring-cloud; \$2 repo name e.g. spring-cloud-sleuth"
-      exit 1
-    fi
-    if [[ "${JUST_PUSH}" == "yes" ]] ; then
-        echo "Skipping cloning since the option to just push was provided"
-        exit 0
-    fi
-    local ORGANIZATION=$1
-    local REPO_NAME=$2
-    local LOCALREPO_VC_DIR=${REPO_NAME}/.git
-    if [ ! -d ${LOCALREPO_VC_DIR} ]
-    then
-        echo "Repo [${REPO_NAME}] doesn't exist - will clone it!"
-        git clone git@github.com:${ORGANIZATION}/${REPO_NAME}.git
-    else
-        echo "Repo [${REPO_NAME}] exists - will pull the changes"
-        cd ${REPO_NAME} && git pull || echo "Not pulling since repo is up to date"
-        cd ${ROOT_FOLDER}
-    fi
-}
-
-# For the given branch updates the docs/src/main/asciidoc/ghpages.sh
-# with the one from spring-cloud-build. Then commits and pushes the change
-# Params:
-# $1 repo name e.g. spring-cloud-sleuth
-# $2 branch name
-function update_mvnw_script() {
-    if [ "$#" -ne 2 ]
-    then
-      echo "You haven't provided 2 args... \$1 repo name e.g. spring-cloud-sleuth; \$2 branch name e.g. master"
-      exit 1
-    fi
-    local REPO_NAME=$1
-    local BRANCH_NAME=$2
-    echo "Updating ghpages script for [${REPO_NAME}] and branch [${BRANCH_NAME}]"
-    cd  ${REPO_NAME}
-    echo "Checking out [${BRANCH_NAME}]"
-    git checkout ${BRANCH_NAME}
-    echo "Resetting the repo and pulling before commiting"
-    git reset --hard origin/${BRANCH_NAME} && git pull origin ${BRANCH_NAME}
-    # If the user wants to just push we will not copy / add / commit files
-    if [[ "${JUST_PUSH}" != "yes" ]] ; then
-        echo "Copying [${MVNW_LOCATION}] to [${MVNW_IN_REPO_PATH}]"
-        cp -rf ${MVNW_LOCATION} ${MVNW_IN_REPO_PATH}
-        echo "Adding and committing [${MVNW_IN_REPO_PATH}] with message [${COMMIT_MESSAGE}]"
-        git add ${MVNW_IN_REPO_PATH}
-        git commit -m "${COMMIT_MESSAGE}" || echo "Proceeding to the next repo"
-    fi
-    if [[ "${AUTO_PUSH}" == "yes" ]] ; then
-        echo "Pushing the branch [${BRANCH_NAME}]"
-        wait_if_manual_proceed
-        git push origin ${BRANCH_NAME}
-    fi
-    cd ${ROOT_FOLDER}
-}
-
-# Either clones or pulls the repo for given project and then updates gh-pages for the given project
-# Params:
-# $1 organization e.g. spring-cloud
-# $2 repo name e.g. spring-cloud-sleuth
-# $3 branch name e.g. master
-function clone_and_update_mvnw() {
-    if [ "$#" -ne 3 ]
-    then
-      echo "You haven't provided 3 args... \$1 organization e.g. spring-cloud; \$2 repo name e.g. spring-cloud-sleuth; \$3 branch name e.g. master"
-      exit 1
-    fi
-    local ORGANIZATION=$1
-    local REPO_NAME=$2
-    local BRANCH_NAME=$3
-    local VAR
-    echo -e "\n\nWill clone the repo and update scripts for org [${ORGANIZATION}], repo [${REPO_NAME}] and branch [${BRANCH_NAME}]\n\n"
-    clone_or_pull ${ORGANIZATION} ${REPO_NAME}
-    update_mvnw_script ${REPO_NAME} ${BRANCH_NAME}
-    echo "Proceeding to next project"
-    wait_if_manual_proceed
-}
-
-function wait_if_manual_proceed() {
-    if [[ "${AUTO_PROCEED}" != "yes" ]] ; then
-        echo -n "Press [ENTER] to continue..."
-        read VAR
-    fi
-}
-
-# Prints the provided parameters
-function print_parameters() {
-cat <<EOF
-Running the script with the following parameters
-GHPAGES_URL=${GHPAGES_URL}
-GHPAGES_DOWNLOAD_PATH=${GHPAGES_DOWNLOAD_PATH}
-COMMIT_MESSAGE=${COMMIT_MESSAGE}
-MVNW_IN_REPO_PATH=${MVNW_IN_REPO_PATH}
-MVNW_LOCATION=${MVNW_LOCATION}
-AUTO_PROCEED=${AUTO_PROCEED}
-AUTO_PUSH=${AUTO_PUSH}
-JUST_PUSH=${JUST_PUSH}
-ROOT_FOLDER=${ROOT_FOLDER}
-EOF
-}
-
-# Prints the usage
-function print_usage() {
-cat <<EOF
-The idea of this script is to batch update all ghpages scripts for all projects that we have in Spring Cloud.
-If you don't provide any options by default the script will copy the latest ghpages.sh, commit it for each repo
-and then push it to the appropriate branch.
-
-USAGE:
-
-You can use the following options:
-
-p|--nopush         - the script will not push the changes
-m|--manualproceed  - if you want to do a manual proceed after every step
-f|--file           - provide where your mvnw is located. Defaults to the current folder
-x|--justpush       - if you want to go to every single repo and just push the changes
-h|--help           - present this help message
-
-EOF
-}
-
-# ==========================================
-#    ____   ____ _____  _____ _____ _______
-#  / ____|/ ____|  __ \|_   _|  __ \__   __|
-# | (___ | |    | |__) | | | | |__) | | |
-#  \___ \| |    |  _  /  | | |  ___/  | |
-#  ____) | |____| | \ \ _| |_| |      | |
-# |_____/ \_____|_|  \_\_____|_|      |_|
-#
-# ==========================================
-
-while [[ $# > 0 ]]
-do
-key="$1"
-case ${key} in
-    -p|--nopush)
-    AUTO_PUSH="no"
-    ;;
-    -m|--manualproceed)
-    AUTO_PROCEED="no"
-    ;;
-    -x|--justpush)
-    JUST_PUSH="yes"
-    ;;
-    -f|--file)
-    MVNW_LOCATION="$2"
-    shift
-    ;;
-    -h|--help)
-    print_usage
-    exit 0
-    ;;
-    *)
-    echo "Invalid option: [$1]"
-    print_usage
-    exit 1
-    ;;
-esac
-shift # past argument or value
-done
-
-export COMMIT_MESSAGE=${COMMIT_MESSAGE:-Updating mvnw for all projects}
-export MVNW_IN_REPO_PATH=${MVNW_IN_REPO_PATH:-mvnw}
-export MVNW_LOCATION=${MVNW_LOCATION:-`pwd`/mvnw}
-export AUTO_PROCEED=${AUTO_PROCEED:-yes}
-export AUTO_PUSH=${AUTO_PUSH:-yes}
-export JUST_PUSH=${JUST_PUSH:-no}
-export ROOT_FOLDER=`pwd`
-
-
-print_parameters
-if [[ ! -f "${MVNW_LOCATION}" ]]; then
-    echo -e "\n\nWARNING: In order to run the script you need to have the mvnw file present. You've provided [${MVNW_LOCATION}] and the file is missing."
-    exit 1
-fi
-clone_and_update_mvnw spring-cloud spring-cloud-aws master
-clone_and_update_mvnw spring-cloud spring-cloud-aws 1.0.x
-clone_and_update_mvnw spring-cloud spring-cloud-aws 1.2.x
-clone_and_update_mvnw spring-cloud spring-cloud-bus master
-clone_and_update_mvnw spring-cloud spring-cloud-cli 1.0.x
-clone_and_update_mvnw spring-cloud spring-cloud-cli 1.1.x
-clone_and_update_mvnw spring-cloud spring-cloud-cli master
-clone_and_update_mvnw spring-cloud spring-cloud-cloudfoundry master
-clone_and_update_mvnw spring-cloud spring-cloud-cluster master
-clone_and_update_mvnw spring-cloud spring-cloud-commons master
-clone_and_update_mvnw spring-cloud spring-cloud-config master
-clone_and_update_mvnw spring-cloud spring-cloud-config 1.1.x
-clone_and_update_mvnw spring-cloud spring-cloud-consul 1.0.x
-clone_and_update_mvnw spring-cloud spring-cloud-consul master
-clone_and_update_mvnw spring-cloud spring-cloud-contract master
-clone_and_update_mvnw spring-cloud spring-cloud-netflix 1.0.x
-clone_and_update_mvnw spring-cloud spring-cloud-netflix 1.1.x
-clone_and_update_mvnw spring-cloud spring-cloud-netflix master
-clone_and_update_mvnw spring-cloud spring-cloud-security master
-clone_and_update_mvnw spring-cloud spring-cloud-sleuth 1.0.x
-clone_and_update_mvnw spring-cloud spring-cloud-sleuth master
-clone_and_update_mvnw spring-cloud spring-cloud-starters Brixton
-clone_and_update_mvnw spring-cloud spring-cloud-starters master
-clone_and_update_mvnw spring-cloud-incubator spring-cloud-vault-config master
-clone_and_update_mvnw spring-cloud spring-cloud-zookeeper master
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0"
 		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
 	<artifactId>spring-cloud-build-tools</artifactId>
+	<version>1.1.4.BUILD-SNAPSHOT</version>
 	<name>spring-cloud-build-tools</name>
 	<packaging>jar</packaging>
 	<description>Spring Cloud Build Tools</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>1.3.1.RC1</version>
+		<version>1.1.4.BUILD-SNAPSHOT</version>
 	</parent>

 </project>
@@ -1,7 +1,7 @@

                                 Apache License
                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
+                        https://www.apache.org/licenses/

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

@@ -193,7 +193,7 @@
   you may not use this file except in compliance with the License.
   You may obtain a copy of the License at

-       http://www.apache.org/licenses/LICENSE-2.0
+       https://www.apache.org/licenses/LICENSE-2.0

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE module PUBLIC
 		"-//Puppy Crawl//DTD Check Configuration 1.3//EN"
-		"http://www.puppycrawl.com/dtds/configuration_1_3.dtd">
+		"https://www.puppycrawl.com/dtds/configuration_1_3.dtd">
 <module name="Checker">
 	<module name="TreeWalker">
 		<!-- this. in front of fields -->
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.springframework.cloud</groupId>
-	<version>1.3.1.RC1</version>
+	<version>1.1.4.BUILD-SNAPSHOT</version>
 	<artifactId>spring-cloud-dependencies-parent</artifactId>
 	<packaging>pom</packaging>
 	<name>spring-cloud-dependencies-parent</name>
@@ -24,7 +24,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at

-	http://www.apache.org/licenses/LICENSE-2.0
+	https://www.apache.org/licenses/LICENSE-2.0

 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
@@ -48,7 +48,7 @@ limitations under the License.
 			<name>Dave Syer</name>
 			<email>dsyer at pivotal.io</email>
 			<organization>Pivotal Software, Inc.</organization>
-			<organizationUrl>http://www.spring.io</organizationUrl>
+			<organizationUrl>https://www.spring.io</organizationUrl>
 			<roles>
 				<role>Project lead</role>
 			</roles>
@@ -58,7 +58,7 @@ limitations under the License.
 			<name>Spencer Gibb</name>
 			<email>sgibb at pivotal.io</email>
 			<organization>Pivotal Software, Inc.</organization>
-			<organizationUrl>http://www.spring.io</organizationUrl>
+			<organizationUrl>https://www.spring.io</organizationUrl>
 			<roles>
 				<role>Project lead</role>
 			</roles>
Author	SHA1	Message	Date
Ryan Baxter	ee0e96f18d	Merge pull request #115 from spring-operator/polish-urls-xml-1.1.x URL Cleanup	2019-03-26 11:59:58 -04:00
Ryan Baxter	d4a9bd4bac	Merge pull request #122 from spring-operator/polish-urls-remaining-1.1.x URL Cleanup	2019-03-26 11:58:34 -04:00
Spring Operator	57691803dd	URL Cleanup This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # Fixed URLs ## Fixed But Review Recommended These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended. * [ ] http://compose.docker.io/ (UnknownHostException) with 1 occurrences migrated to: https://compose.docker.io/ ([https](https://compose.docker.io/) result UnknownHostException). ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html with 2 occurrences migrated to: https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html ([https](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html) result 200). * [ ] http://contributor-covenant.org with 1 occurrences migrated to: https://contributor-covenant.org ([https](https://contributor-covenant.org) result 301). * [ ] http://contributor-covenant.org/version/1/3/0/ with 1 occurrences migrated to: https://contributor-covenant.org/version/1/3/0/ ([https](https://contributor-covenant.org/version/1/3/0/) result 301). * [ ] http://plugins.jetbrains.com/plugin/6546 with 2 occurrences migrated to: https://plugins.jetbrains.com/plugin/6546 ([https](https://plugins.jetbrains.com/plugin/6546) result 301). * [ ] http://projectlombok.org/features/index.html with 1 occurrences migrated to: https://projectlombok.org/features/index.html ([https](https://projectlombok.org/features/index.html) result 301). * [ ] http://eclipse.org with 1 occurrences migrated to: https://eclipse.org ([https](https://eclipse.org) result 302). * [ ] http://eclipse.org/m2e/ with 2 occurrences migrated to: https://eclipse.org/m2e/ ([https](https://eclipse.org/m2e/) result 302). * [ ] http://www.springsource.com/developer/sts with 1 occurrences migrated to: https://www.springsource.com/developer/sts ([https](https://www.springsource.com/developer/sts) result 302).	2019-03-26 03:08:49 -05:00
Spring Operator	b907b0e3b6	URL Cleanup This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # Fixed URLs ## Fixed But Review Recommended These URLs were fixed, but the https status was not OK. However, the https status was the same as the http request or http redirected to an https URL, so they were migrated. Your review is recommended. * [ ] http://www.puppycrawl.com/dtds/configuration_1_3.dtd (404) with 1 occurrences migrated to: https://www.puppycrawl.com/dtds/configuration_1_3.dtd ([https](https://www.puppycrawl.com/dtds/configuration_1_3.dtd) result 404). # Ignored These URLs were intentionally ignored. * http://maven.apache.org/POM/4.0.0 with 6 occurrences * http://www.w3.org/2001/XMLSchema-instance with 3 occurrences	2019-03-25 23:49:55 -05:00
Spring Operator	2f6bd439c8	URL Cleanup (#100 ) This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # Fixed URLs ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * [ ] http://www.apache.org/licenses/ with 2 occurrences migrated to: https://www.apache.org/licenses/ ([https](https://www.apache.org/licenses/) result 200). * [ ] http://www.apache.org/licenses/LICENSE-2.0 with 2 occurrences migrated to: https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200).	2019-03-22 10:50:02 +01:00
Spring Operator	31508f9a6c	URL Cleanup (#91 ) This commit updates URLs to prefer the https protocol. Redirects are not followed to avoid accidentally expanding intentionally shortened URLs (i.e. if using a URL shortener). # Fixed URLs ## Fixed Success These URLs were switched to an https URL with a 2xx status. While the status was successful, your review is still recommended. * http://maven.apache.org/xsd/maven-4.0.0.xsd with 3 occurrences migrated to: https://maven.apache.org/xsd/maven-4.0.0.xsd ([https](https://maven.apache.org/xsd/maven-4.0.0.xsd) result 200). * http://projects.spring.io/spring-cloud/ with 1 occurrences migrated to: https://projects.spring.io/spring-cloud/ ([https](https://projects.spring.io/spring-cloud/) result 200). * http://www.apache.org/licenses/LICENSE-2.0 with 6 occurrences migrated to: https://www.apache.org/licenses/LICENSE-2.0 ([https](https://www.apache.org/licenses/LICENSE-2.0) result 200). * http://www.spring.io with 6 occurrences migrated to: https://www.spring.io ([https](https://www.spring.io) result 301). * http://repo.spring.io/libs-milestone-local with 4 occurrences migrated to: https://repo.spring.io/libs-milestone-local ([https](https://repo.spring.io/libs-milestone-local) result 302). * http://repo.spring.io/libs-snapshot-local with 4 occurrences migrated to: https://repo.spring.io/libs-snapshot-local ([https](https://repo.spring.io/libs-snapshot-local) result 302). * http://repo.spring.io/release with 2 occurrences migrated to: https://repo.spring.io/release ([https](https://repo.spring.io/release) result 302). * http://spring.io/spring-cloud with 1 occurrences migrated to: https://spring.io/spring-cloud ([https](https://spring.io/spring-cloud) result 302). # Ignored These URLs were intentionally ignored. * http://maven.apache.org/POM/4.0.0 with 6 occurrences * http://www.w3.org/2001/XMLSchema-instance with 3 occurrences	2019-03-16 11:34:58 -04:00
Ryan Baxter	cbbaef88c9	Backporting versions for javadoc, source, and jar plugins	2016-11-29 10:36:37 -05:00
Ryan Baxter	ea00fa8200	Bumping versions for next release	2016-11-23 14:28:43 -05:00
Ryan Baxter	99a2290cb3	Revert "Version changes for 1.1.3 RELEASE" This reverts commit `fdbe3eda99`.	2016-11-23 14:27:08 -05:00
Ryan Baxter	fdbe3eda99	Version changes for 1.1.3 RELEASE	2016-11-23 14:17:22 -05:00
Ryan Baxter	7801077b32	Upgrade Boot version to 1.3.8	2016-11-18 14:02:48 -05:00
Dave Syer	88a1bda370	Revert to snapshots	2016-08-17 11:32:08 +01:00
Dave Syer	364259a1b1	Update to 1.1.2	2016-08-17 11:29:37 +01:00