Update to 1.0.0.RELEASE

.editorconfig

@@ -1,16 +0,0 @@
-root=true
-
-[*.java]
-indent_style = tab
-indent_size = 4
-continuation_indent_size = 8
-
-[*.groovy]
-indent_style = tab
-indent_size = 4
-continuation_indent_size = 8
-
-[*.xml]
-indent_style = tab
-indent_size = 4
-continuation_indent_size = 8

.github/CONTRIBUTING.md

@@ -1,45 +0,0 @@
-
-# Contributing
-
-Spring Cloud is released under the non-restrictive Apache 2.0 license,
-and follows a very standard Github development process, using Github
-tracker for issues and merging pull requests into main. If you want
-to contribute even something trivial please do not hesitate, but
-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
-[Contributor License Agreement](https://cla.pivotal.io/sign/spring).
-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
-given the ability to merge pull requests.
-
-## Code of Conduct
-This project adheres to the Contributor Covenant [code of
-conduct](https://github.com/spring-cloud/spring-cloud-build/blob/main/docs/src/main/asciidoc/code-of-conduct.adoc). By participating, you  are expected to uphold this code. Please report
-unacceptable behavior to spring-code-of-conduct@pivotal.io.
-
-## Code Conventions and Housekeeping
-None of these is essential for a pull request, but they will all help.  They can also be
-added after the original pull request but before a merge.
-
-* Use the Spring Framework code format conventions. If you use Eclipse
-  you can import formatter settings using the
-  `eclipse-code-formatter.xml` file from the
-  [Spring Cloud Build](https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/spring-cloud-dependencies-parent/eclipse-code-formatter.xml) project. If using IntelliJ, you can use the
-  [Eclipse Code Formatter Plugin](https://plugins.jetbrains.com/plugin/6546) 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
-  for.
-* Add the ASF license header comment to all new `.java` files (copy from existing files
-  in the project)
-* Add yourself as an `@author` to the .java files that you modify substantially (more
-  than cosmetic changes).
-* Add some Javadocs and, if you change the namespace, some XSD doc elements.
-* 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 main (or
-  other target branch in the main project).
-* When writing a commit message please follow [these conventions](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html),
-  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).

.github/ISSUE_TEMPLATE.md

@@ -1,20 +0,0 @@
-<!--
-Thanks for raising a Spring Cloud issue. What sort of issue are you raising?
-
-Question
-
-Please ask questions about how to use something, or to understand why something isn't
-working as you expect it to, on Stack Overflow using the spring-cloud tag.
-
-Bug report
-
-Please provide details of the problem, including the version of Spring Cloud that you
-are using. If possible, please provide a test case or sample application that reproduces
-the problem. This makes it much easier for us to diagnose the problem and to verify that
-we have fixed it.
-
-Enhancement
-
-Please start by describing the problem that you are trying to solve. There may already
-be a solution, or there may be a way to solve it that you hadn't considered.
--->

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,17 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: waiting-for-triage
-assignees: ''
-
----
-
-**Describe the bug**
-Please provide details of the problem, including the version of Spring Cloud that you
-are using. 
-
-**Sample**
-If possible, please provide a test case or sample application that reproduces
-the problem. This makes it much easier for us to diagnose the problem and to verify that
-we have fixed it.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -1,20 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.

.github/dependabot.yml

@@ -1,49 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    target-branch: "3.1.x" # oldest OSS supported branch
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    target-branch: "4.0.x" # oldest OSS supported branch
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    target-branch: "main"
-    schedule:
-      interval: "weekly"
-  - package-ecosystem: maven
-    directory: /
-    schedule:
-      interval: daily
-    target-branch: 3.1.x
-    ignore:
-      # only upgrade patch versions for maintenance branch
-      - dependency-name: "*"
-        update-types:
-          - version-update:semver-major
-          - version-update:semver-minor
-  - package-ecosystem: maven
-    directory: /
-    schedule:
-      interval: daily
-    target-branch: 4.0.x
-    ignore:
-      # only upgrade patch versions for maintenance branch
-      - dependency-name: "*"
-        update-types:
-          - version-update:semver-major
-          - version-update:semver-minor
-  - package-ecosystem: maven
-    directory: /
-    schedule:
-      interval: daily
-    target-branch: main
-    ignore:
-      # only upgrade by minor or patch
-      - dependency-name: "*"
-        update-types:
-          - version-update:semver-major

.github/workflows/deploy-docs.yml

@@ -1,32 +0,0 @@
-name: Deploy Docs
-on:
-  push:
-    branches-ignore: [ gh-pages ]
-    tags: '**'
-  repository_dispatch:
-    types: request-build-reference # legacy
-  #schedule:
-  #- cron: '0 10 * * *' # Once per day at 10am UTC
-  workflow_dispatch:
-permissions:
-  actions: write
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    # if: github.repository_owner == 'spring-cloud'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: docs-build
-          fetch-depth: 1
-      - name: Dispatch (partial build)
-        if: github.ref_type == 'branch'
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD) -f build-refname=${{ github.ref_name }}
-      - name: Dispatch (full build)
-        if: github.ref_type == 'tag'
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: gh workflow run deploy-docs.yml -r $(git rev-parse --abbrev-ref HEAD)

.github/workflows/maven.yml

@@ -1,33 +0,0 @@
-# This workflow will build a Java project with Maven
-# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven
-
-name: Build
-
-on:
-  push:
-    branches: [ main ]
-  pull_request:
-    branches: [ main ]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        java: ["17"]
-
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up JDK ${{ matrix.java }}
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: ${{ matrix.java }}
-          cache: 'maven'
-      - name: Build with Maven
-        run: ./mvnw clean install -B -U -P sonar
-      - uses: codecov/codecov-action@v3
-        with:
-          fail_ci_if_error: false

.gitignore

@@ -1,6 +1,3 @@
-/application.yml
-/application.properties
-asciidoctor.css
 *~
 #*
 *#
@@ -8,30 +5,8 @@ asciidoctor.css
 .classpath
 .project
 .settings/
-.settings
 .springBeans
 target/
-bin/
 _site/
 .idea
 *.iml
-*.ipr
-*.iws
-.factorypath
-*.log
-.shelf
-*.swp
-*.swo
-/spring-cloud-release-tools*.jar
-antrun
-.vscode/
-.flattened-pom.xml
-node
-node_modules
-build
-_configprops.adoc
-_spans.adoc
-_metrics.adoc
-_conventions.adoc
-package.json
-package-lock.json

.java-version

@@ -1 +0,0 @@
-17

.mvn/jvm.config

@@ -1 +0,0 @@
--Xmx1024m -XX:CICompilerCount=1 -XX:TieredStopAtLevel=1 -Djava.security.egd=file:/dev/./urandom

.mvn/maven.config

@@ -1,2 +0,0 @@
--DaltSnapshotDeploymentRepository=repo.spring.io::default::https://repo.spring.io/libs-snapshot-local
--P spring

.mvn/wrapper/maven-wrapper.properties

@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.4/apache-maven-3.9.4-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

.sdkmanrc

@@ -1,3 +0,0 @@
-# Enable auto-env through the sdkman_auto_env config
-# Add key=value pairs of SDKs to use below
-java=17.0.1-tem

.settings.xml

@@ -9,19 +9,13 @@
   </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>https://repo.spring.io/libs-snapshot-local</url>
+			<url>http://repo.spring.io/libs-snapshot-local</url>
 			<snapshots>
 				<enabled>true</enabled>
 			</snapshots>
@@ -29,7 +23,7 @@
 		<repository>
 			<id>spring-milestones</id>
 			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/libs-milestone-local</url>
+			<url>http://repo.spring.io/libs-milestone-local</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
@@ -37,7 +31,7 @@
 		<repository>
 			<id>spring-releases</id>
 			<name>Spring Releases</name>
-			<url>https://repo.spring.io/release</url>
+			<url>http://repo.spring.io/release</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
@@ -47,7 +41,7 @@
 		<pluginRepository>
 			<id>spring-snapshots</id>
 			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/libs-snapshot-local</url>
+			<url>http://repo.spring.io/libs-snapshot-local</url>
 			<snapshots>
 				<enabled>true</enabled>
 			</snapshots>
@@ -55,7 +49,7 @@
 		<pluginRepository>
 			<id>spring-milestones</id>
 			<name>Spring Milestones</name>
-			<url>https://repo.spring.io/libs-milestone-local</url>
+			<url>http://repo.spring.io/libs-milestone-local</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>

.travis.yml

@@ -0,0 +1,27 @@
+sudo: false
+cache:
+  directories:
+    - $HOME/.m2
+language: java
+jdk:
+  - oraclejdk8
+services:
+  - rabbitmq
+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:
+- mvn --settings .settings.xml install -P docs -q -U -DskipTests=true -Dmaven.test.redirectTestOutputToFile=true
+- ./docs/src/main/asciidoc/ghpages.sh
+script:
+- '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || mvn --settings .settings.xml deploy -P release -nsu -Dmaven.test.redirectTestOutputToFile=true'
+- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] || mvn --settings .settings.xml install -nsu -Dmaven.test.redirectTestOutputToFile=true'
+env:
+  global:
+  - GIT_NAME="Dave Syer"
+  - GIT_EMAIL=dsyer@pivotal.io
+  - CI_DEPLOY_USERNAME=buildmaster
+  - secure: aeLXRC5oFSddwnZt1/7G2/OHr7jDbxz0ET7sej3I+eSbe3N5vbzQ6FC08es4l89l54ciXd90I1g2BMw7DTYKOO373FP78XPdAEbifJTU4DGd6fCELmoTtUPhjunBIk7E49hisPbv82892IYYA7qi/hzG548cPyZ1IgiJjq0NCsc=

Guardfile

@@ -0,0 +1,11 @@
+require 'asciidoctor'
+require 'erb'
+
+options = {:mkdirs => true, :safe => :unsafe, :attributes => 'linkcss'}
+
+guard 'shell' do
+  watch(/^docs\/[A-Za-z].*\.adoc$/) {|m|
+    Asciidoctor.load_file('docs/src/main/asciidoc/README.adoc', :to_file => './README.adoc', safe: :safe, parse: false, attributes: 'allow-uri-read')
+    Asciidoctor.render_file('docs/src/main/asciidoc/spring-cloud-netflix.adoc', options.merge(:to_dir => 'target/generated-docs'))
+  }
+end

LICENSE.txt

@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        https://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   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
-
-       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,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

README.adoc

@@ -1,122 +1,194 @@
-////
-DO NOT EDIT THIS FILE. IT WAS GENERATED.
-Manual changes to this file will be lost when it is generated again.
-Edit the files in the src/main/asciidoc/ directory instead.
-////
+// Do not edit this file (e.g. go instead to src/main/asciidoc)
+
+image::https://travis-ci.org/spring-cloud/spring-cloud-netflix.svg?branch=master[Build Status, link=https://travis-ci.org/spring-cloud/spring-cloud-netflix]
+
+This project provides Netflix OSS integrations for Spring Boot apps through autoconfiguration
+and binding to the Spring Environment and other Spring programming model idioms. With a few
+simple annotations you can quickly enable and configure the common patterns inside your
+application and build large distributed systems with battle-tested Netflix components. The
+patterns provided include Service Discovery (Eureka), Circuit Breaker (Hystrix),
+Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon).
 
 
-
-image::https://github.com/spring-cloud/spring-cloud-netflix/actions/workflows/maven.yml/badge.svg?branch=main&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-netflix/actions/workflows/maven.yml"]
-
-image:https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/main/graph/badge.svg["Codecov", link="https://app.codecov.io/gh/spring-cloud/spring-cloud-netflix/tree/main"]
-
-
-[[features]]
 == Features
 
 * Service Discovery: Eureka instances can be registered and clients can discover the instances using Spring-managed beans
 * Service Discovery: an embedded Eureka server can be created with declarative Java configuration
+* Circuit Breaker: Hystrix clients can be built with a simple annotation-driven method decorator
+* Circuit Breaker: embedded Hystrix dashboard with declarative Java configuration
+* Declarative REST Client: Feign creates a dynamic implementation of an interface decorated with JAX-RS or Spring MVC annotations
+* Client Side Load Balancer: Ribbon
+* External Configuration: a bridge from the Sprnig Environment to Archaius (enables native configuration of Netflix components using Spring Boot conventions)
+* Router and Filter: automatic regsitration of Zuul filters, and a simple convention over configuration approach to reverse proxy creation
 
-
-[[building]]
 == Building
 
-:jdkversion: 17
+=== Basic Compile and Test
 
-[[basic-compile-and-test]]
-== Basic Compile and Test
-
-To build the source you will need to install JDK {jdkversion}.
+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.
 
 Spring Cloud uses Maven for most build-related activities, and you
 should be able to get off the ground quite quickly by cloning the
 project you are interested in and typing
 
 ----
-$ ./mvnw install
+$ mvn install -s .settings.xml
 ----
 
-NOTE: You can also install Maven (>=3.3.3) yourself and run the `mvn` command
-in place of `./mvnw` in the examples below. If you do that you also
-might need to add `-P spring` if your local Maven settings do not
-contain repository declarations for spring pre-release artifacts.
+NOTE: You may need to increase the amount of memory available to Maven by setting
+a `MAVEN_OPTS` environment variable with the value `-Xmx512m -XX:MaxPermSize=128m`
 
-NOTE: Be aware that you might need to increase the amount of memory
-available to Maven by setting a `MAVEN_OPTS` environment variable with
-a value like `-Xmx512m -XX:MaxPermSize=128m`. We try to cover this in
-the `.mvn` configuration, so if you find you have to do it to make a
-build succeed, please raise a ticket to get the settings added to
-source control.
+The `.settings.xml` is only required the first time (or after updates
+to dependencies). It is there to provide repository declarations so
+that those do not need to be hard coded in the project poms.
 
-The projects that require middleware (i.e. Redis) for testing generally
-require that a local instance of [Docker](https://www.docker.com/get-started) is installed and running.
+For hints on how to build the project look in `.travis.yml` if there
+is one. There should be a "script" and maybe "install" command. Also
+look at the "services" section to see if any services need to be
+running locally (e.g. mongo or rabbit).  Ignore the git-related bits
+that you might find in "before_install" since they will be able git
+credentials and you already have those.
 
-[[documentation]]
-== Documentation
+If you need mongo, rabbit or redis, see the README in the https://github.com/spring-cloud-samples/scripts[scripts
+demo repository] for
+instructions. For example consider using the "fig.yml" with
+http://www.fig.sh/[Fig] to run them in Docker containers.
+
+=== Documentation
 
 The spring-cloud-build module has a "docs" profile, and if you switch
-that on it will try to build asciidoc sources using https://docs.antora.org/antora/latest/[Antora] from
-`modules/ROOT/`.
-
-As part of that process it will look for a
-`docs/src/main/asciidoc/README.adoc` and process it by loading all the includes, but not
+that on it will try to build asciidoc sources from
+`src/main/asciidoc`. As part of that process it will look for a
+`README.adoc` and process it by loading all the includes, but not
 parsing or rendering it, just copying it to `${main.basedir}`
-(defaults to `$\{basedir}`, i.e. the root of the project). If there are
+(defaults to `${basedir}`, i.e. the root of the project). If there are
 any changes in the README it will then show up after a Maven build as
 a modified file in the correct place. Just commit it and push the change.
 
-[[working-with-the-code]]
-== Working with the code
+=== Pull Requests
+
+Spring Cloud is released under the non-restrictive Apache 2.0 license,
+and follows a very standard Github development process, using Github
+tracker for issues and merging pull requests into master. If you want
+to contribute even something trivial please do not hesitate, but
+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://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 given
+the ability to merge pull requests.
+
+==== Code Conventions and Housekeeping
+None of these is essential for a pull request, but they will all help.  They can also be
+added after the original pull request but before a merge.
+
+* Use the Spring Framework code format conventions. If you use Eclipse and you follow
+  the ``Importing into eclipse'' instructions below you should get project specific
+  formatting automatically. You can also import formatter settings using the
+  `eclipse-code-formatter.xml` file from the `eclipse` folder. If using IntelliJ, you can
+  use the http://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
+  for.
+* Add the ASF license header comment to all new `.java` files (copy from existing files
+  in the project)
+* Add yourself as an `@author` to the .java files that you modify substantially (more
+  than cosmetic changes).
+* Add some Javadocs and, if you change the namespace, some XSD doc elements.
+* 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).
+
+=== Working with the code
 If you don't have an IDE preference we would recommend that you use
-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/[m2eclipse] 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.
+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/[m2eclipe] eclipse plugin for maven support. Other IDEs and tools
+should also work without issue.
 
-[[activate-the-spring-maven-profile]]
-=== Activate the Spring Maven profile
-Spring Cloud projects require the 'spring' Maven profile to be activated to resolve
-the spring milestone and snapshot repositories. Use your preferred IDE to set this
-profile to be active, or you may experience build errors.
-
-[[importing-into-eclipse-with-m2eclipse]]
-=== Importing into eclipse with m2eclipse
-We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with
+==== Importing into eclipse with m2eclipse
+We recommend the http://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".
 
-NOTE: Older versions of m2e do not support Maven 3.3, so once the
-projects are imported into Eclipse you will also need to tell
-m2eclipse to use the right profile for the projects.  If you
-see many different errors related to the POMs in the projects, check
-that you have an up to date installation.  If you can't upgrade m2e,
-add the "spring" profile to your `settings.xml`. Alternatively you can
-copy the repository settings from the "spring" profile of the parent
-pom into your `settings.xml`.
-
-[[importing-into-eclipse-without-m2eclipse]]
-=== Importing into eclipse without m2eclipse
+==== Importing into eclipse without m2eclipse
 If you prefer not to use m2eclipse you can generate eclipse project metadata using the
 following command:
 
 [indent=0]
 ----
-	$ ./mvnw eclipse:eclipse
+	$ mvn eclipse:eclipse
 ----
 
 The generated eclipse projects can be imported by selecting `import existing projects`
 from the `file` menu.
 
+==== Adding Project Lombok Agent
 
-NOTE:  To build the module `spring-cloud-netflix-hystrix-contract` along with the entire Netflix project run the
-`build.sh` script in the `scripts` directory.
+Spring Cloud uses [Project
+Lombok](http://projectlombok.org/features/index.html) 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
+sign that you need to do this is a lot of compiler errors to do with
+missing methods and fields, e.g.
+
+[indent=0]
+----
+The method getInitialStatus() is undefined for the type EurekaInstanceConfigBean    EurekaDiscoveryClientConfiguration.java /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka   line 120    Java Problem
+The method getInitialStatus() is undefined for the type EurekaInstanceConfigBean    EurekaDiscoveryClientConfiguration.java /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka   line 121    Java Problem
+The method setNonSecurePort(int) is undefined for the type EurekaInstanceConfigBean EurekaDiscoveryClientConfiguration.java /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka   line 112    Java Problem
+The type EurekaInstanceConfigBean.IdentifyingDataCenterInfo must implement the inherited abstract method DataCenterInfo.getName()   EurekaInstanceConfigBean.java   /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka   line 131    Java Problem
+The method getId() is undefined for the type ProxyRouteLocator.ProxyRouteSpec   PreDecorationFilter.java    /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre line 60 Java Problem
+The method getLocation() is undefined for the type ProxyRouteLocator.ProxyRouteSpec PreDecorationFilter.java    /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre line 55 Java Problem
+----
+
+==== Importing into other IDEs
+Maven is well supported by most Java IDEs. Refer to you vendor documentation.
 
-[[contributing]]
 == Contributing
 
-NOTE: Spring Cloud is released under the non-restrictive Apache 2.0 license. If you would like to contribute to this section of the documentation or if you find an error, please find the source code and issue trackers in the project at {github-project}[github].
+Spring Cloud is released under the non-restrictive Apache 2.0 license. If you would like
+to contribute something, or simply want to hack on the code this document should help
+you get started.
 
-[[license]]
-== License
+=== Sign the Contributor License Agreement
+Before we accept a non-trivial patch or pull request we will need you to sign the
+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
+given the ability to merge pull requests.
 
-The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-netflix/main/LICENSE.txt[here].
+=== Code Conventions and Housekeeping
+None of these is essential for a pull request, but they will all help.  They can also be
+added after the original pull request but before a merge.
+
+* Use the Spring Framework code format conventions. If you use Eclipse
+  you can import formatter settings using the
+  `eclipse-code-formatter.xml` file from the
+  https://github.com/spring-cloud/build/tree/master/eclipse-coding-conventions.xml[Spring
+  Cloud Build] project. If using IntelliJ, you can use the
+  http://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
+  for.
+* Add the ASF license header comment to all new `.java` files (copy from existing files
+  in the project)
+* Add yourself as an `@author` to the .java files that you modify substantially (more
+  than cosmetic changes).
+* Add some Javadocs and, if you change the namespace, some XSD doc elements.
+* 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],
+  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).

RUNNING.md

@@ -0,0 +1,74 @@
+# Running Spring Platform components
+
+## Config Server
+
+  `spring-platform-config$ java -Dspring.platform.config.server.uri=https://github.com/spencergibb/config-repo -jar spring-platform-config-server/target/spring-platform-config-server-1.0.0.BUILD-SNAPSHOT-exec.jar`
+  
+## Netflix Eureka
+
+  `spring-boot-eureka$ mvn spring-boot:run`
+  
+  http://localhost:8080/eureka/jsp/status.jsp
+  
+  Error running executable war:
+  
+    2014-07-14 18:14:25,713 ERROR org.apache.juli.logging.DirectJDKLog:185 [localhost-startStop-1] [log] Exception starting filter servletContainer
+    com.sun.jersey.core.spi.scanning.ScannerException: IO error when scanning jar jar:file:/Users/sgibb/workspace/spring/spring-boot-eureka/target/eureka-server-1.0.0.BUILD-SNAPSHOT.war!/WEB-INF/lib/jersey-apache-client4-1.11.jar!/com/sun/jersey
+    	at com.sun.jersey.core.spi.scanning.uri.JarZipSchemeScanner.scan(JarZipSchemeScanner.java:82)
+    	at com.sun.jersey.core.spi.scanning.PackageNamesScanner.scan(PackageNamesScanner.java:223)
+    	at com.sun.jersey.core.spi.scanning.PackageNamesScanner.scan(PackageNamesScanner.java:139)
+    	at com.sun.jersey.api.core.ScanningResourceConfig.init(ScanningResourceConfig.java:80)
+    	at com.sun.jersey.api.core.PackagesResourceConfig.init(PackagesResourceConfig.java:104)
+    	at com.sun.jersey.api.core.PackagesResourceConfig.<init>(PackagesResourceConfig.java:78)
+    	at com.sun.jersey.api.core.PackagesResourceConfig.<init>(PackagesResourceConfig.java:89)
+    	at com.sun.jersey.spi.container.servlet.WebComponent.createResourceConfig(WebComponent.java:700)
+    	at com.sun.jersey.spi.container.servlet.WebComponent.createResourceConfig(WebComponent.java:678)
+    	at com.sun.jersey.spi.container.servlet.WebComponent.init(WebComponent.java:203)
+    	at com.sun.jersey.spi.container.servlet.ServletContainer.init(ServletContainer.java:374)
+    	at com.sun.jersey.spi.container.servlet.ServletContainer.init(ServletContainer.java:727)
+    	at org.apache.catalina.core.ApplicationFilterConfig.initFilter(ApplicationFilterConfig.java:279)
+    	at org.apache.catalina.core.ApplicationFilterConfig.<init>(ApplicationFilterConfig.java:109)
+    	at org.apache.catalina.core.StandardContext.filterStart(StandardContext.java:4809)
+    	at org.apache.catalina.core.StandardContext.startInternal(StandardContext.java:5485)
+    	at org.apache.catalina.util.LifecycleBase.start(LifecycleBase.java:150)
+    	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1559)
+    	at org.apache.catalina.core.ContainerBase$StartChild.call(ContainerBase.java:1549)
+    	at java.util.concurrent.FutureTask.run(FutureTask.java:262)
+    	at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
+    	at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
+    	at java.lang.Thread.run(Thread.java:744)
+    Caused by: java.io.FileNotFoundException: /Users/sgibb/workspace/spring/spring-boot-eureka/target/eureka-server-1.0.0.BUILD-SNAPSHOT.war!/WEB-INF/lib/jersey-apache-client4-1.11.jar (No such file or directory)
+    	at java.io.FileInputStream.open(Native Method)
+    	at java.io.FileInputStream.<init>(FileInputStream.java:146)
+    	at java.io.FileInputStream.<init>(FileInputStream.java:101)
+    	at sun.net.www.protocol.file.FileURLConnection.connect(FileURLConnection.java:90)
+    	at sun.net.www.protocol.file.FileURLConnection.getInputStream(FileURLConnection.java:188)
+    	at java.net.URL.openStream(URL.java:1037)
+    	at com.sun.jersey.core.spi.scanning.uri.JarZipSchemeScanner.closing(JarZipSchemeScanner.java:123)
+    	at com.sun.jersey.core.spi.scanning.uri.JarZipSchemeScanner.scan(JarZipSchemeScanner.java:75)
+    	... 22 more
+  
+  
+## Netflix Zuul
+
+  `spring-platform-netflix-zuul$ java -Dzuul.filterRoot=src/main/resources/filters -jar target/spring-platform-netflix-zuul-1.0.0.BUILD-SNAPSHOT.jar`
+  
+  http://localhost:6080/ (routes to Sample Frontend)
+  
+## Netflix Hystrix Dashboard
+
+  `spring-platform-netflix-hystrix$ java -jar target/spring-platform-netflix-hystrix-1.0.0.BUILD-SNAPSHOT.war`
+  
+## Netflix Turbine
+ 
+  `spring-platform-netflix-turbine$ java -jar target/spring-platform-netflix-turbine-1.0.0.BUILD-SNAPSHOT.war --InstanceDiscovery.impl=io.spring.platform.netflix.turbine.EurekaInstanceDiscovery --turbine.appConfig=samplefrontendservice --turbine.aggregator.clusterConfig=SAMPLEAPPS --turbine.instanceUrlSuffix=/hystrix.stream --turbine.instanceInsertPort=true`
+  
+## Sandbox Sample Backend
+
+  `spring-platform-sandbox-sample-backend$ java -jar target/spring-platform-sandbox-sample-backend-1.0.0.BUILD-SNAPSHOT.jar`
+  
+## Sandbox Sample Frontend
+
+  `spring-platform-sandbox-sample-frontend$ java -jar target/spring-platform-sandbox-sample-frontend-1.0.0.BUILD-SNAPSHOT.jar`
+  
+  http://localhost:9080/

asciidoctor.css

@@ -1,4 +1,4 @@
-/* Asciidoctor default stylesheet | MIT License | https://asciidoctor.org */
+/* Asciidoctor default stylesheet | MIT License | http://asciidoctor.org */
 /* Remove the comments around the @import statement below when using this as a custom stylesheet */
 /*@import "https://fonts.googleapis.com/css?family=Open+Sans:300,300italic,400,400italic,600,600italic|Noto+Serif:400,400italic,700,700italic|Droid+Sans+Mono:400";*/
 article,aside,details,figcaption,figure,footer,header,hgroup,main,nav,section,summary{display:block}

docs/README.adoc

@@ -0,0 +1,22 @@
+// Do not edit this file (e.g. go instead to src/main/asciidoc)
+
+
+This project provides Netflix OSS integrations for Spring Boot apps through autoconfiguration
+and binding to the Spring Environment and other Spring programming model idioms. With a few
+simple annotations you can quickly enable and configure the common patterns inside your
+application and build large distributed systems with battle-tested Netflix components. The 
+patterns provided include Service Discovery (Eureka), Circuit Breaker (Hystrix), 
+Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon).
+
+
+== Features
+
+* Service Discovery: Eureka instances can be registered and clients can discover the instances using Spring-managed beans
+* Service Discovery: an embedded Eureka server can be created with declarative Java configuration
+* Circuit Breaker: Hystrix clients can be built with a simple annotation-driven method decorator
+* Circuit Breaker: embedded Hystrix dashboard with declarative Java configuration
+* Declarative REST Client: Feign creates a dynamic implementation of an interface decorated with JAX-RS or Spring MVC annotations
+* Client Side Load Balancer: Ribbon
+* External Configuration: a bridge from the Sprnig Environment to Archaius (enabls native configuration of Netflix components using Spring Boot conventions)
+* Router and Filter: automatic regsitration of Zuul filters,a nd a simple convention over configuration approach to reverse proxy creation
+

docs/antora-playbook.yml

@@ -1,39 +0,0 @@
-antora:
-  extensions:
-    - '@springio/antora-extensions/partial-build-extension'
-    - require: '@springio/antora-extensions/latest-version-extension'
-    - require: '@springio/antora-extensions/inject-collector-cache-config-extension'
-    - '@antora/collector-extension'
-    - '@antora/atlas-extension'
-    - require: '@springio/antora-extensions/root-component-extension'
-      root_component_name: 'cloud-netflix'
-    - '@springio/antora-extensions/static-page-extension'
-site:
-  title: Spring Cloud Netflix
-  url: https://docs.spring.io/spring-cloud-netflix/reference/
-content:
-  sources:
-    - url: ./..
-      branches: HEAD
-      start_path: docs
-      worktrees: true
-asciidoc:
-  attributes:
-    page-stackoverflow-url: https://stackoverflow.com/tags/spring-cloud
-    page-pagination: ''
-    hide-uri-scheme: '@'
-    tabs-sync-option: '@'
-    chomp: 'all'
-  extensions:
-    - '@asciidoctor/tabs'
-    - '@springio/asciidoctor-extensions'
-  sourcemap: true
-urls:
-  latest_version_segment: ''
-runtime:
-  log:
-    failure_level: warn
-    format: pretty
-ui:
-  bundle:
-    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.2/ui-bundle.zip

docs/antora.yml

@@ -1,12 +0,0 @@
-name: cloud-netflix
-version: true
-title: Spring Cloud Netflix
-nav:
-  - modules/ROOT/nav.adoc
-ext:
-  collector:
-    run:
-      command: ./mvnw --no-transfer-progress -B process-resources -Pdocs -pl docs -Dantora-maven-plugin.phase=none -Dgenerate-docs.phase=none -Dgenerate-readme.phase=none -Dgenerate-cloud-resources.phase=none -Dmaven-dependency-plugin-for-docs.phase=none -Dmaven-dependency-plugin-for-docs-classes.phase=none -DskipTests
-      local: true
-    scan:
-      dir: ./target/classes/antora-resources/

docs/modules/ROOT/nav.adoc

@@ -1,5 +0,0 @@
-* xref:index.adoc[Introduction]
-* xref:spring-cloud-netflix.adoc[]
-* xref:appendix.adoc[]
-** xref:configprops.adoc[]
-

docs/modules/ROOT/pages/_attributes.adoc

@@ -1,13 +0,0 @@
-:doctype: book
-:idprefix:
-:idseparator: -
-:tabsize: 4
-:numbered:
-:sectanchors:
-:sectnums:
-:icons: font
-:hide-uri-scheme:
-:docinfo: shared,private
-
-:sc-ext: java
-:project-full-name: Spring Cloud Netflix

docs/modules/ROOT/pages/appendix.adoc

@@ -1,13 +0,0 @@
-:numbered!:
-[appendix]
-[[common-application-properties]]
-= Common application properties
-:page-section-summary-toc: 1
-
-
-Various properties can be specified inside your `application.properties` file, inside your `application.yml` file, or as command line switches.
-This appendix provides a list of common Spring Cloud Netflix properties and references to the underlying classes that consume them.
-
-NOTE: Property contributions can come from additional jar files on your classpath, so you should not consider this an exhaustive list.
-Also, you can define your own properties.
-

docs/modules/ROOT/pages/configprops.adoc

@@ -1,6 +0,0 @@
-[[configuration-properties]]
-= Configuration Properties
-
-Below you can find a list of configuration properties.
-
-include::partial$_configprops.adoc[]

docs/modules/ROOT/pages/index.adoc

@@ -1 +0,0 @@
-include::intro.adoc[]

docs/modules/ROOT/pages/spring-cloud-netflix.adoc

@@ -1,612 +0,0 @@
-[[features]]
-= Spring Cloud Netflix Features
-
-== Service Discovery: Eureka Clients
-
-Service Discovery is one of the key tenets of a microservice-based architecture.
-Trying to hand-configure each client or some form of convention can be difficult to do and can be brittle.
-Eureka is the Netflix Service Discovery Server and Client.
-The server can be configured and deployed to be highly available, with each server replicating state about the registered services to the others.
-
-[[netflix-eureka-client-starter]]
-=== How to Include Eureka Client
-
-To include the Eureka Client in your project, use the starter with a group ID of `org.springframework.cloud` and an artifact ID of  `spring-cloud-starter-netflix-eureka-client`.
-See the https://projects.spring.io/spring-cloud/[Spring Cloud Project page] for details on setting up your build system with the current Spring Cloud Release Train.
-
-=== Registering with Eureka
-
-When a client registers with Eureka, it provides meta-data about itself -- such as host, port, health indicator URL, home page, and other details.
-Eureka receives heartbeat messages from each instance belonging to a service.
-If the heartbeat fails over a configurable timetable, the instance is normally removed from the registry.
-// TODO "normally"? Is there some configuration detail that causes a different behavior?
-
-The following example shows a minimal Eureka client application:
-
-[source,java,indent=0]
-----
-@SpringBootApplication
-@RestController
-public class Application {
-
-    @RequestMapping("/")
-    public String home() {
-        return "Hello world";
-    }
-
-    public static void main(String[] args) {
-        new SpringApplicationBuilder(Application.class).web(true).run(args);
-    }
-
-}
-----
-
-Note that the preceding example shows a normal https://projects.spring.io/spring-boot/[Spring Boot] application.
-By having `spring-cloud-starter-netflix-eureka-client` on the classpath, your application automatically registers with the Eureka Server.  Configuration is required to locate the Eureka server, as shown in the following example:
-
-.application.yml
-----
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: http://localhost:8761/eureka/
-----
-
-In the preceding example, `defaultZone` is a magic string fallback value that provides the service URL for any client that does not express a preference (in other words, it is a useful default).
-
-WARNING: The `defaultZone` property is case sensitive and requires camel case because the `serviceUrl` property is a `Map<String, String>`. Therefore, the `defaultZone` property does not follow the normal Spring Boot snake-case convention of `default-zone`.
-
-The default application name (that is, the service ID), virtual host, and non-secure port (taken from the `Environment`) are `${spring.application.name}`, `${spring.application.name}` and `${server.port}`, respectively.
-
-Having `spring-cloud-starter-netflix-eureka-client` on the classpath makes the app into both a Eureka "`instance`" (that is, it registers itself) and a "`client`" (it can query the registry to locate other services).
-The instance behaviour is driven by `eureka.instance.*` configuration keys, but the defaults are fine if you ensure that your application has a value for `spring.application.name` (this is the default for the Eureka service ID or VIP).
-
-See {github-code}/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBean.java[EurekaInstanceConfigBean] and {github-code}/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBean.java[EurekaClientConfigBean] for more details on the configurable options.
-
-To disable the Eureka Discovery Client, you can set `eureka.client.enabled` to `false`. Eureka Discovery Client will also be disabled when `spring.cloud.discovery.enabled` is set to `false`.
-
-
-NOTE: Specifying the version of the Spring Cloud Netflix Eureka server as a path parameter is not currently supported. This means you cannot set the version in the context path (`eurekaServerURLContext`). Instead, you can include the version in the server URL (for example, you can set `defaultZone: http://localhost:8761/eureka/v2`).
-
-=== Authenticating with the Eureka Server
-
-HTTP basic authentication is automatically added to your eureka client if one of the `eureka.client.serviceUrl.defaultZone` URLs has credentials embedded in it (curl style, as follows: `https://user:password@localhost:8761/eureka`).
-For more complex needs, you can create a `@Bean` of type `DiscoveryClientOptionalArgs` and inject `ClientFilter` instances into it, all of which is applied to the calls from the client to the server.
-
-When Eureka server requires client side certificate for authentication, the client side certificate and trust store can be configured via properties, as shown in following example:
-
-.application.yml
-[source,yaml]
-----
-eureka:
-  client:
-    tls:
-      enabled: true
-      key-store: <path-of-key-store>
-      key-store-type: PKCS12
-      key-store-password: <key-store-password>
-      key-password: <key-password>
-      trust-store: <path-of-trust-store>
-      trust-store-type: PKCS12
-      trust-store-password: <trust-store-password>
-----
-
-The `eureka.client.tls.enabled` needs to be true to enable Eureka client side TLS. When `eureka.client.tls.trust-store` is omitted, a JVM default trust store is used. The default value for `eureka.client.tls.key-store-type` and `eureka.client.tls.trust-store-type` is PKCS12. When password properties are omitted, empty password is assumed.
-
-NOTE: Because of a limitation in Eureka, it is not possible to support per-server basic auth credentials, so only the first set that are found is used.
-
-If you want to customize the RestTemplate used by the Eureka HTTP Client you may want to create a bean of `EurekaClientHttpRequestFactorySupplier` and provide your own logic for generating a `ClientHttpRequestFactory` instance.
-
-All default timeout-related properties for RestTemplate used by the Eureka HTTP Client are set to 3 minutes (in keeping with Apache HC5 default `RequestConfig` and `SocketConfig`). Therefore, to specify the timeout values, you must specify the value directly with the properties in `eureka.client.rest-template-timeout`. (All timeout properties are in milliseconds.)
-
-.application.yml
-[source,yaml]
-----
-eureka:
-  client:
-    rest-template-timeout:
-      connect-timeout: 5000
-      connect-request-timeout: 8000
-      socket-timeout: 10000
-----
-
-=== Status Page and Health Indicator
-
-The status page and health indicators for a Eureka instance default to `/info` and `/health` respectively, which are the default locations of useful endpoints in a Spring Boot Actuator application.
-You need to change these, even for an Actuator application if you use a non-default context path or servlet path (such as `server.servletPath=/custom`). The following example shows the default values for the two settings:
-
-.application.yml
-----
-eureka:
-  instance:
-    statusPageUrlPath: ${server.servletPath}/info
-    healthCheckUrlPath: ${server.servletPath}/health
-----
-
-These links show up in the metadata that is consumed by clients and are used in some scenarios to decide whether to send requests to your application, so it is helpful if they are accurate.
-
-NOTE: In Dalston it was also required to set the status and health check URLs when changing
-that management context path.  This requirement was removed beginning in Edgware.
-
-=== Registering a Secure Application
-
-If your app wants to be contacted over HTTPS, you can set two flags in the `EurekaInstanceConfigBean`:
-
-* `eureka.instance.[nonSecurePortEnabled]=[false]`
-* `eureka.instance.[securePortEnabled]=[true]`
-
-Doing so makes Eureka publish instance information that shows an explicit preference for secure communication.
-The Spring Cloud `DiscoveryClient` always returns a URI starting with `https` for a service configured this way.
-Similarly, when a service is configured this way, the Eureka (native) instance information has a secure health check URL.
-
-Because of the way Eureka works internally, it still publishes a non-secure URL for the status and home pages unless you also override those explicitly.
-You can use placeholders to configure the eureka instance URLs, as shown in the following example:
-
-.application.yml
-----
-eureka:
-  instance:
-    statusPageUrl: https://${eureka.hostname}/info
-    healthCheckUrl: https://${eureka.hostname}/health
-    homePageUrl: https://${eureka.hostname}/
-----
-
-(Note that `${eureka.hostname}` is a native placeholder only available
-in later versions of Eureka. You could achieve the same thing with
-Spring placeholders as well -- for example, by using `${eureka.instance.hostName}`.)
-
-NOTE: If your application runs behind a proxy, and the SSL termination is in the proxy (for example, if you run in Cloud Foundry or other platforms as a service), then you need to ensure that the proxy "`forwarded`" headers are intercepted and handled by the application.
-If the Tomcat container embedded in a Spring Boot application has explicit configuration for the 'X-Forwarded-\*` headers, this happens automatically.
-The links rendered by your app to itself being wrong (the wrong host, port, or protocol) is a sign that you got this configuration wrong.
-
-=== Eureka's Health Checks
-
-By default, Eureka uses the client heartbeat to determine if a client is up.
-Unless specified otherwise, the Discovery Client does not propagate the current health check status of the application, per the Spring Boot Actuator.
-Consequently, after successful registration, Eureka always announces that the application is in 'UP' state. This behavior can be altered by enabling Eureka health checks, which results in propagating application status to Eureka.
-As a consequence, every other application does not send traffic to applications in states other then 'UP'.
-The following example shows how to enable health checks for the client:
-
-.application.yml
-----
-eureka:
-  client:
-    healthcheck:
-      enabled: true
-----
-
-WARNING: `eureka.client.healthcheck.enabled=true` should only be set in `application.yml`. Setting the value in `bootstrap.yml` causes undesirable side effects, such as registering in Eureka with an `UNKNOWN` status.
-
-If you require more control over the health checks, consider implementing your own `com.netflix.appinfo.HealthCheckHandler`.
-
-=== Eureka Metadata for Instances and Clients
-
-It is worth spending a bit of time understanding how the Eureka metadata works, so you can use it in a way that makes sense in your platform.
-There is standard metadata for information such as hostname, IP address, port numbers, the status page, and health check.
-These are published in the service registry and used by clients to contact the services in a straightforward way.
-Additional metadata can be added to the instance registration in the `eureka.instance.metadataMap`, and this metadata is accessible in the remote clients.
-In general, additional metadata does not change the behavior of the client, unless the client is made aware of the meaning of the metadata.
-There are a couple of special cases, described later in this document, where Spring Cloud already assigns meaning to the metadata map.
-// TODO Add links from here to the relevant places in the document
-
-==== Using Eureka on Cloud Foundry
-
-Cloud Foundry has a global router so that all instances of the same app have the same hostname (other PaaS solutions with a similar architecture have the same arrangement).
-This is not necessarily a barrier to using Eureka.
-However, if you use the router (recommended or even mandatory, depending on the way your platform was set up), you need to explicitly set the hostname and port numbers (secure or non-secure) so that they use the router.
-You might also want to use instance metadata so that you can distinguish between the instances on the client (for example, in a custom load balancer).
-By default, the `eureka.instance.instanceId` is `vcap.application.instance_id`, as shown in the following example:
-
-.application.yml
-----
-eureka:
-  instance:
-    hostname: ${vcap.application.uris[0]}
-    nonSecurePort: 80
-----
-
-Depending on the way the security rules are set up in your Cloud Foundry instance, you might be able to register and use the IP address of the host VM for direct service-to-service calls.
-This feature is not yet available on Pivotal Web Services (https://run.pivotal.io[PWS]).
-
-==== Using Eureka on AWS
-
-If the application is planned to be deployed to an AWS cloud, the Eureka instance must be configured to be AWS-aware. You can do so by customizing the {github-code}/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBean.java[EurekaInstanceConfigBean] as follows:
-
-[source,java,indent=0]
-----
-@Bean
-@Profile("!default")
-public EurekaInstanceConfigBean eurekaInstanceConfig(InetUtils inetUtils) {
-  EurekaInstanceConfigBean bean = new EurekaInstanceConfigBean(inetUtils);
-  AmazonInfo info = AmazonInfo.Builder.newBuilder().autoBuild("eureka");
-  bean.setDataCenterInfo(info);
-  return bean;
-}
-----
-
-==== Changing the Eureka Instance ID
-
-A vanilla Netflix Eureka instance is registered with an ID that is equal to its host name (that is, there is only one service per host).
-Spring Cloud Eureka provides a sensible default, which is defined as follows:
-
-`${spring.cloud.client.hostname}:${spring.application.name}:${spring.application.instance_id:${server.port}}`
-
-An example is `myhost:myappname:8080`.
-
-By using Spring Cloud, you can override this value by providing a unique identifier in `eureka.instance.instanceId`, as shown in the following example:
-
-.application.yml
-----
-eureka:
-  instance:
-    instanceId: ${spring.application.name}:${vcap.application.instance_id:${spring.application.instance_id:${random.value}}}
-----
-
-With the metadata shown in the preceding example and multiple service instances deployed on localhost, the random value is inserted there to make the instance unique.
-In Cloud Foundry, the `vcap.application.instance_id` is populated automatically in a Spring Boot application, so the random value is not needed.
-
-=== Using the EurekaClient
-
-Once you have an application that is a discovery client, you can use it to discover service instances from the <<spring-cloud-eureka-server,
-Eureka Server>>.
-One way to do so is to use the native `com.netflix.discovery.EurekaClient` (as opposed to the Spring Cloud `DiscoveryClient`), as shown in the following example:
-
-----
-@Autowired
-private EurekaClient discoveryClient;
-
-public String serviceUrl() {
-    InstanceInfo instance = discoveryClient.getNextServerFromEureka("STORES", false);
-    return instance.getHomePageUrl();
-}
-----
-
-[TIP]
-====
-Do not use the `EurekaClient` in a `@PostConstruct` method or in a `@Scheduled` method (or anywhere where the `ApplicationContext` might not be started yet).
-It is initialized in a `SmartLifecycle` (with `phase=0`), so the earliest you can rely on it being available is in another `SmartLifecycle` with a higher phase.
-====
-
-==== Underlying HTTP clients
-
-`EurekaClient` uses either `RestTemplate`, `WebClient` or `JerseyClient` under the hood. In order to use the `EurekaClient`, you need to have one of the supported HTTP clients on your classpath.
-
-To use `RestTemplate`, add `spring-boot-starter-web` to your dependencies. To use `WebClient`, add `spring-boot-starter-webflux` to your dependencies. If both `RestTemplate` and `WebClient` are on the classpath when `eureka.client.webclient.enabled` is set to `true`, `WebClient` is used. Otherwise, `RestTemplate` is used.
-
-If you wish to use Jersey instead, you need to add the Jersey dependencies to your classpath.
-The following example shows the dependencies you need to add:
-
-[source,xml]
-----
-<dependencies>
-    <dependency>
-        <groupId>com.sun.jersey</groupId>
-        <artifactId>jersey-client</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>com.sun.jersey</groupId>
-        <artifactId>jersey-core</artifactId>
-    </dependency>
-    <dependency>
-        <groupId>com.sun.jersey.contribs</groupId>
-        <artifactId>jersey-apache-client4</artifactId>
-    </dependency>
-</dependencies>
-----
-
-=== Alternatives to the Native Netflix EurekaClient
-
-You need not use the raw Netflix `EurekaClient`.
-Also, it is usually more convenient to use it behind a wrapper of some sort.
-Spring Cloud has support for <<spring-cloud-feign, Feign>> (a REST client builder) and https://docs.spring.io/spring-cloud-commons/reference/4.1/spring-cloud-commons/loadbalancer.html[Spring Cloud LoadBalancer] through the logical Eureka service identifiers (VIPs) instead of physical URLs.
-
-You can also use the `org.springframework.cloud.client.discovery.DiscoveryClient`, which provides a simple API (not specific to Netflix) for discovery clients, as shown in the following example:
-
-----
-@Autowired
-private DiscoveryClient discoveryClient;
-
-public String serviceUrl() {
-    List<ServiceInstance> list = discoveryClient.getInstances("STORES");
-    if (list != null && list.size() > 0 ) {
-        return list.get(0).getUri();
-    }
-    return null;
-}
-----
-
-=== Why Is It so Slow to Register a Service?
-
-Being an instance also involves a periodic heartbeat to the registry
-(through the client's `serviceUrl`) with a default duration of 30 seconds.
-A service is not available for discovery by clients until the instance, the server, and the client all have the same metadata in their local
-cache (so it could take 3 heartbeats).
-You can change the period by setting `eureka.instance.leaseRenewalIntervalInSeconds`.
-Setting it to a value of less than 30 speeds up the process of getting clients connected to other services.
-In production, it is probably better to stick with the default, because of internal computations in the server that make assumptions about the lease renewal period.
-
-=== Zones
-
-If you have deployed Eureka clients to multiple zones, you may prefer that those clients use services within the same zone before trying services in another zone.
-To set that up, you need to configure your Eureka clients correctly.
-
-First, you need to make sure you have Eureka servers deployed to each zone and that
-they are peers of each other.
-See the section on <<spring-cloud-eureka-server-zones-and-regions,zones and regions>>
-for more information.
-
-Next, you need to tell Eureka which zone your service is in.
-You can do so by using the `metadataMap` property.
-For example, if `service 1` is deployed to both `zone 1` and `zone 2`, you need to set the following Eureka properties in `service 1`:
-
-*Service 1 in Zone 1*
-```
-eureka.instance.metadataMap.zone = zone1
-eureka.client.preferSameZoneEureka = true
-```
-
-*Service 1 in Zone 2*
-```
-eureka.instance.metadataMap.zone = zone2
-eureka.client.preferSameZoneEureka = true
-```
-
-=== Refreshing Eureka Clients
-
-By default, the `EurekaClient` bean is refreshable, meaning the Eureka client properties can be changed and refreshed.
-When a refresh occurs clients will be unregistered from the Eureka server and there might be a brief moment of time
-where all instance of a given service are not available. One way to eliminate this from happening is to disable
-the ability to refresh Eureka clients.  To do this set `eureka.client.refresh.enable=false`.
-
-=== Using Eureka with Spring Cloud LoadBalancer
-
-We offer support for the Spring Cloud LoadBalancer `ZonePreferenceServiceInstanceListSupplier`.
-The `zone` value from the Eureka instance metadata (`eureka.instance.metadataMap.zone`) is used for setting the
-value of `spring-cloud-loadbalancer-zone` property that is used to filter service instances by zone.
-
-If that is missing and if the `spring.cloud.loadbalancer.eureka.approximateZoneFromHostname` flag is set to `true`,
-it can use the domain name from the server hostname as a proxy for the zone.
-
-If there is no other source of zone data, then a guess is made, based on the client configuration (as opposed to the instance configuration).
-We take `eureka.client.availabilityZones`, which is a map from region name to a list of zones, and pull out the first zone for the instance's own region (that is, the `eureka.client.region`, which defaults to "us-east-1", for compatibility with native Netflix).
-
-=== AOT and Native Image Support
-
-Spring Cloud Netflix Eureka Client integration supports Spring AOT transformations and native images, however, only with refresh mode disabled.
-
-WARNING: If you want to run Eureka Client in AOT or native image modes, make sure to set `spring.cloud.refresh.enabled` to `false`
-
-[[spring-cloud-eureka-server]]
-== Service Discovery: Eureka Server
-
-This section describes how to set up a Eureka server.
-
-[[netflix-eureka-server-starter]]
-=== How to Include Eureka Server
-
-To include Eureka Server in your project, use the starter with a group ID of `org.springframework.cloud` and an artifact ID of `spring-cloud-starter-netflix-eureka-server`.
-See the https://projects.spring.io/spring-cloud/[Spring Cloud Project page] for details on setting up your build system with the current Spring Cloud Release Train.
-
-NOTE: If your project already uses Thymeleaf as its template engine, the Freemarker templates of the Eureka server may not be loaded correctly. In this case it is necessary to configure the template loader manually:
-
-.application.yml
-----
-spring:
-  freemarker:
-    template-loader-path: classpath:/templates/
-    prefer-file-system-access: false
-----
-
-[[spring-cloud-running-eureka-server]]
-=== How to Run a Eureka Server
-
-The following example shows a minimal Eureka server:
-
-[source,java,indent=0]
-----
-@SpringBootApplication
-@EnableEurekaServer
-public class Application {
-
-    public static void main(String[] args) {
-        new SpringApplicationBuilder(Application.class).web(true).run(args);
-    }
-
-}
-----
-
-The server has a home page with a UI and HTTP API endpoints for the normal Eureka functionality under `/eureka/*`.
-
-The following links have some Eureka background reading:  https://github.com/cfregly/fluxcapacitor/wiki/NetflixOSS-FAQ#eureka-service-discovery-load-balancer[flux capacitor] and https://groups.google.com/forum/?fromgroups#!topic/eureka_netflix/g3p2r7gHnN0[google group discussion].
-
-[TIP]
-====
-Due to Gradle's dependency resolution rules and the lack of a parent bom feature, depending on `spring-cloud-starter-netflix-eureka-server` can cause failures on application startup.
-To remedy this issue, add the Spring Boot Gradle plugin and import the Spring cloud starter parent bom as follows:
-
-.build.gradle
-[source,java,indent=0]
-----
-buildscript {
-  dependencies {
-    classpath("org.springframework.boot:spring-boot-gradle-plugin:{spring-boot-docs-version}")
-  }
-}
-
-apply plugin: "spring-boot"
-
-dependencyManagement {
-  imports {
-    mavenBom "org.springframework.cloud:spring-cloud-dependencies:{spring-cloud-version}"
-  }
-}
-----
-====
-
-=== `defaultOpenForTrafficCount` and its effect on EurekaServer warmup time
-
-Netflix Eureka's `waitTimeInMsWhenSyncEmpty` setting is not taken into account in Spring Cloud Eureka server at the beginning. In order to enable the warmup time, set `eureka.server.defaultOpenForTrafficCount=0`.
-
-[[spring-cloud-eureka-server-zones-and-regions]]
-=== High Availability, Zones and Regions
-
-The Eureka server does not have a back end store, but the service instances in the registry all have to send heartbeats to keep their registrations up to date (so this can be done in memory).
-Clients also have an in-memory cache of Eureka registrations (so they do not have to go to the registry for every request to a service).
-
-By default, every Eureka server is also a Eureka client and requires (at least one) service URL to locate a peer.
-If you do not provide it, the service runs and works, but it fills your logs with a lot of noise about not being able to register with the peer.
-
-[[spring-cloud-eureka-server-standalone-mode]]
-=== Standalone Mode
-
-The combination of the two caches (client and server) and the heartbeats make a standalone Eureka server fairly resilient to failure, as long as there is some sort of monitor or elastic runtime (such as Cloud Foundry) keeping it alive.
-In standalone mode, you might prefer to switch off the client side behavior so that it does not keep trying and failing to reach its peers.
-The following example shows how to switch off the client-side behavior:
-
-.application.yml (Standalone Eureka Server)
-----
-server:
-  port: 8761
-
-eureka:
-  instance:
-    hostname: localhost
-  client:
-    registerWithEureka: false
-    fetchRegistry: false
-    serviceUrl:
-      defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
-----
-
-Notice that the `serviceUrl` is pointing to the same host as the local instance.
-
-[[spring-cloud-eureka-server-peer-awareness]]
-=== Peer Awareness
-
-Eureka can be made even more resilient and available by running multiple instances and asking them to register with each other.
-In fact, this is the default behavior, so all you need to do to make it work is add a valid `serviceUrl` to a peer, as shown in the following example:
-
-.application.yml (Two Peer Aware Eureka Servers)
-----
-
----
-spring:
-  profiles: peer1
-eureka:
-  instance:
-    hostname: peer1
-  client:
-    serviceUrl:
-      defaultZone: https://peer2/eureka/
-
----
-spring:
-  profiles: peer2
-eureka:
-  instance:
-    hostname: peer2
-  client:
-    serviceUrl:
-      defaultZone: https://peer1/eureka/
-----
-
-In the preceding example, we have a YAML file that can be used to run the same server on two hosts (`peer1` and `peer2`) by running it in different Spring profiles.
-You could use this configuration to test the peer awareness on a single host (there is not much value in doing that in production) by manipulating `/etc/hosts` to resolve the host names.
-In fact, the `eureka.instance.hostname` is not needed if you are running on a machine that knows its own hostname (by default, it is looked up by using `java.net.InetAddress`).
-
-You can add multiple peers to a system, and, as long as they are all connected to each other by at least one edge, they synchronize
-the registrations amongst themselves.
-If the peers are physically separated (inside a data center or between multiple data centers), then the system can, in principle, survive "`split-brain`" type failures.
-You can add multiple peers to a system, and as long as they are all
-directly connected to each other, they will synchronize
-the registrations amongst themselves.
-
-.application.yml (Three Peer Aware Eureka Servers)
-----
-eureka:
-  client:
-    serviceUrl:
-      defaultZone: https://peer1/eureka/,http://peer2/eureka/,http://peer3/eureka/
-
----
-spring:
-  profiles: peer1
-eureka:
-  instance:
-    hostname: peer1
-
----
-spring:
-  profiles: peer2
-eureka:
-  instance:
-    hostname: peer2
-
----
-spring:
-  profiles: peer3
-eureka:
-  instance:
-    hostname: peer3
-----
-
-[[spring-cloud-eureka-server-prefer-ip-address]]
-=== When to Prefer IP Address
-
-In some cases, it is preferable for Eureka to advertise the IP addresses of services rather than the hostname.
-Set `eureka.instance.preferIpAddress` to `true` and, when the application registers with eureka, it uses its IP address rather than its hostname.
-
-[TIP]
-====
-If the hostname cannot be determined by Java, then the IP address is sent to Eureka.
-Only explict way of setting the hostname is by setting `eureka.instance.hostname` property.
-You can set your hostname at the run-time by using an environment variable -- for example, `eureka.instance.hostname=$\{HOST_NAME}`.
-====
-
-=== Securing The Eureka Server
-
-You can secure your Eureka server simply by adding Spring Security to your
-server's classpath via `spring-boot-starter-security`.  By default, when Spring Security is on the classpath it will require that
-a valid CSRF token be sent with every request to the app.  Eureka clients will not generally possess a valid
-cross site request forgery (CSRF) token you will need to disable this requirement for the `/eureka/**` endpoints.
-For example:
-
-[source,java,indent=0]
-----
-@Bean
-public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
-	http.authorizeHttpRequests((authz) -> authz
-        .anyRequest().authenticated())
-	    .httpBasic(withDefaults());
-    http.csrf().ignoringRequestMatchers("/eureka/**");
-    return http.build();
-}
-----
-
-For more information on CSRF see the https://docs.spring.io/spring-security/site/docs/current/reference/htmlsingle/#csrf[Spring Security documentation].
-
-A demo Eureka Server can be found in the Spring Cloud Samples https://github.com/spring-cloud-samples/eureka/tree/Eureka-With-Security-4.x[repo].
-
-=== JDK 11 Support
-
-The JAXB modules which the Eureka server depends upon were removed in JDK 11.  If you intend to use JDK 11
-when running a Eureka server you must include these dependencies in your POM or Gradle file.
-
-[source,xml,indent=0]
-----
-<dependency>
-	<groupId>org.glassfish.jaxb</groupId>
-	<artifactId>jaxb-runtime</artifactId>
-</dependency>
-----
-
-=== AOT and Native Image Support
-
-Spring Cloud Netflix Eureka Server does not support Spring AOT transformations or native images.
-
-== Configuration properties
-
-To see the list of all Spring Cloud Netflix related configuration properties please check link:appendix.html[the Appendix page].
-
-
-

docs/modules/ROOT/partials/_configprops.adoc

@@ -1,259 +0,0 @@
-|===
-|Name | Default | Description
-
-|eureka.client.allow-redirects | `+++false+++` | Indicates whether server can redirect a client request to a backup server/cluster. If set to false, the server will handle the request directly, If set to true, it may send HTTP redirect to the client, with a new server location.
-|eureka.client.availability-zones |  | Gets the list of availability zones (used in AWS data centers) for the region in which this instance resides. The changes are effective at runtime at the next registry fetch cycle as specified by registryFetchIntervalSeconds.
-|eureka.client.backup-registry-impl |  | Gets the name of the implementation which implements BackupRegistry to fetch the registry information as a fallback option for only the first time when the eureka client starts. This may be needed for applications which needs additional resiliency for registry information without which it cannot operate.
-|eureka.client.cache-refresh-executor-exponential-back-off-bound | `+++10+++` | Cache refresh executor exponential back off related property. It is a maximum multiplier value for retry delay, in case where a sequence of timeouts occurred.
-|eureka.client.cache-refresh-executor-thread-pool-size | `+++2+++` | The thread pool size for the cacheRefreshExecutor to initialise with.
-|eureka.client.client-data-accept |  | EurekaAccept name for client data accept.
-|eureka.client.decoder-name |  | This is a transient config and once the latest codecs are stable, can be removed (as there will only be one).
-|eureka.client.disable-delta | `+++false+++` | Indicates whether the eureka client should disable fetching of delta and should rather resort to getting the full registry information. Note that the delta fetches can reduce the traffic tremendously, because the rate of change with the eureka server is normally much lower than the rate of fetches. The changes are effective at runtime at the next registry fetch cycle as specified by registryFetchIntervalSeconds
-|eureka.client.dollar-replacement | `+++_-+++` | Get a replacement string for Dollar sign <code>$</code> during serializing/deserializing information in eureka server.
-|eureka.client.enabled | `+++true+++` | Flag to indicate that the Eureka client is enabled.
-|eureka.client.encoder-name |  | This is a transient config and once the latest codecs are stable, can be removed (as there will only be one).
-|eureka.client.escape-char-replacement | `+++__+++` | Get a replacement string for underscore sign <code>_</code> during serializing/ deserializing information in eureka server.
-|eureka.client.eureka-connection-idle-timeout-seconds | `+++30+++` | Indicates how much time (in seconds) that the HTTP connections to eureka server can stay idle before it can be closed. In the AWS environment, it is recommended that the values is 30 seconds or less, since the firewall cleans up the connection information after a few mins leaving the connection hanging in limbo.
-|eureka.client.eureka-server-connect-timeout-seconds | `+++5+++` | Indicates how long to wait (in seconds) before a connection to eureka server needs to timeout. Note that the connections in the client are pooled by {@link HttpClient} and this setting affects the actual connection creation and also the wait time to get the connection from the pool.
-|eureka.client.eureka-server-d-n-s-name |  | Gets the DNS name to be queried to get the list of eureka servers.This information is not required if the contract returns the service urls by implementing serviceUrls. The DNS mechanism is used when useDnsForFetchingServiceUrls is set to true and the eureka client expects the DNS to configured a certain way so that it can fetch changing eureka servers dynamically. The changes are effective at runtime.
-|eureka.client.eureka-server-port |  | Gets the port to be used to construct the service url to contact eureka server when the list of eureka servers come from the DNS.This information is not required if the contract returns the service urls eurekaServerServiceUrls(String). The DNS mechanism is used when useDnsForFetchingServiceUrls is set to true and the eureka client expects the DNS to configured a certain way so that it can fetch changing eureka servers dynamically. The changes are effective at runtime.
-|eureka.client.eureka-server-read-timeout-seconds | `+++8+++` | Indicates how long to wait (in seconds) before a read from eureka server needs to timeout.
-|eureka.client.eureka-server-total-connections | `+++200+++` | Gets the total number of connections that is allowed from eureka client to all eureka servers.
-|eureka.client.eureka-server-total-connections-per-host | `+++50+++` | Gets the total number of connections that is allowed from eureka client to a eureka server host.
-|eureka.client.eureka-server-u-r-l-context |  | Gets the URL context to be used to construct the service url to contact eureka server when the list of eureka servers come from the DNS. This information is not required if the contract returns the service urls from eurekaServerServiceUrls. The DNS mechanism is used when useDnsForFetchingServiceUrls is set to true and the eureka client expects the DNS to configured a certain way so that it can fetch changing eureka servers dynamically. The changes are effective at runtime.
-|eureka.client.eureka-service-url-poll-interval-seconds | `+++0+++` | Indicates how often(in seconds) to poll for changes to eureka server information. Eureka servers could be added or removed and this setting controls how soon the eureka clients should know about it.
-|eureka.client.fetch-registry | `+++true+++` | Indicates whether this client should fetch eureka registry information from eureka server.
-|eureka.client.fetch-remote-regions-registry |  | Comma separated list of regions for which the eureka registry information will be fetched. It is mandatory to define the availability zones for each of these regions as returned by availabilityZones. Failing to do so, will result in failure of discovery client startup.
-|eureka.client.filter-only-up-instances | `+++true+++` | Indicates whether to get the applications after filtering the applications for instances with only InstanceStatus UP states.
-|eureka.client.g-zip-content | `+++true+++` | Indicates whether the content fetched from eureka server has to be compressed whenever it is supported by the server. The registry information from the eureka server is compressed for optimum network traffic.
-|eureka.client.healthcheck.enabled | `+++true+++` | Enables the Eureka health check handler.
-|eureka.client.heartbeat-executor-exponential-back-off-bound | `+++10+++` | Heartbeat executor exponential back off related property. It is a maximum multiplier value for retry delay, in case where a sequence of timeouts occurred.
-|eureka.client.heartbeat-executor-thread-pool-size | `+++2+++` | The thread pool size for the heartbeatExecutor to initialise with.
-|eureka.client.initial-instance-info-replication-interval-seconds | `+++40+++` | Indicates how long initially (in seconds) to replicate instance info to the eureka server.
-|eureka.client.instance-info-replication-interval-seconds | `+++30+++` | Indicates how often(in seconds) to replicate instance changes to be replicated to the eureka server.
-|eureka.client.log-delta-diff | `+++false+++` | Indicates whether to log differences between the eureka server and the eureka client in terms of registry information. Eureka client tries to retrieve only delta changes from eureka server to minimize network traffic. After receiving the deltas, eureka client reconciles the information from the server to verify it has not missed out some information. Reconciliation failures could happen when the client has had network issues communicating to server.If the reconciliation fails, eureka client gets the full registry information. While getting the full registry information, the eureka client can log the differences between the client and the server and this setting controls that. The changes are effective at runtime at the next registry fetch cycle as specified by registryFetchIntervalSecondsr
-|eureka.client.on-demand-update-status-change | `+++true+++` | If set to true, local status updates via ApplicationInfoManager will trigger on-demand (but rate limited) register/updates to remote eureka servers.
-|eureka.client.order | `+++0+++` | Order of the discovery client used by `CompositeDiscoveryClient` for sorting available clients.
-|eureka.client.prefer-same-zone-eureka | `+++true+++` | Indicates whether or not this instance should try to use the eureka server in the same zone for latency and/or other reason. Ideally eureka clients are configured to talk to servers in the same zone The changes are effective at runtime at the next registry fetch cycle as specified by registryFetchIntervalSeconds
-|eureka.client.property-resolver |  | 
-|eureka.client.proxy-host |  | Gets the proxy host to eureka server if any.
-|eureka.client.proxy-password |  | Gets the proxy password if any.
-|eureka.client.proxy-port |  | Gets the proxy port to eureka server if any.
-|eureka.client.proxy-user-name |  | Gets the proxy user name if any.
-|eureka.client.refresh.enable | `+++true+++` | Determines whether the EurekaClient instance can be refreshed or not(If disabled none of the Eureka client properties will be refreshable).
-|eureka.client.region | `+++us-east-1+++` | Gets the region (used in AWS datacenters) where this instance resides.
-|eureka.client.register-with-eureka | `+++true+++` | Indicates whether or not this instance should register its information with eureka server for discovery by others. In some cases, you do not want your instances to be discovered whereas you just want do discover other instances.
-|eureka.client.registry-fetch-interval-seconds | `+++30+++` | Indicates how often(in seconds) to fetch the registry information from the eureka server.
-|eureka.client.registry-refresh-single-vip-address |  | Indicates whether the client is only interested in the registry information for a single VIP.
-|eureka.client.rest-template-timeout.connect-request-timeout | `+++0+++` | 
-|eureka.client.rest-template-timeout.connect-timeout | `+++0+++` | Default values are set to 180000, in keeping with {@link RequestConfig} and {@link SocketConfig} defaults.
-|eureka.client.rest-template-timeout.socket-timeout | `+++0+++` | 
-|eureka.client.service-url |  | Map of availability zone to list of fully qualified URLs to communicate with eureka server. Each value can be a single URL or a comma separated list of alternative locations. Typically the eureka server URLs carry protocol,host,port,context and version information if any. Example: https://ec2-256-156-243-129.compute-1.amazonaws.com:7001/eureka/ The changes are effective at runtime at the next service url refresh cycle as specified by eurekaServiceUrlPollIntervalSeconds.
-|eureka.client.should-enforce-registration-at-init | `+++false+++` | Indicates whether the client should enforce registration during initialization. Defaults to false.
-|eureka.client.should-unregister-on-shutdown | `+++true+++` | Indicates whether the client should explicitly unregister itself from the remote server on client shutdown.
-|eureka.client.tls.enabled |  | 
-|eureka.client.tls.key-password |  | 
-|eureka.client.tls.key-store |  | 
-|eureka.client.tls.key-store-password |  | 
-|eureka.client.tls.key-store-type |  | 
-|eureka.client.tls.trust-store |  | 
-|eureka.client.tls.trust-store-password |  | 
-|eureka.client.tls.trust-store-type |  | 
-|eureka.client.use-dns-for-fetching-service-urls | `+++false+++` | Indicates whether the eureka client should use the DNS mechanism to fetch a list of eureka servers to talk to. When the DNS name is updated to have additional servers, that information is used immediately after the eureka client polls for that information as specified in eurekaServiceUrlPollIntervalSeconds. Alternatively, the service urls can be returned serviceUrls, but the users should implement their own mechanism to return the updated list in case of changes. The changes are effective at runtime.
-|eureka.client.webclient.enabled | `+++false+++` | Enables the use of WebClient for Eureka HTTP Client.
-|eureka.dashboard.enabled | `+++true+++` | Flag to enable the Eureka dashboard. Default true.
-|eureka.dashboard.path | `+++/+++` | The path to the Eureka dashboard (relative to the servlet path). Defaults to "/".
-|eureka.datacenter | `+++default+++` | Eureka datacenter. Defaults to "default".
-|eureka.environment | `+++test+++` | Eureka environment. Defaults to "test".
-|eureka.instance.a-s-g-name |  | Gets the AWS autoscaling group name associated with this instance. This information is specifically used in an AWS environment to automatically put an instance out of service after the instance is launched and it has been disabled for traffic..
-|eureka.instance.app-group-name |  | Get the name of the application group to be registered with eureka.
-|eureka.instance.appname | `+++unknown+++` | Get the name of the application to be registered with eureka.
-|eureka.instance.data-center-info |  | Returns the data center this instance is deployed. This information is used to get some AWS specific instance information if the instance is deployed in AWS.
-|eureka.instance.default-address-resolution-order | `+++[]+++` | 
-|eureka.instance.environment |  | 
-|eureka.instance.health-check-url |  | Gets the absolute health check page URL for this instance. The users can provide the healthCheckUrlPath if the health check page resides in the same instance talking to eureka, else in the cases where the instance is a proxy for some other server, users can provide the full URL. If the full URL is provided it takes precedence. <p> It is normally used for making educated decisions based on the health of the instance - for example, it can be used to determine whether to proceed deployments to an entire farm or stop the deployments without causing further damage. The full URL should follow the format http://${eureka.hostname}:7001/ where the value ${eureka.hostname} is replaced at runtime.
-|eureka.instance.health-check-url-path |  | Gets the relative health check URL path for this instance. The health check page URL is then constructed out of the hostname and the type of communication - secure or unsecure as specified in securePort and nonSecurePort. It is normally used for making educated decisions based on the health of the instance - for example, it can be used to determine whether to proceed deployments to an entire farm or stop the deployments without causing further damage.
-|eureka.instance.home-page-url |  | Gets the absolute home page URL for this instance. The users can provide the homePageUrlPath if the home page resides in the same instance talking to eureka, else in the cases where the instance is a proxy for some other server, users can provide the full URL. If the full URL is provided it takes precedence. It is normally used for informational purposes for other services to use it as a landing page. The full URL should follow the format http://${eureka.hostname}:7001/ where the value ${eureka.hostname} is replaced at runtime.
-|eureka.instance.home-page-url-path | `+++/+++` | Gets the relative home page URL Path for this instance. The home page URL is then constructed out of the hostName and the type of communication - secure or unsecure. It is normally used for informational purposes for other services to use it as a landing page.
-|eureka.instance.hostname |  | The hostname if it can be determined at configuration time (otherwise it will be guessed from OS primitives).
-|eureka.instance.initial-status |  | Initial status to register with remote Eureka server.
-|eureka.instance.instance-enabled-onit | `+++false+++` | Indicates whether the instance should be enabled for taking traffic as soon as it is registered with eureka. Sometimes the application might need to do some pre-processing before it is ready to take traffic.
-|eureka.instance.instance-id |  | Get the unique Id (within the scope of the appName) of this instance to be registered with eureka.
-|eureka.instance.ip-address |  | Get the IPAdress of the instance. This information is for academic purposes only as the communication from other instances primarily happen using the information supplied in {@link #getHostName(boolean)}.
-|eureka.instance.lease-expiration-duration-in-seconds | `+++90+++` | Indicates the time in seconds that the eureka server waits since it received the last heartbeat before it can remove this instance from its view and there by disallowing traffic to this instance. Setting this value too long could mean that the traffic could be routed to the instance even though the instance is not alive. Setting this value too small could mean, the instance may be taken out of traffic because of temporary network glitches.This value to be set to atleast higher than the value specified in leaseRenewalIntervalInSeconds.
-|eureka.instance.lease-renewal-interval-in-seconds | `+++30+++` | Indicates how often (in seconds) the eureka client needs to send heartbeats to eureka server to indicate that it is still alive. If the heartbeats are not received for the period specified in leaseExpirationDurationInSeconds, eureka server will remove the instance from its view, there by disallowing traffic to this instance. Note that the instance could still not take traffic if it implements HealthCheckCallback and then decides to make itself unavailable.
-|eureka.instance.metadata-map |  | Gets the metadata name/value pairs associated with this instance. This information is sent to eureka server and can be used by other instances.
-|eureka.instance.metadata-map.weight | `+++1+++` | The weight of service instance for weighted load balancing.
-|eureka.instance.namespace | `+++eureka+++` | Get the namespace used to find properties. Ignored in Spring Cloud.
-|eureka.instance.non-secure-port | `+++80+++` | Get the non-secure port on which the instance should receive traffic.
-|eureka.instance.non-secure-port-enabled | `+++true+++` | Indicates whether the non-secure port should be enabled for traffic or not.
-|eureka.instance.prefer-ip-address | `+++false+++` | Flag to say that, when guessing a hostname, the IP address of the server should be used in preference to the hostname reported by the OS.
-|eureka.instance.registry.default-open-for-traffic-count | `+++1+++` | Value used in determining when leases are cancelled, default to 1 for standalone. Should be set to 0 for peer replicated eurekas
-|eureka.instance.registry.expected-number-of-clients-sending-renews | `+++1+++` | 
-|eureka.instance.secure-health-check-url |  | Gets the absolute secure health check page URL for this instance. The users can provide the secureHealthCheckUrl if the health check page resides in the same instance talking to eureka, else in the cases where the instance is a proxy for some other server, users can provide the full URL. If the full URL is provided it takes precedence. <p> It is normally used for making educated decisions based on the health of the instance - for example, it can be used to determine whether to proceed deployments to an entire farm or stop the deployments without causing further damage. The full URL should follow the format http://${eureka.hostname}:7001/ where the value ${eureka.hostname} is replaced at runtime.
-|eureka.instance.secure-port | `+++443+++` | Get the Secure port on which the instance should receive traffic.
-|eureka.instance.secure-port-enabled | `+++false+++` | Indicates whether the secure port should be enabled for traffic or not.
-|eureka.instance.secure-virtual-host-name | `+++unknown+++` | Gets the secure virtual host name defined for this instance. This is typically the way other instance would find this instance by using the secure virtual host name.Think of this as similar to the fully qualified domain name, that the users of your services will need to find this instance.
-|eureka.instance.status-page-url |  | Gets the absolute status page URL path for this instance. The users can provide the statusPageUrlPath if the status page resides in the same instance talking to eureka, else in the cases where the instance is a proxy for some other server, users can provide the full URL. If the full URL is provided it takes precedence. It is normally used for informational purposes for other services to find about the status of this instance. Users can provide a simple HTML indicating what is the current status of the instance.
-|eureka.instance.status-page-url-path |  | Gets the relative status page URL path for this instance. The status page URL is then constructed out of the hostName and the type of communication - secure or unsecure as specified in securePort and nonSecurePort. It is normally used for informational purposes for other services to find about the status of this instance. Users can provide a simple HTML indicating what is the current status of the instance.
-|eureka.instance.virtual-host-name | `+++unknown+++` | Gets the virtual host name defined for this instance. This is typically the way other instance would find this instance by using the virtual host name.Think of this as similar to the fully qualified domain name, that the users of your services will need to find this instance.
-|eureka.server.a-s-g-cache-expiry-timeout-ms | `+++0+++` | 
-|eureka.server.a-s-g-query-timeout-ms | `+++300+++` | 
-|eureka.server.a-s-g-update-interval-ms | `+++0+++` | 
-|eureka.server.a-w-s-access-id |  | 
-|eureka.server.a-w-s-secret-key |  | 
-|eureka.server.batch-replication | `+++false+++` | 
-|eureka.server.binding-strategy |  | 
-|eureka.server.delta-retention-timer-interval-in-ms | `+++0+++` | 
-|eureka.server.disable-delta | `+++false+++` | 
-|eureka.server.disable-delta-for-remote-regions | `+++false+++` | 
-|eureka.server.disable-transparent-fallback-to-other-region | `+++false+++` | 
-|eureka.server.e-i-p-bind-rebind-retries | `+++3+++` | 
-|eureka.server.e-i-p-binding-retry-interval-ms | `+++0+++` | 
-|eureka.server.e-i-p-binding-retry-interval-ms-when-unbound | `+++0+++` | 
-|eureka.server.enable-replicated-request-compression | `+++false+++` | 
-|eureka.server.enable-self-preservation | `+++true+++` | 
-|eureka.server.eviction-interval-timer-in-ms | `+++0+++` | 
-|eureka.server.expected-client-renewal-interval-seconds | `+++30+++` | 
-|eureka.server.g-zip-content-from-remote-region | `+++true+++` | 
-|eureka.server.initial-capacity-of-response-cache | `+++1000+++` | 
-|eureka.server.json-codec-name |  | 
-|eureka.server.list-auto-scaling-groups-role-name | `+++ListAutoScalingGroups+++` | 
-|eureka.server.log-identity-headers | `+++true+++` | 
-|eureka.server.max-elements-in-peer-replication-pool | `+++10000+++` | 
-|eureka.server.max-elements-in-status-replication-pool | `+++10000+++` | 
-|eureka.server.max-idle-thread-age-in-minutes-for-peer-replication | `+++15+++` | 
-|eureka.server.max-idle-thread-in-minutes-age-for-status-replication | `+++10+++` | 
-|eureka.server.max-threads-for-peer-replication | `+++20+++` | 
-|eureka.server.max-threads-for-status-replication | `+++1+++` | 
-|eureka.server.max-time-for-replication | `+++30000+++` | 
-|eureka.server.min-available-instances-for-peer-replication | `+++-1+++` | 
-|eureka.server.min-threads-for-peer-replication | `+++5+++` | 
-|eureka.server.min-threads-for-status-replication | `+++1+++` | 
-|eureka.server.my-url |  | 
-|eureka.server.number-of-replication-retries | `+++5+++` | 
-|eureka.server.peer-eureka-nodes-update-interval-ms | `+++0+++` | 
-|eureka.server.peer-eureka-status-refresh-time-interval-ms | `+++0+++` | 
-|eureka.server.peer-node-connect-timeout-ms | `+++200+++` | 
-|eureka.server.peer-node-connection-idle-timeout-seconds | `+++30+++` | 
-|eureka.server.peer-node-read-timeout-ms | `+++200+++` | 
-|eureka.server.peer-node-total-connections | `+++1000+++` | 
-|eureka.server.peer-node-total-connections-per-host | `+++500+++` | 
-|eureka.server.prime-aws-replica-connections | `+++true+++` | 
-|eureka.server.property-resolver |  | 
-|eureka.server.rate-limiter-burst-size | `+++10+++` | 
-|eureka.server.rate-limiter-enabled | `+++false+++` | 
-|eureka.server.rate-limiter-full-fetch-average-rate | `+++100+++` | 
-|eureka.server.rate-limiter-privileged-clients |  | 
-|eureka.server.rate-limiter-registry-fetch-average-rate | `+++500+++` | 
-|eureka.server.rate-limiter-throttle-standard-clients | `+++false+++` | 
-|eureka.server.registry-sync-retries | `+++0+++` | 
-|eureka.server.registry-sync-retry-wait-ms | `+++0+++` | 
-|eureka.server.remote-region-app-whitelist |  | 
-|eureka.server.remote-region-connect-timeout-ms | `+++1000+++` | 
-|eureka.server.remote-region-connection-idle-timeout-seconds | `+++30+++` | 
-|eureka.server.remote-region-fetch-thread-pool-size | `+++20+++` | 
-|eureka.server.remote-region-read-timeout-ms | `+++1000+++` | 
-|eureka.server.remote-region-registry-fetch-interval | `+++30+++` | 
-|eureka.server.remote-region-total-connections | `+++1000+++` | 
-|eureka.server.remote-region-total-connections-per-host | `+++500+++` | 
-|eureka.server.remote-region-trust-store |  | 
-|eureka.server.remote-region-trust-store-password | `+++changeit+++` | 
-|eureka.server.remote-region-urls |  | 
-|eureka.server.remote-region-urls-with-name |  | 
-|eureka.server.renewal-percent-threshold | `+++0.85+++` | 
-|eureka.server.renewal-threshold-update-interval-ms | `+++0+++` | 
-|eureka.server.response-cache-auto-expiration-in-seconds | `+++180+++` | 
-|eureka.server.response-cache-update-interval-ms | `+++0+++` | 
-|eureka.server.retention-time-in-m-s-in-delta-queue | `+++0+++` | 
-|eureka.server.route53-bind-rebind-retries | `+++3+++` | 
-|eureka.server.route53-binding-retry-interval-ms | `+++0+++` | 
-|eureka.server.route53-domain-t-t-l | `+++30+++` | 
-|eureka.server.sync-when-timestamp-differs | `+++true+++` | 
-|eureka.server.use-read-only-response-cache | `+++true+++` | 
-|eureka.server.wait-time-in-ms-when-sync-empty | `+++0+++` | 
-|eureka.server.xml-codec-name |  | 
-|spring.cloud.compatibility-verifier.compatible-boot-versions | `+++3.2.x+++` | Default accepted versions for the Spring Boot dependency. You can set {@code x} for the patch version if you don't want to specify a concrete value. Example: {@code 3.4.x}
-|spring.cloud.compatibility-verifier.enabled | `+++false+++` | Enables creation of Spring Cloud compatibility verification.
-|spring.cloud.config.allow-override | `+++true+++` | Flag to indicate that {@link #isOverrideSystemProperties() systemPropertiesOverride} can be used. Set to false to prevent users from changing the default accidentally. Default true.
-|spring.cloud.config.initialize-on-context-refresh | `+++false+++` | Flag to initialize bootstrap configuration on context refresh event. Default false.
-|spring.cloud.config.override-none | `+++false+++` | Flag to indicate that when {@link #setAllowOverride(boolean) allowOverride} is true, external properties should take lowest priority and should not override any existing property sources (including local config files). Default false. This will only have an effect when using config first bootstrap.
-|spring.cloud.config.override-system-properties | `+++true+++` | Flag to indicate that the external properties should override system properties. Default true.
-|spring.cloud.decrypt-environment-post-processor.enabled | `+++true+++` | Enable the DecryptEnvironmentPostProcessor.
-|spring.cloud.discovery.client.composite-indicator.enabled | `+++true+++` | Enables discovery client composite health indicator.
-|spring.cloud.discovery.client.health-indicator.enabled | `+++true+++` | 
-|spring.cloud.discovery.client.health-indicator.include-description | `+++false+++` | 
-|spring.cloud.discovery.client.health-indicator.use-services-query | `+++true+++` | Whether or not the indicator should use {@link DiscoveryClient#getServices} to check its health. When set to {@code false} the indicator instead uses the lighter {@link DiscoveryClient#probe()}. This can be helpful in large deployments where the number of services returned makes the operation unnecessarily heavy.
-|spring.cloud.discovery.client.simple.instances |  | 
-|spring.cloud.discovery.client.simple.local.host |  | 
-|spring.cloud.discovery.client.simple.local.instance-id |  | 
-|spring.cloud.discovery.client.simple.local.metadata |  | 
-|spring.cloud.discovery.client.simple.local.port | `+++0+++` | 
-|spring.cloud.discovery.client.simple.local.secure | `+++false+++` | 
-|spring.cloud.discovery.client.simple.local.service-id |  | 
-|spring.cloud.discovery.client.simple.local.uri |  | 
-|spring.cloud.discovery.client.simple.order |  | 
-|spring.cloud.discovery.enabled | `+++true+++` | Enables discovery client health indicators.
-|spring.cloud.features.enabled | `+++true+++` | Enables the features endpoint.
-|spring.cloud.httpclientfactories.apache.enabled | `+++true+++` | Enables creation of Apache Http Client factory beans.
-|spring.cloud.httpclientfactories.ok.enabled | `+++true+++` | Enables creation of OK Http Client factory beans.
-|spring.cloud.hypermedia.refresh.fixed-delay | `+++5000+++` | 
-|spring.cloud.hypermedia.refresh.initial-delay | `+++10000+++` | 
-|spring.cloud.inetutils.default-hostname | `+++localhost+++` | The default hostname. Used in case of errors.
-|spring.cloud.inetutils.default-ip-address | `+++127.0.0.1+++` | The default IP address. Used in case of errors.
-|spring.cloud.inetutils.ignored-interfaces |  | List of Java regular expressions for network interfaces that will be ignored.
-|spring.cloud.inetutils.preferred-networks |  | List of Java regular expressions for network addresses that will be preferred.
-|spring.cloud.inetutils.timeout-seconds | `+++1+++` | Timeout, in seconds, for calculating hostname.
-|spring.cloud.inetutils.use-only-site-local-interfaces | `+++false+++` | Whether to use only interfaces with site local addresses. See {@link InetAddress#isSiteLocalAddress()} for more details.
-|spring.cloud.loadbalancer.cache.caffeine.spec |  | The spec to use to create caches. See CaffeineSpec for more details on the spec format.
-|spring.cloud.loadbalancer.cache.capacity | `+++256+++` | Initial cache capacity expressed as int.
-|spring.cloud.loadbalancer.cache.enabled | `+++true+++` | Enables Spring Cloud LoadBalancer caching mechanism.
-|spring.cloud.loadbalancer.cache.ttl | `+++35s+++` | Time To Live - time counted from writing of the record, after which cache entries are expired, expressed as a {@link Duration}. The property {@link String} has to be in keeping with the appropriate syntax as specified in Spring Boot <code>StringToDurationConverter</code>. @see <a href= "https://github.com/spring-projects/spring-boot/blob/master/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/convert/StringToDurationConverter.java">StringToDurationConverter.java</a>
-|spring.cloud.loadbalancer.call-get-with-request-on-delegates | `+++true+++` | If this flag is set to {@code true}, {@code ServiceInstanceListSupplier#get(Request request)} method will be implemented to call {@code delegate.get(request)} in classes assignable from {@code DelegatingServiceInstanceListSupplier} that don't already implement that method, with the exclusion of {@code CachingServiceInstanceListSupplier} and {@code HealthCheckServiceInstanceListSupplier}, which should be placed in the instance supplier hierarchy directly after the supplier performing instance retrieval over the network, before any request-based filtering is done, {@code true} by default.
-|spring.cloud.loadbalancer.clients |  | 
-|spring.cloud.loadbalancer.configurations | `+++default+++` | Enables a predefined LoadBalancer configuration.
-|spring.cloud.loadbalancer.eager-load.clients |  | Names of the clients.
-|spring.cloud.loadbalancer.enabled | `+++true+++` | Enables Spring Cloud LoadBalancer.
-|spring.cloud.loadbalancer.eureka.approximate-zone-from-hostname | `+++false+++` | Used to determine whether we should try to get the `zone` value from host name.
-|spring.cloud.loadbalancer.health-check.initial-delay | `+++0+++` | Initial delay value for the HealthCheck scheduler.
-|spring.cloud.loadbalancer.health-check.interval | `+++25s+++` | Interval for rerunning the HealthCheck scheduler.
-|spring.cloud.loadbalancer.health-check.interval  | `+++25s+++` | Interval for rerunning the HealthCheck scheduler.
-|spring.cloud.loadbalancer.health-check.path |  | Path at which the health-check request should be made. Can be set up per `serviceId`. A `default` value can be set up as well. If none is set up, `/actuator/health` will be used.
-|spring.cloud.loadbalancer.health-check.port |  | Path at which the health-check request should be made. If none is set, the port under which the requested service is available at the service instance.
-|spring.cloud.loadbalancer.health-check.refetch-instances | `+++false+++` | Indicates whether the instances should be refetched by the `HealthCheckServiceInstanceListSupplier`. This can be used if the instances can be updated and the underlying delegate does not provide an ongoing flux.
-|spring.cloud.loadbalancer.health-check.refetch-instances-interval | `+++25s+++` | Interval for refetching available service instances.
-|spring.cloud.loadbalancer.health-check.repeat-health-check | `+++true+++` | Indicates whether health checks should keep repeating. It might be useful to set it to `false` if periodically refetching the instances, as every refetch will also trigger a healthcheck.
-|spring.cloud.loadbalancer.health-check.update-results-list | `+++true+++` | Indicates whether the {@code healthCheckFlux} should emit on each alive {@link ServiceInstance} that has been retrieved. If set to {@code false}, the entire alive instances sequence is first collected into a list and only then emitted.
-|spring.cloud.loadbalancer.hint |  | Allows setting the value of <code>hint</code> that is passed on to the LoadBalancer request and can subsequently be used in {@link ReactiveLoadBalancer} implementations.
-|spring.cloud.loadbalancer.hint-header-name | `+++X-SC-LB-Hint+++` | Allows setting the name of the header used for passing the hint for hint-based service instance filtering.
-|spring.cloud.loadbalancer.retry.avoid-previous-instance | `+++true+++` | Enables wrapping ServiceInstanceListSupplier beans with `RetryAwareServiceInstanceListSupplier` if Spring-Retry is in the classpath.
-|spring.cloud.loadbalancer.retry.backoff.enabled | `+++false+++` | Indicates whether Reactor Retry backoffs should be applied.
-|spring.cloud.loadbalancer.retry.backoff.jitter | `+++0.5+++` | Used to set `RetryBackoffSpec.jitter`.
-|spring.cloud.loadbalancer.retry.backoff.max-backoff | `+++Long.MAX ms+++` | Used to set `RetryBackoffSpec.maxBackoff`.
-|spring.cloud.loadbalancer.retry.backoff.min-backoff | `+++5 ms+++` | Used to set `RetryBackoffSpec#minBackoff`.
-|spring.cloud.loadbalancer.retry.enabled | `+++true+++` | Enables LoadBalancer retries.
-|spring.cloud.loadbalancer.retry.max-retries-on-next-service-instance | `+++1+++` | Number of retries to be executed on the next `ServiceInstance`. A `ServiceInstance` is chosen before each retry call.
-|spring.cloud.loadbalancer.retry.max-retries-on-same-service-instance | `+++0+++` | Number of retries to be executed on the same `ServiceInstance`.
-|spring.cloud.loadbalancer.retry.retry-on-all-exceptions | `+++false+++` | Indicates retries should be attempted for all exceptions, not only those specified in `retryableExceptions`.
-|spring.cloud.loadbalancer.retry.retry-on-all-operations | `+++false+++` | Indicates retries should be attempted on operations other than `HttpMethod.GET`.
-|spring.cloud.loadbalancer.retry.retryable-exceptions | `+++{}+++` | A `Set` of `Throwable` classes that should trigger a retry.
-|spring.cloud.loadbalancer.retry.retryable-status-codes | `+++{}+++` | A `Set` of status codes that should trigger a retry.
-|spring.cloud.loadbalancer.service-discovery.timeout |  | String representation of Duration of the timeout for calls to service discovery.
-|spring.cloud.loadbalancer.stats.micrometer.enabled | `+++false+++` | Enables Spring Cloud LoadBalancer Micrometer stats.
-|spring.cloud.loadbalancer.sticky-session.add-service-instance-cookie | `+++false+++` | Indicates whether a cookie with the newly selected instance should be added by LoadBalancer.
-|spring.cloud.loadbalancer.sticky-session.instance-id-cookie-name | `+++sc-lb-instance-id+++` | The name of the cookie holding the preferred instance id.
-|spring.cloud.loadbalancer.subset.instance-id |  | Instance id of deterministic subsetting. If not set, {@link IdUtils#getDefaultInstanceId(PropertyResolver)} will be used.
-|spring.cloud.loadbalancer.subset.size | `+++100+++` | Max subset size of deterministic subsetting.
-|spring.cloud.loadbalancer.x-forwarded.enabled | `+++false+++` | To Enable X-Forwarded Headers.
-|spring.cloud.loadbalancer.zone |  | Spring Cloud LoadBalancer zone.
-|spring.cloud.refresh.additional-property-sources-to-retain |  | Additional property sources to retain during a refresh. Typically only system property sources are retained. This property allows property sources, such as property sources created by EnvironmentPostProcessors to be retained as well.
-|spring.cloud.refresh.enabled | `+++true+++` | Enables autoconfiguration for the refresh scope and associated features.
-|spring.cloud.refresh.extra-refreshable | `+++true+++` | Additional class names for beans to post process into refresh scope.
-|spring.cloud.refresh.never-refreshable | `+++true+++` | Comma separated list of class names for beans to never be refreshed or rebound.
-|spring.cloud.refresh.on-restart.enabled | `+++true+++` | Enable refreshing context on start.
-|spring.cloud.service-registry.auto-registration.enabled | `+++true+++` | Whether service auto-registration is enabled. Defaults to true.
-|spring.cloud.service-registry.auto-registration.fail-fast | `+++false+++` | Whether startup fails if there is no AutoServiceRegistration. Defaults to false.
-|spring.cloud.service-registry.auto-registration.register-management | `+++true+++` | Whether to register the management as a service. Defaults to true.
-|spring.cloud.util.enabled | `+++true+++` | Enables creation of Spring Cloud utility beans.
-
-|===

docs/pom.xml

@@ -1,76 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xmlns="http://maven.apache.org/POM/4.0.0"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+<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">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.cloud</groupId>
-	<artifactId>spring-cloud-netflix-docs</artifactId>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-netflix</artifactId>
-		<version>4.1.1-SNAPSHOT</version>
-		<relativePath>..</relativePath>
+		<artifactId>spring-cloud-build</artifactId>
+		<version>1.0.0.RELEASE</version>
+		<relativePath />
 	</parent>
-	<packaging>jar</packaging>
+	<artifactId>spring-cloud-netflix-docs</artifactId>
+	<packaging>pom</packaging>
 	<name>Spring Cloud Netflix Docs</name>
-	<description>Spring Cloud Netflix Docs</description>
+	<description>Spring Cloud Docs</description>
 	<properties>
 		<docs.main>spring-cloud-netflix</docs.main>
 		<main.basedir>${basedir}/..</main.basedir>
-		<configprops.inclusionPattern>eureka.*|spring.cloud.*</configprops.inclusionPattern>
-		<!-- Don't upload docs jar to central / repo.spring.io -->
-		<maven-deploy-plugin-default.phase>none</maven-deploy-plugin-default.phase>
 	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<sourceDirectory>src/main/asciidoc</sourceDirectory>
-	</build>
 	<profiles>
 		<profile>
 			<id>docs</id>
 			<build>
-				<resources>
-					<resource>
-						<directory>src/main/antora/resources/antora-resources</directory>
-						<filtering>true</filtering>
-					</resource>
-				</resources>
 				<plugins>
 					<plugin>
-						<groupId>pl.project13.maven</groupId>
-						<artifactId>git-commit-id-plugin</artifactId>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-dependency-plugin</artifactId>
-					</plugin>
-					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>exec-maven-plugin</artifactId>
-					</plugin>
-					<plugin>
-						<groupId>io.spring.maven.antora</groupId>
-						<artifactId>antora-component-version-maven-plugin</artifactId>
-					</plugin>
-					<plugin>
-						<groupId>io.spring.maven.antora</groupId>
-						<artifactId>antora-maven-plugin</artifactId>
+						<groupId>org.asciidoctor</groupId>
+						<artifactId>asciidoctor-maven-plugin</artifactId>
+						<inherited>false</inherited>
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
+						<inherited>false</inherited>
 					</plugin>
 					<plugin>
-						<artifactId>maven-deploy-plugin</artifactId>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>build-helper-maven-plugin</artifactId>
+						<inherited>false</inherited>
 					</plugin>
 				</plugins>
 			</build>

docs/src/main/antora/resources/antora-resources/antora.yml

@@ -1,20 +0,0 @@
-version: @antora-component.version@
-prerelease: @antora-component.prerelease@
-
-asciidoc:
-  attributes:
-    attribute-missing: 'warn'
-    chomp: 'all'
-    project-root: @maven.multiModuleProjectDirectory@
-    github-repo: @docs.main@
-    github-raw: https://raw.githubusercontent.com/spring-cloud/@docs.main@/@github-tag@
-    github-code: https://github.com/spring-cloud/@docs.main@/tree/@github-tag@
-    github-issues: https://github.com/spring-cloud/@docs.main@/issues/
-    github-wiki: https://github.com/spring-cloud/@docs.main@/wiki
-    spring-cloud-version: @project.version@
-    github-tag: @github-tag@
-    version-type: @version-type@
-    docs-url: https://docs.spring.io/@docs.main@/docs/@project.version@
-    raw-docs-url: https://raw.githubusercontent.com/spring-cloud/@docs.main@/@github-tag@
-    project-version: @project.version@
-    project-name: @docs.main@

docs/src/main/asciidoc/README.adoc

@@ -1,30 +1,22 @@
+image::https://travis-ci.org/spring-cloud/spring-cloud-netflix.svg?branch=master[Build Status, link=https://travis-ci.org/spring-cloud/spring-cloud-netflix]
 
-image::https://github.com/spring-cloud/spring-cloud-netflix/actions/workflows/maven.yml/badge.svg?branch=main&style=svg["Build",link="https://github.com/spring-cloud/spring-cloud-netflix/actions/workflows/maven.yml"]
+include::intro.adoc[]
 
-image:https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/main/graph/badge.svg["Codecov", link="https://app.codecov.io/gh/spring-cloud/spring-cloud-netflix/tree/main"]
-
-
-[[features]]
 == Features
 
 * Service Discovery: Eureka instances can be registered and clients can discover the instances using Spring-managed beans
 * Service Discovery: an embedded Eureka server can be created with declarative Java configuration
+* Circuit Breaker: Hystrix clients can be built with a simple annotation-driven method decorator
+* Circuit Breaker: embedded Hystrix dashboard with declarative Java configuration
+* Declarative REST Client: Feign creates a dynamic implementation of an interface decorated with JAX-RS or Spring MVC annotations
+* Client Side Load Balancer: Ribbon
+* External Configuration: a bridge from the Sprnig Environment to Archaius (enables native configuration of Netflix components using Spring Boot conventions)
+* Router and Filter: automatic regsitration of Zuul filters, and a simple convention over configuration approach to reverse proxy creation
 
-
-[[building]]
 == Building
 
-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/modules/ROOT/partials/building.adoc[]
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building.adoc[]
 
-NOTE:  To build the module `spring-cloud-netflix-hystrix-contract` along with the entire Netflix project run the
-`build.sh` script in the `scripts` directory.
-
-[[contributing]]
 == Contributing
 
-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/modules/ROOT/partials/contributing-docs.adoc[]
-
-[[license]]
-== License
-
-The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-netflix/main/LICENSE.txt[here].
+include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]

docs/src/main/asciidoc/ghpages.sh

@@ -1,330 +1,46 @@
-ALLOW#!/bin/bash -x
+#!/bin/bash -x
 
-set -e
+git remote set-url --push origin `git config remote.origin.url | sed -e 's/^git:/https:/'`
 
-# Set default props like MAVEN_PATH, ROOT_FOLDER etc.
-function set_default_props() {
-    # The script should be run from the root folder
-    ROOT_FOLDER=`pwd`
-    echo "Current folder is ${ROOT_FOLDER}"
+if ! (git remote set-branches --add origin gh-pages && git fetch -q); then
+    echo "No gh-pages, 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:-}
-    echo "Path to Maven is [${MAVEN_PATH}]"
-    REPO_NAME=${PWD##*/}
-    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); 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 main we want to publish as we did until now
-    # https://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() {
-    git checkout v${VERSION}
-}
-
-# 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 allow branches - assumes that a `docs` module is available under `docs` profile
-function retrieve_doc_properties() {
-    MAIN_ADOC_VALUE=$("${MAVEN_PATH}"mvn -q \
-        -Dexec.executable="echo" \
-        -Dexec.args='${docs.main}' \
-        --non-recursive \
-        org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
-    echo "Extracted 'main.adoc' from Maven build [${MAIN_ADOC_VALUE}]"
-
-
-    ALLOW_PROPERTY=${ALLOW_PROPERTY:-"docs.allowed.branches"}
-    ALLOWED_BRANCHES_VALUE=$("${MAVEN_PATH}"mvn -q \
-        -Dexec.executable="echo" \
-        -Dexec.args="\${${ALLOW_PROPERTY}}" \
-        org.codehaus.mojo:exec-maven-plugin:1.3.1:exec \
-        -P docs \
-        -pl docs)
-    echo "Extracted '${ALLOW_PROPERTY}' from Maven build [${ALLOWED_BRANCHES_VALUE}]"
-}
+if ! [ -d docs/target/generated-docs ]; then
+    echo "No gh-pages sources in docs/target/generated-docs, so not syncing"
+    exit 0
+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} && 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
-        DESTINATION_REPO_FOLDER=${clonedStatic}/${REPO_NAME}
-        mkdir -p ${DESTINATION_REPO_FOLDER}
-    else
-        if [[ ! -e "${DESTINATION}/.git" ]]; then
-            echo "[${DESTINATION}] is not a git repository"
-            exit 1
-        fi
-        DESTINATION_REPO_FOLDER=${DESTINATION}/${REPO_NAME}
-        mkdir -p ${DESTINATION_REPO_FOLDER}
-        echo "Destination was provided [${DESTINATION}]"
-    fi
-    cd ${DESTINATION_REPO_FOLDER}
-    git checkout gh-pages
-    git pull origin gh-pages
+# Switch to gh-pages branch to sync it with master
+###################################################################
+git checkout gh-pages
 
-    # Add git branches
-    ###################################################################
-    if [[ -z "${VERSION}" ]] ; 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}" == "main" ]] ; then
-        echo -e "Current branch is main - 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}/
-                git add -A ${ROOT_FOLDER}/$file
-            fi
-        done
-        COMMIT_CHANGES="yes"
-    else
-        echo -e "Current branch is [${CURRENT_BRANCH}]"
-        # https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
-        if [[ ",${ALLOWED_BRANCHES_VALUE}," = *",${CURRENT_BRANCH},"* ]] ; then
-            mkdir -p ${ROOT_FOLDER}/${CURRENT_BRANCH}
-            echo -e "Branch [${CURRENT_BRANCH}] is allowed! 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 allow list! Check out the Maven [${ALLOW_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
-            git add -A ${destination}/index.html
-        else
-            cp -rf $f ${destination}
-            git add -A ${destination}/$file
-        fi
+        cp -rf $f .
+        git add -A $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 main 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}], 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
-}
-
-# 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 main branch the generated docs are copied to the root of gh-pages branch
-- for any other branch (if that branch is allowed) 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 allow 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>`
-
-USAGE:
-
-You can use the following options:
-
--v|--version        - the script will apply the whole procedure for a particular library 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
-    ;;
-    -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 commit -a -m "Sync docs from master to gh-pages"
+
+# 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!
+###################################################################
+git push origin gh-pages
+
+# Finally, switch back to the master branch and exit block
+git checkout master
+if [ "$dirty" != "0" ]; then git stash pop; fi
+
+exit 0

docs/src/main/asciidoc/intro.adoc

@@ -1,9 +1,7 @@
-[[introduction]]
-= Spring Cloud Netflix
-
 This project provides Netflix OSS integrations for Spring Boot apps through autoconfiguration
 and binding to the Spring Environment and other Spring programming model idioms. With a few
 simple annotations you can quickly enable and configure the common patterns inside your
 application and build large distributed systems with battle-tested Netflix components. The 
-patterns provided include Service Discovery (Eureka).
+patterns provided include Service Discovery (Eureka), Circuit Breaker (Hystrix), 
+Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon).
 

docs/src/main/asciidoc/sagan-index.adoc

@@ -1,48 +0,0 @@
-Spring Cloud Netflix provides Netflix OSS integrations for Spring Boot apps through autoconfiguration and binding to the Spring Environment and other Spring programming model idioms. With a few simple annotations you can quickly enable and configure the common patterns inside your application and build large distributed systems with battle-tested Netflix components. The patterns provided include Service Discovery (Eureka).
-
-## Features
-
-Spring Cloud Netflix features:
-
-* Service Discovery: Eureka instances can be registered and clients can discover the instances using Spring-managed beans
-* Service Discovery: an embedded Eureka server can be created with declarative Java configuration
-
-## Getting Started
-
-As long as Spring Cloud Netflix and Eureka Core are on the
-classpath any Spring Boot application with `spring-cloud-starter-netflix-eureka-client` in dependencies will try to contact a Eureka
-server on `http://localhost:8761` (the default value of
-`eureka.client.serviceUrl.defaultZone`):
-
-```java
-@SpringBootApplication
-@RestController
-public class Application {
-
-  @RequestMapping("/")
-  public String home() {
-    return "Hello World";
-  }
-
-  public static void main(String[] args) {
-    SpringApplication.run(Application.class, args);
-  }
-
-}
-```
-
-To run your own server use the `spring-cloud-starter-netflix-eureka-server` dependency and `@EnableEurekaServer`.
-
-## Contributing
-
-We welcome contributions. You can read more on how to contribute to the project https://github.com/spring-cloud/spring-cloud-netflix#contributing[here].
-
-## Community Support
-
-* You can report issues through https://github.com/spring-cloud/spring-cloud-netflix/issues[Github].
-* We monitor https://stackoverflow.com/[StackOverflow] for questions with the `spring-cloud-netflix` tag.
-* You can contact our team at https://gitter.im/spring-cloud/spring-cloud[Gitter].
-
-## Commercial Support
-
-Commercial Support is provided as part of the https://spring.io/support[VMware Spring Runtime] offering.

docs/src/main/asciidoc/spring-cloud-netflix.adoc

@@ -0,0 +1,979 @@
+:github-tag: master
+:github-repo: spring-cloud/spring-cloud-netflix
+:github-raw: http://raw.github.com/{github-repo}/{github-tag}
+:github-code: http://github.com/{github-repo}/tree/{github-tag}
+= Spring Cloud Netflix
+
+include::intro.adoc[]
+
+== Service Discovery: Eureka Clients
+
+Service Discovery is one of the key tenets of a microservice based architecture. Trying to hand configure each client or some form of convention can be very difficult to do and can be very brittle.  Eureka is the Netflix Service Discovery Server and Client.  The server can be configured and deployed to be highly available, with each server replicating state about the registered services to the others.
+
+=== Registering with Eureka
+
+When a client registers with Eureka, it provide meta-data about itself
+such as host and port, health indicator URL, home page etc.  Eureka
+receives heartbeat messages from each instance belonging to a service.
+If the heartbeat fails over a configurable timetable, the instance is
+normally removed from the registry.
+
+Example eureka client:
+
+[source,java,indent=0]
+----
+@Configuration
+@ComponentScan
+@EnableAutoConfiguration
+@EnableEurekaClient
+@RestController
+public class Application {
+
+    @RequestMapping("/")
+    public String home() {
+        return "Hello world";
+    }
+    
+    public static void main(String[] args) {
+        new SpringApplicationBuilder(Application.class).web(true).run(args);
+    }
+
+}
+----
+
+(i.e. utterly normal Spring Boot app). In this example we use
+`@EnableEurekaClient` explicitly, but with only Eureka available you
+could also use `@EnableDiscoveryClient`. Configuration is required to
+locate the Eureka server. Example:
+
+
+.application.yml
+----
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: http://localhost:8761/eureka/
+----
+
+where "defaultZone" is a magic string fallback value that provides the
+service URL for any client that doesn't express a preference
+(i.e. it's a useful default).
+
+The default application name (service ID), virtual host and non-secure
+port, taken from the `Environment`, are `${spring.application.name}`,
+`${spring.application.name}` and `${server.port}` respectively.
+
+`@EnableEurekaClient` makes the app into both a Eureka "instance"
+(i.e. it registers itself) and a "client" (i.e. it can query the
+registry to locate other services). The instance behaviour is driven
+by `eureka.instance.*` configuration keys, but the defaults will be
+fine if you ensure that your application has a
+`spring.application.name` (this is the default for the Eureka service
+ID, or VIP).
+
+See {github-code}/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBean.java[EurekaInstanceConfigBean] and {github-code}/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBean.java[EurekaClientConfigBean] for more details of the configurable options.
+
+=== Status Page and Health Indicator
+
+The status page and health indicators for a Eureka instance default to
+"/info" and "/health" respectively, which are the default locations of
+useful endpoints in a Spring Boot Actuator application. You need to
+change these, even for an Actuator application if you use a
+non-default context path or servlet path
+(e.g. `server.servletPath=/foo`) or management endpoint path
+(e.g. `management.contextPath=/admin`). Example:
+
+.application.yml
+----
+eureka:
+  instance:
+    statusPageUrlPath: ${management.contextPath}/info
+    healthCheckUrlPath: ${management.contextPath}/health
+----
+
+These links show up in the metadata that is consumers by clients, and
+used in some scenarios to decide whether to send requests to your
+application, so it's helpful if they are accurate.
+
+=== Eureka Metadata for Instances and Clients
+
+It's worth spending a bit of time understanding how the Eureka metadata works, so you can use it in a way that makes sense in your platform. There is standard metadata for things like hostname, IP address, port numbers, status page and health check. These are published in the service registry and used by clients to contact the services in a straightforward way. Additional metadata can be added to the instance registration in the `eureka.instance.metadataMap`, and this will be accessible in the remote clients, but in general will not change the behaviour of the client, unless it is made aware of the meaning of the metadata. There are a couple of special cases described below where Spring Cloud already assigns meaning to the metadata map.
+
+==== Using Eureka on Cloudfoundry
+
+Cloudfoundry has a global router so that all instances of the same app have the same hostname (it's the same in other PaaS solutions with a similar architecture). This isn't necessarily a barrier to using Eureka, but if you use the router (recommended, or even mandatory depending on the way your platform was set up), you need to explicitly set the hostname and port numbers (secure or non-secure) so that they use the router. You might also want to use instance metadata so you can distinguish between the instances on the client (e.g. in a custom load balancer). For example:
+
+.application.yml
+----
+eureka:
+  instance:
+    metadataMap:
+      hostname: ${vcap.application.uris[0]}
+      nonSecurePort: 80
+      instanceId: ${vcap.application.instance_id:${spring.application.name}:${spring.application.instance_id:${server.port}}}
+----
+
+Depending on the way the security rules are set up in your Cloudfoundry instance, you might be able to register and use the IP address of the host VM for direct service-to-service calls. This feature is not (yet) available on Pivotal Web Services (https://run.pivotal.io[PWS]).
+
+==== Making the Eureka Instance ID Unique
+
+By default a eureka instance is registered with an ID that is equal to its host name (i.e. only one service per host). Using Spring Cloud you can override this by providing a unique identifier in `eureka.instance.metadataMap.instanceId`. For example:
+
+.application.yml
+----
+eureka:
+  instance:
+    metadataMap:
+      instanceId: ${spring.application.name}:${spring.application.instance_id:${random.value}}
+----
+
+With this meatdata, and multiple service instances deployed on
+localhost, the random value will kick in there to make the instance
+unique. In Cloudfoundry the `spring.application.instance_id` will be
+populated automatically in a Spring Boot Actuator application, so the
+random value will not be needed.
+
+=== Using the DiscoveryClient
+
+Once you have an app that is `@EnableEurekaClient` you can use it to
+discover service instances from the <<spring-cloud-eureka-server,
+Eureka Server>>. One way to do that is to use the native `DiscoveryClient`, e.g.
+
+----
+@Autowired
+private DiscoveryClient discoveryClient;
+
+public String serviceUrl() {
+    InstanceInfo instance = discoveryClient.getNextServerFromEureka("STORES", false);
+    return instance.getHomePageUrl();
+}
+----
+
+[TIP]
+====
+Don't use the `DiscoveryClient` in `@PostConstruct` method or in a
+`@Scheduled` method (or anywhere where the `ApplicationContext` might
+not be started yet). It is initialized in a `SmartLifecycle` (with
+`phase=0`) so the earliest you can rely on it being available is in
+another `SmartLifecycle` with higher phase.
+====
+
+=== Alternatives to the DiscoveryClient
+
+You don't have to use the raw Netflix `DiscoveryClient` and usually it
+is more convenient to use it behind a wrapper of some sort. Spring
+Cloud has support for <<spring-cloud-feign, Feign>> (a REST client
+builder) and also <<spring-cloud-ribbon, Spring `RestTemplate`>> using
+the logical Eureka service identifiers (VIPs) instead of physical
+URLs. To configure Ribbon with a fixed list of physical servers you
+can simply set `<client>.ribbon.listOfServers` to a comma-separated
+list of physical addresses (or hostnames), where `<client>` is the ID 
+of the client.
+
+=== Why is it so Slow to Register a Service?
+
+Being an instance also involves a periodic heartbeat to the registry
+(via the client's `serviceUrl`) with default duration 30 seconds. A
+service is not available for discovery by clients until the instance,
+the server and the client all have the same metadata in their local
+cache (so it could take 3 hearbeats). You can change the period using
+`eureka.instance.leaseRenewalIntervalInSeconds` and this will speed up
+the process of getting clients connected to other services. In
+production it's probably better to stick with the default because
+there are some computations internally in the server that make
+assumptions about the lease renewal period.
+
+[[spring-cloud-eureka-server]]
+== Service Discovery: Eureka Server
+
+Example eureka server:
+
+[source,java,indent=0]
+----
+@Configuration
+@EnableAutoConfiguration
+@EnableEurekaServer
+public class Application {
+
+    public static void main(String[] args) {
+        new SpringApplicationBuilder(Application.class).web(true).run(args);
+    }
+
+}
+----
+
+The server has a home page with a UI, and HTTP API endpoints per the
+normal Eureka functionality under `/eureka/*`.
+
+Eureka background reading: see https://github.com/cfregly/fluxcapacitor/wiki/NetflixOSS-FAQ#eureka-service-discovery-load-balancer[flux capacitor] and https://groups.google.com/forum/?fromgroups#!topic/eureka_netflix/g3p2r7gHnN0[google group discussion].
+
+[TIP]
+====
+You can run the Eureka server as an executable JAR (or WAR) using the
+http://docs.spring.io/spring-boot/docs/current/reference/htmlsingle/#build-tool-plugins[Spring
+Boot build tools], but to avoid problems with classpath scanning in
+Jersey 1.x you have to tell the build plugins to unpack the jars that
+contain JAX-RS resources, e.g. (for Maven)
+
+.pom.xml
+[source,xml,indent=0]
+----
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <configuration>
+                    <requiresUnpack>
+                        <dependency>
+                            <groupId>com.netflix.eureka</groupId>
+                            <artifactId>eureka-core</artifactId>
+                        </dependency>
+                        <dependency>
+                            <groupId>com.netflix.eureka</groupId>
+                            <artifactId>eureka-client</artifactId>
+                        </dependency>
+                    </requiresUnpack>
+                </configuration>
+            </plugin>
+----
+
+or with Gradle
+
+.build.gradle
+[source,java,indent=0]
+----
+apply plugin: 'spring-boot'
+springBoot {
+    requiresUnpack = ['com.netflix.eureka:eureka-core','com.netflix.eureka:eureka-client']
+}
+----
+====
+
+[NOTE]
+====
+The Eureka server is tied to log4j and doesn't work with logback, 
+so the dependency configuration
+has to be tweaked compared to a normal Spring Boot app. The 
+`spring-cloud-starter-eureka-server` does this for you, but if you
+add logback transitively through another dependency you will need to
+exclude it manually, e.g. in Maven
+
+.pom.xml
+[source,xml,indent=0]
+----
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+			<exclusions>
+				<exclusion>
+					<artifactId>spring-boot-starter-logging</artifactId>
+					<groupId>org.springframework.boot</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+----
+====
+
+=== High Availability, Zones and Regions
+
+The Eureka server does not have a backend store, but the service
+instances in the registry all have to send heartbeats to keep their
+registrations up to date (so this can be done in memory). Clients also
+have an in-memory cache of eureka registrations (so they don't have to
+go to the registry for every single request to a service).
+
+By default every Eureka server is also a Eureka client and requires
+(at least one) service URL to locate a peer. If you don't provide it
+the service will run and work, but it will shower your logs with a lot
+of noise about not being able to register with the peer.
+
+See also <<spring-cloud-ribbon,below for details of Ribbon
+support>> on the client side for Zones and Regions.
+
+=== Standalone Mode
+
+The combination of the two caches (client and server) and the
+heartbeats make a standalone Eureka server fairly resilient to
+failure, as long as there is some sort of monitor or elastic runtime
+keeping it alive (e.g. Cloud Foundry). In standalone mode, you might
+prefer to switch off the client side behaviour, so it doesn't keep
+trying and failing to reach its peers. Example:
+
+.application.yml (Standalone Eureka Server)
+----
+server:
+  port: 8761
+
+eureka:
+  instance:
+    hostname: localhost
+  client: 
+    registerWithEureka: false
+    fetchRegistry: false
+    serviceUrl:
+      defaultZone: http://${eureka.instance.hostname}:${server.port}/eureka/
+----
+
+Notice that the `serviceUrl` is pointing to the same host as the local
+instance.
+
+=== Peer Awareness
+
+Eureka can be made even more resilient and available by running
+multiple instances and asking them to register with each other. In
+fact, this is the default behaviour, so all you need to do to make it
+work is add a valid `serviceUrl` to a peer, e.g.
+
+.application.yml (Two Peer Aware Eureka Servers)
+----
+
+---
+spring:
+  profiles: peer1
+eureka:
+  instance:
+    hostname: peer1
+  client: 
+    serviceUrl:
+      defaultZone: http://peer2/eureka/
+
+---
+spring:
+  profiles: peer2
+eureka:
+  instance:
+    hostname: peer2
+  client: 
+    serviceUrl:
+      defaultZone: http://peer1/eureka/
+----
+
+In this example we have a YAML file that can be used to run the same
+server on 2 hosts (peer1 and peer2), by running it in different
+Spring profiles. You could use this configuration to test the peer
+awareness on a single host (there's not much value in doing that in
+production) by manipulating `/etc/hosts` to resolve the host names. In
+fact, the `eureka.instance.hostname` is not needed if you are running
+on a machine that knows its own hostname (it is looked up using
+`java.net.InetAddress` by default).
+
+You can add multiple peers to a system, and as long as they are all
+connected to each other by at least one edge, they will synchronize
+the registrations amongst themselves. If the peers are physically
+separated (inside a data centre or between multiple data centres) then
+the system can in principle survive split-brain type failures.
+
+=== Prefer IP Address
+
+In some cases, it is preferable for Eureka to advertise the IP Adresses
+of services rather than the hostname.  Set `eureka.instance.preferIpAddress`
+to `true` and when the application registers with eureka, it will use its
+IP Address rather than its hostname.
+
+== Circuit Breaker: Hystrix Clients
+
+Netflix has created a library called https://github.com/Netflix/Hystrix[Hystrix] that implements the http://martinfowler.com/bliki/CircuitBreaker.html[circuit breaker pattern].  In a microservice architecture it is common to have multiple layers of service calls.
+
+.Microservice Graph
+image::HystrixGraph.png[]
+
+A service failure in the lower level of services can cause cascading failure all the way up to the user.  When calls to a particular service reach a certain threshold (20 failures in 5 seconds is the default in Hystrix), the circuit opens and the call is not made.  In cases of error and an open circuit a fallback can be provided by the developer.
+
+.Hystrix fallback prevents cascading failures
+image::HystrixFallback.png[]
+
+Having an open circuit stops cascading failures and allows overwhelmed or failing services time to heal.  The fallback can be another Hystrix protected call, static data or a sane empty value.  Fallbacks may be chained so the first fallback makes some other business call which in turn falls back to static data.
+
+Example boot app:
+
+----
+@Configuration
+@EnableAutoConfiguration
+@EnableHystrix
+public class Application {
+
+    public static void main(String[] args) {
+        new SpringApplicationBuilder(Application.class).web(true).run(args);
+    }
+
+}
+
+@Component
+public class StoreIntegration {
+
+    @HystrixCommand(fallbackMethod = "defaultStores")
+    public Object getStores(Map<String, Object> parameters) {
+        //do stuff that might fail
+    }
+
+    public Object defaultStores(Map<String, Object> parameters) {
+        return /* something useful */;
+    }
+}
+
+----
+
+The `@HystrixCommand` is provided by a Netflix contrib library called
+https://github.com/Netflix/Hystrix/tree/master/hystrix-contrib/hystrix-javanica["javanica"].
+Spring Cloud automatically wraps Spring beans with that
+annotation in a proxy that is connected to the Hystrix circuit
+breaker. The circuit breaker calculates when to open and close the
+circuit, and what to do in case of a failure.
+
+To configure the `@HystrixCommand` you can use the `commandProperties`
+attribute with a list of `@HystrixProperty` annotations.  See
+https://github.com/Netflix/Hystrix/tree/master/hystrix-contrib/hystrix-javanica#configuration[here]
+for more details.  See the https://github.com/Netflix/Hystrix/wiki/Configuration[Hystrix wiki]
+for details on the properties available.
+
+The state of the connected circuit breakers are also exposed in the
+`/health` endpoint of the calling application. 
+
+[source,json,indent=0]
+----
+{
+    "hystrix": {
+        "openCircuitBreakers": [
+            "StoreIntegration::getStoresByLocationLink"
+        ],
+        "status": "CIRCUIT_OPEN"
+    },
+    "status": "UP"
+}
+----
+
+=== Hystrix Metrics Stream
+
+To enable the Hystrix metrics stream include a dependency on `spring-boot-starter-actuator`.  This will expose the `/hystrix.stream` as a management endpoint.
+
+[source,xml]
+----
+    <dependency>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-actuator</artifactId>
+    </dependency>
+----
+
+== Circuit Breaker: Hystrix Dashboard
+
+One of the main benefits of Hystrix is the set of metrics it gathers about each HystrixCommand.  The Hystrix Dashboard displays the health of each circuit breaker in an efficient manner.
+
+.Hystrix Dashboard
+image::Hystrix.png[]
+
+To run the Hystrix Dashboard annotate your Spring Boot main class with `@EnableHystrixDashboard`.  You then visit `/hystrix` and point the dashboard to an individual instances `/hystrix.stream` endpoint in a Hystrix client application.
+
+=== Turbine
+
+Looking at an individual instances Hystrix data is not very useful in terms of the overall health of the system.  https://github.com/Netflix/Turbine[Turbine] is an application that aggregates all of the relevant `/hystrix.stream` endpoints into a combined `/turbine.stream` for use in the Hystrix Dashboard.  Individual instances are located via Eureka.  Running Turbine is as simple as annotating your main class with the `@EnableTurbine` annotation.  All of the documented configuration properties from https://github.com/Netflix/Turbine/wiki/Configuration-(1.x)[the Turbine 1 wiki] apply.  The only difference is that the `turbine.instanceUrlSuffix` does not need the port prepended as this is handled automatically unless `turbine.instanceInsertPort=false`.
+
+Configuration key `turbine.appConfig` is a list of eureka serviceId's that turbine will use to lookup instances.  The turbine stream is then used in the Hystrix dashboard using a url that looks like: `http://my.turbine.sever:8080/turbine.stream?cluster=<CLUSTERNAME>` (the cluster parameter can be omitted if the name is "default"). The `cluster` parameter must match an entry in `turbine.aggregator.clusterConfig`. Value returned from eureka are uppercase, thus we expect this example to work if there is an app registered with Eureka called "customers":
+
+----
+turbine:
+  aggregator:
+    clusterConfig: CUSTOMERS
+  appConfig: customers
+----
+
+The `clusterName` can be customized by a SPEL expression in `turbine.clusterNameExpression`.  For example, `turbine.clusterNameExpression=aSGName` would get the cluster name from the AWS ASG name. To use the "default" cluster for all apps you need a string literal expression (with single quotes):
+
+----
+turbine:
+  appConfig: customers,stores
+  clusterNameExpression: 'default'
+----
+
+Spring Cloud provides a `spring-cloud-starter-turbine` that has all the dependencies you need to get a Turbine server running. Just create a Spring Boot application and annotate it with `@EnableTurbine`.
+
+=== Turbine AMQP
+
+In some environments (e.g. in a PaaS setting), the classic Turbine model of pulling metrics from all the distributed Hystrix commands doesn't work. In that case you might want to have your Hystrix commands push metrics to Turbine, and Spring Cloud enables that with AMQP messaging. All you need to do on the client is add a dependency to `spring-cloud-netflix-hystrix-amqp` and make sure there is a Rabbit broker available (see Spring Boot documentation for details on how to configure the client credentials, but it should work out of the box for a local broker or in Cloud Foundry).
+
+On the server side Just create a Spring Boot application and annotate it with `@EnableTurbineAmqp` and by default it will come up on port 8989 (point your Hystrix dashboard to that port, any path). You can customize the port using either `server.port` or `turbine.amqp.port`. If you have `spring-boot-starter-web` and `spring-boot-starter-actuator` on the classpath as well, then you can open up the Actuator endpoints on a separate port (with Tomcat by default) by providing a `management.port` which is different.
+
+You can then point the Hystrix Dashboard to the Turbine AMQP Server instead of individual Hystrix streams.  If Turbine AMQP is running on port 8989 on myhost, then put `http://myhost:8989` in the stream input field in the Hystrix Dashboard. Circuits will be prefixed by their respective serviceId, followed by a dot, then the circuit name.
+
+Spring Cloud provides a `spring-cloud-starter-turbine-amqp` that has all the dependencies you need to get a Turbine AMQP server running. You need Java 8 to run the app because it is Netty-based.
+
+== Customizing the AMQP ConnectionFactory
+
+If you are using AMQP there needs to be a `ConnectionFactory` (from
+Spring Rabbit) in the application context. If there is a single
+`ConnectionFactory` it will be used, or if there is a one qualified as
+`@HystrixConnectionFactory` (on the client) and
+`@TurbineConnectionFactory` (on the server) it will be preferred over
+others, otherwise the `@Primary` one will be used. If there are
+multiple unqualified connection factories there will be an error.
+
+Note that Spring Boot (as of 1.2.2) creates a `ConnectionFactory` that
+is _not_ `@Primary`, so if you want to use one connection factory for
+the bus and another for business messages, you need to create both,
+and annotate them `@*ConnectionFactory` and `@Primary` respectively.
+
+[[spring-cloud-ribbon]]
+== Client Side Load Balancer: Ribbon
+
+Ribbon is a client side load balancer which gives you a lot of control
+over the behaviour of HTTP and TCP clients. Feign already uses Ribbon,
+so if you are using `@FeignClient` then this section also applies.
+
+A central concept in Ribbon is that of the named client. Each load
+balancer is part of an ensemble of components that work together to
+contact a remote server on demend, and the ensemble has a name that
+you give it as an application developer (e.g. using the `@FeignClient`
+annotation). Spring Cloud creates a new ensemble as an
+`ApplicationContext` on demand for each named client using
+`RibbonClientConfiguration`. This contains (amongst other things) an
+`ILoadBalancer`, a `RestClient`, and a `ServerListFilter`. 
+
+=== Customizing the Ribbon Client
+
+You can configure some bits of a Ribbon client using external
+properties in `<client>.ribbon.*`, which is no different than using
+the Netflix APIs natively, except that you can use Spring Boot
+configuration files. The native options can
+be inspected as static fields in `CommonClientConfigKey` (part of
+ribbon-core).
+
+Spring Cloud also lets you take full control of the client by
+declaring additional configuration (on top of the
+`RibbonClientConfiguration`) using `@RibbonClient`. Example:
+
+[source,java,indent=0]
+----
+	@Configuration
+	@RibbonClient(name = "foo", configuration = FooConfiguration.class)
+	public class TestConfiguration {
+	}
+----
+
+In this case the client is composed from the components already in
+`RibbonClientConfiguration` together with any in `FooConfiguration`
+(where the latter generally will override the former).
+
+Spring Cloud Netflix provides the following beans by default for ribbon
+(`BeanType` beanName: `ClassName`):
+
+* `IClientConfig` ribbonClientConfig: `DefaultClientConfigImpl`
+* `IRule` ribbonRule: `ZoneAvoidanceRule`
+* `IPing` ribbonPing: `NoOpPing`
+* `ServerList<Server> ribbonServerList: `ConfigurationBasedServerList`
+* `ServerListFilter<Server>` ribbonServerListFilter: `ZonePreferenceServerListFilter`
+* `ILoadBalancer` ribbonLoadBalancer: `ZoneAwareLoadBalancer`
+
+Creating a bean of one of those type and placing it in a `@RibbonClient`
+configuration (such as `FooConfiguration` above) allows you to override each
+one of the beans described.  Example:
+
+[source,java,indent=0]
+----
+	@Configuration
+	public class FooConfiguration {
+		@Bean
+    	public IPing ribbonPing(IClientConfig config) {
+    		return new PingUrl();
+    	}
+	}
+----
+
+This replaces the `NoOpPing` with `PingUrl`.
+
+=== Using Ribbon with Eureka
+
+When Eureka is used in conjunction with Ribbon the `ribbonServerList`
+is overridden with an extension of `DiscoveryEnabledNIWSServerList`
+which populates the list of servers from Eureka.  It also replaces the
+`IPing` interface with `NIWSDiscoveryPing` which delegates to Eureka
+to determine if a server is up. The `ServerList` that is installed by
+default is a `DomainExtractingServerList` and the purpose of this is
+to make physical metadata available to the load balancer without using
+AWS AMI metadata (which is what Netflix relies on). By default the
+server list will be constructed with "zone" information as provided in
+the instance metadata (so on the client set
+`eureka.instance.metadataMap.zone`), and if that is missing it can use
+the domain name from the server hostname as a proxy for zone (if the
+flag `approximateZoneFromDomain` is set). Once the zone information is
+available it can be used in a `ServerListFilter` (by default it will
+be used to locate a server in the same zone as the client because the
+default is a `ZonePreferenceServerListFilter`).
+
+[[spring-cloud-ribbon-without-eureka]]
+=== Example: How to Use Ribbon Without Eureka
+
+Eureka is a convenient way to abstract the discovery of remote servers
+so you don't have to hard code their URLs in clients, but if you
+prefer not to use it, Ribbon and Feign are still quite
+amenable. Suppose you have declared a `@RibbonClient` for "stores",
+and Eureka is not in use (and not even on the classpath). The Ribbon
+client defaults to a configured server list, and you can supply the
+configuration like this
+
+.application.yml
+----
+stores:
+  ribbon:
+    listOfServers: example.com,google.com
+----
+
+=== Using the Ribbon API Directly
+
+You can also use the `LoadBalancerClient` directly. Example:
+
+[source,java,indent=0]
+----
+public class MyClass {
+    @Autowired
+    private LoadBalancerClient loadBalancer;
+
+    public void doStuff() {
+        ServiceInstance instance = loadBalancer.choose("stores");
+        URI storesUri = URI.create(String.format("http://%s:%s", instance.getHost(), instance.getPort()));
+        // ... do something with the URI
+    }
+}
+----
+
+=== Spring RestTemplate as a Ribbon Client
+
+You can use Ribbon indirectly via an autoconfigured `RestTemplate`
+(provided Spring Cloud and Ribbon are both on the classpath):
+
+[source,java,indent=0]
+----
+public class MyClass {
+    @Autowired
+    private RestTemplate restTemplate;
+
+    public String doOtherStuff() {
+        String results = restTemplate.getForObject("http://stores/stores", String.class);
+        return results;
+    }
+}
+----
+
+The URI is inspected to see if it has a full host name, or a virtual
+one. If it is virtual the Ribbon client is used to create a full
+physical address. See
+{github-code}/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java[RibbonAutoConfiguration]
+for details of how the `RestTemplate` is set up.
+
+[[spring-cloud-feign]]
+== Declarative REST Client: Feign
+
+https://github.com/Netflix/feign[Feign] is a declarative web service client.  It makes writing web service clients easier.  To use Feign create an interface and annotate it.  It has pluggable annotation support including Feign annotations and JAX-RS annotations. Feign also supports pluggable encoders and decoders.  Spring Cloud adds support for Spring MVC annotations and for using the same `HttpMessageConverters` used by default in Spring Web.  Spring Cloud integrates Ribbon and Eureka to provide a load balanced http client when using Feign.
+
+Example spring boot app
+
+[source,java,indent=0]
+----
+@Configuration
+@ComponentScan
+@EnableAutoConfiguration
+@EnableEurekaClient
+@EnableFeignClients
+public class Application {
+
+    public static void main(String[] args) {
+        SpringApplication.run(Application.class, args);
+    }
+
+}
+----
+
+.StoreClient.java
+[source,java,indent=0]
+----
+@FeignClient("stores")
+public interface StoreClient {
+    @RequestMapping(method = RequestMethod.GET, value = "/stores")
+    List<Store> getStores();
+
+    @RequestMapping(method = RequestMethod.POST, value = "/stores/{storeId}", consumes = "application/json")
+    Store update(@PathParameter("storeId") Long storeId, Store store);
+}
+----
+
+In the `@FeignClient` annotation the String value ("stores" above) is
+an arbitrary client name, which is used to create a Ribbon load
+balancer (see <<spring-cloud-ribbon,below for details of Ribbon
+support>>). You can also specify a URL using the `url` attribute
+(absolute value or just a hostname).
+
+The Ribbon client above will want to discover the physical addresses
+for the "stores" service. If your application is a Eureka client then
+it will resolve the service in the Eureka service registry. If you
+don't want to use Eureka, you can simply configure a list of servers
+in your external configuration (see
+<<spring-cloud-ribbon-without-eureka,above for example>>).
+
+== External Configuration: Archaius
+
+https://github.com/Netflix/archaius[Archaius] is the Netflix client side configuration library.  It is the library used by all of the Netflix OSS components for configuration.  Archaius is an extension of the http://commons.apache.org/proper/commons-configuration[Apache Commons Configuration] project.  It allows updates to configuration by either polling a source for changes or for a source to push changes to the client.  Archaius uses Dynamic<Type>Property classes as handles to properties.
+
+.Archaius Example
+[source,java]
+----
+class ArchaiusTest {
+    DynamicStringProperty myprop = DynamicPropertyFactory
+            .getInstance()
+            .getStringProperty("my.prop");
+
+    void doSomething() {
+        OtherClass.someMethod(myprop.get());
+    }
+}
+----
+
+Archaius has its own set of configuration files and loading priorities.  Spring applications should generally not use Archaius directly., but the need to configure the Netflix tools natively remains.  Spring Cloud has a Spring Environment Bridge so Archaius can read properties from the Spring Environment.  This allows Spring Boot projects to use the normal configuration toolchain, while allowing them to configure the Netflix tools, for the most part, as documented.
+
+== Router and Filter: Zuul
+
+Routing in an integral part of a microservice architecture.  For example, `/` may be mapped to your web application, `/api/users` is mapped to the user service and `/api/shop` is mapped to the shop service.  https://github.com/Netflix/zuul[Zuul] is a JVM based router and server side load balancer by Netflix.
+
+http://www.slideshare.net/MikeyCohen1/edge-architecture-ieee-international-conference-on-cloud-engineering-32240146/27[Netflix uses Zuul] for the following:
+
+* Authentication
+* Insights
+* Stress Testing
+* Canary Testing
+* Dynamic Routing
+* Service Migration
+* Load Shedding
+* Security
+* Static Response handling
+* Active/Active traffic management
+
+Zuul's rule engine allows rules and filters to be written in essentially any JVM language, with built in support for Java and Groovy.
+
+[[netflix-zuul-reverse-proxy]]
+=== Embedded Zuul Reverse Proxy
+
+Spring Cloud has created an embedded Zuul proxy to ease the
+development of a very common use case where a UI application wants to
+proxy calls to one or more back end services.  This feature is useful
+for a user interface to proxy to the backend services it requires,
+avoiding the need to manage CORS and authentication concerns
+independently for all the backends.
+
+To enable it, annotate a Spring Boot main class with
+`@EnableZuulProxy`, and this forwards local calls to the appropriate
+service.  By convention, a service with the Eureka ID "users", will
+receive requests from the proxy located at `/users` (with the prefix
+stripped). The proxy uses Ribbon to locate an instance to forward to
+via Eureka, and all requests are executed in a hystrix command, so
+failures will show up in Hystrix metrics, and once the circuit is open
+the proxy will not try to contact the service.
+
+To skip having a service automatically added, set
+`zuul.ignored-services` to a list of service id patterns. If a service
+matches a pattern that is ignored, but also included in the explicitly
+configured routes map, then it will be unignored. Example:
+
+.application.yml
+[source,yaml]
+----
+ zuul:
+  ignoredServices: * 
+  routes:
+    users: /myusers/**
+----
+
+In this example, all services are ignored *except* "users".
+
+To augment or change
+the proxy routes, you can add external configuration like the
+following:
+
+.application.yml
+[source,yaml]
+----
+ zuul:
+  routes:
+    users: /myusers/**
+----
+
+This means that http calls to "/myusers" get forwarded to the "users"
+service (for example "/myusers/101" is forwarded to "/101").
+
+To get more fine-grained control over a route you can specify the path
+and the serviceId independently:
+
+.application.yml
+[source,yaml]
+----
+ zuul:
+  routes:
+    users:
+      path: /myusers/**
+      serviceId: users_service
+----
+
+This means that http calls to "/myusers" get forwarded to the
+"users_service" service.  The route has to have a "path" which can be
+specified as an ant-style pattern, so "/myusers/*" only matches one
+level, but "/myusers/**" matches hierarchically. 
+
+The location of the backend can be specified as either a "serviceId"
+(for a Eureka service) or a "url" (for a physical location), e.g.
+
+.application.yml
+[source,yaml]
+----
+ zuul:
+  routes:
+    users:
+      path: /myusers/**
+      url: http://example.com/users_service
+----
+
+To add a prefix to all mappings, set `zuul.prefix` to a value, such as
+`/api`. The proxy prefix is stripped from the request before the
+request is forwarded by default (switch this behaviour off with
+`zuul.stripPrefix=false`). You can also switch off the stripping of
+the service-specific prefix from individual routes, e.g.
+
+.application.yml
+[source,yaml]
+----
+ zuul:
+  routes:
+    users:
+      path: /myusers/**
+      stripPrefix: false
+----
+
+In this example requests to "/myusers/101" will be forwarded to "/myusers/101" on the "users" service.
+
+The `zuul.routes` entries actually bind to an object of type `ProxyRouteLocator`. If you
+look at the properties of that object you will see that it also has a "retryable" flag.
+Set that flag to "true" to have the Ribbon client automatically retry failed requests
+(and if you need to you can modify the parameters of the retry operations using
+the Ribbon client configuration).
+
+The `X-Forwarded-Host` header added to the forwarded requests by
+default.  To turn it off set `zuul.addProxyHeaders = false`.  The
+prefix path is stripped by default, and the request to the backend
+picks up a header "X-Forwarded-Prefix" ("/myusers" in the examples
+above).
+
+An application with the `@EnableZuulProxy` could act as a standalone
+server if you set a default route ("/"), for example `zuul.route.home:
+/` would route all traffic (i.e. "/**") to the "home" service.
+
+=== Plain Embedded Zuul
+
+You can also run a Zuul server without the proxying, or switch on parts of the proxying platform selectively, if you
+use `@EnableZuulServer` (instead of `@EnableZuulProxy`). Any beans that you add to the application of type `ZuulFilter`
+will be installed automatically.
+
+In this case the routes into the Zuul server are 
+still specified by configuring "zuul.routes.*", but there is no service discovery and no proxying, so the
+"serviceId" and "url" settings are ignored. For example:
+
+.application.yml
+[source,yaml]
+----
+ zuul:
+  routes:
+    api: /api/**
+----
+
+maps all paths in "/api/**" to the Zuul filter chain.
+
+=== Polyglot support with Sidecar
+
+Do you have non-jvm languages you want to take advantage of Eureka, Ribbon and
+Config Server?  The Spring Cloud Netflix Sidecar was inspired by
+https://github.com/Netflix/Prana[Netflix Prana].  It includes a simple http api
+to get all of the instances (ie host and port) for a given service.  You can
+also proxy service calls through an embedded Zuul proxy which gets its route
+entries from Eureka.  The Spring Cloud Config Server can be accessed directly
+via host lookup or through the Zuul Proxy.  The non-jvm app should implement
+a health check so the Sidecar can report to eureka if the app is up or down.
+
+To enable the Sidecar, create a Spring Boot application with `@EnableSidecar`.
+This annotation includes `@EnableCircuitBreaker`, `@EnableDiscoveryClient`,
+and `@EnableZuulProxy`.  Run the resulting application on the same host as the
+non-jvm application.
+
+To configure the side car add `sidecar.port` and `sidecar.health-uri` to `application.yml`.
+The `sidecar.port` property is the port the non-jvm app is listening on.  This
+is so the Sidecar can properly register the app with Eureka.  The `sidecar.health-uri`
+is a uri accessible on the non-jvm app that mimicks a Spring Boot health
+indicator.  It should return a json document like the following:
+
+.health-uri-document
+[source,json]
+----
+{
+  "status":"UP"
+}
+----
+
+Here is an example application.yml for a Sidecar application:
+
+.application.yml
+[source,yaml]
+----
+server:
+  port: 5678
+spring:
+  application:
+    name: sidecar
+
+sidecar:
+  port: 8000
+  health-uri: http://localhost:8000/health.json
+----
+
+The api for the `DiscoveryClient.getInstances()` method is `/hosts/{serviceId}`.
+Here is an example response for `/hosts/customers` that returns two instances on
+different hosts.  This api is accessible to the non-jvm app (if the sidecar is
+on port 5678) at `http://localhost:5678/hosts/{serviceId}`.
+
+./hosts/customers
+[source,json]
+----
+[
+    {
+        "host": "myhost",
+        "port": 9000,
+        "uri": "http://myhost:9000",
+        "serviceId": "CUSTOMERS",
+        "secure": false
+    },
+    {
+        "host": "myhost2",
+        "port": 9000,
+        "uri": "http://myhost2:9000",
+        "serviceId": "CUSTOMERS",
+        "secure": false
+    }
+]
+----
+
+The Zuul proxy automatically adds routes for each service known in eureka to
+`/<serviceId>`, so the customers service is available at `/customers`.  The
+Non-jvm app can access the customer service via `http://localhost:5678/customers`
+(assuming the sidecar is listening on port 5678).
+
+If the Config Server is registered with Eureka, non-jvm application can access
+it via the Zuul proxy.  If the serviceId of the ConfigServer is `configserver`
+and the Sidecar is on port 5678, then it can be accessed at
+http://localhost:5678/configserver
+
+Non-jvm app can take advantage of the Config Server's ability to return YAML
+documents.  For example, a call to http://sidecar.local.spring.io:5678/configserver/default-master.yml
+might result in a YAML document like the following
+
+[source,yaml]
+----
+eureka:
+  client:
+    serviceUrl:
+      defaultZone: http://localhost:8761/eureka/
+  password: password
+info:
+  description: Spring Cloud Samples
+  url: https://github.com/spring-cloud-samples
+----

docs/src/main/ruby/generate_readme.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env ruby
+
+base_dir = File.join(File.dirname(__FILE__),'../../..')
+src_dir = File.join(base_dir, "/src/main/asciidoc")
+require 'asciidoctor'
+require 'optparse'
+
+options = {}
+file = "#{src_dir}/README.adoc"
+
+OptionParser.new do |o|
+  o.on('-o OUTPUT_FILE', 'Output file (default is stdout)') { |file| options[:to_file] = file unless file=='-' }
+  o.on('-h', '--help') { puts o; exit }
+  o.parse!
+end
+
+file = ARGV[0] if ARGV.length>0
+
+srcDir = File.dirname(file)
+out = "// Do not edit this file (e.g. go instead to src/main/asciidoc)\n\n"
+doc = Asciidoctor.load_file file, safe: :safe, parse: false, attributes: 'allow-uri-read'
+out << doc.reader.read
+
+unless options[:to_file]
+  puts out
+else
+  File.open(options[:to_file],'w+') do |file|
+    file.write(out)
+  end
+end

eclipse/eclipse-code-formatter.xml

@@ -1,315 +1,295 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<profiles version="13">
-	<profile kind="CodeFormatterProfile" name="Spring Cloud Java Conventions" version="12">
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment" value="common_lines"/>
-		<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation" value="common_lines"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement" value="common_lines"/>
-		<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="4"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration" value="common_lines"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
-		<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
-		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
-		<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement" value="common_lines"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
-		<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position" value="false"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references" value="0"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
-		<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="90"/>
-		<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
-		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause" value="common_lines"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
-		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
-		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
-		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
-		<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_parameters" value="0"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
-		<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
-		<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
-		<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
-		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation" value="common_lines"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_module_statements" value="16"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
-		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="16"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
-		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
-		<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
-		<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.wrap_before_conditional_operator" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines" value="2147483647"/>
-		<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
-		<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
-		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause" value="common_lines"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
-		<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
-		<setting id="org.eclipse.jdt.core.compiler.source" value="9"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="false"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="9"/>
-		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration" value="common_lines"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
-		<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_type_arguments" value="0"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
-		<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
-		<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.compiler.compliance" value="9"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration" value="common_lines"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
-		<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
-		<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header" value="0"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
-		<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="90"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
-		<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
-	</profile>
+<profiles version="12">
+<profile kind="CodeFormatterProfile" name="Spring Cloud Java Conventions" version="12">
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_ellipsis" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_javadoc_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.indentation.size" value="8"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_root_tags" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.enabling_tag" value="@formatter:on"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.enumIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_block" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.line_length" value="90"/>
+<setting id="org.eclipse.jdt.core.formatter.use_on_off_tags" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_method_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_binary_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_lambda_body" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.compact_else_if" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.compiler.problem.assertIdentifier" value="error"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_binary_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_ellipsis" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_line_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.align_type_members_on_columns" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_assignment" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_conditional_expression" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_block_in_case" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_header" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while" value="insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode" value="enabled"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_method_declaration" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.join_wrapped_lines" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_resources_in_try" value="80"/>
+<setting id="org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column" value="false"/>
+<setting id="org.eclipse.jdt.core.compiler.source" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.size" value="4"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_source_code" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_field" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer" value="2"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.codegen.targetPlatform" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_switch" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_html" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_compact_if" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_empty_lines" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_unary_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_label" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_member_type" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.format_block_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line" value="false"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_statements_compare_to_body" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_multiple_fields" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_array_initializer" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_before_binary_operator" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.compiler.compliance" value="1.8"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_enum_constant" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.brace_position_for_type_declaration" value="end_of_line"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_before_package" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.join_lines_in_comments" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.comment.indent_parameter_description" value="true"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement" value="insert"/>
+<setting id="org.eclipse.jdt.core.formatter.tabulation.char" value="tab"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.blank_lines_between_import_groups" value="1"/>
+<setting id="org.eclipse.jdt.core.formatter.lineSplit" value="90"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
+<setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
+</profile>
 </profiles>

eclipse/org.eclipse.jdt.core.prefs

@@ -10,10 +10,9 @@ org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
 org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
 org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -52,11 +51,11 @@ org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=return_tag
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
 org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=default
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
 org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
 org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
@@ -103,9 +102,7 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disa
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.processAnnotations=disabled
-org.eclipse.jdt.core.compiler.source=1.8
-org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
@@ -116,14 +113,11 @@ org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_e
 org.eclipse.jdt.core.formatter.alignment_for_assignment=0
 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
 org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
@@ -133,8 +127,6 @@ org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration
 org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
 org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
-org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
 org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
 org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
 org.eclipse.jdt.core.formatter.blank_lines_after_package=1
@@ -161,7 +153,6 @@ org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
 org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
 org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
-org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
 org.eclipse.jdt.core.formatter.comment.format_block_comments=true
 org.eclipse.jdt.core.formatter.comment.format_header=false
 org.eclipse.jdt.core.formatter.comment.format_html=true
@@ -193,8 +184,7 @@ org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
 org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
 org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
+org.eclipse.jdt.core.formatter.indentation.size=8
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
 org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
@@ -222,7 +212,7 @@ org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
 org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
 org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
@@ -389,24 +379,11 @@ org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
 org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
 org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
-org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
 org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
 org.eclipse.jdt.core.formatter.tabulation.char=tab
 org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_on_off_tags=false
 org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
-org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
 org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
 org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
 org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
-org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter

mvnw

@@ -1,308 +0,0 @@
-#!/bin/sh
-# ----------------------------------------------------------------------------
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# ----------------------------------------------------------------------------
-
-# ----------------------------------------------------------------------------
-# Apache Maven Wrapper startup batch script, version 3.2.0
-#
-# Required ENV vars:
-# ------------------
-#   JAVA_HOME - location of a JDK home dir
-#
-# Optional ENV vars
-# -----------------
-#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
-#     e.g. to debug Maven itself, use
-#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-# ----------------------------------------------------------------------------
-
-if [ -z "$MAVEN_SKIP_RC" ] ; then
-
-  if [ -f /usr/local/etc/mavenrc ] ; then
-    . /usr/local/etc/mavenrc
-  fi
-
-  if [ -f /etc/mavenrc ] ; then
-    . /etc/mavenrc
-  fi
-
-  if [ -f "$HOME/.mavenrc" ] ; then
-    . "$HOME/.mavenrc"
-  fi
-
-fi
-
-# OS specific support.  $var _must_ be set to either true or false.
-cygwin=false;
-darwin=false;
-mingw=false
-case "$(uname)" in
-  CYGWIN*) cygwin=true ;;
-  MINGW*) mingw=true;;
-  Darwin*) darwin=true
-    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
-    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
-    if [ -z "$JAVA_HOME" ]; then
-      if [ -x "/usr/libexec/java_home" ]; then
-        JAVA_HOME="$(/usr/libexec/java_home)"; export JAVA_HOME
-      else
-        JAVA_HOME="/Library/Java/Home"; export JAVA_HOME
-      fi
-    fi
-    ;;
-esac
-
-if [ -z "$JAVA_HOME" ] ; then
-  if [ -r /etc/gentoo-release ] ; then
-    JAVA_HOME=$(java-config --jre-home)
-  fi
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin ; then
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=$(cygpath --unix "$JAVA_HOME")
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=$(cygpath --path --unix "$CLASSPATH")
-fi
-
-# For Mingw, ensure paths are in UNIX format before anything is touched
-if $mingw ; then
-  [ -n "$JAVA_HOME" ] && [ -d "$JAVA_HOME" ] &&
-    JAVA_HOME="$(cd "$JAVA_HOME" || (echo "cannot cd into $JAVA_HOME."; exit 1); pwd)"
-fi
-
-if [ -z "$JAVA_HOME" ]; then
-  javaExecutable="$(which javac)"
-  if [ -n "$javaExecutable" ] && ! [ "$(expr "\"$javaExecutable\"" : '\([^ ]*\)')" = "no" ]; then
-    # readlink(1) is not available as standard on Solaris 10.
-    readLink=$(which readlink)
-    if [ ! "$(expr "$readLink" : '\([^ ]*\)')" = "no" ]; then
-      if $darwin ; then
-        javaHome="$(dirname "\"$javaExecutable\"")"
-        javaExecutable="$(cd "\"$javaHome\"" && pwd -P)/javac"
-      else
-        javaExecutable="$(readlink -f "\"$javaExecutable\"")"
-      fi
-      javaHome="$(dirname "\"$javaExecutable\"")"
-      javaHome=$(expr "$javaHome" : '\(.*\)/bin')
-      JAVA_HOME="$javaHome"
-      export JAVA_HOME
-    fi
-  fi
-fi
-
-if [ -z "$JAVACMD" ] ; then
-  if [ -n "$JAVA_HOME"  ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-      # IBM's JDK on AIX uses strange locations for the executables
-      JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-      JAVACMD="$JAVA_HOME/bin/java"
-    fi
-  else
-    JAVACMD="$(\unset -f command 2>/dev/null; \command -v java)"
-  fi
-fi
-
-if [ ! -x "$JAVACMD" ] ; then
-  echo "Error: JAVA_HOME is not defined correctly." >&2
-  echo "  We cannot execute $JAVACMD" >&2
-  exit 1
-fi
-
-if [ -z "$JAVA_HOME" ] ; then
-  echo "Warning: JAVA_HOME environment variable is not set."
-fi
-
-# traverses directory structure from process work directory to filesystem root
-# first directory with .mvn subdirectory is considered project base directory
-find_maven_basedir() {
-  if [ -z "$1" ]
-  then
-    echo "Path not specified to find_maven_basedir"
-    return 1
-  fi
-
-  basedir="$1"
-  wdir="$1"
-  while [ "$wdir" != '/' ] ; do
-    if [ -d "$wdir"/.mvn ] ; then
-      basedir=$wdir
-      break
-    fi
-    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
-    if [ -d "${wdir}" ]; then
-      wdir=$(cd "$wdir/.." || exit 1; pwd)
-    fi
-    # end of workaround
-  done
-  printf '%s' "$(cd "$basedir" || exit 1; pwd)"
-}
-
-# concatenates all lines of a file
-concat_lines() {
-  if [ -f "$1" ]; then
-    # Remove \r in case we run on Windows within Git Bash
-    # and check out the repository with auto CRLF management
-    # enabled. Otherwise, we may read lines that are delimited with
-    # \r\n and produce $'-Xarg\r' rather than -Xarg due to word
-    # splitting rules.
-    tr -s '\r\n' ' ' < "$1"
-  fi
-}
-
-log() {
-  if [ "$MVNW_VERBOSE" = true ]; then
-    printf '%s\n' "$1"
-  fi
-}
-
-BASE_DIR=$(find_maven_basedir "$(dirname "$0")")
-if [ -z "$BASE_DIR" ]; then
-  exit 1;
-fi
-
-MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}; export MAVEN_PROJECTBASEDIR
-log "$MAVEN_PROJECTBASEDIR"
-
-##########################################################################################
-# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-# This allows using the maven wrapper in projects that prohibit checking in binary data.
-##########################################################################################
-wrapperJarPath="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar"
-if [ -r "$wrapperJarPath" ]; then
-    log "Found $wrapperJarPath"
-else
-    log "Couldn't find $wrapperJarPath, downloading it ..."
-
-    if [ -n "$MVNW_REPOURL" ]; then
-      wrapperUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
-    else
-      wrapperUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
-    fi
-    while IFS="=" read -r key value; do
-      # Remove '\r' from value to allow usage on windows as IFS does not consider '\r' as a separator ( considers space, tab, new line ('\n'), and custom '=' )
-      safeValue=$(echo "$value" | tr -d '\r')
-      case "$key" in (wrapperUrl) wrapperUrl="$safeValue"; break ;;
-      esac
-    done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
-    log "Downloading from: $wrapperUrl"
-
-    if $cygwin; then
-      wrapperJarPath=$(cygpath --path --windows "$wrapperJarPath")
-    fi
-
-    if command -v wget > /dev/null; then
-        log "Found wget ... using wget"
-        [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--quiet"
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            wget $QUIET "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
-        else
-            wget $QUIET --http-user="$MVNW_USERNAME" --http-password="$MVNW_PASSWORD" "$wrapperUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath"
-        fi
-    elif command -v curl > /dev/null; then
-        log "Found curl ... using curl"
-        [ "$MVNW_VERBOSE" = true ] && QUIET="" || QUIET="--silent"
-        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
-            curl $QUIET -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
-        else
-            curl $QUIET --user "$MVNW_USERNAME:$MVNW_PASSWORD" -o "$wrapperJarPath" "$wrapperUrl" -f -L || rm -f "$wrapperJarPath"
-        fi
-    else
-        log "Falling back to using Java to download"
-        javaSource="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.java"
-        javaClass="$MAVEN_PROJECTBASEDIR/.mvn/wrapper/MavenWrapperDownloader.class"
-        # For Cygwin, switch paths to Windows format before running javac
-        if $cygwin; then
-          javaSource=$(cygpath --path --windows "$javaSource")
-          javaClass=$(cygpath --path --windows "$javaClass")
-        fi
-        if [ -e "$javaSource" ]; then
-            if [ ! -e "$javaClass" ]; then
-                log " - Compiling MavenWrapperDownloader.java ..."
-                ("$JAVA_HOME/bin/javac" "$javaSource")
-            fi
-            if [ -e "$javaClass" ]; then
-                log " - Running MavenWrapperDownloader.java ..."
-                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$wrapperUrl" "$wrapperJarPath") || rm -f "$wrapperJarPath"
-            fi
-        fi
-    fi
-fi
-##########################################################################################
-# End of extension
-##########################################################################################
-
-# If specified, validate the SHA-256 sum of the Maven wrapper jar file
-wrapperSha256Sum=""
-while IFS="=" read -r key value; do
-  case "$key" in (wrapperSha256Sum) wrapperSha256Sum=$value; break ;;
-  esac
-done < "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.properties"
-if [ -n "$wrapperSha256Sum" ]; then
-  wrapperSha256Result=false
-  if command -v sha256sum > /dev/null; then
-    if echo "$wrapperSha256Sum  $wrapperJarPath" | sha256sum -c > /dev/null 2>&1; then
-      wrapperSha256Result=true
-    fi
-  elif command -v shasum > /dev/null; then
-    if echo "$wrapperSha256Sum  $wrapperJarPath" | shasum -a 256 -c > /dev/null 2>&1; then
-      wrapperSha256Result=true
-    fi
-  else
-    echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available."
-    echo "Please install either command, or disable validation by removing 'wrapperSha256Sum' from your maven-wrapper.properties."
-    exit 1
-  fi
-  if [ $wrapperSha256Result = false ]; then
-    echo "Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised." >&2
-    echo "Investigate or delete $wrapperJarPath to attempt a clean download." >&2
-    echo "If you updated your Maven version, you need to update the specified wrapperSha256Sum property." >&2
-    exit 1
-  fi
-fi
-
-MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
-  [ -n "$JAVA_HOME" ] &&
-    JAVA_HOME=$(cygpath --path --windows "$JAVA_HOME")
-  [ -n "$CLASSPATH" ] &&
-    CLASSPATH=$(cygpath --path --windows "$CLASSPATH")
-  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
-    MAVEN_PROJECTBASEDIR=$(cygpath --path --windows "$MAVEN_PROJECTBASEDIR")
-fi
-
-# 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
-
-# shellcheck disable=SC2086 # safe args
-exec "$JAVACMD" \
-  $MAVEN_OPTS \
-  $MAVEN_DEBUG_OPTS \
-  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
-  "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
-  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

mvnw.cmd

@@ -1,205 +0,0 @@
-@REM ----------------------------------------------------------------------------
-@REM Licensed to the Apache Software Foundation (ASF) under one
-@REM or more contributor license agreements.  See the NOTICE file
-@REM distributed with this work for additional information
-@REM regarding copyright ownership.  The ASF licenses this file
-@REM to you under the Apache License, Version 2.0 (the
-@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
-@REM Unless required by applicable law or agreed to in writing,
-@REM software distributed under the License is distributed on an
-@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-@REM KIND, either express or implied.  See the License for the
-@REM specific language governing permissions and limitations
-@REM under the License.
-@REM ----------------------------------------------------------------------------
-
-@REM ----------------------------------------------------------------------------
-@REM Apache Maven Wrapper startup batch script, version 3.2.0
-@REM
-@REM Required ENV vars:
-@REM JAVA_HOME - location of a JDK home dir
-@REM
-@REM Optional ENV vars
-@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
-@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending
-@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
-@REM     e.g. to debug Maven itself, use
-@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
-@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
-@REM ----------------------------------------------------------------------------
-
-@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
-@echo off
-@REM set title of command window
-title %0
-@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
-@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
-
-@REM set %HOME% to equivalent of $HOME
-if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
-
-@REM Execute a user defined script before this one
-if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
-@REM check for pre script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %*
-if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %*
-:skipRcPre
-
-@setlocal
-
-set ERROR_CODE=0
-
-@REM To isolate internal variables from possible post scripts, we use another setlocal
-@setlocal
-
-@REM ==== START VALIDATION ====
-if not "%JAVA_HOME%" == "" goto OkJHome
-
-echo.
-echo Error: JAVA_HOME not found in your environment. >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-:OkJHome
-if exist "%JAVA_HOME%\bin\java.exe" goto init
-
-echo.
-echo Error: JAVA_HOME is set to an invalid directory. >&2
-echo JAVA_HOME = "%JAVA_HOME%" >&2
-echo Please set the JAVA_HOME variable in your environment to match the >&2
-echo location of your Java installation. >&2
-echo.
-goto error
-
-@REM ==== END VALIDATION ====
-
-:init
-
-@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
-@REM Fallback to current working directory if not found.
-
-set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
-IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
-
-set EXEC_DIR=%CD%
-set WDIR=%EXEC_DIR%
-:findBaseDir
-IF EXIST "%WDIR%"\.mvn goto baseDirFound
-cd ..
-IF "%WDIR%"=="%CD%" goto baseDirNotFound
-set WDIR=%CD%
-goto findBaseDir
-
-:baseDirFound
-set MAVEN_PROJECTBASEDIR=%WDIR%
-cd "%EXEC_DIR%"
-goto endDetectBaseDir
-
-:baseDirNotFound
-set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
-cd "%EXEC_DIR%"
-
-:endDetectBaseDir
-
-IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
-
-@setlocal EnableExtensions EnableDelayedExpansion
-for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
-@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
-
-:endReadAdditionalConfig
-
-SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
-set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
-set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
-
-set WRAPPER_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
-
-FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
-    IF "%%A"=="wrapperUrl" SET WRAPPER_URL=%%B
-)
-
-@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
-@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
-if exist %WRAPPER_JAR% (
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Found %WRAPPER_JAR%
-    )
-) else (
-    if not "%MVNW_REPOURL%" == "" (
-        SET WRAPPER_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar"
-    )
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Couldn't find %WRAPPER_JAR%, downloading it ...
-        echo Downloading from: %WRAPPER_URL%
-    )
-
-    powershell -Command "&{"^
-		"$webclient = new-object System.Net.WebClient;"^
-		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
-		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
-		"}"^
-		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%WRAPPER_URL%', '%WRAPPER_JAR%')"^
-		"}"
-    if "%MVNW_VERBOSE%" == "true" (
-        echo Finished downloading %WRAPPER_JAR%
-    )
-)
-@REM End of extension
-
-@REM If specified, validate the SHA-256 sum of the Maven wrapper jar file
-SET WRAPPER_SHA_256_SUM=""
-FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO (
-    IF "%%A"=="wrapperSha256Sum" SET WRAPPER_SHA_256_SUM=%%B
-)
-IF NOT %WRAPPER_SHA_256_SUM%=="" (
-    powershell -Command "&{"^
-       "$hash = (Get-FileHash \"%WRAPPER_JAR%\" -Algorithm SHA256).Hash.ToLower();"^
-       "If('%WRAPPER_SHA_256_SUM%' -ne $hash){"^
-       "  Write-Output 'Error: Failed to validate Maven wrapper SHA-256, your Maven wrapper might be compromised.';"^
-       "  Write-Output 'Investigate or delete %WRAPPER_JAR% to attempt a clean download.';"^
-       "  Write-Output 'If you updated your Maven version, you need to update the specified wrapperSha256Sum property.';"^
-       "  exit 1;"^
-       "}"^
-       "}"
-    if ERRORLEVEL 1 goto error
-)
-
-@REM Provide a "standardized" way to retrieve the CLI args that will
-@REM work with both Windows and non-Windows executions.
-set MAVEN_CMD_LINE_ARGS=%*
-
-%MAVEN_JAVA_EXE% ^
-  %JVM_CONFIG_MAVEN_PROPS% ^
-  %MAVEN_OPTS% ^
-  %MAVEN_DEBUG_OPTS% ^
-  -classpath %WRAPPER_JAR% ^
-  "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^
-  %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
-if ERRORLEVEL 1 goto error
-goto end
-
-:error
-set ERROR_CODE=1
-
-:end
-@endlocal & set ERROR_CODE=%ERROR_CODE%
-
-if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost
-@REM check for post script, once with legacy .bat ending and once with .cmd ending
-if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat"
-if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd"
-:skipRcPost
-
-@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
-if "%MAVEN_BATCH_PAUSE%"=="on" pause
-
-if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE%
-
-cmd /C exit /B %ERROR_CODE%

pom.xml

@@ -1,18 +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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>spring-cloud-netflix</artifactId>
-	<version>4.1.1-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>Spring Cloud Netflix</name>
-	<description>Spring Cloud Netflix</description>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>4.1.1-SNAPSHOT</version>
+		<version>1.0.0.RELEASE</version>
 		<relativePath />
 	</parent>
+	<artifactId>spring-cloud-netflix</artifactId>
+	<version>1.0.0.RELEASE</version>
+	<packaging>pom</packaging>
+	<name>Spring Cloud Netflix</name>
+	<description>Spring Cloud Netflix</description>
 	<scm>
 		<url>https://github.com/spring-cloud/spring-cloud-netflix</url>
 		<connection>scm:git:git://github.com/spring-cloud/spring-cloud-netflix.git</connection>
@@ -20,63 +20,42 @@
 		<tag>HEAD</tag>
 	</scm>
 	<properties>
-		<bintray.package>netflix</bintray.package>
-		<spring-cloud-commons.version>4.1.1-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-config.version>4.1.1-SNAPSHOT</spring-cloud-config.version>
-		<testcontainers.version>1.19.3</testcontainers.version>
-		<mockserverclient.version>5.15.0</mockserverclient.version>
-
-		<!-- Sonar -->
-		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-		<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
-		<sonar.language>java</sonar.language>
-		<maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
-		<!-- FIXME: 4.0.0 -->
-		<duplicate-finder-maven-plugin.skip>true</duplicate-finder-maven-plugin.skip>
+		<main.basedir>${basedir}</main.basedir>
+		<archaius.version>0.6.5</archaius.version>
+		<eureka.version>1.1.147</eureka.version>
+		<feign.version>7.1.0</feign.version>
+		<hystrix.version>1.4.0-RC6</hystrix.version>
+		<ribbon.version>2.0-RC13</ribbon.version>
+		<zuul.version>1.0.28</zuul.version>
+		<netflix.rxjava.version>0.20.7</netflix.rxjava.version>
+		<java.version>1.7</java.version>
+		<spring-integration-dsl.version>1.0.0.RELEASE</spring-integration-dsl.version>
+		<cloud-connectors.version>1.1.1.BUILD-SNAPSHOT</cloud-connectors.version>
 	</properties>
 	<build>
 		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>flatten-maven-plugin</artifactId>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-eclipse-plugin</artifactId>
-				<version>${maven-eclipse-plugin.version}</version>
 				<configuration>
 					<useProjectReferences>false</useProjectReferences>
 					<additionalConfig>
 						<file>
 							<name>.settings/org.eclipse.jdt.ui.prefs</name>
-							<location>${maven.multiModuleProjectDirectory}/eclipse/org.eclipse.jdt.ui.prefs</location>
+							<location>${main.basedir}/eclipse/org.eclipse.jdt.ui.prefs</location>
 						</file>
 						<file>
 							<name>.settings/org.eclipse.jdt.core.prefs</name>
-							<location>${maven.multiModuleProjectDirectory}/eclipse/org.eclipse.jdt.core.prefs</location>
+							<location>${main.basedir}/eclipse/org.eclipse.jdt.core.prefs</location>
 						</file>
 					</additionalConfig>
 				</configuration>
 			</plugin>
 			<plugin>
-				<groupId>io.spring.javaformat</groupId>
-				<artifactId>spring-javaformat-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.basepom.maven</groupId>
-				<artifactId>duplicate-finder-maven-plugin</artifactId>
+				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
-					<ignoredResourcePatterns>
-						<ignoredResourcePattern>about.html</ignoredResourcePattern>
-						<ignoredResourcePattern>plugin.properties</ignoredResourcePattern>
-						<ignoredResourcePattern>mozilla/public-suffix-list.txt</ignoredResourcePattern>
-					</ignoredResourcePatterns>
-					<checkTestClasspath>false</checkTestClasspath>
+					<source>1.7</source>
+					<target>1.7</target>
 				</configuration>
 			</plugin>
 		</plugins>
@@ -85,176 +64,259 @@
 		<dependencies>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-dependencies</artifactId>
-				<version>${project.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
+				<artifactId>spring-cloud-commons</artifactId>
+				<version>1.0.0.RELEASE</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-commons-dependencies</artifactId>
-				<version>${spring-cloud-commons.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
+				<artifactId>spring-cloud-config-client</artifactId>
+				<version>1.0.0.RELEASE</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-test-support</artifactId>
-				<scope>test</scope>
-				<version>${spring-cloud-commons.version}</version>
+				<artifactId>spring-cloud-config-server</artifactId>
+				<version>1.0.0.RELEASE</version>
 			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-config-dependencies</artifactId>
-				<version>${spring-cloud-config.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
+				<artifactId>spring-cloud-netflix-core</artifactId>
+				<version>1.0.0.RELEASE</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-netflix-eureka-server</artifactId>
+				<version>1.0.0.RELEASE</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-netflix-hystrix-dashboard</artifactId>
+				<version>1.0.0.RELEASE</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-netflix-hystrix-amqp</artifactId>
+				<version>1.0.0.RELEASE</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-netflix-turbine</artifactId>
+				<version>1.0.0.RELEASE</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-netflix-turbine-amqp</artifactId>
+				<version>1.0.0.RELEASE</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-netflix-zuul-server</artifactId>
+				<version>1.0.0.RELEASE</version>
+			</dependency>
+			<dependency>
+				<groupId>com.netflix.archaius</groupId>
+				<artifactId>archaius-core</artifactId>
+				<version>${archaius.version}</version>
+				<exclusions>
+					<exclusion>
+						<artifactId>commons-logging</artifactId>
+						<groupId>commons-logging</groupId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>com.netflix.eureka</groupId>
+				<artifactId>eureka-client</artifactId>
+				<version>${eureka.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>javax.servlet</groupId>
+						<artifactId>servlet-api</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>com.netflix.eureka</groupId>
+				<artifactId>eureka-core</artifactId>
+				<version>${eureka.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>javax.servlet</groupId>
+						<artifactId>servlet-api</artifactId>
+					</exclusion>
+					<exclusion>
+						<artifactId>commons-logging</artifactId>
+						<groupId>commons-logging</groupId>
+					</exclusion>
+					<exclusion>
+						<artifactId>log4j</artifactId>
+						<groupId>log4j</groupId>
+					</exclusion>
+					<exclusion>
+						<artifactId>com.netflix.blitz4j</artifactId>
+						<groupId>blitz4j</groupId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<!-- Eureka core dep that is now optional -->
+			<dependency>
+				<groupId>com.thoughtworks.xstream</groupId>
+				<artifactId>xstream</artifactId>
+				<version>1.4.2</version>
+			</dependency>
+			<!-- Eureka server dep that is now optional -->
+			<dependency>
+				<groupId>com.netflix.blitz4j</groupId>
+				<artifactId>blitz4j</artifactId>
+				<version>1.36.0</version>
+			</dependency>
+			<dependency>
+				<groupId>com.netflix.feign</groupId>
+				<artifactId>feign-core</artifactId>
+				<version>${feign.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.netflix.feign</groupId>
+				<artifactId>feign-ribbon</artifactId>
+				<version>${feign.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>com.netflix.ribbon</groupId>
+						<artifactId>ribbon-loadbalancer</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<!-- TODO: remove with feign 8.0.0 -->
+			<dependency>
+				<groupId>com.squareup.dagger</groupId>
+				<artifactId>dagger</artifactId>
+				<version>1.2.2</version>
+			</dependency>
+			<dependency>
+				<groupId>com.netflix.feign</groupId>
+				<artifactId>feign-slf4j</artifactId>
+				<version>${feign.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.netflix.hystrix</groupId>
+				<artifactId>hystrix-core</artifactId>
+				<version>${hystrix.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.netflix.hystrix</groupId>
+				<artifactId>hystrix-metrics-event-stream</artifactId>
+				<version>${hystrix.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.netflix.hystrix</groupId>
+				<artifactId>hystrix-javanica</artifactId>
+				<version>${hystrix.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.netflix.ribbon</groupId>
+				<artifactId>ribbon</artifactId>
+				<version>${ribbon.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.netflix.ribbon</groupId>
+				<artifactId>ribbon-core</artifactId>
+				<version>${ribbon.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.netflix.ribbon</groupId>
+				<artifactId>ribbon-httpclient</artifactId>
+				<version>${ribbon.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.netflix.ribbon</groupId>
+				<artifactId>ribbon-eureka</artifactId>
+				<version>${ribbon.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>javax.servlet</groupId>
+						<artifactId>servlet-api</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>com.netflix.rxjava</groupId>
+				<artifactId>rxjava-core</artifactId>
+				<version>${netflix.rxjava.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.netflix.zuul</groupId>
+				<artifactId>zuul-core</artifactId>
+				<version>${zuul.version}</version>
+				<exclusions>
+					<exclusion>
+						<artifactId>groovy-all</artifactId>
+						<groupId>org.codehaus.groovy</groupId>
+					</exclusion>
+					<exclusion>
+						<artifactId>mockito-all</artifactId>
+						<groupId>org.mockito</groupId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.integration</groupId>
+				<artifactId>spring-integration-java-dsl</artifactId>
+				<version>${spring-integration-dsl.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.google.guava</groupId>
+				<artifactId>guava</artifactId>
+				<version>18.0</version>
+			</dependency>
+			<dependency>
+				<groupId>com.sun.jersey</groupId>
+				<artifactId>jersey-servlet</artifactId>
+				<version>1.13</version>
+			</dependency>
+			<dependency>
+				<groupId>com.sun.jersey</groupId>
+				<artifactId>jersey-core</artifactId>
+				<version>1.13</version>
+			</dependency>
+			<dependency>
+				<groupId>com.sun.jersey</groupId>
+				<artifactId>jersey-client</artifactId>
+				<version>1.13</version>
+			</dependency>
+			<dependency>
+				<groupId>com.sun.jersey</groupId>
+				<artifactId>jersey-server</artifactId>
+				<version>1.13</version>
+			</dependency>
+			<dependency>
+				<groupId>org.webjars</groupId>
+				<artifactId>d3js</artifactId>
+				<version>3.4.11</version>
+			</dependency>
+			<dependency>
+				<groupId>org.webjars</groupId>
+				<artifactId>jquery</artifactId>
+				<version>2.1.1</version>
+			</dependency>
+			<dependency>
+				<groupId>org.webjars</groupId>
+				<artifactId>bootstrap</artifactId>
+				<version>3.2.0</version>
 			</dependency>
 			<dependency>
 				<groupId>javax.inject</groupId>
 				<artifactId>javax.inject</artifactId>
 				<version>1</version>
 			</dependency>
-			<!-- Eureka core dep that is now optional -->
-			<!-- end eureka deps -->
-
-			<dependency>
-				<groupId>org.testcontainers</groupId>
-				<artifactId>mockserver</artifactId>
-				<version>${testcontainers.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.testcontainers</groupId>
-				<artifactId>junit-jupiter</artifactId>
-				<version>${testcontainers.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.mock-server</groupId>
-				<artifactId>mockserver-client-java</artifactId>
-				<version>${mockserverclient.version}</version>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
-	<reporting>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-checkstyle-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</reporting>
 	<modules>
-		<module>spring-cloud-netflix-dependencies</module>
-		<module>spring-cloud-netflix-eureka-client</module>
+		<module>spring-cloud-netflix-core</module>
+		<module>spring-cloud-netflix-hystrix-dashboard</module>
+		<module>spring-cloud-netflix-hystrix-amqp</module>
 		<module>spring-cloud-netflix-eureka-server</module>
-		<module>spring-cloud-starter-netflix-eureka-client</module>
-		<module>spring-cloud-starter-netflix-eureka-server</module>
-		<module>spring-cloud-netflix-eureka-client-tls-tests</module>
+		<module>spring-cloud-netflix-turbine</module>
+		<module>spring-cloud-netflix-turbine-amqp</module>
+		<module>spring-cloud-netflix-sidecar</module>
 		<module>docs</module>
-    </modules>
-	<profiles>
-		<profile>
-			<id>spring</id>
-			<repositories>
-				<repository>
-					<id>spring-snapshots</id>
-					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/libs-snapshot-local</url>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-					<releases>
-						<enabled>false</enabled>
-					</releases>
-				</repository>
-				<repository>
-					<id>spring-milestones</id>
-					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</repository>
-				<repository>
-					<id>spring-releases</id>
-					<name>Spring Releases</name>
-					<url>https://repo.spring.io/release</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</repository>
-			</repositories>
-			<pluginRepositories>
-				<pluginRepository>
-					<id>spring-snapshots</id>
-					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/libs-snapshot-local</url>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-					<releases>
-						<enabled>false</enabled>
-					</releases>
-				</pluginRepository>
-				<pluginRepository>
-					<id>spring-milestones</id>
-					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</pluginRepository>
-				<pluginRepository>
-					<id>spring-releases</id>
-					<name>Spring Releases</name>
-					<url>https://repo.spring.io/libs-release-local</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</pluginRepository>
-			</pluginRepositories>
-		</profile>
-		<profile>
-			<id>sonar</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.jacoco</groupId>
-						<artifactId>jacoco-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>pre-unit-test</id>
-								<goals>
-									<goal>prepare-agent</goal>
-								</goals>
-								<configuration>
-									<propertyName>surefireArgLine</propertyName>
-									<destFile>${project.build.directory}/jacoco.exec</destFile>
-								</configuration>
-							</execution>
-							<execution>
-								<id>post-unit-test</id>
-								<phase>test</phase>
-								<goals>
-									<goal>report</goal>
-								</goals>
-								<configuration>
-									<!-- Sets the path to the file which contains the execution data. -->
-									<dataFile>${project.build.directory}/jacoco.exec</dataFile>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<configuration>
-							<!-- Sets the VM argument line used when unit tests are run. -->
-							<argLine>${surefireArgLine}</argLine>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+	</modules>
 </project>

scripts/compileOnly.sh

@@ -1,6 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-(cd spring-cloud-netflix-hystrix-contract && ../mvnw clean install -B -Pdocs -DskipTests)
-./mvnw clean install -B -Pdocs -DskipTests -fae

scripts/runAcceptanceTests.sh

@@ -1,27 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-mkdir -p target
-
-SCRIPT_URL="https://raw.githubusercontent.com/spring-cloud-samples/brewery/3.1.x/runAcceptanceTests.sh"
-AT_WHAT_TO_TEST="EUREKA"
-
-cd target
-
-curl "${SCRIPT_URL}" --output runAcceptanceTests.sh
-
-chmod +x runAcceptanceTests.sh
-
-echo "Killing all running apps"
-./runAcceptanceTests.sh -t "${AT_WHAT_TO_TEST}" --killnow
-
-./runAcceptanceTests.sh -t "${AT_WHAT_TO_TEST}" --killattheend
-
-SCRIPT_URL="https://raw.githubusercontent.com/spring-cloud-samples/tests/main/scripts/runTests.sh"
-
-curl "${SCRIPT_URL}" --output runIntegrationTests.sh
-
-chmod +x runIntegrationTests.sh
-
-./runIntegrationTests.sh

spring-cloud-netflix-core/pom.xml

@@ -0,0 +1,153 @@
+<?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">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-netflix</artifactId>
+		<version>1.0.0.RELEASE</version>
+		<relativePath>..</relativePath>
+	</parent>
+	<artifactId>spring-cloud-netflix-core</artifactId>
+	<packaging>jar</packaging>
+	<name>Spring Cloud Netflix Core</name>
+	<description>Spring Cloud Netflix Core</description>
+	<properties>
+		<main.basedir>${basedir}/..</main.basedir>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-autoconfigure</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-commons</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-config-client</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-config-server</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.archaius</groupId>
+			<artifactId>archaius-core</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.eureka</groupId>
+			<artifactId>eureka-client</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.eureka</groupId>
+			<artifactId>eureka-core</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<!-- Eureka core deps that are now optional -->
+		<dependency>
+			<groupId>com.thoughtworks.xstream</groupId>
+			<artifactId>xstream</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>net.java.dev.rome</groupId>
+			<artifactId>rome</artifactId>
+			<version>1.0.0</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.feign</groupId>
+			<artifactId>feign-core</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.feign</groupId>
+			<artifactId>feign-slf4j</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.feign</groupId>
+			<artifactId>feign-ribbon</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.squareup.dagger</groupId>
+			<artifactId>dagger</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.hystrix</groupId>
+			<artifactId>hystrix-core</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.hystrix</groupId>
+			<artifactId>hystrix-metrics-event-stream</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.hystrix</groupId>
+			<artifactId>hystrix-javanica</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.ribbon</groupId>
+			<artifactId>ribbon</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.ribbon</groupId>
+			<artifactId>ribbon-core</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.ribbon</groupId>
+			<artifactId>ribbon-eureka</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.ribbon</groupId>
+			<artifactId>ribbon-httpclient</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.zuul</groupId>
+			<artifactId>zuul-core</artifactId>
+			<optional>true</optional>
+			<exclusions>
+				<exclusion>
+					<artifactId>groovy-all</artifactId>
+					<groupId>org.codehaus.groovy</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>com.netflix.rxjava</groupId>
+			<artifactId>rxjava-core</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<!-- Only needed at compile time -->
+			<scope>compile</scope>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-test</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+</project>

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfiguration.java

@@ -0,0 +1,183 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.archaius;
+
+import java.lang.reflect.Field;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+import javax.annotation.PreDestroy;
+
+import lombok.extern.apachecommons.CommonsLog;
+import org.apache.commons.configuration.AbstractConfiguration;
+import org.apache.commons.configuration.ConfigurationBuilder;
+import org.apache.commons.configuration.EnvironmentConfiguration;
+import org.apache.commons.configuration.SystemConfiguration;
+import org.apache.commons.configuration.event.ConfigurationEvent;
+import org.apache.commons.configuration.event.ConfigurationListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.actuate.endpoint.Endpoint;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.Environment;
+import org.springframework.util.ReflectionUtils;
+
+import com.netflix.config.ConcurrentCompositeConfiguration;
+import com.netflix.config.ConfigurationManager;
+import com.netflix.config.DynamicPropertyFactory;
+import com.netflix.config.DynamicURLConfiguration;
+
+import static com.netflix.config.ConfigurationBasedDeploymentContext.DEPLOYMENT_APPLICATION_ID_PROPERTY;
+import static com.netflix.config.ConfigurationManager.APPLICATION_PROPERTIES;
+import static com.netflix.config.ConfigurationManager.DISABLE_DEFAULT_ENV_CONFIG;
+import static com.netflix.config.ConfigurationManager.DISABLE_DEFAULT_SYS_CONFIG;
+import static com.netflix.config.ConfigurationManager.ENV_CONFIG_NAME;
+import static com.netflix.config.ConfigurationManager.SYS_CONFIG_NAME;
+import static com.netflix.config.ConfigurationManager.URL_CONFIG_NAME;
+
+/**
+ * @author Spencer Gibb
+ */
+@Configuration
+@ConditionalOnClass({ ConcurrentCompositeConfiguration.class, ConfigurationBuilder.class })
+@CommonsLog
+public class ArchaiusAutoConfiguration {
+
+	private static final AtomicBoolean initialized = new AtomicBoolean(false);
+
+	@Autowired
+	private ConfigurableEnvironment env;
+
+	@PreDestroy
+	public void close() {
+		setStatic(ConfigurationManager.class, "instance", null);
+		setStatic(ConfigurationManager.class, "customConfigurationInstalled", false);
+		setStatic(DynamicPropertyFactory.class, "config", null);
+		setStatic(DynamicPropertyFactory.class, "initializedWithDefaultConfig", false);
+		initialized.compareAndSet(true, false);
+	}
+
+	@Bean
+	public ConfigurableEnvironmentConfiguration configurableEnvironmentConfiguration() {
+		ConfigurableEnvironmentConfiguration envConfig = new ConfigurableEnvironmentConfiguration(
+				this.env);
+		configureArchaius(envConfig);
+		return envConfig;
+	}
+
+	@Configuration
+	@ConditionalOnClass(Endpoint.class)
+	protected static class ArchaiusEndpointConfuguration {
+		@Bean
+		protected ArchaiusEndpoint archaiusEndpoint() {
+			return new ArchaiusEndpoint();
+		}
+	}
+
+	@Configuration
+	@ConditionalOnProperty(value = "archaius.propagate.environmentChangedEvent", matchIfMissing = true)
+	@ConditionalOnClass(EnvironmentChangeEvent.class)
+	protected static class PropagateEventsConfiguration implements ApplicationListener<EnvironmentChangeEvent> {
+		@Autowired
+		private Environment env;
+
+		@Override
+		public void onApplicationEvent(EnvironmentChangeEvent event) {
+			AbstractConfiguration manager = ConfigurationManager.getConfigInstance();
+			for (String key : event.getKeys()) {
+				for (ConfigurationListener listener : manager.getConfigurationListeners()) {
+					Object source = event.getSource();
+					// TODO: Handle add vs set vs delete?
+					int type = AbstractConfiguration.EVENT_SET_PROPERTY;
+					String value = env.getProperty(key);
+					boolean beforeUpdate = false;
+					listener.configurationChanged(new ConfigurationEvent(source,
+							type, key, value, beforeUpdate));
+				}
+			}
+		}
+	}
+
+	@SuppressWarnings("deprecation")
+	protected void configureArchaius(ConfigurableEnvironmentConfiguration envConfig) {
+		if (initialized.compareAndSet(false, true)) {
+			String appName = this.env.getProperty("spring.application.name");
+			if (appName == null) {
+				appName = "application";
+				log.warn("No spring.application.name found, defaulting to 'application'");
+			}
+			// this is deprecated, but currently it seams the only way to set it initially
+			System.setProperty(DEPLOYMENT_APPLICATION_ID_PROPERTY, appName);
+
+			// TODO: support for other DeploymentContexts
+
+			ConcurrentCompositeConfiguration config = new ConcurrentCompositeConfiguration();
+
+			// support to add other Configurations (Jdbc, DynamoDb, Zookeeper, jclouds,
+			// etc...)
+			/*
+			 * if (factories != null && !factories.isEmpty()) { for
+			 * (PropertiesSourceFactory factory: factories) {
+			 * config.addConfiguration(factory.getConfiguration(), factory.getName()); } }
+			 */
+			config.addConfiguration(envConfig,
+					ConfigurableEnvironmentConfiguration.class.getSimpleName());
+
+			// below come from ConfigurationManager.createDefaultConfigInstance()
+			DynamicURLConfiguration defaultURLConfig = new DynamicURLConfiguration();
+			try {
+				config.addConfiguration(defaultURLConfig, URL_CONFIG_NAME);
+			}
+			catch (Throwable ex) {
+				log.error("Cannot create config from " + defaultURLConfig, ex);
+			}
+
+			// TODO: sys/env above urls?
+			if (!Boolean.getBoolean(DISABLE_DEFAULT_SYS_CONFIG)) {
+				SystemConfiguration sysConfig = new SystemConfiguration();
+				config.addConfiguration(sysConfig, SYS_CONFIG_NAME);
+			}
+			if (!Boolean.getBoolean(DISABLE_DEFAULT_ENV_CONFIG)) {
+				EnvironmentConfiguration environmentConfiguration = new EnvironmentConfiguration();
+				config.addConfiguration(environmentConfiguration, ENV_CONFIG_NAME);
+			}
+
+			ConcurrentCompositeConfiguration appOverrideConfig = new ConcurrentCompositeConfiguration();
+			config.addConfiguration(appOverrideConfig, APPLICATION_PROPERTIES);
+			config.setContainerConfigurationIndex(config
+					.getIndexOfConfiguration(appOverrideConfig));
+
+			ConfigurationManager.install(config);
+		}
+		else {
+			// TODO: reinstall ConfigurationManager
+			log.warn("Netflix ConfigurationManager has already been installed, unable to re-install");
+		}
+	}
+
+	private static void setStatic(Class<?> type, String name, Object value) {
+		// Hack a private static field
+		Field field = ReflectionUtils.findField(type, name);
+		ReflectionUtils.makeAccessible(field);
+		ReflectionUtils.setField(field, null, value);
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusDelegatingProxyUtils.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.archaius;
+
+import org.apache.commons.configuration.AbstractConfiguration;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ConfigurableApplicationContext;
+
+import com.netflix.config.ConfigurationManager;
+
+/**
+ * @author Dave Syer
+ */
+public class ArchaiusDelegatingProxyUtils {
+
+	public static String APPLICATION_CONTEXT = ApplicationContext.class.getName();
+
+	public static <T> T getNamedInstance(Class<T> type, String name) {
+		ApplicationContext context = (ApplicationContext) ConfigurationManager
+				.getConfigInstance().getProperty(APPLICATION_CONTEXT);
+		return context != null && context.containsBean(name) ? context
+				.getBean(name, type) : null;
+	}
+
+	public static <T> T getInstanceWithPrefix(Class<T> type, String prefix) {
+		String name = prefix + type.getSimpleName();
+		return getNamedInstance(type, name);
+	}
+
+	public static void addApplicationContext(ConfigurableApplicationContext context) {
+		AbstractConfiguration config = ConfigurationManager.getConfigInstance();
+		config.clearProperty(APPLICATION_CONTEXT);
+		config.setProperty(APPLICATION_CONTEXT, context);
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/archaius/ArchaiusEndpoint.java

@@ -0,0 +1,73 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.archaius;
+
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.apache.commons.configuration.AbstractConfiguration;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.EnvironmentConfiguration;
+import org.apache.commons.configuration.SystemConfiguration;
+import org.springframework.boot.actuate.endpoint.AbstractEndpoint;
+
+import com.netflix.config.ConcurrentCompositeConfiguration;
+import com.netflix.config.ConfigurationManager;
+
+/**
+ * @author Dave Syer
+ */
+public class ArchaiusEndpoint extends AbstractEndpoint<Map<String, Object>> {
+
+	public ArchaiusEndpoint() {
+		super("archaius");
+	}
+
+	@Override
+	public Map<String, Object> invoke() {
+		Map<String, Object> map = new LinkedHashMap<String, Object>();
+		AbstractConfiguration config = ConfigurationManager.getConfigInstance();
+		if (config instanceof ConcurrentCompositeConfiguration) {
+			ConcurrentCompositeConfiguration composite = (ConcurrentCompositeConfiguration) config;
+			for (Configuration item : composite.getConfigurations()) {
+				append(map, item);
+			}
+		}
+		else {
+			append(map, config);
+		}
+		return map;
+	}
+
+	private void append(Map<String, Object> map, Configuration config) {
+		if (config instanceof ConfigurableEnvironmentConfiguration) {
+			return;
+		}
+		if (config instanceof SystemConfiguration) {
+			return;
+		}
+		if (config instanceof EnvironmentConfiguration) {
+			return;
+		}
+		for (Iterator<String> iter = config.getKeys(); iter.hasNext();) {
+			String key = iter.next();
+			map.put(key, config.getProperty(key));
+		}
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/archaius/ConfigurableEnvironmentConfiguration.java

@@ -0,0 +1,102 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.archaius;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.configuration.AbstractConfiguration;
+import org.springframework.core.env.CompositePropertySource;
+import org.springframework.core.env.ConfigurableEnvironment;
+import org.springframework.core.env.EnumerablePropertySource;
+import org.springframework.core.env.MutablePropertySources;
+import org.springframework.core.env.PropertySource;
+import org.springframework.core.env.StandardEnvironment;
+
+/**
+ * @author Spencer Gibb
+ */
+public class ConfigurableEnvironmentConfiguration extends AbstractConfiguration {
+
+	private final ConfigurableEnvironment environment;
+
+	public ConfigurableEnvironmentConfiguration(ConfigurableEnvironment environment) {
+		this.environment = environment;
+	}
+
+	@Override
+	protected void addPropertyDirect(String key, Object value) {
+
+	}
+
+	@Override
+	public boolean isEmpty() {
+		return !getKeys().hasNext(); // TODO: find a better way to do this
+	}
+
+	@Override
+	public boolean containsKey(String key) {
+		return this.environment.containsProperty(key);
+	}
+
+	@Override
+	public Object getProperty(String key) {
+		return this.environment.getProperty(key);
+	}
+
+	@Override
+	public Iterator<String> getKeys() {
+		List<String> result = new ArrayList<>();
+		for (Map.Entry<String, PropertySource<?>> entry : getPropertySources().entrySet()) {
+			PropertySource<?> source = entry.getValue();
+			if (source instanceof EnumerablePropertySource) {
+				EnumerablePropertySource<?> enumerable = (EnumerablePropertySource<?>) source;
+				for (String name : enumerable.getPropertyNames()) {
+					result.add(name);
+				}
+			}
+		}
+		return result.iterator();
+	}
+
+	private Map<String, PropertySource<?>> getPropertySources() {
+		Map<String, PropertySource<?>> map = new LinkedHashMap<>();
+		MutablePropertySources sources = (this.environment != null ? this.environment
+				.getPropertySources() : new StandardEnvironment().getPropertySources());
+		for (PropertySource<?> source : sources) {
+			extract("", map, source);
+		}
+		return map;
+	}
+
+	private void extract(String root, Map<String, PropertySource<?>> map,
+			PropertySource<?> source) {
+		if (source instanceof CompositePropertySource) {
+			for (PropertySource<?> nest : ((CompositePropertySource) source)
+					.getPropertySources()) {
+				extract(source.getName() + ":", map, nest);
+			}
+		}
+		else {
+			map.put(root + source.getName(), source);
+		}
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/config/DiscoveryClientConfigServiceBootstrapConfiguration.java

@@ -0,0 +1,117 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.config;
+
+import lombok.extern.apachecommons.CommonsLog;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.client.discovery.event.HeartbeatEvent;
+import org.springframework.cloud.client.discovery.event.HeartbeatMonitor;
+import org.springframework.cloud.config.client.ConfigClientProperties;
+import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator;
+import org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.springframework.context.event.ContextRefreshedEvent;
+import org.springframework.context.event.SmartApplicationListener;
+
+import com.netflix.appinfo.InstanceInfo;
+import com.netflix.discovery.DiscoveryClient;
+
+/**
+ * Bootstrap configuration for a config client that wants to lookup the config server via
+ * discovery.
+ *
+ * @author Dave Syer
+ */
+@ConditionalOnClass({ DiscoveryClient.class, ConfigServicePropertySourceLocator.class })
+@ConditionalOnExpression("${spring.cloud.config.discovery.enabled:false}")
+@Configuration
+@EnableDiscoveryClient
+@Import(EurekaClientAutoConfiguration.class)
+@CommonsLog
+public class DiscoveryClientConfigServiceBootstrapConfiguration implements
+		SmartApplicationListener {
+
+	private HeartbeatMonitor monitor = new HeartbeatMonitor();
+
+	@Autowired
+	private DiscoveryClient client;
+
+	@Autowired
+	private ConfigClientProperties config;
+
+	@Override
+	public void onApplicationEvent(ApplicationEvent event) {
+		if (event instanceof ContextRefreshedEvent) {
+			refresh();
+		}
+		else if (event instanceof HeartbeatEvent) {
+			if (this.monitor.update(((HeartbeatEvent) event).getValue())) {
+				refresh();
+			}
+		}
+	}
+
+	@Override
+	public int getOrder() {
+		return 0;
+	}
+
+	@Override
+	public boolean supportsEventType(Class<? extends ApplicationEvent> eventType) {
+		return ContextRefreshedEvent.class.isAssignableFrom(eventType)
+				|| HeartbeatEvent.class.isAssignableFrom(eventType);
+	}
+
+	@Override
+	public boolean supportsSourceType(Class<?> sourceType) {
+		return true;
+	}
+
+	private void refresh() {
+		try {
+			log.info("Locating configserver via discovery");
+			InstanceInfo server = this.client.getNextServerFromEureka(this.config
+					.getDiscovery().getServiceId(), false);
+			String url = server.getHomePageUrl();
+			if (server.getMetadata().containsKey("password")) {
+				String user = server.getMetadata().get("user");
+				user = user == null ? "user" : user;
+				this.config.setUsername(user);
+				String password = server.getMetadata().get("password");
+				this.config.setPassword(password);
+			}
+			if (server.getMetadata().containsKey("configPath")) {
+				String path = server.getMetadata().get("configPath");
+				if (url.endsWith("/") && path.startsWith("/")) {
+					url = url.substring(0, url.length() - 1);
+				}
+				url = url + path;
+			}
+			this.config.setUri(url);
+		}
+		catch (Exception ex) {
+			log.warn("Could not locate configserver via discovery", ex);
+		}
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/config/EurekaClientConfigServerAutoConfiguration.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * 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
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://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,
@@ -14,44 +14,44 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.netflix.eureka.config;
+package org.springframework.cloud.netflix.config;
 
-import com.netflix.appinfo.EurekaInstanceConfig;
-import com.netflix.discovery.EurekaClient;
-import jakarta.annotation.PostConstruct;
+import javax.annotation.PostConstruct;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.config.server.ConfigServerProperties;
 import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.Environment;
 import org.springframework.util.StringUtils;
 
+import com.netflix.discovery.DiscoveryClient;
+
 /**
  * Extra configuration for config server if it happens to be a Eureka instance.
  *
  * @author Dave Syer
  */
-@Configuration(proxyBeanMethods = false)
+@Configuration
 @EnableConfigurationProperties
-@ConditionalOnClass(value = { EurekaInstanceConfigBean.class, EurekaClient.class },
-		name = "org.springframework.cloud.config.server.config.ConfigServerProperties")
+@ConditionalOnClass({ EurekaInstanceConfigBean.class, DiscoveryClient.class,
+		ConfigServerProperties.class })
 public class EurekaClientConfigServerAutoConfiguration {
 
 	@Autowired(required = false)
-	private EurekaInstanceConfig instance;
+	private EurekaInstanceConfigBean instance;
 
-	@Autowired
-	private Environment env;
+	@Autowired(required = false)
+	private ConfigServerProperties server;
 
 	@PostConstruct
 	public void init() {
-		if (this.instance == null) {
+		if (this.instance == null || this.server == null) {
 			return;
 		}
-		String prefix = this.env.getProperty("spring.cloud.config.server.prefix");
-		if (StringUtils.hasText(prefix) && !StringUtils.hasText(this.instance.getMetadataMap().get("configPath"))) {
+		String prefix = this.server.getPrefix();
+		if (StringUtils.hasText(prefix)) {
 			this.instance.getMetadataMap().put("configPath", prefix);
 		}
 	}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/endpoint/ServletWrappingEndpoint.java

@@ -0,0 +1,100 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.endpoint;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.boot.actuate.endpoint.Endpoint;
+import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoint;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.context.ServletContextAware;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.mvc.ServletWrappingController;
+
+public abstract class ServletWrappingEndpoint implements InitializingBean,
+		ApplicationContextAware, ServletContextAware, MvcEndpoint {
+
+	// TODO: move to spring-boot?
+
+	private String path;
+
+	private boolean sensitive;
+
+	private boolean enabled = true;
+
+	private final ServletWrappingController controller = new ServletWrappingController();
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		this.controller.afterPropertiesSet();
+	}
+
+	@Override
+	public void setServletContext(ServletContext servletContext) {
+		this.controller.setServletContext(servletContext);
+	}
+
+	@Override
+	public void setApplicationContext(ApplicationContext applicationContext)
+			throws BeansException {
+		this.controller.setApplicationContext(applicationContext);
+	}
+
+	protected ServletWrappingEndpoint(Class<?> servletClass, String servletName,
+			String path, boolean sensitive, boolean enabled) {
+		this.controller.setServletClass(servletClass);
+		this.controller.setServletName(servletName);
+		this.path = path;
+		this.sensitive = sensitive;
+		this.enabled = enabled;
+	}
+
+	@RequestMapping("**")
+	public ModelAndView handle(HttpServletRequest request, HttpServletResponse response)
+			throws Exception {
+		return this.controller.handleRequest(request, response);
+	}
+
+	public boolean isEnabled() {
+		return enabled;
+	}
+
+	public ServletWrappingController getController() {
+		return controller;
+	}
+	@Override
+	public String getPath() {
+		return this.path;
+	}
+
+	@Override
+	public boolean isSensitive() {
+		return this.sensitive;
+	}
+
+	@Override
+	public Class<? extends Endpoint<?>> getEndpointType() {
+		return null;
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/DataCenterAwareMarshallingStrategy.java

@@ -0,0 +1,208 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import lombok.extern.apachecommons.CommonsLog;
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+import org.springframework.aop.framework.ProxyFactory;
+import org.springframework.cloud.client.discovery.event.HeartbeatEvent;
+import org.springframework.context.ApplicationContext;
+
+import com.netflix.appinfo.DataCenterInfo;
+import com.netflix.appinfo.DataCenterInfo.Name;
+import com.netflix.appinfo.InstanceInfo;
+import com.netflix.appinfo.UniqueIdentifier;
+import com.netflix.discovery.converters.Converters.ApplicationsConverter;
+import com.netflix.discovery.converters.Converters.InstanceInfoConverter;
+import com.netflix.discovery.shared.Applications;
+import com.thoughtworks.xstream.MarshallingStrategy;
+import com.thoughtworks.xstream.converters.Converter;
+import com.thoughtworks.xstream.converters.ConverterLookup;
+import com.thoughtworks.xstream.converters.DataHolder;
+import com.thoughtworks.xstream.converters.MarshallingContext;
+import com.thoughtworks.xstream.converters.UnmarshallingContext;
+import com.thoughtworks.xstream.core.TreeMarshallingStrategy;
+import com.thoughtworks.xstream.io.HierarchicalStreamReader;
+import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+import com.thoughtworks.xstream.mapper.Mapper;
+
+/**
+ * A special purpose wrapper for an XStream TreeMarshallingStrategy that is aware of the
+ * {@link InstanceInfo} type and can create a more useful {@link DataCenterInfo} for it
+ * after unmarshalling. If the InstanceInfo has a metadataMap containing an
+ * <code>instanceId</code>, and the DataCenterInfo is not already an AmazonInfo, then the
+ * instanceId is used to create an identifier, but appending it to the existing one. This
+ * is useful when not running Eureka in bare EC2 VMs, so the EC2 metadata is not available
+ * for uniquely identifying the InstanceInfo (the default is to just use the hostname, but
+ * that isn't very useful when sitting behind a proxy).
+ *
+ * @author Dave Syer
+ */
+public class DataCenterAwareMarshallingStrategy implements MarshallingStrategy {
+
+	private TreeMarshallingStrategy delegate = new TreeMarshallingStrategy();
+
+	private ApplicationContext context;
+
+	public DataCenterAwareMarshallingStrategy(ApplicationContext context) {
+		this.context = context;
+	}
+
+	@Override
+	public Object unmarshal(Object root, HierarchicalStreamReader reader,
+			DataHolder dataHolder, ConverterLookup converterLookup, Mapper mapper) {
+		ConverterLookup wrapped = new DataCenterAwareConverterLookup(converterLookup,
+				this.context);
+		return this.delegate.unmarshal(root, reader, dataHolder, wrapped, mapper);
+	}
+
+	@Override
+	public void marshal(HierarchicalStreamWriter writer, Object obj,
+			ConverterLookup converterLookup, Mapper mapper, DataHolder dataHolder) {
+		ConverterLookup wrapped = new DataCenterAwareConverterLookup(converterLookup,
+				this.context);
+		this.delegate.marshal(writer, obj, wrapped, mapper, dataHolder);
+	}
+
+	public static class InstanceIdDataCenterInfo implements DataCenterInfo,
+			UniqueIdentifier {
+
+		private String instanceId;
+
+		public InstanceIdDataCenterInfo(String instanceId) {
+			this.instanceId = instanceId;
+		}
+
+		@Override
+		public Name getName() {
+			return Name.MyOwn;
+		}
+
+		@Override
+		public String getId() {
+			return this.instanceId;
+		}
+
+	}
+
+	private static class DataCenterAwareConverterLookup implements ConverterLookup {
+
+		private ConverterLookup delegate;
+
+		private ApplicationContext context;
+
+		public DataCenterAwareConverterLookup(ConverterLookup delegate,
+				ApplicationContext context) {
+			this.delegate = delegate;
+			this.context = context;
+		}
+
+		@Override
+		public Converter lookupConverterForType(@SuppressWarnings("rawtypes") Class type) {
+			Converter converter = this.delegate.lookupConverterForType(type);
+			if (InstanceInfo.class == type) {
+				return new DataCenterAwareConverter();
+			}
+			else if (Applications.class == type) {
+				return new PublishingApplicationsConverter(this.context);
+			}
+			return converter;
+		}
+
+	}
+
+	private static class PublishingApplicationsConverter extends ApplicationsConverter {
+
+		private ApplicationContext context;
+
+		public PublishingApplicationsConverter(ApplicationContext context) {
+			this.context = context;
+		}
+
+		@Override
+		public Object unmarshal(HierarchicalStreamReader reader,
+				UnmarshallingContext unmarshallingContext) {
+			Object obj = super.unmarshal(reader, unmarshallingContext);
+
+			ProxyFactory factory = new ProxyFactory(obj);
+			factory.addAdvice(new SetVersionInterceptor(this.context));
+			return factory.getProxy();
+		}
+	}
+
+	@CommonsLog
+	private static class SetVersionInterceptor implements MethodInterceptor {
+
+		private ApplicationContext context;
+
+		public SetVersionInterceptor(ApplicationContext context) {
+			this.context = context;
+		}
+
+		@Override
+		public Object invoke(MethodInvocation invocation) throws Throwable {
+			Object ret = invocation.proceed();
+			if ("setVersion".equals(invocation.getMethod().getName())) {
+				Long version = Long.class.cast(invocation.getArguments()[0]);
+				log.debug("Applications.setVersion() called with version: " + version);
+				this.context.publishEvent(new HeartbeatEvent(invocation
+						.getThis(), version));
+			}
+			return ret;
+		}
+
+	}
+
+	private static class DataCenterAwareConverter extends InstanceInfoConverter {
+
+		@Override
+		public void marshal(Object source, HierarchicalStreamWriter writer,
+				MarshallingContext context) {
+			InstanceInfo info = (InstanceInfo) source;
+			String instanceId = info.getMetadata().get("instanceId");
+			DataCenterInfo dataCenter = info.getDataCenterInfo();
+			if (instanceId != null && Name.Amazon != dataCenter.getName()) {
+				String old = info.getId();
+				String id = old.endsWith(instanceId) ? old : old + ":" + instanceId;
+				info = new InstanceInfo.Builder(info).setDataCenterInfo(
+						new InstanceIdDataCenterInfo(id)).build();
+				source = info;
+			}
+			super.marshal(source, writer, context);
+		}
+
+		@Override
+		public Object unmarshal(HierarchicalStreamReader reader,
+				UnmarshallingContext context) {
+			Object obj = super.unmarshal(reader, context);
+			InstanceInfo info = (InstanceInfo) obj;
+			String instanceId = info.getMetadata().get("instanceId");
+			DataCenterInfo dataCenter = info.getDataCenterInfo();
+			if (instanceId != null && Name.Amazon != dataCenter.getName()) {
+				String old = info.getId();
+				String id = old.endsWith(instanceId) ? old : old + ":" + instanceId;
+				info = new InstanceInfo.Builder(info).setDataCenterInfo(
+						new InstanceIdDataCenterInfo(id)).build();
+				obj = info;
+			}
+			return obj;
+		}
+
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/DiscoveryManagerInitializer.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.netflix.appinfo.EurekaInstanceConfig;
+import com.netflix.discovery.DiscoveryManager;
+import com.netflix.discovery.EurekaClientConfig;
+
+/**
+ * @author Spencer Gibb
+ */
+public class DiscoveryManagerInitializer {
+
+	@Autowired
+	private EurekaClientConfig clientConfig;
+
+	@Autowired
+	private EurekaInstanceConfig instanceConfig;
+
+	public synchronized void init() {
+		if (DiscoveryManager.getInstance().getDiscoveryClient() == null) {
+			DiscoveryManager.getInstance().initComponent(this.instanceConfig,
+					this.clientConfig);
+		}
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EnableEurekaClient.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+
+/**
+ * Convenience annotation for clients to enable Eureka discovery configuration
+ * (specifically). Use this (optionally) in case you want discovery and know for sure that
+ * it is Eureka you want. All it does is turn on discovery and let the autoconfiguration
+ * find the eureka classes if they are available (i.e. you need Eureka on the classpath as
+ * well).
+ *
+ * @author Dave Syer
+ * @author Spencer Gibb
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+@EnableDiscoveryClient
+public @interface EnableEurekaClient {
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientAutoConfiguration.java

@@ -0,0 +1,113 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import javax.annotation.PostConstruct;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.builder.ParentContextApplicationContextInitializer;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.client.discovery.event.HeartbeatEvent;
+import org.springframework.cloud.client.discovery.event.ParentHeartbeatEvent;
+import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClientAutoConfiguration;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.netflix.appinfo.EurekaInstanceConfig;
+import com.netflix.discovery.EurekaClientConfig;
+import com.netflix.discovery.converters.JsonXStream;
+import com.netflix.discovery.converters.XmlXStream;
+
+/**
+ * @author Dave Syer
+ */
+@Configuration
+@EnableConfigurationProperties
+@ConditionalOnClass(EurekaClientConfig.class)
+@ConditionalOnProperty(value = "eureka.client.enabled", matchIfMissing = true)
+@AutoConfigureBefore(NoopDiscoveryClientAutoConfiguration.class)
+public class EurekaClientAutoConfiguration implements ApplicationListener<ParentContextApplicationContextInitializer.ParentContextAvailableEvent> {
+
+	@Autowired
+	private ApplicationContext applicationContext;
+
+	private static final ConcurrentMap<String, String> listenerAdded = new ConcurrentHashMap<>();
+
+	@Value("${server.port:${SERVER_PORT:${PORT:8080}}}")
+	int nonSecurePort;
+	
+	@PostConstruct
+	public void init() {
+		XmlXStream.getInstance().setMarshallingStrategy(
+				new DataCenterAwareMarshallingStrategy(this.applicationContext));
+		JsonXStream.getInstance().setMarshallingStrategy(
+				new DataCenterAwareMarshallingStrategy(this.applicationContext));
+	}
+
+	@Bean
+	@ConditionalOnMissingBean(EurekaClientConfig.class)
+	public EurekaClientConfigBean eurekaClientConfigBean() {
+		return new EurekaClientConfigBean();
+	}
+
+	@Bean
+	@ConditionalOnMissingBean(EurekaInstanceConfig.class)
+	public EurekaInstanceConfigBean eurekaInstanceConfigBean() {
+		EurekaInstanceConfigBean instance = new EurekaInstanceConfigBean();
+		instance.setNonSecurePort(this.nonSecurePort);
+		return instance;
+	}
+
+
+	/**
+	 * propagate HeartbeatEvent from parent to child. Do it via a
+	 * ParentHeartbeatEvent since events get published to the parent context,
+	 * otherwise results in a stack overflow
+	 * @param event
+	 */
+	@Override
+	public void onApplicationEvent(final ParentContextApplicationContextInitializer.ParentContextAvailableEvent event) {
+		final ConfigurableApplicationContext context = event.getApplicationContext();
+		String childId = context.getId();
+		ApplicationContext parent = context.getParent();
+		if (parent != null && "bootstrap".equals(parent.getId())
+				&& parent instanceof ConfigurableApplicationContext) {
+			if (listenerAdded.putIfAbsent(childId, childId) == null) {
+				@SuppressWarnings("resource")
+				ConfigurableApplicationContext ctx = (ConfigurableApplicationContext) parent;
+				ctx.addApplicationListener(new ApplicationListener<HeartbeatEvent>() {
+					@Override
+					public void onApplicationEvent(HeartbeatEvent dhe) {
+						context.publishEvent(new ParentHeartbeatEvent(dhe
+								.getSource(), dhe.getValue()));
+					}
+				});
+			}
+		}
+	}
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaClientConfigBean.java

@@ -0,0 +1,189 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import lombok.Data;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import com.netflix.discovery.EurekaClientConfig;
+
+/**
+ * @author Dave Syer
+ */
+@Data
+@ConfigurationProperties("eureka.client")
+public class EurekaClientConfigBean implements EurekaClientConfig {
+
+	public static final String DEFAULT_URL = "http://localhost:8761"
+			+ EurekaServerConfigBean.DEFAULT_PREFIX + "/";
+
+	public static final String DEFAULT_ZONE = "defaultZone";
+
+	private static final int MINUTES = 60;
+
+	private boolean enabled = true;
+
+	private int registryFetchIntervalSeconds = 30;
+
+	private int instanceInfoReplicationIntervalSeconds = 30;
+
+	private int initialInstanceInfoReplicationIntervalSeconds = 40;
+
+	private int eurekaServiceUrlPollIntervalSeconds = 5 * MINUTES;
+
+	private String proxyPort;
+
+	private String proxyHost;
+
+	private String proxyUserName;
+
+	private String proxyPassword;
+
+	private int eurekaServerReadTimeoutSeconds = 8;
+
+	private int eurekaServerConnectTimeoutSeconds = 5;
+
+	private String backupRegistryImpl;
+
+	private int eurekaServerTotalConnections = 200;
+
+	private int eurekaServerTotalConnectionsPerHost = 50;
+
+	private String eurekaServerURLContext;
+
+	private String eurekaServerPort;
+
+	private String eurekaServerDNSName;
+
+	private String region = "us-east-1";
+
+	private int eurekaConnectionIdleTimeoutSeconds = 30;
+
+	private String registryRefreshSingleVipAddress;
+
+	private int heartbeatExecutorThreadPoolSize = 2;
+
+	private int heartbeatExecutorExponentialBackOffBound = 10;
+
+	private int cacheRefreshExecutorThreadPoolSize = 2;
+
+	private int cacheRefreshExecutorExponentialBackOffBound = 10;
+
+	private Map<String, String> serviceUrl = new HashMap<String, String>();
+	{
+		this.serviceUrl.put(DEFAULT_ZONE, DEFAULT_URL);
+	}
+
+	private boolean gZipContent = true;
+
+	private boolean useDnsForFetchingServiceUrls = false;
+
+	private boolean registerWithEureka = true;
+
+	private boolean preferSameZoneEureka = true;
+
+	private boolean logDeltaDiff;
+
+	private boolean disableDelta;
+
+	private String fetchRemoteRegionsRegistry;
+
+	private Map<String, String> availabilityZones = new HashMap<String, String>();
+
+	private boolean filterOnlyUpInstances = true;
+
+	private boolean fetchRegistry = true;
+
+	private String dollarReplacement = "_-";
+
+	private String escapeCharReplacement = "__";
+
+	@Override
+	public boolean shouldGZipContent() {
+		return this.gZipContent;
+	}
+
+	@Override
+	public boolean shouldUseDnsForFetchingServiceUrls() {
+		return this.useDnsForFetchingServiceUrls;
+	}
+
+	@Override
+	public boolean shouldRegisterWithEureka() {
+		return this.registerWithEureka;
+	}
+
+	@Override
+	public boolean shouldPreferSameZoneEureka() {
+		return this.preferSameZoneEureka;
+	}
+
+	@Override
+	public boolean shouldLogDeltaDiff() {
+		return this.logDeltaDiff;
+	}
+
+	@Override
+	public boolean shouldDisableDelta() {
+		return this.disableDelta;
+	}
+
+	@Override
+	public String fetchRegistryForRemoteRegions() {
+		return this.fetchRemoteRegionsRegistry;
+	}
+
+	@Override
+	public String[] getAvailabilityZones(String region) {
+		String value = this.availabilityZones.get(region);
+		if (value == null) {
+			value = DEFAULT_ZONE;
+		}
+		return value.split(",");
+	}
+
+	@Override
+	public List<String> getEurekaServerServiceUrls(String myZone) {
+		String serviceUrls = this.serviceUrl.get(myZone);
+		if (serviceUrls == null || serviceUrls.isEmpty()) {
+			serviceUrls = this.serviceUrl.get(DEFAULT_ZONE);
+		}
+		if (serviceUrls != null) {
+			return Arrays.asList(serviceUrls.split(","));
+		}
+
+		return new ArrayList<>();
+	}
+
+	@Override
+	public boolean shouldFilterOnlyUpInstances() {
+		return this.filterOnlyUpInstances;
+	}
+
+	@Override
+	public boolean shouldFetchRegistry() {
+		return this.fetchRegistry;
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClient.java

@@ -0,0 +1,149 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cloud.client.DefaultServiceInstance;
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+
+import com.netflix.appinfo.InstanceInfo;
+import com.netflix.discovery.shared.Application;
+import com.netflix.discovery.shared.Applications;
+
+import static com.netflix.appinfo.InstanceInfo.PortType.*;
+
+/**
+ * @author Spencer Gibb
+ */
+public class EurekaDiscoveryClient implements DiscoveryClient {
+
+	public static final String DESCRIPTION = "Spring Cloud Eureka Discovery Client";
+
+	@Autowired
+	private EurekaInstanceConfigBean config;
+
+	@Autowired
+	private com.netflix.discovery.DiscoveryClient discovery;
+
+	@Override
+	public String description() {
+		return DESCRIPTION;
+	}
+
+	@Override
+	public ServiceInstance getLocalServiceInstance() {
+		return new ServiceInstance() {
+			@Override
+			public String getServiceId() {
+				return EurekaDiscoveryClient.this.config.getAppname();
+			}
+
+			@Override
+			public String getHost() {
+				return EurekaDiscoveryClient.this.config.getHostname();
+			}
+
+			@Override
+			public int getPort() {
+				return EurekaDiscoveryClient.this.config.getNonSecurePort();
+			}
+
+			@Override
+			public boolean isSecure() {
+				return EurekaDiscoveryClient.this.config.getSecurePortEnabled();
+			}
+
+			@Override
+			public URI getUri() {
+				return DefaultServiceInstance.getUri(this);
+			}
+		};
+	}
+
+	@Override
+	public List<ServiceInstance> getInstances(String serviceId) {
+		List<InstanceInfo> infos = this.discovery.getInstancesByVipAddress(serviceId,
+				false);
+		List<ServiceInstance> instances = new ArrayList<ServiceInstance>();
+		for (InstanceInfo info : infos) {
+			instances.add(new EurekaServiceInstance(info));
+		}
+		return instances;
+	}
+
+	static class EurekaServiceInstance implements ServiceInstance {
+		private InstanceInfo instance;
+
+		EurekaServiceInstance(InstanceInfo instance) {
+			this.instance = instance;
+		}
+
+		@Override
+		public String getServiceId() {
+			return this.instance.getAppName();
+		}
+
+		@Override
+		public String getHost() {
+			return this.instance.getHostName();
+		}
+
+		@Override
+		public int getPort() {
+			// assume if unsecure is enabled, that is the default
+			if (this.instance.isPortEnabled(UNSECURE) || !this.instance.isPortEnabled(SECURE)) {
+				return this.instance.getPort();
+			}
+			return this.instance.getSecurePort();
+		}
+
+		@Override
+		public boolean isSecure() {
+			return this.instance.isPortEnabled(SECURE);
+		}
+
+		@Override
+		public URI getUri() {
+			return DefaultServiceInstance.getUri(this);
+		}
+	}
+
+	@Override
+	public List<String> getServices() {
+		Applications applications = this.discovery.getApplications();
+		if (applications == null) {
+			return Collections.emptyList();
+		}
+		List<Application> registered = applications.getRegisteredApplications();
+		List<String> names = new ArrayList<String>();
+		for (Application app : registered) {
+			if (app.getInstances().isEmpty()) {
+				continue;
+			}
+			names.add(app.getName().toLowerCase());
+
+		}
+		return names;
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaDiscoveryClientConfiguration.java

@@ -0,0 +1,221 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import java.lang.reflect.Field;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import javax.annotation.PreDestroy;
+
+import lombok.extern.apachecommons.CommonsLog;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.actuate.endpoint.Endpoint;
+import org.springframework.boot.actuate.metrics.reader.MetricReader;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.embedded.EmbeddedServletContainerInitializedEvent;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.client.discovery.DiscoveryClient;
+import org.springframework.cloud.client.discovery.event.InstanceRegisteredEvent;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationListener;
+import org.springframework.context.SmartLifecycle;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.context.annotation.Scope;
+import org.springframework.context.annotation.ScopedProxyMode;
+import org.springframework.core.Ordered;
+import org.springframework.util.ReflectionUtils;
+
+import com.netflix.appinfo.ApplicationInfoManager;
+import com.netflix.appinfo.EurekaInstanceConfig;
+import com.netflix.appinfo.HealthCheckHandler;
+import com.netflix.appinfo.InstanceInfo.InstanceStatus;
+import com.netflix.discovery.DiscoveryManager;
+import com.netflix.discovery.EurekaClientConfig;
+import com.netflix.discovery.shared.EurekaJerseyClient;
+
+/**
+ * @author Dave Syer
+ */
+@Configuration
+@EnableConfigurationProperties
+@ConditionalOnClass(EurekaClientConfig.class)
+@ConditionalOnProperty(value = "eureka.client.enabled", matchIfMissing = true)
+@CommonsLog
+public class EurekaDiscoveryClientConfiguration implements SmartLifecycle, Ordered {
+
+	private AtomicBoolean running = new AtomicBoolean(false);
+
+	private int order = 0;
+
+	private AtomicInteger port = new AtomicInteger(0);
+
+	@Autowired
+	private EurekaInstanceConfigBean instanceConfig;
+
+	@Autowired(required = false)
+	private HealthCheckHandler healthCheckHandler;
+
+	@Autowired
+	private ApplicationContext context;
+
+	@PreDestroy
+	public void close() {
+		closeDiscoveryClientJersey();
+		log.info("Removing application " + this.instanceConfig.getAppname()
+				+ " from eureka");
+		DiscoveryManager.getInstance().shutdownComponent();
+	}
+
+	private void closeDiscoveryClientJersey() {
+		log.info("Closing DiscoveryClient.jerseyClient");
+		Field jerseyClientField = ReflectionUtils.findField(
+				com.netflix.discovery.DiscoveryClient.class, "discoveryJerseyClient",
+				EurekaJerseyClient.JerseyClient.class);
+		if (jerseyClientField != null) {
+			try {
+				jerseyClientField.setAccessible(true);
+				if (DiscoveryManager.getInstance() != null &&
+						DiscoveryManager.getInstance().getDiscoveryClient() != null) {
+					Object obj = jerseyClientField.get(DiscoveryManager.getInstance()
+							.getDiscoveryClient());
+					if (obj != null) {
+						EurekaJerseyClient.JerseyClient jerseyClient = (EurekaJerseyClient.JerseyClient) obj;
+						jerseyClient.destroyResources();
+					}
+				}
+			}
+			catch (Exception ex) {
+				log.error("Error closing DiscoveryClient.jerseyClient", ex);
+			}
+		}
+	}
+
+	@Override
+	public void start() {
+		// only set the port if the nonSecurePort is 0 and this.port != 0
+		if (this.port.get() != 0 && this.instanceConfig.getNonSecurePort() == 0) {
+			this.instanceConfig.setNonSecurePort(this.port.get());
+		}
+		// only initialize if nonSecurePort is greater than 0 and it isn't already running
+		// because of containerPortInitializer below
+		if (!this.running.get() && this.instanceConfig.getNonSecurePort() > 0) {
+			discoveryManagerIntitializer().init();
+
+			log.info("Registering application " + this.instanceConfig.getAppname()
+					+ " with eureka with status "
+					+ this.instanceConfig.getInitialStatus());
+
+			ApplicationInfoManager.getInstance().setInstanceStatus(
+					this.instanceConfig.getInitialStatus());
+
+			if (this.healthCheckHandler != null) {
+				DiscoveryManager.getInstance().getDiscoveryClient()
+						.registerHealthCheck(this.healthCheckHandler);
+			}
+			this.context.publishEvent(new InstanceRegisteredEvent<>(this,
+					this.instanceConfig));
+			this.running.set(true);
+		}
+	}
+
+	@Override
+	public void stop() {
+		log.info("Unregistering application " + this.instanceConfig.getAppname()
+				+ " with eureka with status OUT_OF_SERVICE");
+		ApplicationInfoManager.getInstance().setInstanceStatus(
+				InstanceStatus.OUT_OF_SERVICE);
+		this.running.set(false);
+	}
+
+	@Override
+	public boolean isRunning() {
+		return this.running.get();
+	}
+
+	@Override
+	public int getPhase() {
+		return 0;
+	}
+
+	@Override
+	public boolean isAutoStartup() {
+		return true;
+	}
+
+	@Override
+	public void stop(Runnable callback) {
+		callback.run();
+	}
+
+	@Override
+	public int getOrder() {
+		return this.order;
+	}
+
+	@Bean
+	@ConditionalOnMissingBean(DiscoveryManagerInitializer.class)
+	public DiscoveryManagerInitializer discoveryManagerIntitializer() {
+		return new DiscoveryManagerInitializer();
+	}
+
+	@Bean
+	@Lazy
+	@Scope(proxyMode = ScopedProxyMode.TARGET_CLASS)
+	@ConditionalOnMissingBean(com.netflix.discovery.DiscoveryClient.class)
+	public com.netflix.discovery.DiscoveryClient eurekaDiscoveryClient() {
+		return DiscoveryManager.getInstance().getDiscoveryClient();
+	}
+
+	@Bean
+	public DiscoveryClient discoveryClient() {
+		return new EurekaDiscoveryClient();
+	}
+
+	@Bean
+	protected ApplicationListener<EmbeddedServletContainerInitializedEvent> containerPortInitializer() {
+		return new ApplicationListener<EmbeddedServletContainerInitializedEvent>() {
+
+			@Override
+			public void onApplicationEvent(EmbeddedServletContainerInitializedEvent event) {
+				// TODO: take SSL into account when Spring Boot 1.2 is available
+				EurekaDiscoveryClientConfiguration.this.port.compareAndSet(0, event
+						.getEmbeddedServletContainer().getPort());
+				EurekaDiscoveryClientConfiguration.this.start();
+			}
+		};
+	}
+
+	@Configuration
+	@ConditionalOnClass(Endpoint.class)
+	@ConditionalOnBean(MetricReader.class)
+	protected static class EurekaHealthIndicatorConfiguration {
+		@Bean
+		@ConditionalOnMissingBean
+		public EurekaHealthIndicator eurekaHealthIndicator(
+				com.netflix.discovery.DiscoveryClient eurekaDiscoveryClient,
+				MetricReader metrics, EurekaInstanceConfig config) {
+			return new EurekaHealthIndicator(eurekaDiscoveryClient, metrics, config);
+		}
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaHealthIndicator.java

@@ -0,0 +1,103 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.springframework.boot.actuate.health.Health;
+import org.springframework.boot.actuate.health.Health.Builder;
+import org.springframework.boot.actuate.health.Status;
+import org.springframework.boot.actuate.metrics.Metric;
+import org.springframework.boot.actuate.metrics.reader.MetricReader;
+import org.springframework.cloud.client.discovery.health.DiscoveryHealthIndicator;
+
+import com.netflix.appinfo.EurekaInstanceConfig;
+import com.netflix.discovery.DiscoveryClient;
+import com.netflix.discovery.shared.Application;
+import com.netflix.discovery.shared.Applications;
+
+/**
+ * @author Dave Syer
+ */
+public class EurekaHealthIndicator implements DiscoveryHealthIndicator {
+
+	private final DiscoveryClient discovery;
+
+	private final MetricReader metrics;
+
+	private final EurekaInstanceConfig instanceConfig;
+
+	private int failCount = 0;
+
+	public EurekaHealthIndicator(DiscoveryClient discovery, MetricReader metrics,
+			EurekaInstanceConfig instanceConfig) {
+		super();
+		this.discovery = discovery;
+		this.metrics = metrics;
+		this.instanceConfig = instanceConfig;
+	}
+
+	@Override
+	public String getName() {
+		return "eureka";
+	}
+
+	@Override
+	public Health health() {
+		Builder builder = Health.unknown();
+		Status status = getStatus(builder);
+		return builder.status(status).withDetail("applications", getApplications())
+				.build();
+	}
+
+	private Status getStatus(Builder builder) {
+		Status status = new Status(this.discovery.getInstanceRemoteStatus().toString(),
+				"Remote status from Eureka server");
+		@SuppressWarnings("unchecked")
+		Metric<Number> value = (Metric<Number>) this.metrics
+				.findOne("counter.servo.discoveryclient_failed");
+		if (value != null) {
+			int renewalPeriod = this.instanceConfig.getLeaseRenewalIntervalInSeconds();
+			int latest = value.getValue().intValue();
+			builder.withDetail("failCount", latest);
+			builder.withDetail("renewalPeriod", renewalPeriod);
+			if (this.failCount < latest) {
+				status = new Status("UP", "Eureka discovery client is reporting failures");
+				this.failCount = latest;
+			}
+			else {
+				status = new Status("UP", "No new failures in Eureka discovery client");
+			}
+		}
+		return status;
+	}
+
+	private Map<String, Object> getApplications() {
+		Applications applications = this.discovery.getApplications();
+		if (applications == null) {
+			return Collections.emptyMap();
+		}
+		Map<String, Object> result = new HashMap<String, Object>();
+		for (Application application : applications.getRegisteredApplications()) {
+			result.put(application.getName(), application.getInstances().size());
+		}
+		return result;
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaInstanceConfigBean.java

@@ -0,0 +1,153 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.HashMap;
+import java.util.Map;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import com.netflix.appinfo.DataCenterInfo;
+import com.netflix.appinfo.EurekaInstanceConfig;
+import com.netflix.appinfo.InstanceInfo.InstanceStatus;
+import com.netflix.appinfo.UniqueIdentifier;
+
+/**
+ * @author Dave Syer
+ */
+@Data
+@ConfigurationProperties("eureka.instance")
+public class EurekaInstanceConfigBean implements EurekaInstanceConfig {
+
+	private static final Log logger = LogFactory.getLog(EurekaInstanceConfigBean.class);
+
+	@Getter(AccessLevel.PRIVATE)
+	@Setter(AccessLevel.PRIVATE)
+	private String[] hostInfo = initHostInfo();
+
+	@Value("${spring.application.name:unknown}")
+	private String appname = "unknown";
+
+	private String appGroupName;
+
+	private boolean instanceEnabledOnit;
+
+	private int nonSecurePort = 80;
+
+	private int securePort = 443;
+
+	private boolean nonSecurePortEnabled = true;
+
+	private boolean securePortEnabled;
+
+	private int leaseRenewalIntervalInSeconds = 30;
+
+	private int leaseExpirationDurationInSeconds = 90;
+
+	@Value("${spring.application.name:unknown}")
+	private String virtualHostName;
+
+	private String secureVirtualHostName;
+
+	private String aSGName;
+
+	private Map<String, String> metadataMap = new HashMap<>();
+
+	private DataCenterInfo dataCenterInfo = new IdentifyingDataCenterInfo();
+
+	private String ipAddress = this.hostInfo[0];
+
+	private String statusPageUrlPath = "/info";
+
+	private String statusPageUrl;
+
+	private String homePageUrlPath = "/";
+
+	private String homePageUrl;
+
+	private String healthCheckUrlPath = "/health";
+
+	private String healthCheckUrl;
+
+	private String secureHealthCheckUrl;
+
+	private String namespace = "eureka";
+
+	private String hostname = this.hostInfo[1];
+
+	private boolean preferIpAddress = false;
+
+	private InstanceStatus initialStatus = InstanceStatus.UP;
+
+	public String getHostname() {
+		return this.preferIpAddress ? this.ipAddress : this.hostname;
+	}
+
+	@Override
+	public boolean getSecurePortEnabled() {
+		return this.securePortEnabled;
+	}
+
+	private String[] initHostInfo() {
+		String[] info = new String[2];
+		try {
+			info[0] = InetAddress.getLocalHost().getHostAddress();
+			info[1] = InetAddress.getLocalHost().getHostName();
+		}
+		catch (UnknownHostException ex) {
+			logger.error("Cannot get host info", ex);
+		}
+		return info;
+	}
+
+	@Override
+	public String getHostName(boolean refresh) {
+		return this.preferIpAddress ? this.ipAddress : this.hostname;
+	}
+
+	private final class IdentifyingDataCenterInfo implements DataCenterInfo,
+			UniqueIdentifier {
+
+		@Getter
+		@Setter
+		private Name name = Name.MyOwn;
+
+		@Override
+		public String getId() {
+			String instanceId = EurekaInstanceConfigBean.this.metadataMap
+					.get("instanceId");
+			if (instanceId != null) {
+				String old = getHostname();
+				String id = old.endsWith(instanceId) ? old : old + ":" + instanceId;
+				return id;
+			}
+			return getHostname();
+		}
+
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka/EurekaServerConfigBean.java

@@ -0,0 +1,208 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.eureka;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+
+import lombok.Data;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+import com.netflix.eureka.EurekaServerConfig;
+
+/**
+ * @author Dave Syer
+ */
+@Data
+@ConfigurationProperties("eureka.server")
+public class EurekaServerConfigBean implements EurekaServerConfig {
+
+	public static final String DEFAULT_PREFIX = "/eureka";
+
+	private static final int MINUTES = 60 * 1000;
+
+	private String aWSAccessId;
+
+	private String aWSSecretKey;
+
+	private int eIPBindRebindRetries = 3;
+
+	private int eIPBindingRetryIntervalMs = 5 * MINUTES;
+
+	private boolean enableSelfPreservation = true;
+
+	private double renewalPercentThreshold = 0.85;
+
+	private int renewalThresholdUpdateIntervalMs = 10 * MINUTES;
+
+	private int peerEurekaNodesUpdateIntervalMs = 15 * MINUTES;
+
+	private int numberOfReplicationRetries = 5;
+
+	private int peerEurekaStatusRefreshTimeIntervalMs = 30 * 1000;
+
+	private int waitTimeInMsWhenSyncEmpty = 5 * MINUTES;
+
+	private int peerNodeConnectTimeoutMs = 200;
+
+	private int peerNodeReadTimeoutMs = 200;
+
+	private int peerNodeTotalConnections = 1000;
+
+	private int peerNodeTotalConnectionsPerHost = 500;
+
+	private int peerNodeConnectionIdleTimeoutSeconds = 30;
+
+	private long retentionTimeInMSInDeltaQueue = 3 * MINUTES;
+
+	private long deltaRetentionTimerIntervalInMs = 30 * 1000;
+
+	private long evictionIntervalTimerInMs = 60 * 1000;
+
+	private int aSGQueryTimeoutMs = 300;
+
+	private long aSGUpdateIntervalMs = 5 * MINUTES;
+
+	private long responseCacheAutoExpirationInSeconds = 180;
+
+	private long responseCacheUpdateIntervalMs = 30 * 1000;
+
+	private boolean disableDelta;
+
+	private long maxIdleThreadInMinutesAgeForStatusReplication = 10;
+
+	private int minThreadsForStatusReplication = 1;
+
+	private int maxThreadsForStatusReplication = 1;
+
+	private int maxElementsInStatusReplicationPool = 10000;
+
+	private boolean syncWhenTimestampDiffers = true;
+
+	private int registrySyncRetries = 5;
+
+	private int maxElementsInPeerReplicationPool = 10000;
+
+	private long maxIdleThreadAgeInMinutesForPeerReplication = 15;
+
+	private int minThreadsForPeerReplication = 5;
+
+	private int maxThreadsForPeerReplication = 20;
+
+	private int maxTimeForReplication = 30000;
+
+	private boolean primeAwsReplicaConnections = true;
+
+	private boolean disableDeltaForRemoteRegions;
+
+	private int remoteRegionConnectTimeoutMs = 1000;
+
+	private int remoteRegionReadTimeoutMs = 1000;
+
+	private int remoteRegionTotalConnections = 1000;
+
+	private int remoteRegionTotalConnectionsPerHost = 500;
+
+	private int remoteRegionConnectionIdleTimeoutSeconds = 30;
+
+	private boolean gZipContentFromRemoteRegion = true;
+
+	private Map<String, String> remoteRegionUrlsWithName = new HashMap<String, String>();
+
+	private String[] remoteRegionUrls;
+
+	private Map<String, Set<String>> remoteRegionAppWhitelist;
+
+	private int remoteRegionRegistryFetchInterval = 30;
+
+	private String remoteRegionTrustStore = "";
+
+	private String remoteRegionTrustStorePassword = "changeit";
+
+	private boolean disableTransparentFallbackToOtherRegion;
+
+	private boolean batchReplication;
+
+	private boolean rateLimiterEnabled = false;
+
+	private boolean rateLimiterThrottleStandardClients = false;
+
+	private Set<String> rateLimiterPrivilegedClients = Collections.emptySet();
+
+	private int rateLimiterBurstSize = 10;
+
+	private int rateLimiterRegistryFetchAverageRate = 500;
+
+	private int rateLimiterFullFetchAverageRate = 100;
+
+	private boolean logIdentityHeaders = true;
+
+	@Override
+	public boolean shouldEnableSelfPreservation() {
+		return this.enableSelfPreservation;
+	}
+
+	@Override
+	public boolean shouldDisableDelta() {
+		return this.disableDelta;
+	}
+
+	@Override
+	public boolean shouldSyncWhenTimestampDiffers() {
+		return this.syncWhenTimestampDiffers;
+	}
+
+	@Override
+	public boolean shouldPrimeAwsReplicaConnections() {
+		return this.primeAwsReplicaConnections;
+	}
+
+	@Override
+	public boolean shouldDisableDeltaForRemoteRegions() {
+		return this.disableDeltaForRemoteRegions;
+	}
+
+	@Override
+	public boolean shouldGZipContentFromRemoteRegion() {
+		return this.gZipContentFromRemoteRegion;
+	}
+
+	@Override
+	public Set<String> getRemoteRegionAppWhitelist(String regionName) {
+		return this.remoteRegionAppWhitelist.get(regionName == null ? "global"
+				: regionName.trim().toLowerCase());
+	}
+
+	@Override
+	public boolean disableTransparentFallbackToOtherRegion() {
+		return this.disableTransparentFallbackToOtherRegion;
+	}
+
+	@Override
+	public boolean shouldBatchReplication() {
+		return this.batchReplication;
+	}
+
+	@Override
+	public boolean shouldLogIdentityHeaders() {
+		return this.logIdentityHeaders;
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/EnableFeignClients.java

@@ -0,0 +1,74 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.feign;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.context.annotation.Import;
+
+/**
+ * Scans for interfaces that declare they are feign clients (via {@link FeignClient
+ * <code>@FeignClient</code>}). Configures component scanning directives for use with
+ * {@link org.springframework.context.annotation.Configuration
+ * <code>@Configuration</code>} classes.
+ *
+ * @author Spencer Gibb
+ * @author Dave Syer
+ * @since 1.0
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+@Documented
+@Import({ FeignClientsConfiguration.class, FeignClientsRegistrar.class })
+public @interface EnableFeignClients {
+
+	/**
+	 * Alias for the {@link #basePackages()} attribute. Allows for more concise annotation
+	 * declarations e.g.: {@code @ComponentScan("org.my.pkg")} instead of
+	 * {@code @ComponentScan(basePackages="org.my.pkg")}.
+	 * @return the array of 'basePackages'.
+	 */
+	String[] value() default {};
+
+	/**
+	 * Base packages to scan for annotated components.
+	 * <p>
+	 * {@link #value()} is an alias for (and mutually exclusive with) this attribute.
+	 * <p>
+	 * Use {@link #basePackageClasses()} for a type-safe alternative to String-based
+	 * package names.
+	 *
+	 * @return the array of 'basePackages'.
+	 */
+	String[] basePackages() default {};
+
+	/**
+	 * Type-safe alternative to {@link #basePackages()} for specifying the packages to
+	 * scan for annotated components. The package of each class specified will be scanned.
+	 * <p>
+	 * Consider creating a special no-op marker class or interface in each package that
+	 * serves no purpose other than being referenced by this attribute.
+	 *
+	 * @return the array of 'basePackageClasses'.
+	 */
+	Class<?>[] basePackageClasses() default {};
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignAutoConfiguration.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.feign;
+
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import feign.Feign;
+
+/**
+ * @author Spencer Gibb
+ * @author Julien Roy
+ */
+@Configuration
+@ConditionalOnClass(Feign.class)
+@AutoConfigureAfter(ArchaiusAutoConfiguration.class)
+@Import(FeignClientsConfiguration.class)
+public class FeignAutoConfiguration {
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClient.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.feign;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation for interfaces declaring that a REST client with that interface should be
+ * created (e.g. for autowiring into another component). If ribbon is available it will be
+ * used to load balance the backend requests, and the load balancer can be configured
+ * using a <code>@RibbonClient</code> with the same name (i.e. value) as the feign client.
+ *
+ * @author Spencer Gibb
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface FeignClient {
+
+	/**
+	 * The serviceId with optional protocol prefix. Synonym for {@link #serviceId()
+	 * serviceId}. Either serviceId or url must be specified but not both.
+	 */
+	String value() default "";
+
+	/**
+	 * The serviceId with optional protocol prefix. Synonym for {@link #value() value}.
+	 * Either serviceId or url must be specified but not both.
+	 */
+	String serviceId() default "";
+
+	/**
+	 * An absolute URL or resolvable hostname (the protocol is optional).
+	 */
+	String url() default "";
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientFactoryBean.java

@@ -0,0 +1,154 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.feign;
+
+import java.util.List;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import org.springframework.beans.factory.FactoryBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.Assert;
+import org.springframework.util.StringUtils;
+
+import feign.Client;
+import feign.Contract;
+import feign.Feign;
+import feign.Logger;
+import feign.Request;
+import feign.RequestInterceptor;
+import feign.Retryer;
+import feign.codec.Decoder;
+import feign.codec.Encoder;
+import feign.codec.ErrorDecoder;
+import feign.ribbon.LoadBalancingTarget;
+import feign.slf4j.Slf4jLogger;
+
+/**
+ * @author Spencer Gibb
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+class FeignClientFactoryBean implements FactoryBean<Object>, InitializingBean {
+
+	private Class<?> type;
+
+	private String name;
+
+	private String url;
+
+	@Autowired
+	private Decoder decoder;
+
+	@Autowired
+	private Encoder encoder;
+
+	@Autowired
+	private Logger logger;
+
+	@Autowired
+	private Contract contract;
+
+	@Autowired(required = false)
+	private Logger.Level logLevel;
+
+	@Autowired(required = false)
+	private Retryer retryer;
+
+	@Autowired(required = false)
+	private ErrorDecoder errorDecoder;
+
+	@Autowired(required = false)
+	private Request.Options options;
+
+	@Autowired(required = false)
+	private Client ribbonClient;
+
+	@Autowired(required = false)
+	private List<RequestInterceptor> requestInterceptors;
+
+	@Override
+	public void afterPropertiesSet() throws Exception {
+		if (StringUtils.hasText(this.name)) {
+			Assert.state(!StringUtils.hasText(this.url),
+					"Either value or url can be specified, but not both");
+		}
+	}
+
+	protected Feign.Builder feign() {
+		Feign.Builder builder = Feign.builder()
+				// required values
+				.logger(this.logger).encoder(this.encoder).decoder(this.decoder)
+				.contract(this.contract);
+
+		// optional values
+		if (this.logLevel != null) {
+			builder.logLevel(this.logLevel);
+		}
+		if (this.retryer != null) {
+			builder.retryer(this.retryer);
+		}
+		if (this.errorDecoder != null) {
+			builder.errorDecoder(this.errorDecoder);
+		}
+		if (this.options != null) {
+			builder.options(this.options);
+		}
+		if (this.requestInterceptors != null) {
+			builder.requestInterceptors(this.requestInterceptors);
+		}
+
+		return builder;
+	}
+
+	protected <T> T loadBalance(Feign.Builder builder, Class<T> type, String schemeName) {
+		builder.logger(new Slf4jLogger(type)); // TODO: how to have choice here?
+		if (this.ribbonClient != null) {
+			return builder.client(this.ribbonClient).target(type, schemeName);
+		}
+		else {
+			return builder.target(LoadBalancingTarget.create(type, schemeName));
+		}
+	}
+
+	@Override
+	public Object getObject() throws Exception {
+		if (StringUtils.hasText(this.name) && !this.name.startsWith("http")) {
+			this.name = "http://" + this.name;
+		}
+		if (StringUtils.hasText(this.name)) {
+			return loadBalance(feign(), this.type, this.name);
+		}
+		if (StringUtils.hasText(this.url) && !this.url.startsWith("http")) {
+			this.url = "http://" + this.url;
+		}
+		return feign().target(this.type, this.url);
+	}
+
+	@Override
+	public Class<?> getObjectType() {
+		return this.type;
+	}
+
+	@Override
+	public boolean isSingleton() {
+		return true;
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsConfiguration.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.feign;
+
+import org.springframework.cloud.netflix.feign.support.SpringDecoder;
+import org.springframework.cloud.netflix.feign.support.SpringEncoder;
+import org.springframework.cloud.netflix.feign.support.SpringMvcContract;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import feign.Contract;
+import feign.Logger;
+import feign.slf4j.Slf4jLogger;
+
+/**
+ * @author Dave Syer
+ */
+@Configuration
+public class FeignClientsConfiguration {
+
+	@Bean
+	public SpringDecoder feignDecoder() {
+		return new SpringDecoder();
+	}
+
+	@Bean
+	public SpringEncoder feignEncoder() {
+		return new SpringEncoder();
+	}
+
+	@Bean
+	public Logger feignLogger() {
+		return new Slf4jLogger();
+	}
+
+	@Bean
+	public Contract feignContract() {
+		return new SpringMvcContract();
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/FeignClientsRegistrar.java

@@ -0,0 +1,187 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.feign;
+
+import java.lang.annotation.Annotation;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.springframework.beans.factory.BeanClassLoaderAware;
+import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
+import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.BeanDefinitionHolder;
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.context.ResourceLoaderAware;
+import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
+import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
+import org.springframework.core.io.ResourceLoader;
+import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.core.type.filter.AnnotationTypeFilter;
+import org.springframework.util.Assert;
+import org.springframework.util.ClassUtils;
+import org.springframework.util.StringUtils;
+
+/**
+ * @author Spencer Gibb
+ */
+public class FeignClientsRegistrar implements ImportBeanDefinitionRegistrar,
+		ResourceLoaderAware, BeanClassLoaderAware {
+
+	// patterned after Spring Integration IntegrationComponentScanRegistrar
+
+	private ResourceLoader resourceLoader;
+
+	private ClassLoader classLoader;
+
+	public FeignClientsRegistrar() {
+	}
+
+	@Override
+	public void setResourceLoader(ResourceLoader resourceLoader) {
+		this.resourceLoader = resourceLoader;
+	}
+
+	@Override
+	public void setBeanClassLoader(ClassLoader classLoader) {
+		this.classLoader = classLoader;
+	}
+
+	@Override
+	public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata,
+			BeanDefinitionRegistry registry) {
+
+		Set<String> basePackages = getBasePackages(importingClassMetadata);
+
+		ClassPathScanningCandidateComponentProvider scanner = getScanner();
+		scanner.addIncludeFilter(new AnnotationTypeFilter(FeignClient.class));
+		scanner.setResourceLoader(this.resourceLoader);
+
+		for (String basePackage : basePackages) {
+			Set<BeanDefinition> candidateComponents = scanner
+					.findCandidateComponents(basePackage);
+			for (BeanDefinition candidateComponent : candidateComponents) {
+				if (candidateComponent instanceof AnnotatedBeanDefinition) {
+					// verify annotated class is an interface
+					AnnotatedBeanDefinition beanDefinition = (AnnotatedBeanDefinition) candidateComponent;
+					AnnotationMetadata annotationMetadata = beanDefinition.getMetadata();
+					Assert.isTrue(annotationMetadata.isInterface(),
+							"@FeignClient can only be specified on an interface");
+
+					BeanDefinitionHolder holder = createBeanDefinition(annotationMetadata);
+					BeanDefinitionReaderUtils.registerBeanDefinition(holder, registry);
+				}
+			}
+		}
+	}
+
+	private BeanDefinitionHolder createBeanDefinition(
+			AnnotationMetadata annotationMetadata) {
+		Map<String, Object> attributes = annotationMetadata
+				.getAnnotationAttributes(FeignClient.class.getCanonicalName());
+
+		String className = annotationMetadata.getClassName();
+		BeanDefinitionBuilder definition = BeanDefinitionBuilder
+				.genericBeanDefinition(FeignClientFactoryBean.class);
+		validate(attributes);
+		definition.addPropertyValue("url", getUrl(attributes));
+		definition.addPropertyValue("name", getServiceId(attributes));
+		definition.addPropertyValue("type", className);
+
+		String beanName = StringUtils.uncapitalize(className.substring(className
+				.lastIndexOf(".") + 1));
+		return new BeanDefinitionHolder(definition.getBeanDefinition(), beanName);
+	}
+
+	private void validate(Map<String, Object> attributes) {
+		if (StringUtils.hasText((String) attributes.get("value"))) {
+			Assert.isTrue(!StringUtils.hasText((String) attributes.get("name")),
+					"Either name or value can be specified, but not both");
+		}
+	}
+
+	private String getServiceId(Map<String, Object> attributes) {
+		if (StringUtils.hasText((String) attributes.get("name"))) {
+			return (String) attributes.get("name");
+		}
+		return (String) attributes.get("value");
+	}
+
+	private String getUrl(Map<String, Object> attributes) {
+		return (String) attributes.get("url");
+	}
+
+	protected ClassPathScanningCandidateComponentProvider getScanner() {
+		return new ClassPathScanningCandidateComponentProvider(false) {
+
+			@Override
+			protected boolean isCandidateComponent(AnnotatedBeanDefinition beanDefinition) {
+				if (beanDefinition.getMetadata().isIndependent()) {
+					// TODO until SPR-11711 will be resolved
+					if (beanDefinition.getMetadata().isInterface()
+							&& beanDefinition.getMetadata().getInterfaceNames().length == 1
+							&& Annotation.class.getName().equals(
+									beanDefinition.getMetadata().getInterfaceNames()[0])) {
+						try {
+							Class<?> target = ClassUtils.forName(beanDefinition
+									.getMetadata().getClassName(),
+									FeignClientsRegistrar.this.classLoader);
+							return !target.isAnnotation();
+						}
+						catch (Exception ex) {
+							this.logger.error("Could not load target class: "
+									+ beanDefinition.getMetadata().getClassName(), ex);
+
+						}
+					}
+					return true;
+				}
+				return false;
+
+			}
+		};
+	}
+
+	protected Set<String> getBasePackages(AnnotationMetadata importingClassMetadata) {
+		Map<String, Object> attributes = importingClassMetadata
+				.getAnnotationAttributes(EnableFeignClients.class.getCanonicalName());
+
+		Set<String> basePackages = new HashSet<>();
+		for (String pkg : (String[]) attributes.get("value")) {
+			if (StringUtils.hasText(pkg)) {
+				basePackages.add(pkg);
+			}
+		}
+		for (String pkg : (String[]) attributes.get("basePackages")) {
+			if (StringUtils.hasText(pkg)) {
+				basePackages.add(pkg);
+			}
+		}
+		for (Class<?> clazz : (Class[]) attributes.get("basePackageClasses")) {
+			basePackages.add(ClassUtils.getPackageName(clazz));
+		}
+
+		if (basePackages.isEmpty()) {
+			basePackages.add(ClassUtils.getPackageName(importingClassMetadata
+					.getClassName()));
+		}
+		return basePackages;
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonClient.java

@@ -0,0 +1,115 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.feign.ribbon;
+
+import java.io.IOException;
+import java.net.URI;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLSocketFactory;
+
+import lombok.Data;
+
+import org.springframework.cloud.netflix.feign.ribbon.RibbonLoadBalancer.RibbonRequest;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+import org.springframework.util.ReflectionUtils;
+
+import com.netflix.client.ClientException;
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.ILoadBalancer;
+
+import dagger.Lazy;
+import feign.Client;
+import feign.Request;
+import feign.Response;
+
+/**
+ * @author Julien Roy
+ * @author Spencer Gibb
+ */
+public class FeignRibbonClient implements Client {
+
+	private Client defaultClient = new Default(new LazySSLSocketFactory(),
+			new LazyHostnameVerifier());
+
+	private SpringClientFactory factory;
+
+	public FeignRibbonClient(SpringClientFactory factory) {
+		this.factory = factory;
+	}
+
+	@Override
+	public Response execute(Request request, Request.Options options) throws IOException {
+		try {
+			URI asUri = URI.create(request.url());
+			String clientName = asUri.getHost();
+			URI uriWithoutSchemeAndPort = URI.create(request.url().replace(
+					asUri.getScheme() + "://" + asUri.getHost(),
+					asUri.getScheme() + "://"));
+			RibbonLoadBalancer.RibbonRequest ribbonRequest = new RibbonRequest(request,
+					uriWithoutSchemeAndPort);
+			LBClient client = getClient(clientName);
+			return client.getLoadBalancer()
+					.executeWithLoadBalancer(ribbonRequest, client.config).toResponse();
+		}
+		catch (ClientException ex) {
+			if (ex.getCause() instanceof IOException) {
+				throw IOException.class.cast(ex.getCause());
+			}
+			ReflectionUtils.rethrowRuntimeException(ex);
+			return null;
+		}
+	}
+
+	@Data
+	private class LBClient {
+		private final IClientConfig config;
+		private final RibbonLoadBalancer loadBalancer;
+	}
+
+	private LBClient getClient(String clientName) {
+		IClientConfig config = this.factory.getClientConfig(clientName);
+		ILoadBalancer lb = this.factory.getLoadBalancer(clientName);
+		RibbonLoadBalancer loadBalancer = new RibbonLoadBalancer(this.defaultClient, lb,
+				config);
+		return new LBClient(config, loadBalancer);
+	}
+
+	public void setDefaultClient(Client defaultClient) {
+		this.defaultClient = defaultClient;
+	}
+
+	private static class LazySSLSocketFactory implements Lazy<SSLSocketFactory> {
+
+		@Override
+		public SSLSocketFactory get() {
+			return (SSLSocketFactory) SSLSocketFactory.getDefault();
+		}
+
+	}
+
+	private static class LazyHostnameVerifier implements Lazy<HostnameVerifier> {
+
+		@Override
+		public HostnameVerifier get() {
+			return HttpsURLConnection.getDefaultHostnameVerifier();
+		}
+
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/FeignRibbonClientAutoConfiguration.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.feign.ribbon;
+
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.cloud.netflix.feign.FeignAutoConfiguration;
+import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.netflix.loadbalancer.ILoadBalancer;
+
+import feign.Client;
+import feign.Feign;
+
+/**
+ * Autoconfiguration to be activated if Feign is in use and needs to be use Ribbon as a
+ * load balancer.
+ *
+ * @author Dave Syer
+ */
+@ConditionalOnClass({ ILoadBalancer.class, Feign.class })
+@Configuration
+@AutoConfigureBefore(FeignAutoConfiguration.class)
+public class FeignRibbonClientAutoConfiguration {
+	@Bean
+	public Client feignRibbonClient(SpringClientFactory factory) {
+		return new FeignRibbonClient(factory);
+	}
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/ribbon/RibbonLoadBalancer.java

@@ -0,0 +1,164 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.feign.ribbon;
+
+import java.io.IOException;
+import java.net.URI;
+import java.util.Collection;
+import java.util.Map;
+
+import com.netflix.client.AbstractLoadBalancerAwareClient;
+import com.netflix.client.ClientException;
+import com.netflix.client.ClientRequest;
+import com.netflix.client.IResponse;
+import com.netflix.client.RequestSpecificRetryHandler;
+import com.netflix.client.RetryHandler;
+import com.netflix.client.config.CommonClientConfigKey;
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.ILoadBalancer;
+
+import feign.Client;
+import feign.Request;
+import feign.RequestTemplate;
+import feign.Response;
+
+public class RibbonLoadBalancer
+		extends
+		AbstractLoadBalancerAwareClient<RibbonLoadBalancer.RibbonRequest, RibbonLoadBalancer.RibbonResponse> {
+
+	private final Client delegate;
+
+	private final int connectTimeout;
+
+	private final int readTimeout;
+
+	private final IClientConfig clientConfig;
+
+	public RibbonLoadBalancer(Client delegate, ILoadBalancer lb,
+			IClientConfig clientConfig) {
+		super(lb, clientConfig);
+		this.setRetryHandler(RetryHandler.DEFAULT);
+		this.clientConfig = clientConfig;
+		this.delegate = delegate;
+		this.connectTimeout = clientConfig.get(CommonClientConfigKey.ConnectTimeout);
+		this.readTimeout = clientConfig.get(CommonClientConfigKey.ReadTimeout);
+	}
+
+	@Override
+	public RibbonResponse execute(RibbonRequest request, IClientConfig configOverride)
+			throws IOException {
+		Request.Options options;
+		if (configOverride != null) {
+			options = new Request.Options(configOverride.get(
+					CommonClientConfigKey.ConnectTimeout, this.connectTimeout),
+					(configOverride.get(CommonClientConfigKey.ReadTimeout,
+							this.readTimeout)));
+		}
+		else {
+			options = new Request.Options(this.connectTimeout, this.readTimeout);
+		}
+		Response response = this.delegate.execute(request.toRequest(), options);
+		return new RibbonResponse(request.getUri(), response);
+	}
+
+	@Override
+	public RequestSpecificRetryHandler getRequestSpecificRetryHandler(
+			RibbonRequest request, IClientConfig requestConfig) {
+		if (this.clientConfig.get(CommonClientConfigKey.OkToRetryOnAllOperations, false)) {
+			return new RequestSpecificRetryHandler(true, true, this.getRetryHandler(),
+					requestConfig);
+		}
+		if (!request.toRequest().method().equals("GET")) {
+			return new RequestSpecificRetryHandler(true, false, this.getRetryHandler(),
+					requestConfig);
+		}
+		else {
+			return new RequestSpecificRetryHandler(true, true, this.getRetryHandler(),
+					requestConfig);
+		}
+	}
+
+	static class RibbonRequest extends ClientRequest implements Cloneable {
+
+		private final Request request;
+
+		RibbonRequest(Request request, URI uri) {
+			this.request = request;
+			setUri(uri);
+		}
+
+		Request toRequest() {
+			return new RequestTemplate().method(this.request.method())
+					.append(getUri().toASCIIString()).headers(this.request.headers())
+					.body(this.request.body(), this.request.charset()).request();
+		}
+
+		@Override
+		public Object clone() {
+			return new RibbonRequest(this.request, getUri());
+		}
+	}
+
+	static class RibbonResponse implements IResponse {
+
+		private final URI uri;
+		private final Response response;
+
+		RibbonResponse(URI uri, Response response) {
+			this.uri = uri;
+			this.response = response;
+		}
+
+		@Override
+		public Object getPayload() throws ClientException {
+			return this.response.body();
+		}
+
+		@Override
+		public boolean hasPayload() {
+			return this.response.body() != null;
+		}
+
+		@Override
+		public boolean isSuccess() {
+			return this.response.status() == 200;
+		}
+
+		@Override
+		public URI getRequestedURI() {
+			return this.uri;
+		}
+
+		@Override
+		public Map<String, Collection<String>> getHeaders() {
+			return this.response.headers();
+		}
+
+		Response toResponse() {
+			return this.response;
+		}
+
+		@Override
+		public void close() throws IOException {
+			if (this.response != null && this.response.body() != null) {
+				this.response.body().close();
+			}
+		}
+
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/FeignUtils.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.feign.support;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+
+import org.springframework.http.HttpHeaders;
+
+/**
+ * @author Spencer Gibb
+ */
+public class FeignUtils {
+
+	static HttpHeaders getHttpHeaders(Map<String, Collection<String>> headers) {
+		HttpHeaders httpHeaders = new HttpHeaders();
+		for (Map.Entry<String, Collection<String>> entry : headers.entrySet()) {
+			httpHeaders.put(entry.getKey(), new ArrayList<>(entry.getValue()));
+		}
+		return httpHeaders;
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/SpringDecoder.java

@@ -0,0 +1,110 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.feign.support;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+import javax.inject.Provider;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.web.HttpMessageConverters;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.web.client.HttpMessageConverterExtractor;
+
+import static org.springframework.cloud.netflix.feign.support.FeignUtils.getHttpHeaders;
+
+import feign.FeignException;
+import feign.Response;
+import feign.codec.DecodeException;
+import feign.codec.Decoder;
+
+/**
+ * @author Spencer Gibb
+ */
+public class SpringDecoder implements Decoder {
+
+	@Autowired
+	private Provider<HttpMessageConverters> messageConverters;
+
+	public SpringDecoder() {
+	}
+
+	@Override
+	public Object decode(final Response response, Type type) throws IOException,
+			FeignException {
+		if (type instanceof Class || type instanceof ParameterizedType) {
+			@SuppressWarnings({ "unchecked", "rawtypes" })
+			HttpMessageConverterExtractor<?> extractor = new HttpMessageConverterExtractor(
+					type, this.messageConverters.get().getConverters());
+
+			return extractor.extractData(new FeignResponseAdapter(response));
+		}
+		throw new DecodeException(
+				"type is not an instance of Class or ParameterizedType: " + type);
+	}
+
+	private class FeignResponseAdapter implements ClientHttpResponse {
+
+		private final Response response;
+
+		private FeignResponseAdapter(Response response) {
+			this.response = response;
+		}
+
+		@Override
+		public HttpStatus getStatusCode() throws IOException {
+			return HttpStatus.valueOf(this.response.status());
+		}
+
+		@Override
+		public int getRawStatusCode() throws IOException {
+			return this.response.status();
+		}
+
+		@Override
+		public String getStatusText() throws IOException {
+			return this.response.reason();
+		}
+
+		@Override
+		public void close() {
+			try {
+				this.response.body().close();
+			}
+			catch (IOException ex) {
+				// Ignore exception on close...
+			}
+		}
+
+		@Override
+		public InputStream getBody() throws IOException {
+			return this.response.body().asInputStream();
+		}
+
+		@Override
+		public HttpHeaders getHeaders() {
+			return getHttpHeaders(this.response.headers());
+		}
+
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/SpringEncoder.java

@@ -0,0 +1,130 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.feign.support;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.charset.Charset;
+import java.util.Collection;
+
+import javax.inject.Provider;
+
+import lombok.extern.apachecommons.CommonsLog;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.web.HttpMessageConverters;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpOutputMessage;
+import org.springframework.http.MediaType;
+import org.springframework.http.converter.HttpMessageConverter;
+
+import feign.RequestTemplate;
+import feign.codec.EncodeException;
+import feign.codec.Encoder;
+
+import static org.springframework.cloud.netflix.feign.support.FeignUtils.getHttpHeaders;
+
+/**
+ * @author Spencer Gibb
+ */
+@CommonsLog
+public class SpringEncoder implements Encoder {
+
+	@Autowired
+	private Provider<HttpMessageConverters> messageConverters;
+
+	@Override
+	public void encode(Object requestBody, RequestTemplate request)
+			throws EncodeException {
+		// template.body(conversionService.convert(object, String.class));
+		if (requestBody != null) {
+			Class<?> requestType = requestBody.getClass();
+			Collection<String> contentTypes = request.headers().get("Content-Type");
+
+			MediaType requestContentType = null;
+			if (contentTypes != null && !contentTypes.isEmpty()) {
+				String type = contentTypes.iterator().next();
+				requestContentType = MediaType.valueOf(type);
+			}
+
+			for (HttpMessageConverter<?> messageConverter : this.messageConverters.get()
+					.getConverters()) {
+				if (messageConverter.canWrite(requestType, requestContentType)) {
+					if (log.isDebugEnabled()) {
+						if (requestContentType != null) {
+							log.debug("Writing [" + requestBody + "] as \""
+									+ requestContentType + "\" using ["
+									+ messageConverter + "]");
+						}
+						else {
+							log.debug("Writing [" + requestBody + "] using ["
+									+ messageConverter + "]");
+						}
+
+					}
+
+					FeignOutputMessage outputMessage = new FeignOutputMessage(request);
+					try {
+						@SuppressWarnings("unchecked")
+						HttpMessageConverter<Object> copy = (HttpMessageConverter<Object>) messageConverter;
+						copy.write(requestBody, requestContentType, outputMessage);
+					}
+					catch (IOException ex) {
+						throw new EncodeException("Error converting request body", ex);
+					}
+					request.body(outputMessage.getOutputStream().toByteArray(),
+							Charset.forName("UTF-8")); // TODO: set charset
+					return;
+				}
+			}
+			String message = "Could not write request: no suitable HttpMessageConverter "
+					+ "found for request type [" + requestType.getName() + "]";
+			if (requestContentType != null) {
+				message += " and content type [" + requestContentType + "]";
+			}
+			throw new EncodeException(message);
+		}
+	}
+
+	private class FeignOutputMessage implements HttpOutputMessage {
+
+		private final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+
+		private final RequestTemplate request;
+
+		private FeignOutputMessage(RequestTemplate request) {
+			this.request = request;
+		}
+
+		@Override
+		public OutputStream getBody() throws IOException {
+			return this.outputStream;
+		}
+
+		@Override
+		public HttpHeaders getHeaders() {
+			return getHttpHeaders(this.request.headers());
+		}
+
+		public ByteArrayOutputStream getOutputStream() {
+			return this.outputStream;
+		}
+
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/feign/support/SpringMvcContract.java

@@ -0,0 +1,179 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.feign.support;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Map;
+
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import feign.Contract;
+import feign.MethodMetadata;
+
+import static feign.Util.checkState;
+import static feign.Util.emptyToNull;
+
+/**
+ * @author Spencer Gibb
+ */
+public class SpringMvcContract extends Contract.BaseContract {
+
+	private static final String ACCEPT = "Accept";
+
+	private static final String CONTENT_TYPE = "Content-Type";
+
+	@Override
+	protected void processAnnotationOnMethod(MethodMetadata data,
+			Annotation methodAnnotation, Method method) {
+		RequestMapping mapping = RequestMapping.class.cast(methodAnnotation);
+		if (mapping != null) {
+			// HTTP Method
+			checkOne(method, mapping.method(), "method");
+			data.template().method(mapping.method()[0].name());
+
+			// path
+			checkOne(method, mapping.value(), "value");
+
+			String methodAnnotationValue = mapping.value()[0];
+			String pathValue = emptyToNull(methodAnnotationValue);
+			checkState(pathValue != null, "value was empty on method %s",
+					method.getName());
+			if (!methodAnnotationValue.startsWith("/")
+					&& !data.template().toString().endsWith("/")) {
+				methodAnnotationValue = "/" + methodAnnotationValue;
+			}
+			data.template().append(methodAnnotationValue);
+
+			// produces
+			checkAtMostOne(method, mapping.produces(), "produces");
+			String[] serverProduces = mapping.produces();
+			String clientAccepts = serverProduces.length == 0 ? null
+					: emptyToNull(serverProduces[0]);
+			if (clientAccepts != null) {
+				data.template().header(ACCEPT, clientAccepts);
+			}
+
+			// consumes
+			checkAtMostOne(method, mapping.consumes(), "consumes");
+			String[] serverConsumes = mapping.consumes();
+			String clientProduces = serverConsumes.length == 0 ? null
+					: emptyToNull(serverConsumes[0]);
+			if (clientProduces != null) {
+				data.template().header(CONTENT_TYPE, clientProduces);
+			}
+
+			// headers
+			// TODO: only supports one header value per key
+			if (mapping.headers() != null && mapping.headers().length > 0) {
+				for (String header : mapping.headers()) {
+					int colon = header.indexOf(':');
+					data.template().header(header.substring(0, colon),
+							header.substring(colon + 2));
+				}
+			}
+		}
+	}
+
+	private void checkAtMostOne(Method method, Object[] values, String fieldName) {
+		checkState(values != null && (values.length == 0 || values.length == 1),
+				"Method %s can only contain at most 1 %s field. Found: %s",
+				method.getName(), fieldName,
+				values == null ? null : Arrays.asList(values));
+	}
+
+	private void checkOne(Method method, Object[] values, String fieldName) {
+		checkState(values != null && values.length == 1,
+				"Method %s can only contain 1 %s field. Found: %s", method.getName(),
+				fieldName, values == null ? null : Arrays.asList(values));
+	}
+
+	@Override
+	protected boolean processAnnotationsOnParameter(MethodMetadata data,
+			Annotation[] annotations, int paramIndex) {
+		boolean isHttpAnnotation = false;
+		// TODO: support spring parameter annotations?
+		for (Annotation parameterAnnotation : annotations) {
+			Class<? extends Annotation> annotationType = parameterAnnotation
+					.annotationType();
+			if (annotationType == PathVariable.class) {
+				String name = PathVariable.class.cast(parameterAnnotation).value();
+				checkState(emptyToNull(name) != null,
+						"PathVariable annotation was empty on param %s.", paramIndex);
+				nameParam(data, name, paramIndex);
+				isHttpAnnotation = true;
+				String varName = '{' + name + '}';
+				if (data.template().url().indexOf(varName) == -1
+						&& !searchMapValues(data.template().queries(), varName)
+						&& !searchMapValues(data.template().headers(), varName)) {
+					data.formParams().add(name);
+				}
+			}
+			else if (annotationType == RequestParam.class) {
+				String name = RequestParam.class.cast(parameterAnnotation).value();
+				checkState(emptyToNull(name) != null,
+						"QueryParam.value() was empty on parameter %s", paramIndex);
+				Collection<String> query = addTemplatedParam(data.template().queries()
+						.get(name), name);
+				data.template().query(name, query);
+				nameParam(data, name, paramIndex);
+				isHttpAnnotation = true;
+			}
+			else if (annotationType == RequestHeader.class) {
+				String name = RequestHeader.class.cast(parameterAnnotation).value();
+				checkState(emptyToNull(name) != null,
+						"HeaderParam.value() was empty on parameter %s", paramIndex);
+				Collection<String> header = addTemplatedParam(data.template().headers()
+						.get(name), name);
+				data.template().header(name, header);
+				nameParam(data, name, paramIndex);
+				isHttpAnnotation = true;
+			}
+
+			// TODO
+			/*
+			 * else if (annotationType == FormParam.class) { String name =
+			 * FormParam.class.cast(parameterAnnotation).value();
+			 * checkState(emptyToNull(name) != null,
+			 * "FormParam.value() was empty on parameter %s", paramIndex);
+			 * data.formParams().add(name); nameParam(data, name, paramIndex);
+			 * isHttpAnnotation = true; }
+			 */
+
+		}
+		return isHttpAnnotation;
+	}
+
+	private <K, V> boolean searchMapValues(Map<K, Collection<V>> map, V search) {
+		Collection<Collection<V>> values = map.values();
+		if (values == null) {
+			return false;
+		}
+		for (Collection<V> entry : values) {
+			if (entry.contains(search)) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/EnableHystrix.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.hystrix;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker;
+
+/**
+ * Convenience annotation for clients to enable Hystrix circuit breakers (specifically).
+ * Use this (optionally) in case you want discovery and know for sure that it is Hystrix
+ * you want. All it does is turn on circuit breakers and let the autoconfiguration find
+ * the Hystrix classes if they are available (i.e. you need Hystrix on the classpath as
+ * well).
+ *
+ * @author Dave Syer
+ * @author Spencer Gibb
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+@Inherited
+@EnableCircuitBreaker
+public @interface EnableHystrix {
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixAutoConfiguration.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.hystrix;
+
+import org.springframework.boot.actuate.autoconfigure.HealthIndicatorAutoConfiguration;
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.netflix.hystrix.Hystrix;
+
+/**
+ * Auto configuration for Hystrix.
+ *
+ * @author Christian Dupuis
+ */
+@Configuration
+@ConditionalOnClass({ Hystrix.class, HealthIndicator.class })
+@ConditionalOnProperty(value = "health.hystrix.enabled", matchIfMissing = true)
+@AutoConfigureAfter({ HealthIndicatorAutoConfiguration.class })
+public class HystrixAutoConfiguration {
+
+	@Bean
+	public HystrixHealthIndicator hystrixHealthIndicator() {
+		return new HystrixHealthIndicator();
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixCircuitBreakerConfiguration.java

@@ -0,0 +1,194 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.hystrix;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.catalina.core.ApplicationContext;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.actuate.endpoint.Endpoint;
+import org.springframework.boot.actuate.metrics.GaugeService;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
+import org.springframework.context.SmartLifecycle;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.netflix.hystrix.Hystrix;
+import com.netflix.hystrix.contrib.javanica.aop.aspectj.HystrixCommandAspect;
+import com.netflix.hystrix.contrib.metrics.eventstream.HystrixMetricsPoller;
+import com.netflix.hystrix.contrib.metrics.eventstream.HystrixMetricsPoller.MetricsAsJsonPollerListener;
+import com.netflix.hystrix.contrib.metrics.eventstream.HystrixMetricsStreamServlet;
+
+/**
+ * @author Spencer Gibb
+ * @author Christian Dupuis
+ */
+@Configuration
+public class HystrixCircuitBreakerConfiguration {
+
+	@Bean
+	public HystrixCommandAspect hystrixCommandAspect() {
+		return new HystrixCommandAspect();
+	}
+
+	@Bean
+	public HystrixShutdownHook hystrixShutdownHook() {
+		return new HystrixShutdownHook();
+	}
+
+	@Configuration
+	@ConditionalOnProperty(value = "hystrix.stream.endpoint.enabled", matchIfMissing = true)
+	@ConditionalOnWebApplication
+	@ConditionalOnClass({ Endpoint.class, HystrixMetricsStreamServlet.class })
+	protected static class HystrixWebConfiguration {
+
+		@Bean
+		public HystrixStreamEndpoint hystrixStreamEndpoint() {
+			return new HystrixStreamEndpoint();
+		}
+
+	}
+
+	@Configuration
+	@ConditionalOnClass({ HystrixMetricsPoller.class, GaugeService.class })
+	protected static class HystrixMetricsPollerConfiguration implements SmartLifecycle {
+
+		private static Log logger = LogFactory
+				.getLog(HystrixMetricsPollerConfiguration.class);
+
+		@Autowired(required = false)
+		private GaugeService gauges;
+
+		private ObjectMapper mapper = new ObjectMapper();
+
+		private HystrixMetricsPoller poller;
+
+		private Set<String> reserved = new HashSet<String>(Arrays.asList("group", "name",
+				"type", "currentTime"));
+
+		@Override
+		public void start() {
+			if (this.gauges == null) {
+				return;
+			}
+			MetricsAsJsonPollerListener listener = new MetricsAsJsonPollerListener() {
+				@Override
+				public void handleJsonMetric(String json) {
+					try {
+						@SuppressWarnings("unchecked")
+						Map<String, Object> map = HystrixMetricsPollerConfiguration.this.mapper
+								.readValue(json, Map.class);
+						if (map != null && map.containsKey("type")) {
+							addMetrics(map, "hystrix.");
+						}
+					}
+					catch (IOException ex) {
+						// ignore
+					}
+				}
+
+			};
+			this.poller = new HystrixMetricsPoller(listener, 2000);
+			// start polling and it will write directly to the listener
+			this.poller.start();
+			logger.info("Starting poller");
+		}
+
+		private void addMetrics(Map<String, Object> map, String root) {
+			StringBuilder prefixBuilder = new StringBuilder(root);
+			if (map.containsKey("type")) {
+				prefixBuilder.append((String) map.get("type"));
+				if (map.containsKey("group")) {
+					prefixBuilder.append(".").append(map.get("group"));
+				}
+				prefixBuilder.append(".").append(map.get("name"));
+			}
+			String prefix = prefixBuilder.toString();
+			for (String key : map.keySet()) {
+				Object value = map.get(key);
+				if (!this.reserved.contains(key)) {
+					if (value instanceof Number) {
+						String name = prefix + "." + key;
+						this.gauges.submit(name, ((Number) value).doubleValue());
+					}
+					else if (value instanceof Map) {
+						@SuppressWarnings("unchecked")
+						Map<String, Object> sub = (Map<String, Object>) value;
+						addMetrics(sub, prefix);
+					}
+				}
+			}
+		}
+
+		@Override
+		public void stop() {
+			if (this.poller != null) {
+				this.poller.shutdown();
+			}
+		}
+
+		@Override
+		public boolean isRunning() {
+			return this.poller != null ? this.poller.isRunning() : false;
+		}
+
+		@Override
+		public int getPhase() {
+			return Ordered.LOWEST_PRECEDENCE;
+		}
+
+		@Override
+		public boolean isAutoStartup() {
+			return true;
+		}
+
+		@Override
+		public void stop(Runnable callback) {
+			if (this.poller != null) {
+				this.poller.shutdown();
+			}
+			callback.run();
+		}
+
+	}
+
+	/**
+	 * {@link DisposableBean} that makes sure that Hystrix internal state is cleared when
+	 * {@link ApplicationContext} shuts down.
+	 */
+	private class HystrixShutdownHook implements DisposableBean {
+
+		@Override
+		public void destroy() throws Exception {
+			// Just call Hystrix to reset thread pool etc.
+			Hystrix.reset();
+		}
+
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixConstants.java

@@ -0,0 +1,26 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.hystrix;
+
+/**
+ * @author Spencer Gibb
+ */
+public interface HystrixConstants {
+
+	String HYSTRIX_STREAM_NAME = "spring.cloud.hystrix.stream";
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixHealthIndicator.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.hystrix;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.boot.actuate.health.AbstractHealthIndicator;
+import org.springframework.boot.actuate.health.Health.Builder;
+import org.springframework.boot.actuate.health.HealthIndicator;
+import org.springframework.boot.actuate.health.Status;
+
+import com.netflix.hystrix.HystrixCircuitBreaker;
+import com.netflix.hystrix.HystrixCommandMetrics;
+
+/**
+ * A {@link HealthIndicator} implementation for Hystrix circuit breakers.
+ * <p>
+ * This default implementation will set the system to <code>OUT_OF_SERVICE</code> and
+ * include all open circuits by name.
+ *
+ * @author Christian Dupuis
+ */
+public class HystrixHealthIndicator extends AbstractHealthIndicator {
+
+	private static final Status CIRCUIT_OPEN = new Status("CIRCUIT_OPEN");
+
+	@Override
+	protected void doHealthCheck(Builder builder) throws Exception {
+		List<String> openCircuitBreakers = new ArrayList<String>();
+
+		// Collect all open circuit breakers from Hystrix
+		for (HystrixCommandMetrics metrics : HystrixCommandMetrics.getInstances()) {
+			HystrixCircuitBreaker circuitBreaker = HystrixCircuitBreaker.Factory
+					.getInstance(metrics.getCommandKey());
+			if (circuitBreaker.isOpen()) {
+				openCircuitBreakers.add(metrics.getCommandGroup().name() + "::"
+						+ metrics.getCommandKey().name());
+			}
+		}
+
+		// If there is at least one open circuit report OUT_OF_SERVICE adding the command
+		// group
+		// and key name
+		if (openCircuitBreakers.size() > 0) {
+			builder.status(CIRCUIT_OPEN).withDetail("openCircuitBreakers",
+					openCircuitBreakers);
+		}
+		else {
+			builder.up();
+		}
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/hystrix/HystrixStreamEndpoint.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.hystrix;
+
+import org.springframework.cloud.netflix.endpoint.ServletWrappingEndpoint;
+
+import com.netflix.hystrix.contrib.metrics.eventstream.HystrixMetricsStreamServlet;
+
+/**
+ * @author Spencer Gibb
+ */
+public class HystrixStreamEndpoint extends ServletWrappingEndpoint {
+
+	public HystrixStreamEndpoint() {
+		super(HystrixMetricsStreamServlet.class, "hystrixStream", "/hystrix.stream",
+				false, true);
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonAutoConfiguration.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.ribbon;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerAutoConfiguration;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
+import org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
+
+import com.netflix.client.IClient;
+
+/**
+ * Auto configuration for Ribbon (client side load balancing).
+ *
+ * @author Spencer Gibb
+ * @author Dave Syer
+ */
+@Configuration
+@ConditionalOnClass({ IClient.class, RestTemplate.class })
+@RibbonClients
+@AutoConfigureAfter(EurekaClientAutoConfiguration.class)
+@AutoConfigureBefore(LoadBalancerAutoConfiguration.class)
+public class RibbonAutoConfiguration {
+
+	@Autowired(required = false)
+	private List<RibbonClientSpecification> configurations = new ArrayList<>();
+
+	@Bean
+	public SpringClientFactory springClientFactory() {
+		SpringClientFactory factory = new SpringClientFactory();
+		factory.setConfigurations(this.configurations);
+		return factory;
+	}
+
+	@Bean
+	@ConditionalOnMissingBean(LoadBalancerClient.class)
+	public LoadBalancerClient loadBalancerClient() {
+		return new RibbonLoadBalancerClient(springClientFactory());
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClient.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.ribbon;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.IRule;
+import com.netflix.loadbalancer.ServerListFilter;
+
+/**
+ * Declarative configuration for a ribbon client. Add this annotation to any
+ * <code>@Configuration</code> and then inject a {@link SpringClientFactory} to access the
+ * client that is created.
+ *
+ * @author Dave Syer
+ */
+@Configuration
+@Import(RibbonClientConfigurationRegistrar.class)
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface RibbonClient {
+
+	/**
+	 * Synonym for name (the name of the client)
+	 *
+	 * @see #name()
+	 */
+	String value() default "";
+
+	/**
+	 * The name of the ribbon client, uniquely identifying a set of client resources,
+	 * including a load balancer.
+	 */
+	String name() default "";
+
+	/**
+	 * A custom <code>@Configuration</code> for the ribbon client. Can contain override
+	 * <code>@Bean</code> definition for the pieces that make up the client, for instance
+	 * {@link ILoadBalancer}, {@link ServerListFilter}, {@link IRule}.
+	 *
+	 * @see RibbonClientConfiguration for the defaults
+	 */
+	Class<?>[] configuration() default {};
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfiguration.java

@@ -0,0 +1,122 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.ribbon;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import com.netflix.client.config.DefaultClientConfigImpl;
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.ConfigurationBasedServerList;
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.IPing;
+import com.netflix.loadbalancer.IRule;
+import com.netflix.loadbalancer.LoadBalancerBuilder;
+import com.netflix.loadbalancer.NoOpPing;
+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerList;
+import com.netflix.loadbalancer.ServerListFilter;
+import com.netflix.loadbalancer.ZoneAvoidanceRule;
+import com.netflix.loadbalancer.ZoneAwareLoadBalancer;
+import com.netflix.niws.client.http.RestClient;
+import com.netflix.servo.monitor.Monitors;
+
+/**
+ * @author Dave Syer
+ */
+@SuppressWarnings("deprecation")
+@Configuration
+@EnableConfigurationProperties
+public class RibbonClientConfiguration {
+
+	@Value("${ribbon.client.name}")
+	private String name = "client";
+
+	// TODO: maybe re-instate autowired load balancers: identified by name they could be
+	// associated with ribbon clients
+
+	@Bean
+	@ConditionalOnMissingBean
+	public IClientConfig ribbonClientConfig() {
+		DefaultClientConfigImpl config = new DefaultClientConfigImpl();
+		config.loadProperties(this.name);
+		return config;
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public IRule ribbonRule(IClientConfig config) {
+		ZoneAvoidanceRule rule = new ZoneAvoidanceRule();
+		rule.initWithNiwsConfig(config);
+		return rule;
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public IPing ribbonPing(IClientConfig config) {
+		// TODO: use PingUrl
+		return new NoOpPing();
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public ServerList<Server> ribbonServerList(IClientConfig config) {
+		ConfigurationBasedServerList serverList = new ConfigurationBasedServerList();
+		serverList.initWithNiwsConfig(config);
+		return serverList;
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public RestClient ribbonRestClient(IClientConfig config, ILoadBalancer loadBalancer) {
+		RestClient client = new RestClient(config);
+		client.setLoadBalancer(loadBalancer);
+		Monitors.registerObject("Client_" + this.name, client);
+		return client;
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public ILoadBalancer ribbonLoadBalancer(IClientConfig config,
+			ServerList<Server> serverList, ServerListFilter<Server> serverListFilter,
+			IRule rule, IPing ping) {
+		ZoneAwareLoadBalancer<Server> balancer = LoadBalancerBuilder.newBuilder()
+				.withClientConfig(config).withRule(rule).withPing(ping)
+				.withServerListFilter(serverListFilter).withDynamicServerList(serverList)
+				.buildDynamicServerListLoadBalancer();
+		return balancer;
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public ServerListFilter<Server> ribbonServerListFilter(IClientConfig config) {
+		ZonePreferenceServerListFilter filter = new ZonePreferenceServerListFilter();
+		filter.initWithNiwsConfig(config);
+		return filter;
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	public RibbonLoadBalancerContext ribbonLoadBalancerContext(
+			ILoadBalancer loadBalancer, IClientConfig config) {
+		return new RibbonLoadBalancerContext(loadBalancer, config);
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClientConfigurationRegistrar.java

@@ -0,0 +1,84 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.ribbon;
+
+import java.util.Map;
+
+import org.springframework.beans.factory.support.BeanDefinitionBuilder;
+import org.springframework.beans.factory.support.BeanDefinitionRegistry;
+import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
+import org.springframework.core.annotation.AnnotationAttributes;
+import org.springframework.core.type.AnnotationMetadata;
+import org.springframework.util.StringUtils;
+
+/**
+ * @author Dave Syer
+ */
+public class RibbonClientConfigurationRegistrar implements ImportBeanDefinitionRegistrar {
+
+	@Override
+	public void registerBeanDefinitions(AnnotationMetadata metadata,
+			BeanDefinitionRegistry registry) {
+		Map<String, Object> attrs = metadata.getAnnotationAttributes(
+				RibbonClients.class.getName(), true);
+		if (attrs != null && attrs.containsKey("value")) {
+			AnnotationAttributes[] clients = (AnnotationAttributes[]) attrs.get("value");
+			for (AnnotationAttributes client : clients) {
+				registerClientConfiguration(registry, client.get("name"),
+						client.get("configuration"));
+			}
+		}
+		if (attrs != null && attrs.containsKey("defaultConfiguration")) {
+			registerClientConfiguration(registry,
+					"default." + metadata.getEnclosingClassName(),
+					attrs.get("defaultConfiguration"));
+		}
+		Map<String, Object> client = metadata.getAnnotationAttributes(
+				RibbonClient.class.getName(), true);
+		String name = getClientName(client);
+		if (name != null) {
+			registerClientConfiguration(registry, name, client.get("configuration"));
+		}
+	}
+
+	private String getClientName(Map<String, Object> client) {
+		if (client == null) {
+			return null;
+		}
+		String value = (String) client.get("value");
+		if (value != null && StringUtils.hasText(value)) {
+			return value;
+		}
+		value = (String) client.get("name");
+		if (value != null && StringUtils.hasText(value)) {
+			return value;
+		}
+		throw new IllegalStateException(
+				"Either 'name' or 'value' must be provided in @RibbonClient");
+	}
+
+	private void registerClientConfiguration(BeanDefinitionRegistry registry,
+			Object name, Object configuration) {
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder
+				.genericBeanDefinition(RibbonClientSpecification.class);
+		builder.addConstructorArgValue(name);
+		builder.addConstructorArgValue(configuration);
+		registry.registerBeanDefinition(name + ".RibbonClientSpecification",
+				builder.getBeanDefinition());
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClientSpecification.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2022 the original author or authors.
+ * Copyright 2013-2014 the original author or authors.
  *
  * 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
  *
- *      https://www.apache.org/licenses/LICENSE-2.0
+ *      http://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,
@@ -14,19 +14,20 @@
  * limitations under the License.
  */
 
-package org.springframework.cloud.netflix.eureka.config;
+package org.springframework.cloud.netflix.ribbon;
 
-import org.springframework.cloud.configuration.TlsProperties;
+import lombok.AllArgsConstructor;
+import lombok.Data;
 
 /**
- * Eureka client TLS properties.
+ * @author Dave Syer
  */
+@Data
+@AllArgsConstructor
+public class RibbonClientSpecification {
 
-public class EurekaTlsProperties extends TlsProperties {
+	private String name;
 
-	/**
-	 * Prefix for Eureka client TLS properties.
-	 */
-	public static final String PREFIX = "eureka.client.tls";
+	private Class<?>[] configuration;
 
 }

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonClients.java

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2013-2014 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.ribbon;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+
+/**
+ * Convenience annotation that allows user to combine multiple <code>@RibbonClient</code>
+ * annotations on a single class (including in Java 7).
+ *
+ * @author Dave Syer
+ */
+@Configuration
+@Retention(RetentionPolicy.RUNTIME)
+@Target({ ElementType.TYPE })
+@Documented
+@Import(RibbonClientConfigurationRegistrar.class)
+public @interface RibbonClients {
+
+	RibbonClient[] value() default {};
+
+	Class<?>[] defaultConfiguration() default {};
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonLoadBalancerClient.java

@@ -0,0 +1,148 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.ribbon;
+
+import java.net.URI;
+import java.util.concurrent.TimeUnit;
+
+import org.springframework.cloud.client.DefaultServiceInstance;
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerClient;
+import org.springframework.cloud.client.loadbalancer.LoadBalancerRequest;
+import org.springframework.util.ReflectionUtils;
+
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.Server;
+import com.netflix.loadbalancer.ServerStats;
+import com.netflix.servo.monitor.Stopwatch;
+
+/**
+ * @author Spencer Gibb
+ * @author Dave Syer
+ */
+public class RibbonLoadBalancerClient implements LoadBalancerClient {
+
+	private SpringClientFactory clientFactory;
+
+	public RibbonLoadBalancerClient(SpringClientFactory clientFactory) {
+		this.clientFactory = clientFactory;
+	}
+
+	@Override
+	public URI reconstructURI(ServiceInstance instance, URI original) {
+		String serviceId = instance.getServiceId();
+		RibbonLoadBalancerContext context = this.clientFactory
+				.getLoadBalancerContext(serviceId);
+		Server server = new Server(instance.getHost(), instance.getPort());
+		return context.reconstructURIWithServer(server, original);
+	}
+
+	@Override
+	public ServiceInstance choose(String serviceId) {
+		Server server = getServer(serviceId);
+		if (server == null) {
+			return null;
+		}
+		return new RibbonServer(serviceId, server);
+	}
+
+	@Override
+	public <T> T execute(String serviceId, LoadBalancerRequest<T> request) {
+		ILoadBalancer loadBalancer = getLoadBalancer(serviceId);
+		RibbonLoadBalancerContext context = this.clientFactory
+				.getLoadBalancerContext(serviceId);
+		Server server = getServer(loadBalancer);
+		RibbonServer ribbonServer = new RibbonServer(serviceId, server);
+
+		ServerStats serverStats = context.getServerStats(server);
+		context.noteOpenConnection(serverStats);
+		Stopwatch tracer = context.getExecuteTracer().start();
+
+		try {
+			T returnVal = request.apply(ribbonServer);
+			recordStats(context, tracer, serverStats, returnVal, null);
+			return returnVal;
+		}
+		catch (Exception ex) {
+			recordStats(context, tracer, serverStats, null, ex);
+			ReflectionUtils.rethrowRuntimeException(ex);
+		}
+		return null;
+	}
+
+	private void recordStats(RibbonLoadBalancerContext context, Stopwatch tracer,
+			ServerStats serverStats, Object entity, Throwable exception) {
+		tracer.stop();
+		long duration = tracer.getDuration(TimeUnit.MILLISECONDS);
+		context.noteRequestCompletion(serverStats, entity, exception, duration, null/* errorHandler */);
+	}
+
+	protected Server getServer(String serviceId) {
+		return getServer(getLoadBalancer(serviceId));
+	}
+
+	protected Server getServer(ILoadBalancer loadBalancer) {
+		if (loadBalancer == null) {
+			return null;
+		}
+		return loadBalancer.chooseServer("default"); //TODO: better handling of key
+	}
+
+	protected ILoadBalancer getLoadBalancer(String serviceId) {
+		return this.clientFactory.getLoadBalancer(serviceId);
+	}
+
+	protected static class RibbonServer implements ServiceInstance {
+		private String serviceId;
+		private Server server;
+
+		protected RibbonServer(String serviceId, Server server) {
+			this.serviceId = serviceId;
+			this.server = server;
+		}
+
+		@Override
+		public String getServiceId() {
+			return this.serviceId;
+		}
+
+		@Override
+		public String getHost() {
+			return this.server.getHost();
+		}
+
+		@Override
+		public int getPort() {
+			return this.server.getPort();
+		}
+
+		@Override
+		public boolean isSecure() {
+			return false; //TODO: howto determine https from ribbon Server
+		}
+
+		@Override
+		public URI getUri() {
+			return DefaultServiceInstance.getUri(this);
+		}
+
+		public Server getServer() {
+			return this.server;
+		}
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonLoadBalancerContext.java

@@ -0,0 +1,65 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.ribbon;
+
+import com.netflix.client.RetryHandler;
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.ILoadBalancer;
+import com.netflix.loadbalancer.LoadBalancerContext;
+import com.netflix.loadbalancer.ServerStats;
+import com.netflix.servo.monitor.Timer;
+
+/**
+ * @author Spencer Gibb
+ */
+public class RibbonLoadBalancerContext extends LoadBalancerContext {
+	public RibbonLoadBalancerContext(ILoadBalancer lb) {
+		super(lb);
+	}
+
+	public RibbonLoadBalancerContext(ILoadBalancer lb, IClientConfig clientConfig) {
+		super(lb, clientConfig);
+	}
+
+	public RibbonLoadBalancerContext(ILoadBalancer lb, IClientConfig clientConfig,
+			RetryHandler handler) {
+		super(lb, clientConfig, handler);
+	}
+
+	@Override
+	public void noteOpenConnection(ServerStats serverStats) {
+		super.noteOpenConnection(serverStats);
+	}
+
+	@Override
+	public Timer getExecuteTracer() {
+		return super.getExecuteTracer();
+	}
+
+	@Override
+	public void noteRequestCompletion(ServerStats stats, Object response, Throwable e,
+			long responseTime) {
+		super.noteRequestCompletion(stats, response, e, responseTime);
+	}
+
+	@Override
+	public void noteRequestCompletion(ServerStats stats, Object response, Throwable e,
+			long responseTime, RetryHandler errorHandler) {
+		super.noteRequestCompletion(stats, response, e, responseTime, errorHandler);
+	}
+
+}

spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/SpringClientFactory.java

@@ -0,0 +1,189 @@
+/*
+ * Copyright 2013-2015 the original author or authors.
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.cloud.netflix.ribbon;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.BeanFactoryUtils;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.context.annotation.AnnotationConfigApplicationContext;
+import org.springframework.core.env.MapPropertySource;
+
+import com.netflix.client.IClient;
+import com.netflix.client.IClientConfigAware;
+import com.netflix.client.config.IClientConfig;
+import com.netflix.loadbalancer.ILoadBalancer;
+
+/**
+ * A factory that creates client, load balancer and client configuration instances. It
+ * creates a Spring ApplicationContext per client name, and extracts the beans that it
+ * needs from there.
+ *
+ * @author Spencer Gibb
+ * @author Dave Syer
+ */
+public class SpringClientFactory implements DisposableBean, ApplicationContextAware {
+
+	private Map<String, AnnotationConfigApplicationContext> contexts = new ConcurrentHashMap<>();
+
+	private Map<String, RibbonClientSpecification> configurations = new ConcurrentHashMap<>();
+
+	private ApplicationContext parent;
+
+	@Override
+	public void setApplicationContext(ApplicationContext parent) throws BeansException {
+		this.parent = parent;
+	}
+
+	public void setConfigurations(List<RibbonClientSpecification> configurations) {
+		for (RibbonClientSpecification client : configurations) {
+			this.configurations.put(client.getName(), client);
+		}
+	}
+
+	@Override
+	public void destroy() {
+		Collection<AnnotationConfigApplicationContext> values = this.contexts.values();
+		this.contexts.clear();
+		for (AnnotationConfigApplicationContext context : values) {
+			context.close();
+		}
+	}
+
+	/**
+	 * Get the rest client associated with the name.
+	 * @throws RuntimeException if any error occurs
+	 */
+	public <C extends IClient<?, ?>> C getClient(String name, Class<C> clientClass) {
+		return getInstance(name, clientClass);
+	}
+
+	/**
+	 * Get the load balancer associated with the name.
+	 * @throws RuntimeException if any error occurs
+	 */
+	public ILoadBalancer getLoadBalancer(String name) {
+		return getInstance(name, ILoadBalancer.class);
+	}
+
+	/**
+	 * Get the client config associated with the name.
+	 * @throws RuntimeException if any error occurs
+	 */
+	public IClientConfig getClientConfig(String name) {
+		return getInstance(name, IClientConfig.class);
+	}
+
+	/**
+	 * Get the load balancer context associated with the name.
+	 * @throws RuntimeException if any error occurs
+	 */
+	public RibbonLoadBalancerContext getLoadBalancerContext(String serviceId) {
+		return getInstance(serviceId, RibbonLoadBalancerContext.class);
+	}
+
+	private AnnotationConfigApplicationContext getContext(String name) {
+		if (!this.contexts.containsKey(name)) {
+			synchronized (this.contexts) {
+				if (!this.contexts.containsKey(name)) {
+					this.contexts.put(name, createContext(name));
+				}
+			}
+		}
+		return this.contexts.get(name);
+	}
+
+	private AnnotationConfigApplicationContext createContext(String name) {
+		AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
+		if (this.configurations.containsKey(name)) {
+			for (Class<?> configuration : this.configurations.get(name)
+					.getConfiguration()) {
+				context.register(configuration);
+			}
+		}
+		for (Entry<String, RibbonClientSpecification> entry : this.configurations
+				.entrySet()) {
+			if (entry.getKey().startsWith("default.")) {
+				for (Class<?> configuration : entry.getValue().getConfiguration()) {
+					context.register(configuration);
+				}
+			}
+		}
+		context.register(PropertyPlaceholderAutoConfiguration.class,
+				RibbonClientConfiguration.class);
+		context.getEnvironment()
+				.getPropertySources()
+				.addFirst(
+						new MapPropertySource("ribbon",
+								Collections.<String, Object> singletonMap(
+										"ribbon.client.name", name)));
+		if (this.parent != null) {
+			// Uses Environment from parent as well as beans
+			context.setParent(this.parent);
+		}
+		context.refresh();
+		return context;
+	}
+
+	private <C> C instantiateWithConfig(AnnotationConfigApplicationContext context,
+			Class<C> clazz, IClientConfig config) {
+		C result = null;
+		if (IClientConfigAware.class.isAssignableFrom(clazz)) {
+			IClientConfigAware obj = (IClientConfigAware) BeanUtils.instantiate(clazz);
+			obj.initWithNiwsConfig(config);
+			@SuppressWarnings("unchecked")
+			C value = (C) obj;
+			result = value;
+		}
+		else {
+			try {
+				if (clazz.getConstructor(IClientConfig.class) != null) {
+					result = clazz.getConstructor(IClientConfig.class)
+							.newInstance(config);
+				}
+				else {
+					result = BeanUtils.instantiate(clazz);
+				}
+			}
+			catch (Throwable ex) {
+				// NOPMD
+			}
+		}
+		context.getAutowireCapableBeanFactory().autowireBean(result);
+		return result;
+	}
+
+	private <C> C getInstance(String name, Class<C> type) {
+		AnnotationConfigApplicationContext context = getContext(name);
+		if (BeanFactoryUtils.beanNamesForTypeIncludingAncestors(context, type).length > 0) {
+			return context.getBean(type);
+		}
+		IClientConfig config = getInstance(name, IClientConfig.class);
+		return instantiateWithConfig(context, type, config);
+	}
+
+}