Update SNAPSHOT to 3.0.0-M2

Bumping versions
2026-09-20 00:59:01 +00:00 · 2020-05-29 18:31:14 +00:00 · 2020-05-28 17:41:51 +00:00 · 2020-05-26 17:43:29 +00:00 · 2020-05-25 14:39:30 +02:00 · 2020-05-25 13:42:13 +02:00
563 changed files with 3444 additions and 49102 deletions
@@ -10,7 +10,6 @@ jobs:
    branches:
      ignore:
        - gh-pages # list of branches to ignore
-    resource_class: large
    steps:
      - checkout
      - restore_cache:
@@ -28,7 +28,7 @@ added after the original pull request but before a merge.
  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/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml) project. If using IntelliJ, you can use the
-  [Eclipse Code Formatter Plugin](http://plugins.jetbrains.com/plugin/6546) to import the same file.
+  [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.
@@ -40,6 +40,6 @@ added after the original pull request but before a merge.
 * A few unit tests would help a lot as well -- someone has to do it.
 * If no-one else is using your branch, please rebase it against the current master (or
  other target branch in the main project).
-* When writing a commit message please follow [these conventions](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html),
+* 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).
@@ -0,0 +1,17 @@
+---
+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.
@@ -0,0 +1,20 @@
+---
+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.
@@ -18,3 +18,6 @@ _site/
 .shelf
 *.swp
 *.swo
+.vscode/
+.flattened-pom.xml
+.sdkmanrc
@@ -7,7 +7,7 @@ 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
+  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
@@ -21,7 +21,7 @@
 		<repository>
 			<id>spring-snapshots</id>
 			<name>Spring Snapshots</name>
-			<url>http://repo.spring.io/libs-snapshot-local</url>
+			<url>https://repo.spring.io/libs-snapshot-local</url>
 			<snapshots>
 				<enabled>true</enabled>
 			</snapshots>
@@ -29,7 +29,7 @@
 		<repository>
 			<id>spring-milestones</id>
 			<name>Spring Milestones</name>
-			<url>http://repo.spring.io/libs-milestone-local</url>
+			<url>https://repo.spring.io/libs-milestone-local</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
@@ -37,7 +37,7 @@
 		<repository>
 			<id>spring-releases</id>
 			<name>Spring Releases</name>
-			<url>http://repo.spring.io/release</url>
+			<url>https://repo.spring.io/release</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
@@ -47,7 +47,7 @@
 		<pluginRepository>
 			<id>spring-snapshots</id>
 			<name>Spring Snapshots</name>
-			<url>http://repo.spring.io/libs-snapshot-local</url>
+			<url>https://repo.spring.io/libs-snapshot-local</url>
 			<snapshots>
 				<enabled>true</enabled>
 			</snapshots>
@@ -55,7 +55,7 @@
 		<pluginRepository>
 			<id>spring-milestones</id>
 			<name>Spring Milestones</name>
-			<url>http://repo.spring.io/libs-milestone-local</url>
+			<url>https://repo.spring.io/libs-milestone-local</url>
 			<snapshots>
 				<enabled>false</enabled>
 			</snapshots>
@@ -1,7 +1,7 @@

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

   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

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

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

   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,10 +1,46 @@
-// Do not edit this file (e.g. go instead to src/main/asciidoc)
+////
+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.
+////
+
+:doctype: book
+:idprefix:
+:idseparator: -
+:toc: left
+:toclevels: 4
+:tabsize: 4
+:numbered:
+:sectanchors:
+:sectnums:
+:icons: font
+:hide-uri-scheme:
+:docinfo: shared,private
+
+:sc-ext: java
+:project-full-name: Spring Cloud Netflix

 image::https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/master.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/master"]
 image::https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/master/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/master"]
 image::https://api.codacy.com/project/badge/Grade/a6885a06921e4f72a0df0b7aabd6d118["Codacy code quality", link="https://www.codacy.com/app/Spring-Cloud/spring-cloud-netflix?utm_source=github.com&utm_medium=referral&utm_content=spring-cloud/spring-cloud-netflix&utm_campaign=Badge_Grade"]


+:doctype: book
+:idprefix:
+:idseparator: -
+:toc: left
+:toclevels: 4
+:tabsize: 4
+:numbered:
+:sectanchors:
+:sectnums:
+:icons: font
+:hide-uri-scheme:
+:docinfo: shared,private
+
+:sc-ext: java
+:project-full-name: 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
@@ -23,6 +59,21 @@ Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon).
 * External Configuration: a bridge from the Spring Environment to Archaius (enables native configuration of Netflix components using Spring Boot conventions)
 * Router and Filter: automatic registration of Zuul filters, and a simple convention over configuration approach to reverse proxy creation

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

 == Modules In Maintenance Mode

@@ -35,6 +86,7 @@ of the Greenwich release train.
 The following Spring Cloud Netflix modules and corresponding starters will be placed into maintenance mode:

 * spring-cloud-netflix-archaius
+* spring-cloud-netflix-concurrency-limits
 * spring-cloud-netflix-hystrix-contract
 * spring-cloud-netflix-hystrix-dashboard
 * spring-cloud-netflix-hystrix-stream
@@ -44,7 +96,7 @@ The following Spring Cloud Netflix modules and corresponding starters will be pl
 * spring-cloud-netflix-turbine
 * spring-cloud-netflix-zuul

-NOTE: This does not include the Eureka or concurrency-limits modules.
+NOTE: This does not include the Eureka modules.


 == Building
@@ -84,7 +136,7 @@ credentials and you already have those.

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

 === Working with the code
 If you don't have an IDE preference we would recommend that you use
-http://www.springsource.com/developer/sts[Spring Tools Suite] or
-http://eclipse.org[Eclipse] when working with the code. We use the
-http://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
+https://www.springsource.com/developer/sts[Spring Tools Suite] or
+https://eclipse.org[Eclipse] when working with the code. We use the
+https://eclipse.org/m2e/[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.

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

@@ -139,8 +191,13 @@ from the `file` menu.



+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

+:spring-cloud-build-branch: master
+
 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
@@ -169,7 +226,7 @@ added after the original pull request but before a merge.
  `eclipse-code-formatter.xml` file from the
  https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring
  Cloud Build] project. If using IntelliJ, you can use the
-  http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
+  https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
  Plugin] to import the same file.
 * Make sure all new `.java` files to have a simple Javadoc class comment with at least an
  `@author` tag identifying you, and preferably at least a paragraph on what the class is
@@ -182,6 +239,139 @@ added after the original pull request but before a merge.
 * A few unit tests would help a lot as well -- someone has to do it.
 * If no-one else is using your branch, please rebase it against the current master (or
  other target branch in the main project).
-* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
+* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
  if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
-  message (where XXXX is the issue number).
+  message (where XXXX is the issue number).
+
+=== Checkstyle
+
+Spring Cloud Build comes with a set of checkstyle rules. You can find them in the `spring-cloud-build-tools` module. The most notable files under the module are:
+
+.spring-cloud-build-tools/
+----
+└── src
+    ├── checkstyle
+    │   └── checkstyle-suppressions.xml <3>
+    └── main
+        └── resources
+            ├── checkstyle-header.txt <2>
+            └── checkstyle.xml <1>
+----
+<1> Default Checkstyle rules
+<2> File header setup
+<3> Default suppression rules
+
+==== Checkstyle configuration
+
+Checkstyle rules are *disabled by default*. To add checkstyle to your project just define the following properties and plugins.
+
+.pom.xml
+----
+<properties>
+<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError> <1>
+        <maven-checkstyle-plugin.failsOnViolation>true
+        </maven-checkstyle-plugin.failsOnViolation> <2>
+        <maven-checkstyle-plugin.includeTestSourceDirectory>true
+        </maven-checkstyle-plugin.includeTestSourceDirectory> <3>
+</properties>
+
+<build>
+        <plugins>
+            <plugin> <4>
+                <groupId>io.spring.javaformat</groupId>
+                <artifactId>spring-javaformat-maven-plugin</artifactId>
+            </plugin>
+            <plugin> <5>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+
+    <reporting>
+        <plugins>
+            <plugin> <5>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-checkstyle-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </reporting>
+</build>
+----
+<1> Fails the build upon Checkstyle errors
+<2> Fails the build upon Checkstyle violations
+<3> Checkstyle analyzes also the test sources
+<4> Add the Spring Java Format plugin that will reformat your code to pass most of the Checkstyle formatting rules
+<5> Add checkstyle plugin to your build and reporting phases
+
+If you need to suppress some rules (e.g. line length needs to be longer), then it's enough for you to define a file under `${project.root}/src/checkstyle/checkstyle-suppressions.xml` with your suppressions. Example:
+
+.projectRoot/src/checkstyle/checkstyle-suppresions.xml
+----
+<?xml version="1.0"?>
+<!DOCTYPE suppressions PUBLIC
+		"-//Puppy Crawl//DTD Suppressions 1.1//EN"
+		"https://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+<suppressions>
+	<suppress files=".*ConfigServerApplication\.java" checks="HideUtilityClassConstructor"/>
+	<suppress files=".*ConfigClientWatch\.java" checks="LineLengthCheck"/>
+</suppressions>
+----
+
+It's advisable to copy the `${spring-cloud-build.rootFolder}/.editorconfig` and `${spring-cloud-build.rootFolder}/.springformat` to your project. That way, some default formatting rules will be applied. You can do so by running this script:
+
+```bash
+$ curl https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/.editorconfig -o .editorconfig
+$ touch .springformat
+```
+
+=== IDE setup
+
+==== Intellij IDEA
+
+In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin.
+The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project.
+
+.spring-cloud-build-tools/
+----
+└── src
+    ├── checkstyle
+    │   └── checkstyle-suppressions.xml <3>
+    └── main
+        └── resources
+            ├── checkstyle-header.txt <2>
+            ├── checkstyle.xml <1>
+            └── intellij
+                ├── Intellij_Project_Defaults.xml <4>
+                └── Intellij_Spring_Boot_Java_Conventions.xml <5>
+----
+<1> Default Checkstyle rules
+<2> File header setup
+<3> Default suppression rules
+<4> Project defaults for Intellij that apply most of Checkstyle rules
+<5> Project style conventions for Intellij that apply most of Checkstyle rules
+
+.Code style
+
+image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-code-style.png[Code style]
+
+Go to `File` -> `Settings` -> `Editor` -> `Code style`. There click on the icon next to the `Scheme` section. There, click on the `Import Scheme` value and pick the `Intellij IDEA code style XML` option. Import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Spring_Boot_Java_Conventions.xml` file.
+
+.Inspection profiles
+
+image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-inspections.png[Code style]
+
+Go to `File` -> `Settings` -> `Editor` -> `Inspections`. There click on the icon next to the `Profile` section. There, click on the `Import Profile` and import the `spring-cloud-build-tools/src/main/resources/intellij/Intellij_Project_Defaults.xml` file.
+
+.Checkstyle
+
+To have Intellij work with Checkstyle, you have to install the `Checkstyle` plugin. It's advisable to also install the `Assertions2Assertj` to automatically convert the JUnit assertions
+
+image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring-cloud-build-branch}/docs/src/main/asciidoc/images/intellij-checkstyle.png[Checkstyle]
+
+Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:
+
+- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
+- `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
+- `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.
+
+IMPORTANT: Remember to set the `Scan Scope` to `All sources` since we apply checkstyle rules for production and test sources.
@@ -0,0 +1,5 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+To report security vulnerabilities, please go to https://pivotal.io/security.
@@ -1,4 +1,4 @@
-/* Asciidoctor default stylesheet | MIT License | http://asciidoctor.org */
+/* Asciidoctor default stylesheet | MIT License | https://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}
@@ -4,11 +4,43 @@ Manual changes to this file will be lost when it is generated again.
 Edit the files in the src/main/asciidoc/ directory instead.
 ////

+:doctype: book
+:idprefix:
+:idseparator: -
+:toc: left
+:toclevels: 4
+:tabsize: 4
+:numbered:
+:sectanchors:
+:sectnums:
+:icons: font
+:hide-uri-scheme:
+:docinfo: shared,private
+
+:sc-ext: java
+:project-full-name: Spring Cloud Netflix
+
 image::https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/master.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/master"]
 image::https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/master/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/master"]
 image::https://api.codacy.com/project/badge/Grade/a6885a06921e4f72a0df0b7aabd6d118["Codacy code quality", link="https://www.codacy.com/app/Spring-Cloud/spring-cloud-netflix?utm_source=github.com&utm_medium=referral&utm_content=spring-cloud/spring-cloud-netflix&utm_campaign=Badge_Grade"]


+:doctype: book
+:idprefix:
+:idseparator: -
+:toc: left
+:toclevels: 4
+:tabsize: 4
+:numbered:
+:sectanchors:
+:sectnums:
+:icons: font
+:hide-uri-scheme:
+:docinfo: shared,private
+
+:sc-ext: java
+:project-full-name: 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
@@ -27,6 +59,21 @@ Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon).
 * External Configuration: a bridge from the Spring Environment to Archaius (enables native configuration of Netflix components using Spring Boot conventions)
 * Router and Filter: automatic registration of Zuul filters, and a simple convention over configuration approach to reverse proxy creation

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

 == Modules In Maintenance Mode

@@ -39,6 +86,7 @@ of the Greenwich release train.
 The following Spring Cloud Netflix modules and corresponding starters will be placed into maintenance mode:

 * spring-cloud-netflix-archaius
+* spring-cloud-netflix-concurrency-limits
 * spring-cloud-netflix-hystrix-contract
 * spring-cloud-netflix-hystrix-dashboard
 * spring-cloud-netflix-hystrix-stream
@@ -48,7 +96,7 @@ The following Spring Cloud Netflix modules and corresponding starters will be pl
 * spring-cloud-netflix-turbine
 * spring-cloud-netflix-zuul

-NOTE: This does not include the Eureka or concurrency-limits modules.
+NOTE: This does not include the Eureka modules.


 == Building
@@ -88,7 +136,7 @@ credentials and you already have those.

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

 === Working with the code
 If you don't have an IDE preference we would recommend that you use
-http://www.springsource.com/developer/sts[Spring Tools Suite] or
-http://eclipse.org[Eclipse] when working with the code. We use the
-http://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
+https://www.springsource.com/developer/sts[Spring Tools Suite] or
+https://eclipse.org[Eclipse] when working with the code. We use the
+https://eclipse.org/m2e/[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.

+==== 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
-We recommend the http://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with
+We recommend the https://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with
 eclipse. If you don't already have m2eclipse installed it is available from the "eclipse
 marketplace".

@@ -143,6 +196,9 @@ from the `file` menu.



+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

 :spring-cloud-build-branch: master
@@ -175,7 +231,7 @@ added after the original pull request but before a merge.
  `eclipse-code-formatter.xml` file from the
  https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml[Spring
  Cloud Build] project. If using IntelliJ, you can use the
-  http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
+  https://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter
  Plugin] to import the same file.
 * Make sure all new `.java` files to have a simple Javadoc class comment with at least an
  `@author` tag identifying you, and preferably at least a paragraph on what the class is
@@ -188,7 +244,7 @@ added after the original pull request but before a merge.
 * A few unit tests would help a lot as well -- someone has to do it.
 * If no-one else is using your branch, please rebase it against the current master (or
  other target branch in the main project).
-* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
+* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
  if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
  message (where XXXX is the issue number).

@@ -259,7 +315,7 @@ If you need to suppress some rules (e.g. line length needs to be longer), then i
 <?xml version="1.0"?>
 <!DOCTYPE suppressions PUBLIC
 		"-//Puppy Crawl//DTD Suppressions 1.1//EN"
-		"http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+		"https://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
 <suppressions>
 	<suppress files=".*ConfigServerApplication\.java" checks="HideUtilityClassConstructor"/>
 	<suppress files=".*ConfigClientWatch\.java" checks="LineLengthCheck"/>
@@ -278,6 +334,7 @@ $ touch .springformat
 ==== Intellij IDEA

 In order to setup Intellij you should import our coding conventions, inspection profiles and set up the checkstyle plugin.
+The following files can be found in the https://github.com/spring-cloud/spring-cloud-build/tree/master/spring-cloud-build-tools[Spring Cloud Build] project.

 .spring-cloud-build-tools/
 ----
@@ -318,7 +375,7 @@ image::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/{spring

 Go to `File` -> `Settings` -> `Other settings` -> `Checkstyle`. There click on the `+` icon in the `Configuration file` section. There, you'll have to define where the checkstyle rules should be picked from. In the image above, we've picked the rules from the cloned Spring Cloud Build repository. However, you can point to the Spring Cloud Build's GitHub repository (e.g. for the `checkstyle.xml` : `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle.xml`). We need to provide the following variables:

- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
+- `checkstyle.header.file` - please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/main/resources/checkstyle-header.txt` URL.
 - `checkstyle.suppressions.file` - default suppressions. Please point it to the Spring Cloud Build's, `spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` file either in your cloned repo or via the `https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-build-tools/src/checkstyle/checkstyle-suppressions.xml` URL.
 - `checkstyle.additional.suppressions.file` - this variable corresponds to suppressions in your local project. E.g. you're working on `spring-cloud-contract`. Then point to the `project-root/src/checkstyle/checkstyle-suppressions.xml` folder. Example for `spring-cloud-contract` would be: `/home/username/spring-cloud-contract/src/checkstyle/checkstyle-suppressions.xml`.

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>2.1.1.RELEASE</version>
+		<version>3.0.0-M2</version>
 	</parent>
 	<artifactId>spring-cloud-netflix-docs</artifactId>
 	<packaging>pom</packaging>
@@ -13,8 +13,22 @@
 	<description>Spring Cloud Docs</description>
 	<properties>
 		<docs.main>spring-cloud-netflix</docs.main>
-		<docs.whitelisted.branches>1.2.x,1.3.x,1.4.x</docs.whitelisted.branches>
+		<docs.whitelisted.branches>2.1.x,2.2.x</docs.whitelisted.branches>
+		<configprops.inclusionPattern>
+			.*.eureka.*
+		</configprops.inclusionPattern>
+		<upload-docs-zip.phase>deploy</upload-docs-zip.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>
 		<plugins>
 			<plugin>
@@ -30,28 +44,32 @@
 			<id>docs</id>
 			<build>
 				<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.asciidoctor</groupId>
-						<artifactId>asciidoctor-maven-plugin</artifactId>
-						<inherited>false</inherited>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-resources-plugin</artifactId>
 					</plugin>
 					<plugin>
-						<groupId>com.agilejava.docbkx</groupId>
-						<artifactId>docbkx-maven-plugin</artifactId>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>exec-maven-plugin</artifactId>
+					</plugin>
+					<plugin>
+						<groupId>org.asciidoctor</groupId>
+						<artifactId>asciidoctor-maven-plugin</artifactId>
 					</plugin>
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-antrun-plugin</artifactId>
-						<inherited>false</inherited>
 					</plugin>
 					<plugin>
-						<groupId>org.codehaus.mojo</groupId>
-						<artifactId>build-helper-maven-plugin</artifactId>
-						<inherited>false</inherited>
+						<artifactId>maven-deploy-plugin</artifactId>
 					</plugin>
 				</plugins>
 			</build>
@@ -1,3 +1,5 @@
+include::_attributes.adoc[]
+
 image::https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/master.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/master"]
 image::https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/master/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/master"]
 image::https://api.codacy.com/project/badge/Grade/a6885a06921e4f72a0df0b7aabd6d118["Codacy code quality", link="https://www.codacy.com/app/Spring-Cloud/spring-cloud-netflix?utm_source=github.com&utm_medium=referral&utm_content=spring-cloud/spring-cloud-netflix&utm_campaign=Badge_Grade"]
@@ -21,6 +23,9 @@ include::maintenance-mode.adoc[]

 include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building-jdk8.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

 include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/contributing.adoc[]
@@ -0,0 +1,15 @@
+:doctype: book
+:idprefix:
+:idseparator: -
+:toc: left
+:toclevels: 4
+:tabsize: 4
+:numbered:
+:sectanchors:
+:sectnums:
+:icons: font
+:hide-uri-scheme:
+:docinfo: shared,private
+
+:sc-ext: java
+:project-full-name: Spring Cloud Netflix
@@ -0,0 +1,20 @@
+|===
+|Name | Default | Description
+
+|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 org.apache.http.client.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.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.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.server.peer-eureka-nodes-update-interval-ms | 0 | null
+|eureka.server.peer-eureka-status-refresh-time-interval-ms | 0 | null
+|ribbon.eureka.enabled | true | Enables the use of Eureka with Ribbon.
+|spring.cloud.loadbalancer.eureka.approximate-zone-from-hostname | false | Used to determine whether we should try to get the `zone` value from host name.
+
+|===
@@ -0,0 +1,14 @@
+:numbered!:
+[appendix]
+[[common-application-properties]]
+== Common application properties
+
+include::_attributes.adoc[]
+
+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 {project-full-name} 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.
+
+include::_configprops.adoc[]
@@ -40,7 +40,7 @@ function check_if_anything_to_sync() {

 function retrieve_current_branch() {
    # Code getting the name of the current branch. For master we want to publish as we did until now
-    # http://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch
+    # 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
@@ -147,7 +147,7 @@ function copy_docs_for_current_version() {
        COMMIT_CHANGES="yes"
    else
        echo -e "Current branch is [${CURRENT_BRANCH}]"
-        # http://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
+        # https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
        if [[ ",${WHITELISTED_BRANCHES_VALUE}," = *",${CURRENT_BRANCH},"* ]] ; then
            mkdir -p ${ROOT_FOLDER}/${CURRENT_BRANCH}
            echo -e "Branch [${CURRENT_BRANCH}] is whitelisted! Will copy the current docs to the [${CURRENT_BRANCH}] folder"
@@ -0,0 +1 @@
+spring-cloud-netflix.adoc
@@ -1,3 +1,5 @@
+include::_attributes.adoc[]
+
 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
@@ -1,3 +1,4 @@
+include::_attributes.adoc[]

 == Modules In Maintenance Mode

@@ -10,6 +11,7 @@ of the Greenwich release train.
 The following Spring Cloud Netflix modules and corresponding starters will be placed into maintenance mode:

 * spring-cloud-netflix-archaius
+* spring-cloud-netflix-concurrency-limits
 * spring-cloud-netflix-hystrix-contract
 * spring-cloud-netflix-hystrix-dashboard
 * spring-cloud-netflix-hystrix-stream
@@ -19,5 +21,5 @@ The following Spring Cloud Netflix modules and corresponding starters will be pl
 * spring-cloud-netflix-turbine
 * spring-cloud-netflix-zuul

-NOTE: This does not include the Eureka or concurrency-limits modules.
+NOTE: This does not include the Eureka modules.

@@ -0,0 +1 @@
+include::_attributes.adoc[]
@@ -0,0 +1,41 @@
+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), Circuit Breaker (Hystrix), Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon)..
+
+## 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
+* 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 Spring Environment to Archaius (enables native configuration of Netflix components using Spring Boot conventions)
+* Router and Filter: automatic registration of Zuul filters, and a simple convention over configuration approach to reverse proxy creation
+
+## Getting Started
+
+As long as Spring Cloud Netflix and Eureka Core are on the
+classpath any Spring Boot application with `@EnableEurekaClient` will try to contact a Eureka
+server on `http://localhost:8761` (the default value of
+`eureka.client.serviceUrl.defaultZone`):
+
+```java
+@SpringBootApplication
+@EnableEurekaClient
+@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`.
@@ -8,7 +8,7 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#    https://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
@@ -7,7 +7,7 @@
@REM "License"); you may not use this file except in compliance
@REM with the License.  You may obtain a copy of the License at
@REM
-@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM    https://www.apache.org/licenses/LICENSE-2.0
@REM
@REM Unless required by applicable law or agreed to in writing,
@REM software distributed under the License is distributed on an
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>spring-cloud-netflix</artifactId>
-	<version>2.1.1.RELEASE</version>
+	<version>3.0.0-M2</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>2.1.3.RELEASE</version>
+		<version>3.0.0-M2</version>
 		<relativePath />
 	</parent>
 	<scm>
@@ -21,25 +21,23 @@
 	</scm>
 	<properties>
 		<bintray.package>netflix</bintray.package>
-		<spring-cloud-commons.version>2.1.1.RELEASE</spring-cloud-commons.version>
-		<spring-cloud-config.version>2.1.1.RELEASE</spring-cloud-config.version>
-		<spring-cloud-stream.version>Fishtown.SR2</spring-cloud-stream.version>
-		<!-- Has to be a stable version (not one that depends on this version of netflix): -->
-		<donotreplacespring-cloud-contract.version>2.0.2.RELEASE</donotreplacespring-cloud-contract.version>
+		<spring-cloud-commons.version>3.0.0-M2</spring-cloud-commons.version>
+		<spring-cloud-config.version>3.0.0-M2</spring-cloud-config.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-checkstyle-plugin.includeTestSourceDirectory>true
-		</maven-checkstyle-plugin.includeTestSourceDirectory>
-		<maven-checkstyle-plugin.failsOnError>true</maven-checkstyle-plugin.failsOnError>
-		<maven-checkstyle-plugin.failOnViolation>true
-		</maven-checkstyle-plugin.failOnViolation>
+		<eureka-jersey.version>1.19.1</eureka-jersey.version>
+		<xstream.version>1.4.11.1</xstream.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>
@@ -78,12 +76,6 @@
 	</build>
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-hystrix-contract</artifactId>
-				<version>${project.version}</version>
-				<scope>test</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-netflix-dependencies</artifactId>
@@ -111,38 +103,43 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-stream-dependencies</artifactId>
-				<version>${spring-cloud-stream.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-contract-dependencies</artifactId>
-				<version>${donotreplacespring-cloud-contract.version}</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 			<dependency>
 				<groupId>javax.inject</groupId>
 				<artifactId>javax.inject</artifactId>
 				<version>1</version>
 			</dependency>
-			<!-- archaius dependencies that are now runtime -->
+			<!-- Eureka core dep that is now optional -->
 			<dependency>
-				<groupId>commons-configuration</groupId>
-				<artifactId>commons-configuration</artifactId>
-				<version>1.8</version>
-				<exclusions>
-					<exclusion>
-						<groupId>commons-logging</groupId>
-						<artifactId>commons-logging</artifactId>
-					</exclusion>
-				</exclusions>
+				<groupId>com.sun.jersey</groupId>
+				<artifactId>jersey-servlet</artifactId>
+				<version>${eureka-jersey.version}</version>
 			</dependency>
-			<!-- end archaius deps -->
+			<dependency>
+				<groupId>com.sun.jersey</groupId>
+				<artifactId>jersey-core</artifactId>
+				<version>${eureka-jersey.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.sun.jersey</groupId>
+				<artifactId>jersey-client</artifactId>
+				<version>${eureka-jersey.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.sun.jersey</groupId>
+				<artifactId>jersey-server</artifactId>
+				<version>${eureka-jersey.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.sun.jersey.contribs</groupId>
+				<artifactId>jersey-apache-client4</artifactId>
+				<version>${eureka-jersey.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>com.thoughtworks.xstream</groupId>
+				<artifactId>xstream</artifactId>
+				<version>${xstream.version}</version>
+			</dependency>
+			<!-- end eureka deps -->
 		</dependencies>
 	</dependencyManagement>
 	<reporting>
@@ -155,22 +152,10 @@
 	</reporting>
 	<modules>
 		<module>spring-cloud-netflix-dependencies</module>
-		<module>spring-cloud-netflix-archaius</module>
-		<!-- Not part of the reactor build: build and deploy separately -->
-		<!--module>spring-cloud-netflix-hystrix-contract</module-->
-		<module>spring-cloud-netflix-core</module>
-		<module>spring-cloud-netflix-concurrency-limits</module>
-		<module>spring-cloud-netflix-hystrix-dashboard</module>
-		<module>spring-cloud-netflix-hystrix-stream</module>
 		<module>spring-cloud-netflix-eureka-client</module>
 		<module>spring-cloud-netflix-eureka-server</module>
-		<module>spring-cloud-netflix-turbine</module>
-		<module>spring-cloud-netflix-turbine-stream</module>
-		<module>spring-cloud-netflix-sidecar</module>
-		<module>spring-cloud-netflix-zuul</module>
-		<module>spring-cloud-netflix-ribbon</module>
-		<module>spring-cloud-starter-netflix</module>
-		<module>spring-cloud-netflix-hystrix</module>
+		<module>spring-cloud-starter-netflix-eureka-client</module>
+		<module>spring-cloud-starter-netflix-eureka-server</module>
 		<module>docs</module>
    </modules>
 	<profiles>
@@ -1,48 +0,0 @@
-<?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>
-        <artifactId>spring-cloud-netflix</artifactId>
-        <groupId>org.springframework.cloud</groupId>
-        <version>2.1.1.RELEASE</version>
-        <relativePath>..</relativePath> <!-- lookup parent from repository -->
-    </parent>
-
-
-    <artifactId>spring-cloud-netflix-archaius</artifactId>
-    <packaging>jar</packaging>
-    <name>Spring Cloud Netflix Archaius</name>
-    <description>Spring Cloud Netflix Archaius</description>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-context</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>com.netflix.archaius</groupId>
-            <artifactId>archaius-core</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>commons-configuration</groupId>
-            <artifactId>commons-configuration</artifactId>
-            <optional>true</optional>
-        </dependency>
-
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
@@ -1,237 +0,0 @@
-/*
- * Copyright 2013-2019 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.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import javax.annotation.PreDestroy;
-
-import com.netflix.config.AggregatedConfiguration;
-import com.netflix.config.ConcurrentCompositeConfiguration;
-import com.netflix.config.ConfigurationManager;
-import com.netflix.config.DeploymentContext;
-import com.netflix.config.DynamicProperty;
-import com.netflix.config.DynamicPropertyFactory;
-import com.netflix.config.DynamicURLConfiguration;
-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.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
-import org.springframework.boot.actuate.health.Health;
-import org.springframework.boot.autoconfigure.AutoConfigureOrder;
-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.ApplicationContext;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.Ordered;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.Environment;
-import org.springframework.util.ReflectionUtils;
-
-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 })
-@AutoConfigureOrder(Ordered.HIGHEST_PRECEDENCE)
-public class ArchaiusAutoConfiguration {
-
-	private static final Log log = LogFactory.getLog(ArchaiusAutoConfiguration.class);
-
-	private static final AtomicBoolean initialized = new AtomicBoolean(false);
-
-	@Autowired
-	private ConfigurableEnvironment env;
-
-	@Autowired(required = false)
-	private List<AbstractConfiguration> externalConfigurations = new ArrayList<>();
-
-	private static DynamicURLConfiguration defaultURLConfig;
-
-	@PreDestroy
-	public void close() {
-		if (defaultURLConfig != null) {
-			defaultURLConfig.stopLoading();
-		}
-		setStatic(ConfigurationManager.class, "instance", null);
-		setStatic(ConfigurationManager.class, "customConfigurationInstalled", false);
-		setStatic(DynamicPropertyFactory.class, "config", null);
-		setStatic(DynamicPropertyFactory.class, "initializedWithDefaultConfig", false);
-		setStatic(DynamicProperty.class, "dynamicPropertySupportImpl", null);
-		initialized.compareAndSet(true, false);
-	}
-
-	@Bean
-	public static ConfigurableEnvironmentConfiguration configurableEnvironmentConfiguration(
-			ConfigurableEnvironment env, ApplicationContext context) {
-		Map<String, AbstractConfiguration> abstractConfigurationMap = context
-				.getBeansOfType(AbstractConfiguration.class);
-		List<AbstractConfiguration> externalConfigurations = new ArrayList<>(
-				abstractConfigurationMap.values());
-		ConfigurableEnvironmentConfiguration envConfig = new ConfigurableEnvironmentConfiguration(
-				env);
-		configureArchaius(envConfig, env, externalConfigurations);
-		return envConfig;
-	}
-
-	protected static void configureArchaius(
-			ConfigurableEnvironmentConfiguration envConfig, ConfigurableEnvironment env,
-			List<AbstractConfiguration> externalConfigurations) {
-		if (initialized.compareAndSet(false, true)) {
-			String appName = env.getProperty("spring.application.name");
-			if (appName == null) {
-				appName = "application";
-				log.warn("No spring.application.name found, defaulting to 'application'");
-			}
-			System.setProperty(DeploymentContext.ContextKey.appId.getKey(), appName);
-
-			ConcurrentCompositeConfiguration config = new ConcurrentCompositeConfiguration();
-
-			// support to add other Configurations (Jdbc, DynamoDb, Zookeeper, jclouds,
-			// etc...)
-			if (externalConfigurations != null) {
-				for (AbstractConfiguration externalConfig : externalConfigurations) {
-					config.addConfiguration(externalConfig);
-				}
-			}
-			config.addConfiguration(envConfig,
-					ConfigurableEnvironmentConfiguration.class.getSimpleName());
-
-			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));
-
-			addArchaiusConfiguration(config);
-		}
-		else {
-			// TODO: reinstall ConfigurationManager
-			log.warn(
-					"Netflix ConfigurationManager has already been installed, unable to re-install");
-		}
-	}
-
-	private static void addArchaiusConfiguration(
-			ConcurrentCompositeConfiguration config) {
-		if (ConfigurationManager.isConfigurationInstalled()) {
-			AbstractConfiguration installedConfiguration = ConfigurationManager
-					.getConfigInstance();
-			if (installedConfiguration instanceof ConcurrentCompositeConfiguration) {
-				ConcurrentCompositeConfiguration configInstance = (ConcurrentCompositeConfiguration) installedConfiguration;
-				configInstance.addConfiguration(config);
-			}
-			else {
-				installedConfiguration.append(config);
-				if (!(installedConfiguration instanceof AggregatedConfiguration)) {
-					log.warn(
-							"Appending a configuration to an existing non-aggregated installed configuration will have no effect");
-				}
-			}
-		}
-		else {
-			ConfigurationManager.install(config);
-		}
-	}
-
-	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);
-	}
-
-	@Configuration
-	@ConditionalOnClass(Health.class)
-	protected static class ArchaiusEndpointConfiguration {
-
-		@Bean
-		@ConditionalOnEnabledEndpoint
-		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 = this.env.getProperty(key);
-					boolean beforeUpdate = false;
-					listener.configurationChanged(new ConfigurationEvent(source, type,
-							key, value, beforeUpdate));
-				}
-			}
-		}
-
-	}
-
-}
@@ -1,56 +0,0 @@
-/*
- * Copyright 2013-2019 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 com.netflix.config.ConfigurationManager;
-import org.apache.commons.configuration.AbstractConfiguration;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ConfigurableApplicationContext;
-
-/**
- * @author Dave Syer
- */
-public final class ArchaiusDelegatingProxyUtils {
-
-	private ArchaiusDelegatingProxyUtils() {
-	}
-
-	/**
-	 * {@code ApplicationContext} class name.
-	 */
-	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);
-	}
-
-}
@@ -1,73 +0,0 @@
-/*
- * Copyright 2013-2019 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 com.netflix.config.ConcurrentCompositeConfiguration;
-import com.netflix.config.ConfigurationManager;
-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.annotation.Endpoint;
-import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
-
-/**
- * An actuator endpoint that returns Archaius configuration.
- *
- * @author Dave Syer
- */
-@Endpoint(id = "archaius")
-public class ArchaiusEndpoint {
-
-	@ReadOperation
-	public Map<String, Object> invoke() {
-		Map<String, Object> map = new LinkedHashMap<>();
-		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));
-		}
-	}
-
-}
@@ -1,107 +0,0 @@
-/*
- * Copyright 2013-2019 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;
-
-/**
- * EnvironmentConfiguration wrapper class providing further configuration possibilities.
- *
- * @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);
-		}
-	}
-
-}
@@ -1,10 +0,0 @@
-{
-  "properties": [
-    {
-      "defaultValue": "true",
-      "name": "archaius.propagate.environmentChangedEvent",
-      "description": "Propagates EnvironmentChanged events to Archaius ConfigurationManager.",
-      "type": "java.lang.Boolean"
-    }
-  ]
-}
@@ -1,2 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration
@@ -1,108 +0,0 @@
-/*
- * Copyright 2013-2019 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.Collections;
-
-import com.netflix.config.ConfigurationManager;
-import com.netflix.config.DynamicPropertyFactory;
-import com.netflix.config.DynamicStringProperty;
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.junit.After;
-import org.junit.Test;
-
-import org.springframework.boot.test.util.TestPropertyValues;
-import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
-import org.springframework.context.annotation.AnnotationConfigApplicationContext;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Dave Syer
- */
-public class ArchaiusAutoConfigurationTests {
-
-	private AnnotationConfigApplicationContext context;
-
-	private Object propertyValue;
-
-	@After
-	public void close() {
-		if (this.context != null) {
-			this.context.close();
-		}
-	}
-
-	@Test
-	public void configurationCreated() {
-		this.context = new AnnotationConfigApplicationContext(
-				ArchaiusAutoConfiguration.class);
-		AbstractConfiguration config = this.context
-				.getBean(ConfigurableEnvironmentConfiguration.class);
-		assertThat(config.getString("java.io.tmpdir")).isNotNull();
-	}
-
-	@Test
-	public void environmentChangeEventPropagated() {
-		this.context = new AnnotationConfigApplicationContext(
-				ArchaiusAutoConfiguration.class);
-		ConfigurationManager.getConfigInstance().addConfigurationListener(event -> {
-			if (event.getPropertyName().equals("my.prop")) {
-				ArchaiusAutoConfigurationTests.this.propertyValue = event
-						.getPropertyValue();
-			}
-		});
-		TestPropertyValues.of("my.prop=my.newval").applyTo(this.context);
-		this.context.publishEvent(
-				new EnvironmentChangeEvent(Collections.singleton("my.prop")));
-		assertThat(this.propertyValue).isEqualTo("my.newval");
-	}
-
-	@Test
-	public void configurationWithoutExternalConfigurations() throws Exception {
-		this.context = new AnnotationConfigApplicationContext(
-				ArchaiusAutoConfiguration.class);
-		DynamicStringProperty dbProperty = DynamicPropertyFactory.getInstance()
-				.getStringProperty("db.property", null);
-		DynamicStringProperty staticProperty = DynamicPropertyFactory.getInstance()
-				.getStringProperty("archaius.file.property", null);
-
-		assertThat(dbProperty.getValue()).isNull();
-		assertThat(staticProperty.getValue()).isNotNull();
-		assertThat(staticProperty.getValue()).isEqualTo("Static config file property");
-	}
-
-	@Test
-	public void configurationWithInjectedConfiguration() throws Exception {
-		this.context = new AnnotationConfigApplicationContext(
-				ArchaiusAutoConfiguration.class, TestArchaiusExternalConfiguration.class);
-		DynamicStringProperty dbProperty = DynamicPropertyFactory.getInstance()
-				.getStringProperty("db.property", null);
-		DynamicStringProperty secondDbProperty = DynamicPropertyFactory.getInstance()
-				.getStringProperty("db.second.property", null);
-		DynamicStringProperty staticProperty = DynamicPropertyFactory.getInstance()
-				.getStringProperty("archaius.file.property", null);
-
-		assertThat(dbProperty.getValue()).isNotNull();
-		assertThat(secondDbProperty.getValue()).isNotNull();
-		assertThat(staticProperty.getValue()).isNotNull();
-		assertThat(dbProperty.getValue()).isEqualTo("this is a db property");
-		assertThat(secondDbProperty.getValue()).isEqualTo("this is another db property");
-		assertThat(staticProperty.getValue()).isEqualTo("Static config file property");
-	}
-
-}
@@ -1,56 +0,0 @@
-/*
- * Copyright 2013-2019 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.Map;
-
-import com.netflix.config.ConcurrentCompositeConfiguration;
-import com.netflix.config.ConfigurationManager;
-import org.junit.Test;
-
-import org.springframework.core.env.StandardEnvironment;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Dave Syer
- */
-public class ArchaiusEndpointTests {
-
-	private ArchaiusEndpoint endpoint = new ArchaiusEndpoint();
-
-	@Test
-	public void detectsPropertiesWhenSet() {
-		ConfigurationManager.getConfigInstance().setProperty("foo", "bar");
-		assertThat(this.endpoint.invoke().containsKey("foo")).isTrue();
-	}
-
-	@Test
-	public void doesNotIncludeSpringEnvironment() {
-		ConcurrentCompositeConfiguration composite = new ConcurrentCompositeConfiguration(
-				ConfigurationManager.getConfigInstance());
-		ConfigurableEnvironmentConfiguration config = new ConfigurableEnvironmentConfiguration(
-				new StandardEnvironment());
-		assertThat(config.containsKey("user.dir")).isTrue();
-		composite.addConfiguration(config);
-		ConfigurationManager.getConfigInstance().setProperty("foo", "bar");
-		Map<String, Object> map = this.endpoint.invoke();
-		assertThat(map.containsKey("foo")).isTrue();
-		assertThat(map.containsKey("user.dir")).isFalse();
-	}
-
-}
@@ -1,41 +0,0 @@
-/*
- * Copyright 2013-2019 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 com.netflix.config.ConcurrentMapConfiguration;
-import org.apache.commons.configuration.AbstractConfiguration;
-
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Alexandru-George Burghelea
- */
-@Configuration
-public class TestArchaiusExternalConfiguration {
-
-	@Bean
-	@Qualifier("dynamicConfiguration")
-	public AbstractConfiguration createDynamicConfiguration() {
-		ConcurrentMapConfiguration config = new ConcurrentMapConfiguration();
-		config.addProperty("db.property", "this is a db property");
-		config.addProperty("db.second.property", "this is another db property");
-		return config;
-	}
-
-}
@@ -1,2 +0,0 @@
-archaius.file.property=Static config file property
-db.second.property=It should be overridden
@@ -1,70 +0,0 @@
-<?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>2.1.1.RELEASE</version>
-		<relativePath>..</relativePath> <!-- lookup parent from repository -->
-	</parent>
-	<artifactId>spring-cloud-netflix-concurrency-limits</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Cloud Netflix Concurrency Limits</name>
-	<url>https://projects.spring.io/spring-cloud/</url>
-	<dependencies>
-		<dependency>
-			<groupId>com.netflix.concurrency-limits</groupId>
-			<artifactId>concurrency-limits-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.concurrency-limits</groupId>
-			<artifactId>concurrency-limits-servlet</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-configuration-processor</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<!--<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-commons</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-context</artifactId>
-			<optional>true</optional>
-		</dependency>-->
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-webflux</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-test-support</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>io.projectreactor</groupId>
-			<artifactId>reactor-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-</project>
@@ -1,53 +0,0 @@
-/*
- * Copyright 2013-2019 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.concurrency.limits.micrometer;
-
-import java.util.function.Supplier;
-
-import com.netflix.concurrency.limits.MetricRegistry;
-import io.micrometer.core.instrument.DistributionSummary;
-import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.core.instrument.Tags;
-
-/**
- * A Micrometer-specific {@link MetricRegistry} implementation.
- *
- * @author Spencer Gibb
- */
-public class MicrometerMetricRegistry implements MetricRegistry {
-
-	private final MeterRegistry meterRegistry;
-
-	// TODO: baseId?
-
-	public MicrometerMetricRegistry(MeterRegistry meterRegistry) {
-		this.meterRegistry = meterRegistry;
-	}
-
-	@Override
-	public SampleListener registerDistribution(String id, String... tagNameValuePairs) {
-		DistributionSummary summary = this.meterRegistry.summary(id, tagNameValuePairs);
-		return value -> summary.record(value.longValue());
-	}
-
-	@Override
-	public void registerGauge(String id, Supplier<Number> supplier,
-			String... tagNameValuePairs) {
-		this.meterRegistry.gauge(id, Tags.of(tagNameValuePairs), supplier.get());
-	}
-
-}
@@ -1,54 +0,0 @@
-/*
- * Copyright 2013-2019 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.concurrency.limits.reactive;
-
-import com.netflix.concurrency.limits.Limiter;
-import reactor.core.publisher.Mono;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.server.WebFilter;
-import org.springframework.web.server.WebFilterChain;
-
-/**
- * A {@link WebFilter} implementation providing the possibility to use Netflix
- * {@link Limiter} to handle requests.
- *
- * @author Spencer Gibb
- */
-public class ConcurrencyLimitsWebFilter implements WebFilter {
-
-	private final Limiter<ServerWebExchange> limiter;
-
-	public ConcurrencyLimitsWebFilter(Limiter<ServerWebExchange> limiter) {
-		this.limiter = limiter;
-	}
-
-	@Override
-	public Mono<Void> filter(ServerWebExchange exchange, WebFilterChain chain) {
-		return limiter.acquire(exchange)
-				.map(listener -> chain.filter(exchange)
-						.doOnSuccess(v -> listener.onSuccess())
-						.doOnError(throwable -> listener.onIgnore()))
-				.orElseGet(() -> {
-					exchange.getResponse().setStatusCode(HttpStatus.TOO_MANY_REQUESTS);
-					// TODO: set body
-					return exchange.getResponse().setComplete();
-				});
-	}
-
-}
@@ -1,67 +0,0 @@
-/*
- * Copyright 2013-2019 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.concurrency.limits.reactive;
-
-import java.util.function.Consumer;
-
-import com.netflix.concurrency.limits.Limiter;
-import reactor.core.publisher.Mono;
-
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.server.ServerWebExchange;
-import org.springframework.web.server.WebFilter;
-
-/**
- * Reactive autoconfiguration class for registering Netflix {@link Limiter} bean.
- *
- * @author Spencer Gibb
- */
-@Configuration
-@ConditionalOnWebApplication(type = Type.REACTIVE)
-@ConditionalOnClass({ WebFilter.class, Mono.class })
-public class ReactiveConcurrencyLimitsAutoConfiguration {
-
-	private final ObjectProvider<Consumer<ServerWebExchangeLimiterBuilder>> configurerProvider;
-
-	public ReactiveConcurrencyLimitsAutoConfiguration(
-			ObjectProvider<Consumer<ServerWebExchangeLimiterBuilder>> configurerProvider) {
-		this.configurerProvider = configurerProvider;
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public Limiter<ServerWebExchange> webfluxLimiter() {
-		ServerWebExchangeLimiterBuilder builder = new ServerWebExchangeLimiterBuilder();
-
-		this.configurerProvider.ifAvailable(consumer -> consumer.accept(builder));
-
-		return builder.build();
-	}
-
-	@Bean
-	public ConcurrencyLimitsWebFilter concurrencyLimitsWebFilter(
-			Limiter<ServerWebExchange> limiter) {
-		return new ConcurrencyLimitsWebFilter(limiter);
-	}
-
-}
@@ -1,100 +0,0 @@
-/*
- * Copyright 2013-2019 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.concurrency.limits.reactive;
-
-import java.util.Optional;
-import java.util.function.Function;
-
-import com.netflix.concurrency.limits.limiter.AbstractPartitionedLimiter;
-
-import org.springframework.web.server.ServerWebExchange;
-
-/**
- * Builder for ServerWebExchange Limiter.
- *
- * @author Spencer Gibb
- */
-public class ServerWebExchangeLimiterBuilder extends
-		AbstractPartitionedLimiter.Builder<ServerWebExchangeLimiterBuilder, ServerWebExchange> {
-
-	/**
-	 * Partition the limit by header.
-	 * @param name header name
-	 * @return Chainable builder
-	 */
-	public ServerWebExchangeLimiterBuilder partitionByHeader(String name) {
-		return partitionResolver(
-				exchange -> exchange.getRequest().getHeaders().getFirst(name));
-	}
-
-	/**
-	 * Partition the limit by {@link Principal}. Percentages of the limit are partitioned
-	 * to named groups. Group membership is derived from the provided mapping function.
-	 * @param principalToGroup Mapping function from {@link Principal} to a named group.
-	 * @param configurer Configuration function though which group percentages may be
-	 * specified Unspecified group values may only use excess capacity.
-	 * @return Chainable builder
-	 */
-	/*
-	 * public ServerWebExchangeLimiterBuilder partitionByUserPrincipal(Function<Principal,
-	 * String> principalToGroup,
-	 * Consumer<LookupPartitionStrategy.Builder<ServerWebExchange>> configurer) { return
-	 * partitionResolver( exchange ->
-	 * Optional.ofNullable(request.getUserPrincipal()).map(principalToGroup).orElse(null),
-	 * configurer); }
-	 */
-
-	/**
-	 * Partition the limit by request attribute.
-	 * @param name attribute name
-	 * @return Chainable builder
-	 */
-	public ServerWebExchangeLimiterBuilder partitionByAttribute(String name) {
-		return partitionResolver(exchange -> exchange.getAttribute(name));
-	}
-
-	/**
-	 * Partition the limit by request parameter.
-	 * @param name parameter name
-	 * @return Chainable builder
-	 */
-	public ServerWebExchangeLimiterBuilder partitionByParameter(String name) {
-		return partitionResolver(
-				exchange -> exchange.getRequest().getQueryParams().getFirst(name));
-	}
-
-	/**
-	 * Partition the limit by the full path. Percentages of the limit are partitioned to
-	 * named groups. Group membership is derived from the provided mapping function.
-	 * @param pathToGroup Mapping function from full path to a named group.
-	 * @return Chainable builder
-	 */
-	public ServerWebExchangeLimiterBuilder partitionByPathInfo(
-			Function<String, String> pathToGroup) {
-		return partitionResolver(exchange -> {
-			// TODO: pathWithinApplication?
-			String path = exchange.getRequest().getPath().contextPath().value();
-			return Optional.ofNullable(path).map(pathToGroup).orElse(null);
-		});
-	}
-
-	@Override
-	protected ServerWebExchangeLimiterBuilder self() {
-		return this;
-	}
-
-}
@@ -1,91 +0,0 @@
-/*
- * Copyright 2013-2019 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.concurrency.limits.web;
-
-import java.io.IOException;
-import java.util.Optional;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.netflix.concurrency.limits.Limiter;
-import com.netflix.concurrency.limits.Limiter.Listener;
-
-import org.springframework.http.HttpStatus;
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
-/**
- * A {@link HandlerInterceptor} implementation providing the possibility to use Netflix
- * {@link Limiter} to handle requests.
- *
- * @author Spencer Gibb
- */
-public class ConcurrencyLimitsHandlerInterceptor implements HandlerInterceptor {
-
-	private final Limiter<HttpServletRequest> limiter;
-
-	public ConcurrencyLimitsHandlerInterceptor(Limiter<HttpServletRequest> limiter) {
-		this.limiter = limiter;
-	}
-
-	@Override
-	public boolean preHandle(HttpServletRequest request, HttpServletResponse response,
-			Object handler) throws Exception {
-		Optional<Listener> listener = limiter.acquire(request);
-		if (listener.isPresent()) {
-			request.setAttribute("concurrency_limiter_listener", listener.get());
-			return true;
-		}
-
-		try {
-			// TODO: headers with information?
-			/*
-			 * response.sendError(HttpStatus.TOO_MANY_REQUESTS.value());
-			 * response.getWriter().print("Concurrency limit exceeded");
-			 */
-			response.sendError(HttpStatus.TOO_MANY_REQUESTS.value(),
-					"Concurrency limit exceeded");
-		}
-		catch (IOException e) {
-			// ignore
-		}
-		return false;
-	}
-
-	@Override
-	public void postHandle(HttpServletRequest request, HttpServletResponse response,
-			Object handler, ModelAndView modelAndView) throws Exception {
-
-	}
-
-	@Override
-	public void afterCompletion(HttpServletRequest request, HttpServletResponse response,
-			Object handler, Exception ex) throws Exception {
-		Listener listener = (Listener) request
-				.getAttribute("concurrency_limiter_listener");
-		if (listener != null) {
-			if (ex != null) {
-				listener.onIgnore();
-			}
-			else {
-				listener.onSuccess();
-			}
-		}
-	}
-
-}
@@ -1,78 +0,0 @@
-/*
- * Copyright 2013-2019 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.concurrency.limits.web;
-
-import java.util.function.Consumer;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.netflix.concurrency.limits.Limiter;
-import com.netflix.concurrency.limits.servlet.ServletLimiterBuilder;
-
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication.Type;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-
-/**
- * MVC autoconfiguration class for registering Netflix {@link Limiter} bean.
- *
- * @author Spencer Gibb
- */
-@Configuration
-@ConditionalOnWebApplication(type = Type.SERVLET)
-@ConditionalOnClass({ HttpServletRequest.class, HandlerInterceptor.class })
-public class MvcConcurrencyLimitsAutoConfiguration implements WebMvcConfigurer {
-
-	private final ObjectProvider<Consumer<ServletLimiterBuilder>> configurerProvider;
-
-	public MvcConcurrencyLimitsAutoConfiguration(
-			ObjectProvider<Consumer<ServletLimiterBuilder>> configurerProvider) {
-		this.configurerProvider = configurerProvider;
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public Limiter<HttpServletRequest> servletLimiter() {
-		ServletLimiterBuilder builder = new ServletLimiterBuilder();
-
-		this.configurerProvider.ifAvailable(consumer -> consumer.accept(builder));
-
-		return builder.build();
-	}
-
-	@Configuration
-	protected static class HandlerInterceptorConfiguration implements WebMvcConfigurer {
-
-		@Autowired
-		private Limiter<HttpServletRequest> limiter;
-
-		@Override
-		public void addInterceptors(InterceptorRegistry registry) {
-			registry.addInterceptor(new ConcurrencyLimitsHandlerInterceptor(limiter));
-		}
-
-	}
-
-}
@@ -1,3 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.netflix.concurrency.limits.reactive.ReactiveConcurrencyLimitsAutoConfiguration,\
-org.springframework.cloud.netflix.concurrency.limits.web.MvcConcurrencyLimitsAutoConfiguration
@@ -1,56 +0,0 @@
-/*
- * Copyright 2013-2019 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.concurrency.limits.micrometer;
-
-import io.micrometer.core.instrument.Gauge;
-import io.micrometer.core.instrument.MeterRegistry;
-import io.micrometer.core.instrument.simple.SimpleMeterRegistry;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class MicrometerMetricRegistryTests {
-
-	@Test
-	public void testGuage() {
-		MeterRegistry registry = new SimpleMeterRegistry();
-		MicrometerMetricRegistry metricRegistry = new MicrometerMetricRegistry(registry);
-
-		metricRegistry.registerGauge("bar", () -> 10);
-
-		Gauge bar = registry.get("bar").gauge();
-
-		assertThat(bar.value()).isEqualTo(10.0);
-	}
-
-	@Test
-	@Ignore // FIXME: micrometer doesn't allow recreating a gauge
-	public void testUnregister() {
-		MeterRegistry registry = new SimpleMeterRegistry();
-		MicrometerMetricRegistry metricRegistry = new MicrometerMetricRegistry(registry);
-
-		metricRegistry.registerGauge("bar", () -> 10);
-		metricRegistry.registerGauge("bar", () -> 20);
-
-		Gauge bar = registry.get("bar").gauge();
-
-		assertThat(bar.value()).isEqualTo(20.0);
-
-	}
-
-}
@@ -1,75 +0,0 @@
-/*
- * Copyright 2013-2019 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.concurrency.limits.reactive;
-
-import java.util.function.Consumer;
-
-import com.netflix.concurrency.limits.limit.FixedLimit;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.cloud.netflix.concurrency.limits.test.AbstractConcurrencyLimitsTests;
-import org.springframework.cloud.test.ClassPathExclusions;
-import org.springframework.cloud.test.ModifiedClassPathRunner;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Import;
-import org.springframework.util.SocketUtils;
-import org.springframework.web.reactive.function.client.WebClient;
-
-@RunWith(ModifiedClassPathRunner.class)
-@ClassPathExclusions({ "spring-boot-starter-tomcat-*", "tomcat-embed-*" })
-public class ConcurrencyLimitsWebFilterTests extends AbstractConcurrencyLimitsTests {
-
-	private int port;
-
-	@Before
-	public void init() {
-		port = SocketUtils.findAvailableTcpPort();
-		client = WebClient.create("http://localhost:" + port);
-	}
-
-	@Test
-	@SuppressWarnings("Duplicates")
-	public void webFilterWorks() {
-
-		try (ConfigurableApplicationContext context = new SpringApplicationBuilder()
-				.properties("server.port=" + port,
-						"spring.main.web-application-type=reactive")
-				.sources(TestConfig.class).run()) {
-
-			assertLimiter(client);
-		}
-	}
-
-	@SpringBootConfiguration
-	@EnableAutoConfiguration
-	@Import(HelloControllerConfiguration.class)
-	protected static class TestConfig {
-
-		@Bean
-		public Consumer<ServerWebExchangeLimiterBuilder> limiterBuilderConfigurer() {
-			return limiterBuilder -> limiterBuilder.limit(FixedLimit.of(1));
-		}
-
-	}
-
-}
@@ -1,80 +0,0 @@
-/*
- * Copyright 2013-2019 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.concurrency.limits.test;
-
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import reactor.test.StepVerifier;
-import reactor.util.function.Tuple2;
-
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.reactive.function.client.WebClient;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class AbstractConcurrencyLimitsTests {
-
-	protected WebClient client;
-
-	protected void assertLimiter(WebClient client) {
-		// TODO: assert the body
-		Flux<Tuple2<String, HttpStatus>> flux = Flux.range(1, 100)
-				.flatMap(integer -> client.get().uri("/").exchange(), 4)
-				// .log("reqs", Level.INFO)
-				.flatMap(response -> response.bodyToMono(String.class).defaultIfEmpty("")
-						/* .log("body2mono", Level.INFO) */
-						.zipWith(Mono.just(response.statusCode())));
-
-		Responses responses = new Responses();
-		StepVerifier.create(flux).thenConsumeWhile(response -> true, response -> {
-			HttpStatus status = response.getT2();
-			if (status.equals(HttpStatus.OK)) {
-				responses.success.incrementAndGet();
-			}
-			else if (status.equals(HttpStatus.TOO_MANY_REQUESTS)) {
-				responses.tooManyReqs.incrementAndGet();
-				String body = response.getT1();
-				// TODO: body from handler isn't coming thru
-				// assertThat(body).isEqualTo("Concurrency limit exceeded");
-			}
-			else {
-				responses.other.incrementAndGet();
-			}
-		}).verifyComplete();
-
-		System.out.println("Responses: " + responses);
-
-		assertThat(responses.other).hasValue(0);
-		assertThat(responses.tooManyReqs).hasValueGreaterThanOrEqualTo(1);
-
-	}
-
-	@Configuration
-	@RestController
-	protected static class HelloControllerConfiguration {
-
-		@GetMapping
-		public String get() {
-			return "Hello";
-		}
-
-	}
-
-}
@@ -1,37 +0,0 @@
-/*
- * Copyright 2013-2019 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.concurrency.limits.test;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-import org.springframework.core.style.ToStringCreator;
-
-public class Responses {
-
-	public AtomicInteger success = new AtomicInteger(0);
-
-	public AtomicInteger tooManyReqs = new AtomicInteger(0);
-
-	public AtomicInteger other = new AtomicInteger(0);
-
-	@Override
-	public String toString() {
-		return new ToStringCreator(this).append("success", success)
-				.append("tooManyReqs", tooManyReqs).append("other", other).toString();
-	}
-
-}
@@ -1,69 +0,0 @@
-/*
- * Copyright 2013-2019 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.concurrency.limits.web;
-
-import java.util.function.Consumer;
-
-import com.netflix.concurrency.limits.limit.FixedLimit;
-import com.netflix.concurrency.limits.servlet.ServletLimiterBuilder;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.cloud.netflix.concurrency.limits.test.AbstractConcurrencyLimitsTests;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Import;
-import org.springframework.test.context.junit4.SpringRunner;
-import org.springframework.web.reactive.function.client.WebClient;
-
-import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-
-@RunWith(SpringRunner.class)
-@SpringBootTest(properties = "logging.level.reactor.netty=DEBUG", webEnvironment = RANDOM_PORT)
-public class ConcurrencyLimitsHandlerInterceptorTests
-		extends AbstractConcurrencyLimitsTests {
-
-	@LocalServerPort
-	public int port;
-
-	@Before
-	public void init() {
-		client = WebClient.create("http://localhost:" + port);
-	}
-
-	@Test
-	public void handlerInterceptorWorks() {
-		assertLimiter(client);
-	}
-
-	@SpringBootConfiguration
-	@EnableAutoConfiguration
-	@Import(HelloControllerConfiguration.class)
-	protected static class TestConfig {
-
-		@Bean
-		public Consumer<ServletLimiterBuilder> limiterBuilderConfigurer() {
-			return servletLimiterBuilder -> servletLimiterBuilder.limit(FixedLimit.of(1));
-		}
-
-	}
-
-}
@@ -1,47 +0,0 @@
-<?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>2.1.1.RELEASE</version>
-		<relativePath>..</relativePath> <!-- lookup parent from repository -->
-	</parent>
-	<artifactId>spring-cloud-netflix-core</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Cloud Netflix Core - Deprecated</name>
-	<description>Deprecated Spring Cloud Netflix Core - will be removed. Please use spring-cloud-netflix-hystrix instead.</description>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-netflix-hystrix</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-autoconfigure</artifactId>
-			<optional>true</optional>
-		</dependency>
-	</dependencies>
-	<profiles>
-		<profile>
-			<id>java8plus</id>
-				<activation>
-					<jdk>[1.8,2.0)</jdk>
-				</activation>
-				<build>
-					<plugins>
-						<plugin>
-							<groupId>org.apache.maven.plugins</groupId>
-							<artifactId>maven-compiler-plugin</artifactId>
-							<configuration>
-								<compilerArgs>
-									<arg>-parameters</arg>
-								</compilerArgs>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>
@@ -1,42 +0,0 @@
-/*
- * Copyright 2018-2019 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.core;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Olga Maciaszek-Sharma
- * @since 2.1.0
- * @deprecated Module spring-cloud-netflix-core is deprecated as of 2.1.0, use
- * spring-cloud-netflix-hystrix instead.
- */
-@Configuration
-@Deprecated
-public class CoreAutoConfiguration {
-
-	private static final Log LOG = LogFactory.getLog(CoreAutoConfiguration.class);
-
-	public CoreAutoConfiguration() {
-		LOG.warn(
-				"This module is deprecated. It will be removed in the next major release. "
-						+ "Please use spring-cloud-netflix-hystrix instead.");
-	}
-
-}
@@ -1,2 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.netflix.core.CoreAutoConfiguration
@@ -1,32 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.1.3.RELEASE</version>
+		<version>3.0.0-M2</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-netflix-dependencies</artifactId>
-	<version>2.1.1.RELEASE</version>
+	<version>3.0.0-M2</version>
 	<packaging>pom</packaging>
 	<name>spring-cloud-netflix-dependencies</name>
 	<description>Spring Cloud Netflix Dependencies</description>
 	<properties>
-		<archaius.version>0.7.6</archaius.version>
-		<concurrency-limits.version>0.1.12</concurrency-limits.version>
-		<eureka.version>1.9.8</eureka.version>
-		<hystrix.version>1.5.18</hystrix.version>
-		<ribbon.version>2.3.0</ribbon.version>
-		<servo.version>0.12.21</servo.version>
-		<zuul.version>1.3.1</zuul.version>
-		<rxjava.version>1.2.0</rxjava.version>
-		<rxjava-reactive-streams.version>1.2.1</rxjava-reactive-streams.version>
-		<turbine.version>1.0.0</turbine.version>
-		<eureka-jersey.version>1.19.1</eureka-jersey.version>
-		<xstream.version>1.4.10</xstream.version>
-		<okhttp3.version>3.8.1</okhttp3.version>
+		<eureka.version>1.9.21</eureka.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -35,16 +23,6 @@
 				<artifactId>spring-cloud-netflix-eureka-client</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-archaius</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-netflix-archaius</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
@@ -55,163 +33,24 @@
 				<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-hystrix-contract</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-netflix-hystrix-dashboard</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-netflix-turbine</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-netflix-turbine-stream</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-netflix-zuul</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-core</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-hystrix</artifactId>
-				<version>${project.version}</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-netflix-eureka-server</artifactId>
 				<version>${project.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-hystrix-dashboard</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-hystrix-stream</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-sidecar</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-turbine</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-turbine-stream</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-zuul</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-ribbon</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.netflix-commons</groupId>
-				<artifactId>netflix-commons-util</artifactId>
-				<version>0.3.0</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>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-
-			<dependency>
-				<groupId>com.sun.jersey</groupId>
-				<artifactId>jersey-servlet</artifactId>
-				<version>${eureka-jersey.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.sun.jersey</groupId>
-				<artifactId>jersey-core</artifactId>
-				<version>${eureka-jersey.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.sun.jersey</groupId>
-				<artifactId>jersey-client</artifactId>
-				<version>${eureka-jersey.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.sun.jersey</groupId>
-				<artifactId>jersey-server</artifactId>
-				<version>${eureka-jersey.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.sun.jersey.contribs</groupId>
-				<artifactId>jersey-apache-client4</artifactId>
-				<version>${eureka-jersey.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.concurrency-limits</groupId>
-				<artifactId>concurrency-limits-core</artifactId>
-				<version>${concurrency-limits.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.concurrency-limits</groupId>
-				<artifactId>concurrency-limits-servlet</artifactId>
-				<version>${concurrency-limits.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.servo</groupId>
-				<artifactId>servo-core</artifactId>
-				<version>${servo.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
 			<dependency>
 				<groupId>com.netflix.eureka</groupId>
 				<artifactId>eureka-client</artifactId>
 				<version>${eureka.version}</version>
 				<exclusions>
+					<exclusion>
+						<groupId>com.netflix.archaius</groupId>
+						<artifactId>archaius-core</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.github.vlsi.compactmap</groupId>
+						<artifactId>compactmap</artifactId>
+					</exclusion>
 					<exclusion>
 						<groupId>javax.servlet</groupId>
 						<artifactId>servlet-api</artifactId>
@@ -235,6 +74,10 @@
 				<artifactId>eureka-core</artifactId>
 				<version>${eureka.version}</version>
 				<exclusions>
+					<exclusion>
+						<groupId>com.netflix.archaius</groupId>
+						<artifactId>archaius-core</artifactId>
+					</exclusion>
 					<exclusion>
 						<groupId>javax.servlet</groupId>
 						<artifactId>servlet-api</artifactId>
@@ -269,158 +112,6 @@
 					</exclusion>
 				</exclusions>
 			</dependency>
-			<!-- Eureka core dep that is now optional -->
-			<dependency>
-				<groupId>com.thoughtworks.xstream</groupId>
-				<artifactId>xstream</artifactId>
-				<version>${xstream.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.hystrix</groupId>
-				<artifactId>hystrix-core</artifactId>
-				<version>${hystrix.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.hystrix</groupId>
-				<artifactId>hystrix-serialization</artifactId>
-				<version>${hystrix.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.hystrix</groupId>
-				<artifactId>hystrix-metrics-event-stream</artifactId>
-				<version>${hystrix.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>javax.servlet</groupId>
-						<artifactId>servlet-api</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.hystrix</groupId>
-				<artifactId>hystrix-javanica</artifactId>
-				<version>${hystrix.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>jsr305</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.aspectj</groupId>
-						<artifactId>aspectjrt</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.ribbon</groupId>
-				<artifactId>ribbon</artifactId>
-				<version>${ribbon.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>commons-logging</groupId>
-						<artifactId>commons-logging</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.ribbon</groupId>
-				<artifactId>ribbon-core</artifactId>
-				<version>${ribbon.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.ribbon</groupId>
-				<artifactId>ribbon-httpclient</artifactId>
-				<version>${ribbon.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.ribbon</groupId>
-				<artifactId>ribbon-eureka</artifactId>
-				<version>${ribbon.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>javax.servlet</groupId>
-						<artifactId>servlet-api</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.ribbon</groupId>
-				<artifactId>ribbon-loadbalancer</artifactId>
-				<version>${ribbon.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>io.reactivex</groupId>
-				<artifactId>rxjava</artifactId>
-				<version>${rxjava.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>io.reactivex</groupId>
-				<artifactId>rxjava-reactive-streams</artifactId>
-				<version>${rxjava-reactive-streams.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>com.squareup.okhttp3</groupId>
-				<artifactId>okhttp</artifactId>
-				<version>${okhttp3.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.squareup.okhttp3</groupId>
-				<artifactId>logging-interceptor</artifactId>
-				<version>${okhttp3.version}</version>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<profiles>
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>2.1.1.RELEASE</version>
+		<version>3.0.0-M2</version>
 		<relativePath>..</relativePath> <!-- lookup parent from repository -->
 	</parent>
 	<artifactId>spring-cloud-netflix-eureka-client</artifactId>
@@ -28,12 +28,8 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-netflix-hystrix</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-netflix-ribbon</artifactId>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-webflux</artifactId>
 			<optional>true</optional>
 		</dependency>
 		<dependency>
@@ -46,10 +42,47 @@
 			<artifactId>spring-cloud-config-server</artifactId>
 			<optional>true</optional>
 		</dependency>
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-loadbalancer</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>com.netflix.eureka</groupId>
 			<artifactId>eureka-client</artifactId>
 			<optional>true</optional>
+			<exclusions>
+				<exclusion>
+					<groupId>com.sun.jersey</groupId>
+					<artifactId>jersey-client</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.sun.jersey</groupId>
+					<artifactId>jersey-core</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.sun.jersey.contribs</groupId>
+					<artifactId>jersey-apache-client4</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.jersey</groupId>
+			<artifactId>jersey-core</artifactId>
+			<version>1.19.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.jersey</groupId>
+			<artifactId>jersey-client</artifactId>
+			<version>1.19.1</version>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
+			<groupId>com.sun.jersey.contribs</groupId>
+			<artifactId>jersey-apache-client4</artifactId>
+			<version>1.19.1</version>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>javax.inject</groupId>
@@ -72,36 +105,11 @@
 			<artifactId>jersey-apache-client4</artifactId>
 			<optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>com.netflix.archaius</groupId>
-			<artifactId>archaius-core</artifactId>
+		<!--<dependency>
+			<groupId>com.netflix.netflix-commons</groupId>
+			<artifactId>netflix-eventbus</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-loadbalancer</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>-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-autoconfigure-processor</artifactId>
@@ -127,5 +135,10 @@
 			<artifactId>spring-retry</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>io.projectreactor</groupId>
+			<artifactId>reactor-test</artifactId>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 </project>
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 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
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 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
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 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
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2020 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
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 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
+ *      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,
@@ -50,13 +50,11 @@ import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
 import org.springframework.cloud.client.CommonsClientAutoConfiguration;
 import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
 import org.springframework.cloud.client.actuator.HasFeatures;
-import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClientAutoConfiguration;
 import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
 import org.springframework.cloud.client.serviceregistry.ServiceRegistryAutoConfiguration;
 import org.springframework.cloud.commons.util.InetUtils;
 import org.springframework.cloud.context.scope.refresh.RefreshScope;
-import org.springframework.cloud.netflix.eureka.config.DiscoveryClientOptionalArgsConfiguration;
 import org.springframework.cloud.netflix.eureka.metadata.DefaultManagementMetadataProvider;
 import org.springframework.cloud.netflix.eureka.metadata.ManagementMetadata;
 import org.springframework.cloud.netflix.eureka.metadata.ManagementMetadataProvider;
@@ -68,7 +66,6 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Conditional;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.util.StringUtils;
@@ -83,17 +80,17 @@ import static org.springframework.cloud.commons.util.IdUtils.getDefaultInstanceI
 * @author Ryan Baxter
 * @author Daniel Lavoie
 * @author Olga Maciaszek-Sharma
+ * @author Tim Ysewyn
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
@ConditionalOnClass(EurekaClientConfig.class)
-@Import(DiscoveryClientOptionalArgsConfiguration.class)
-@ConditionalOnBean(EurekaDiscoveryClientConfiguration.Marker.class)
@ConditionalOnProperty(value = "eureka.client.enabled", matchIfMissing = true)
@ConditionalOnDiscoveryEnabled
@AutoConfigureBefore({ NoopDiscoveryClientAutoConfiguration.class,
 		CommonsClientAutoConfiguration.class, ServiceRegistryAutoConfiguration.class })
@AutoConfigureAfter(name = {
+		"org.springframework.cloud.netflix.eureka.config.DiscoveryClientOptionalArgsConfiguration",
 		"org.springframework.cloud.autoconfigure.RefreshAutoConfiguration",
 		"org.springframework.cloud.netflix.eureka.EurekaDiscoveryClientConfiguration",
 		"org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration" })
@@ -111,15 +108,10 @@ public class EurekaClientAutoConfiguration {
 	}

 	@Bean
-	@ConditionalOnMissingBean(value = EurekaClientConfig.class, search = SearchStrategy.CURRENT)
+	@ConditionalOnMissingBean(value = EurekaClientConfig.class,
+			search = SearchStrategy.CURRENT)
 	public EurekaClientConfigBean eurekaClientConfigBean(ConfigurableEnvironment env) {
-		EurekaClientConfigBean client = new EurekaClientConfigBean();
-		if ("bootstrap".equals(this.env.getProperty("spring.config.name"))) {
-			// We don't register during bootstrap by default, but there will be another
-			// chance later.
-			client.setRegisterWithEureka(false);
-		}
-		return client;
+		return new EurekaClientConfigBean();
 	}

 	@Bean
@@ -133,7 +125,8 @@ public class EurekaClientAutoConfiguration {
 	}

 	@Bean
-	@ConditionalOnMissingBean(value = EurekaInstanceConfig.class, search = SearchStrategy.CURRENT)
+	@ConditionalOnMissingBean(value = EurekaInstanceConfig.class,
+			search = SearchStrategy.CURRENT)
 	public EurekaInstanceConfigBean eurekaInstanceConfigBean(InetUtils inetUtils,
 			ManagementMetadataProvider managementMetadataProvider) {
 		String hostname = getProperty("eureka.instance.hostname");
@@ -144,22 +137,14 @@ public class EurekaClientAutoConfiguration {
 				.parseBoolean(getProperty("eureka.instance.secure-port-enabled"));

 		String serverContextPath = env.getProperty("server.servlet.context-path", "/");
-		int serverPort = Integer
-				.valueOf(env.getProperty("server.port", env.getProperty("port", "8080")));
+		int serverPort = Integer.parseInt(
+				env.getProperty("server.port", env.getProperty("port", "8080")));

-		Integer managementPort = env.getProperty("management.server.port", Integer.class); // nullable.
-		// should
-		// be
-		// wrapped
-		// into
-		// optional
+		Integer managementPort = env.getProperty("management.server.port", Integer.class);
 		String managementContextPath = env
-				.getProperty("management.server.servlet.context-path"); // nullable.
-																		// should
-		// be wrapped into
-		// optional
+				.getProperty("management.server.servlet.context-path");
 		Integer jmxPort = env.getProperty("com.sun.management.jmxremote.port",
-				Integer.class); // nullable
+				Integer.class);
 		EurekaInstanceConfigBean instance = new EurekaInstanceConfigBean(inetUtils);

 		instance.setNonSecurePort(serverPort);
@@ -223,12 +208,6 @@ public class EurekaClientAutoConfiguration {
 		}
 	}

-	@Bean
-	public DiscoveryClient discoveryClient(EurekaClient client,
-			EurekaClientConfig clientConfig) {
-		return new EurekaDiscoveryClient(client, clientConfig);
-	}
-
 	@Bean
 	public EurekaServiceRegistry eurekaServiceRegistry() {
 		return new EurekaServiceRegistry();
@@ -250,14 +229,16 @@ public class EurekaClientAutoConfiguration {

 	@Bean
 	@ConditionalOnBean(AutoServiceRegistrationProperties.class)
-	@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true)
+	@ConditionalOnProperty(
+			value = "spring.cloud.service-registry.auto-registration.enabled",
+			matchIfMissing = true)
 	public EurekaAutoServiceRegistration eurekaAutoServiceRegistration(
 			ApplicationContext context, EurekaServiceRegistry registry,
 			EurekaRegistration registration) {
 		return new EurekaAutoServiceRegistration(context, registry, registration);
 	}

-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnMissingRefreshScope
 	protected static class EurekaClientConfiguration {

@@ -268,7 +249,8 @@ public class EurekaClientAutoConfiguration {
 		private AbstractDiscoveryClientOptionalArgs<?> optionalArgs;

 		@Bean(destroyMethod = "shutdown")
-		@ConditionalOnMissingBean(value = EurekaClient.class, search = SearchStrategy.CURRENT)
+		@ConditionalOnMissingBean(value = EurekaClient.class,
+				search = SearchStrategy.CURRENT)
 		public EurekaClient eurekaClient(ApplicationInfoManager manager,
 				EurekaClientConfig config) {
 			return new CloudEurekaClient(manager, config, this.optionalArgs,
@@ -276,7 +258,8 @@ public class EurekaClientAutoConfiguration {
 		}

 		@Bean
-		@ConditionalOnMissingBean(value = ApplicationInfoManager.class, search = SearchStrategy.CURRENT)
+		@ConditionalOnMissingBean(value = ApplicationInfoManager.class,
+				search = SearchStrategy.CURRENT)
 		public ApplicationInfoManager eurekaApplicationInfoManager(
 				EurekaInstanceConfig config) {
 			InstanceInfo instanceInfo = new InstanceInfoFactory().create(config);
@@ -285,18 +268,20 @@ public class EurekaClientAutoConfiguration {

 		@Bean
 		@ConditionalOnBean(AutoServiceRegistrationProperties.class)
-		@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true)
+		@ConditionalOnProperty(
+				value = "spring.cloud.service-registry.auto-registration.enabled",
+				matchIfMissing = true)
 		public EurekaRegistration eurekaRegistration(EurekaClient eurekaClient,
 				CloudEurekaInstanceConfig instanceConfig,
-				ApplicationInfoManager applicationInfoManager,
-				@Autowired(required = false) ObjectProvider<HealthCheckHandler> healthCheckHandler) {
+				ApplicationInfoManager applicationInfoManager, @Autowired(
+						required = false) ObjectProvider<HealthCheckHandler> healthCheckHandler) {
 			return EurekaRegistration.builder(instanceConfig).with(applicationInfoManager)
 					.with(eurekaClient).with(healthCheckHandler).build();
 		}

 	}

-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnRefreshScope
 	protected static class RefreshableEurekaClientConfiguration {

@@ -307,7 +292,8 @@ public class EurekaClientAutoConfiguration {
 		private AbstractDiscoveryClientOptionalArgs<?> optionalArgs;

 		@Bean(destroyMethod = "shutdown")
-		@ConditionalOnMissingBean(value = EurekaClient.class, search = SearchStrategy.CURRENT)
+		@ConditionalOnMissingBean(value = EurekaClient.class,
+				search = SearchStrategy.CURRENT)
 		@org.springframework.cloud.context.config.annotation.RefreshScope
 		@Lazy
 		public EurekaClient eurekaClient(ApplicationInfoManager manager,
@@ -334,7 +320,8 @@ public class EurekaClientAutoConfiguration {
 		}

 		@Bean
-		@ConditionalOnMissingBean(value = ApplicationInfoManager.class, search = SearchStrategy.CURRENT)
+		@ConditionalOnMissingBean(value = ApplicationInfoManager.class,
+				search = SearchStrategy.CURRENT)
 		@org.springframework.cloud.context.config.annotation.RefreshScope
 		@Lazy
 		public ApplicationInfoManager eurekaApplicationInfoManager(
@@ -346,11 +333,13 @@ public class EurekaClientAutoConfiguration {
 		@Bean
 		@org.springframework.cloud.context.config.annotation.RefreshScope
 		@ConditionalOnBean(AutoServiceRegistrationProperties.class)
-		@ConditionalOnProperty(value = "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true)
+		@ConditionalOnProperty(
+				value = "spring.cloud.service-registry.auto-registration.enabled",
+				matchIfMissing = true)
 		public EurekaRegistration eurekaRegistration(EurekaClient eurekaClient,
 				CloudEurekaInstanceConfig instanceConfig,
-				ApplicationInfoManager applicationInfoManager,
-				@Autowired(required = false) ObjectProvider<HealthCheckHandler> healthCheckHandler) {
+				ApplicationInfoManager applicationInfoManager, @Autowired(
+						required = false) ObjectProvider<HealthCheckHandler> healthCheckHandler) {
 			return EurekaRegistration.builder(instanceConfig).with(applicationInfoManager)
 					.with(eurekaClient).with(healthCheckHandler).build();
 		}
@@ -370,6 +359,8 @@ public class EurekaClientAutoConfiguration {
 	@Documented
 	@ConditionalOnClass(RefreshScope.class)
 	@ConditionalOnBean(RefreshAutoConfiguration.class)
+	@ConditionalOnProperty(value = "eureka.client.refresh.enable", havingValue = "true",
+			matchIfMissing = true)
 	@interface ConditionalOnRefreshScope {

 	}
@@ -390,9 +381,15 @@ public class EurekaClientAutoConfiguration {

 		}

+		@ConditionalOnProperty(value = "eureka.client.refresh.enable",
+				havingValue = "false")
+		static class OnPropertyDisabled {
+
+		}
+
 	}

-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(Health.class)
 	protected static class EurekaHealthIndicatorConfiguration {

@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 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
+ *      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,
@@ -241,7 +241,7 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 	 *
 	 * Typically the eureka server URLs carry protocol,host,port,context and version
 	 * information if any. Example:
-	 * http://ec2-256-156-243-129.compute-1.amazonaws.com:7001/eureka/
+	 * 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.
@@ -1086,7 +1086,7 @@ public class EurekaClientConfigBean implements EurekaClientConfig, Ordered {
 				.append(decoderName).append("', ").append("clientDataAccept='")
 				.append(clientDataAccept).append("', ")
 				.append("shouldUnregisterOnShutdown='").append(shouldUnregisterOnShutdown)
-				.append("', ").append("shouldEnforceRegistrationAtInit='")
+				.append("shouldEnforceRegistrationAtInit='")
 				.append(shouldEnforceRegistrationAtInit).append("', ").append("order='")
 				.append(order).append("'}").toString();
 	}
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 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
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 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
+ *      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,
@@ -16,11 +16,9 @@

 package org.springframework.cloud.netflix.eureka;

-import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-import java.util.Map;

 import com.netflix.appinfo.EurekaInstanceConfig;
 import com.netflix.appinfo.InstanceInfo;
@@ -29,13 +27,9 @@ import com.netflix.discovery.EurekaClientConfig;
 import com.netflix.discovery.shared.Application;
 import com.netflix.discovery.shared.Applications;

-import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.client.ServiceInstance;
 import org.springframework.cloud.client.discovery.DiscoveryClient;
 import org.springframework.core.Ordered;
-import org.springframework.util.Assert;
-
-import static com.netflix.appinfo.InstanceInfo.PortType.SECURE;

 /**
 * A {@link DiscoveryClient} implementation for Eureka.
@@ -105,61 +99,4 @@ public class EurekaDiscoveryClient implements DiscoveryClient {
 				: DiscoveryClient.DEFAULT_ORDER;
 	}

-	/**
-	 * An Eureka-specific {@link ServiceInstance} implementation.
-	 */
-	public static class EurekaServiceInstance implements ServiceInstance {
-
-		private InstanceInfo instance;
-
-		public EurekaServiceInstance(InstanceInfo instance) {
-			Assert.notNull(instance, "Service instance required");
-			this.instance = instance;
-		}
-
-		public InstanceInfo getInstanceInfo() {
-			return instance;
-		}
-
-		@Override
-		public String getInstanceId() {
-			return this.instance.getId();
-		}
-
-		@Override
-		public String getServiceId() {
-			return this.instance.getAppName();
-		}
-
-		@Override
-		public String getHost() {
-			return this.instance.getHostName();
-		}
-
-		@Override
-		public int getPort() {
-			if (isSecure()) {
-				return this.instance.getSecurePort();
-			}
-			return this.instance.getPort();
-		}
-
-		@Override
-		public boolean isSecure() {
-			// assume if secure is enabled, that is the default
-			return this.instance.isPortEnabled(SECURE);
-		}
-
-		@Override
-		public URI getUri() {
-			return DefaultServiceInstance.getUri(this);
-		}
-
-		@Override
-		public Map<String, String> getMetadata() {
-			return this.instance.getMetadata();
-		}
-
-	}
-
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 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
+ *      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,
@@ -21,12 +21,13 @@ import com.netflix.discovery.EurekaClient;
 import com.netflix.discovery.EurekaClientConfig;

 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.actuate.health.HealthAggregator;
-import org.springframework.boot.actuate.health.OrderedHealthAggregator;
+import org.springframework.boot.actuate.health.SimpleStatusAggregator;
+import org.springframework.boot.actuate.health.StatusAggregator;
 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.properties.EnableConfigurationProperties;
+import org.springframework.cloud.client.ConditionalOnBlockingDiscoveryEnabled;
 import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
 import org.springframework.cloud.context.scope.refresh.RefreshScopeRefreshedEvent;
 import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaAutoServiceRegistration;
@@ -40,39 +41,61 @@ import org.springframework.context.annotation.Configuration;
 * @author Jon Schneider
 * @author Jakub Narloch
 * @author Olga Maciaszek-Sharma
+ * @author Tim Ysewyn
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
@ConditionalOnClass(EurekaClientConfig.class)
@ConditionalOnProperty(value = "eureka.client.enabled", matchIfMissing = true)
@ConditionalOnDiscoveryEnabled
+@ConditionalOnBlockingDiscoveryEnabled
 public class EurekaDiscoveryClientConfiguration {

+	/**
+	 * Deprecated in favor of auto configuration order.
+	 * @return Marker bean
+	 * @deprecated in favor of auto configuration order.
+	 */
+	@Deprecated
 	@Bean
 	public Marker eurekaDiscoverClientMarker() {
 		return new Marker();
 	}

-	@Configuration
-	@ConditionalOnProperty(value = "eureka.client.healthcheck.enabled", matchIfMissing = false)
+	@Bean
+	@ConditionalOnMissingBean
+	public EurekaDiscoveryClient discoveryClient(EurekaClient client,
+			EurekaClientConfig clientConfig) {
+		return new EurekaDiscoveryClient(client, clientConfig);
+	}
+
+	@Configuration(proxyBeanMethods = false)
+	@ConditionalOnProperty(value = "eureka.client.healthcheck.enabled",
+			matchIfMissing = false)
 	protected static class EurekaHealthCheckHandlerConfiguration {

 		@Autowired(required = false)
-		private HealthAggregator healthAggregator = new OrderedHealthAggregator();
+		private StatusAggregator statusAggregator = new SimpleStatusAggregator();

 		@Bean
 		@ConditionalOnMissingBean(HealthCheckHandler.class)
 		public EurekaHealthCheckHandler eurekaHealthCheckHandler() {
-			return new EurekaHealthCheckHandler(this.healthAggregator);
+			return new EurekaHealthCheckHandler(this.statusAggregator);
 		}

 	}

+	/**
+	 * Deprecated in favor of auto configuration order.
+	 *
+	 * @deprecated in favor of auto configuration order.
+	 */
+	@Deprecated
 	class Marker {

 	}

-	@Configuration
+	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(RefreshScopeRefreshedEvent.class)
 	protected static class EurekaClientConfigurationRefresher
 			implements ApplicationListener<RefreshScopeRefreshedEvent> {
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 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
+ *      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,
@@ -18,17 +18,19 @@ package org.springframework.cloud.netflix.eureka;

 import java.util.HashMap;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;

 import com.netflix.appinfo.HealthCheckHandler;
 import com.netflix.appinfo.InstanceInfo;

 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.InitializingBean;
-import org.springframework.boot.actuate.health.CompositeHealthIndicator;
-import org.springframework.boot.actuate.health.HealthAggregator;
+import org.springframework.boot.actuate.health.Health;
 import org.springframework.boot.actuate.health.HealthIndicator;
 import org.springframework.boot.actuate.health.Status;
-import org.springframework.cloud.client.discovery.health.DiscoveryCompositeHealthIndicator;
+import org.springframework.boot.actuate.health.StatusAggregator;
+import org.springframework.cloud.client.discovery.health.DiscoveryCompositeHealthContributor;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 import org.springframework.util.Assert;
@@ -41,11 +43,12 @@ import static com.netflix.appinfo.InstanceInfo.InstanceStatus;
 *
 * On each heartbeat Eureka performs the health check invoking registered
 * {@link HealthCheckHandler}. By default this implementation will perform aggregation of
- * all registered {@link HealthIndicator} through registered {@link HealthAggregator}.
+ * all registered {@link HealthIndicator} through registered {@link StatusAggregator}.
 *
 * @author Jakub Narloch
+ * @author Spencer Gibb
 * @see HealthCheckHandler
- * @see HealthAggregator
+ * @see StatusAggregator
 */
 public class EurekaHealthCheckHandler
 		implements HealthCheckHandler, ApplicationContextAware, InitializingBean {
@@ -59,13 +62,16 @@ public class EurekaHealthCheckHandler
 		}
 	};

-	private final CompositeHealthIndicator healthIndicator;
+	private StatusAggregator statusAggregator;

 	private ApplicationContext applicationContext;

-	public EurekaHealthCheckHandler(HealthAggregator healthAggregator) {
-		Assert.notNull(healthAggregator, "HealthAggregator must not be null");
-		this.healthIndicator = new CompositeHealthIndicator(healthAggregator);
+	private Map<String, HealthIndicator> healthIndicators = new HashMap<>();
+
+	public EurekaHealthCheckHandler(StatusAggregator statusAggregator) {
+		this.statusAggregator = statusAggregator;
+		Assert.notNull(statusAggregator, "StatusAggregator must not be null");
+
 	}

 	@Override
@@ -79,24 +85,26 @@ public class EurekaHealthCheckHandler
 		final Map<String, HealthIndicator> healthIndicators = applicationContext
 				.getBeansOfType(HealthIndicator.class);

-		for (Map.Entry<String, HealthIndicator> entry : healthIndicators.entrySet()) {
+		populateHealthIndicators(healthIndicators);
+	}

+	void populateHealthIndicators(Map<String, HealthIndicator> healthIndicators) {
+		for (Map.Entry<String, HealthIndicator> entry : healthIndicators.entrySet()) {
 			// ignore EurekaHealthIndicator and flatten the rest of the composite
 			// otherwise there is a never ending cycle of down. See gh-643
-			if (entry.getValue() instanceof DiscoveryCompositeHealthIndicator) {
-				DiscoveryCompositeHealthIndicator indicator = (DiscoveryCompositeHealthIndicator) entry
+			if (entry.getValue() instanceof DiscoveryCompositeHealthContributor) {
+				DiscoveryCompositeHealthContributor indicator = (DiscoveryCompositeHealthContributor) entry
 						.getValue();
-				for (DiscoveryCompositeHealthIndicator.Holder holder : indicator
-						.getHealthIndicators()) {
-					if (!(holder.getDelegate() instanceof EurekaHealthIndicator)) {
-						healthIndicator.addHealthIndicator(holder.getDelegate().getName(),
-								holder);
+				indicator.forEach(contributor -> {
+					if (!(contributor
+							.getContributor() instanceof EurekaHealthIndicator)) {
+						this.healthIndicators.put(contributor.getName(),
+								(HealthIndicator) contributor.getContributor());
 					}
-				}
-
+				});
 			}
 			else {
-				healthIndicator.addHealthIndicator(entry.getKey(), entry.getValue());
+				this.healthIndicators.put(entry.getKey(), entry.getValue());
 			}
 		}
 	}
@@ -107,10 +115,19 @@ public class EurekaHealthCheckHandler
 	}

 	protected InstanceStatus getHealthStatus() {
-		final Status status = getHealthIndicator().health().getStatus();
+		Status status = getStatus(statusAggregator);
 		return mapToInstanceStatus(status);
 	}

+	protected Status getStatus(StatusAggregator statusAggregator) {
+		Status status;
+		Set<Status> statusSet = healthIndicators.values().stream()
+				.map(HealthIndicator::health).map(Health::getStatus)
+				.collect(Collectors.toSet());
+		status = statusAggregator.getAggregateStatus(statusSet);
+		return status;
+	}
+
 	protected InstanceStatus mapToInstanceStatus(Status status) {
 		if (!STATUS_MAPPING.containsKey(status)) {
 			return InstanceStatus.UNKNOWN;
@@ -118,8 +135,4 @@ public class EurekaHealthCheckHandler
 		return STATUS_MAPPING.get(status);
 	}

-	protected CompositeHealthIndicator getHealthIndicator() {
-		return healthIndicator;
-	}
-
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 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
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 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
+ *      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,
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2013-2020 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
+ *
+ * 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.Map;
+import java.util.Objects;
+
+import com.netflix.appinfo.InstanceInfo;
+
+import org.springframework.cloud.client.DefaultServiceInstance;
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.core.style.ToStringCreator;
+import org.springframework.util.Assert;
+
+import static com.netflix.appinfo.InstanceInfo.PortType.SECURE;
+
+/**
+ * An Eureka-specific {@link ServiceInstance} implementation.
+ *
+ * @author Spencer Gibb
+ * @author Dave Syer
+ * @author Olga Maciaszek-Sharma
+ * @author Tim Ysewyn
+ */
+public class EurekaServiceInstance implements ServiceInstance {
+
+	private InstanceInfo instance;
+
+	public EurekaServiceInstance(InstanceInfo instance) {
+		Assert.notNull(instance, "Service instance required");
+		this.instance = instance;
+	}
+
+	public InstanceInfo getInstanceInfo() {
+		return instance;
+	}
+
+	@Override
+	public String getInstanceId() {
+		return this.instance.getId();
+	}
+
+	@Override
+	public String getServiceId() {
+		return this.instance.getAppName();
+	}
+
+	@Override
+	public String getHost() {
+		return this.instance.getHostName();
+	}
+
+	@Override
+	public int getPort() {
+		if (isSecure()) {
+			return this.instance.getSecurePort();
+		}
+		return this.instance.getPort();
+	}
+
+	@Override
+	public boolean isSecure() {
+		// assume if secure is enabled, that is the default
+		return this.instance.isPortEnabled(SECURE);
+	}
+
+	@Override
+	public URI getUri() {
+		return DefaultServiceInstance.getUri(this);
+	}
+
+	@Override
+	public Map<String, String> getMetadata() {
+		return this.instance.getMetadata();
+	}
+
+	@Override
+	public String getScheme() {
+		return getUri().getScheme();
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (o == null || getClass() != o.getClass()) {
+			return false;
+		}
+		EurekaServiceInstance that = (EurekaServiceInstance) o;
+		return Objects.equals(this.instance, that.instance);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(this.instance);
+	}
+
+	@Override
+	public String toString() {
+		return new ToStringCreator(this).append("instance", instance).toString();
+
+	}
+
+}
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 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
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2015 the original author or authors.
+ * Copyright 2013-2020 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
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 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
+ *      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,
@@ -17,34 +17,76 @@
 package org.springframework.cloud.netflix.eureka.config;

 import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;

 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.SearchStrategy;
 import org.springframework.cloud.netflix.eureka.MutableDiscoveryClientOptionalArgs;
 import org.springframework.cloud.netflix.eureka.http.RestTemplateDiscoveryClientOptionalArgs;
+import org.springframework.cloud.netflix.eureka.http.WebClientDiscoveryClientOptionalArgs;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

 /**
 * @author Daniel Lavoie
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
 public class DiscoveryClientOptionalArgsConfiguration {

+	protected final Log logger = LogFactory.getLog(getClass());
+
 	@Bean
 	@ConditionalOnMissingClass("com.sun.jersey.api.client.filter.ClientFilter")
-	@ConditionalOnMissingBean(value = AbstractDiscoveryClientOptionalArgs.class, search = SearchStrategy.CURRENT)
+	@ConditionalOnMissingBean(value = { AbstractDiscoveryClientOptionalArgs.class },
+			search = SearchStrategy.CURRENT)
+	@ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled",
+			matchIfMissing = true, havingValue = "false")
 	public RestTemplateDiscoveryClientOptionalArgs restTemplateDiscoveryClientOptionalArgs() {
+		logger.info("Eureka HTTP Client uses RestTemplate.");
 		return new RestTemplateDiscoveryClientOptionalArgs();
 	}

+	@Bean
+	@ConditionalOnMissingClass("com.sun.jersey.api.client.filter.ClientFilter")
+	@ConditionalOnClass(
+			name = "org.springframework.web.reactive.function.client.WebClient")
+	@ConditionalOnMissingBean(
+			value = { AbstractDiscoveryClientOptionalArgs.class,
+					RestTemplateDiscoveryClientOptionalArgs.class },
+			search = SearchStrategy.CURRENT)
+	@ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled",
+			havingValue = "true")
+	public WebClientDiscoveryClientOptionalArgs webClientDiscoveryClientOptionalArgs() {
+		logger.info("Eureka HTTP Client uses WebClient.");
+		return new WebClientDiscoveryClientOptionalArgs();
+	}
+
 	@Bean
 	@ConditionalOnClass(name = "com.sun.jersey.api.client.filter.ClientFilter")
-	@ConditionalOnMissingBean(value = AbstractDiscoveryClientOptionalArgs.class, search = SearchStrategy.CURRENT)
+	@ConditionalOnMissingBean(value = AbstractDiscoveryClientOptionalArgs.class,
+			search = SearchStrategy.CURRENT)
 	public MutableDiscoveryClientOptionalArgs discoveryClientOptionalArgs() {
+		logger.info("Eureka Client uses Jersey");
 		return new MutableDiscoveryClientOptionalArgs();
 	}

+	@Configuration
+	@ConditionalOnMissingClass({ "com.sun.jersey.api.client.filter.ClientFilter",
+			"org.springframework.web.reactive.function.client.WebClient" })
+	@ConditionalOnProperty(prefix = "eureka.client", name = "webclient.enabled",
+			havingValue = "true")
+	protected static class WebClientNotFoundConfiguration {
+
+		public WebClientNotFoundConfiguration() {
+			throw new IllegalStateException("eureka.client.webclient.enabled is true, "
+					+ "but WebClient is not on the classpath. Please add "
+					+ "spring-boot-starter-webflux as a dependency.");
+		}
+
+	}
+
 }
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * Copyright 2013-2020 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
+ *      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,
@@ -34,7 +34,7 @@ import org.springframework.util.StringUtils;
 *
 * @author Dave Syer
 */
-@Configuration
+@Configuration(proxyBeanMethods = false)
@EnableConfigurationProperties
@ConditionalOnClass({ EurekaInstanceConfigBean.class, EurekaClient.class,
 		ConfigServerProperties.class })
@@ -0,0 +1,133 @@
+/*
+ * Copyright 2013-2020 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
+ *
+ * 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.config;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.netflix.appinfo.InstanceInfo;
+import com.netflix.discovery.EurekaClientConfig;
+import com.netflix.discovery.endpoint.EndpointUtils;
+import com.netflix.discovery.shared.Applications;
+import com.netflix.discovery.shared.resolver.DefaultEndpoint;
+import com.netflix.discovery.shared.transport.EurekaHttpClient;
+import com.netflix.discovery.shared.transport.EurekaHttpResponse;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.condition.SearchStrategy;
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.config.client.ConfigServerInstanceProvider;
+import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator;
+import org.springframework.cloud.netflix.eureka.EurekaClientConfigBean;
+import org.springframework.cloud.netflix.eureka.EurekaServiceInstance;
+import org.springframework.cloud.netflix.eureka.http.RestTemplateEurekaHttpClient;
+import org.springframework.cloud.netflix.eureka.http.RestTemplateTransportClientFactory;
+import org.springframework.cloud.netflix.eureka.http.WebClientEurekaHttpClient;
+import org.springframework.cloud.netflix.eureka.http.WebClientTransportClientFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.http.HttpStatus;
+
+/**
+ * Bootstrap configuration for config client that wants to lookup the config server via
+ * discovery.
+ *
+ * @author Dave Syer
+ */
+@ConditionalOnClass(ConfigServicePropertySourceLocator.class)
+@ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled",
+		matchIfMissing = false)
+@Configuration(proxyBeanMethods = false)
+public class EurekaConfigServerBootstrapConfiguration {
+
+	private static final Log log = LogFactory
+			.getLog(EurekaConfigServerBootstrapConfiguration.class);
+
+	@Bean
+	@ConditionalOnMissingBean(value = EurekaClientConfig.class,
+			search = SearchStrategy.CURRENT)
+	public EurekaClientConfigBean eurekaClientConfigBean() {
+		return new EurekaClientConfigBean();
+	}
+
+	@Bean
+	@ConditionalOnMissingBean(EurekaHttpClient.class)
+	@ConditionalOnClass(
+			name = "org.springframework.web.reactive.function.client.WebClient")
+	public WebClientEurekaHttpClient configDiscoveryWebClientEurekaHttpClient(
+			EurekaClientConfigBean config) {
+		return (WebClientEurekaHttpClient) new WebClientTransportClientFactory()
+				.newClient(new DefaultEndpoint(getEurekaUrl(config)));
+	}
+
+	@Bean
+	@ConditionalOnMissingBean(EurekaHttpClient.class)
+	@ConditionalOnMissingClass("org.springframework.web.reactive.function.client.WebClient")
+	public RestTemplateEurekaHttpClient configDiscoveryRestTemplateEurekaHttpClient(
+			EurekaClientConfigBean config) {
+		return (RestTemplateEurekaHttpClient) new RestTemplateTransportClientFactory()
+				.newClient(new DefaultEndpoint(getEurekaUrl(config)));
+	}
+
+	private String getEurekaUrl(EurekaClientConfigBean config) {
+		List<String> urls = EndpointUtils.getServiceUrlsFromConfig(config,
+				EurekaClientConfigBean.DEFAULT_ZONE, true);
+		return urls.get(0);
+	}
+
+	private boolean isSuccessful(EurekaHttpResponse<Applications> response) {
+		HttpStatus httpStatus = HttpStatus.resolve(response.getStatusCode());
+		return httpStatus != null && httpStatus.is2xxSuccessful();
+	}
+
+	@Bean
+	public ConfigServerInstanceProvider.Function eurekaConfigServerInstanceProvider(
+			EurekaHttpClient client, EurekaClientConfig config) {
+
+		return serviceId -> {
+			if (log.isDebugEnabled()) {
+				log.debug("eurekaConfigServerInstanceProvider finding instances for "
+						+ serviceId);
+			}
+			EurekaHttpResponse<Applications> response = client
+					.getApplications(config.getRegion());
+			List<ServiceInstance> instances = new ArrayList<>();
+			if (!isSuccessful(response) || response.getEntity() == null) {
+				return instances;
+			}
+
+			Applications applications = response.getEntity();
+			applications.shuffleInstances(config.shouldFilterOnlyUpInstances());
+			List<InstanceInfo> infos = applications
+					.getInstancesByVirtualHostName(serviceId);
+			for (InstanceInfo info : infos) {
+				instances.add(new EurekaServiceInstance(info));
+			}
+			if (log.isDebugEnabled()) {
+				log.debug("eurekaConfigServerInstanceProvider found " + infos.size()
+						+ " instance(s) for " + serviceId + ", " + instances);
+			}
+			return instances;
+		};
+	}
+
+}
@@ -1,55 +0,0 @@
-/*
- * Copyright 2013-2019 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.config;
-
-import javax.annotation.PostConstruct;
-
-import com.netflix.discovery.EurekaClient;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.netflix.eureka.EurekaDiscoveryClientConfiguration;
-import org.springframework.context.ConfigurableApplicationContext;
-
-/**
- * Bootstrap configuration for a config client that wants to lookup the config server via
- * discovery.
- *
- * @author Dave Syer
- */
-@ConditionalOnBean({ EurekaDiscoveryClientConfiguration.class })
-@ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled", matchIfMissing = false)
-public class EurekaDiscoveryClientConfigServiceAutoConfiguration {
-
-	@Autowired
-	private ConfigurableApplicationContext context;
-
-	@PostConstruct
-	public void init() {
-		if (this.context.getParent() != null) {
-			if (this.context.getBeanNamesForType(EurekaClient.class).length > 0
-					&& this.context.getParent()
-							.getBeanNamesForType(EurekaClient.class).length > 0) {
-				// If the parent has a EurekaClient as well it should be shutdown, so the
-				// local one can register accurate instance info
-				this.context.getParent().getBean(EurekaClient.class).shutdown();
-			}
-		}
-	}
-
-}
@@ -1,43 +0,0 @@
-/*
- * Copyright 2013-2019 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.config;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator;
-import org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration;
-import org.springframework.cloud.netflix.eureka.EurekaDiscoveryClientConfiguration;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-
-/**
- * Eureka-specific helper for config client that wants to lookup the config server via
- * discovery.
- *
- * @author Dave Syer
- */
-@ConditionalOnClass(ConfigServicePropertySourceLocator.class)
-@ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled", matchIfMissing = false)
-@Configuration
-@Import({ EurekaDiscoveryClientConfiguration.class, // this emulates
-		// @EnableDiscoveryClient, the import
-		// selector doesn't run before the
-		// bootstrap phase
-		EurekaClientAutoConfiguration.class })
-public class EurekaDiscoveryClientConfigServiceBootstrapConfiguration {
-
-}
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 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
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 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
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 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
+ *      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,
@@ -113,7 +113,7 @@ public class RestTemplateEurekaHttpClient implements EurekaHttpClient {
 	@Override
 	public EurekaHttpResponse<Void> statusUpdate(String appName, String id,
 			InstanceStatus newStatus, InstanceInfo info) {
-		String urlPath = serviceUrl + "apps/" + appName + '/' + id + "?status="
+		String urlPath = serviceUrl + "apps/" + appName + '/' + id + "/status?value="
 				+ newStatus.name() + "&lastDirtyTimestamp="
 				+ info.getLastDirtyTimestamp().toString();

@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 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
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 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
+ *      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,
@@ -39,7 +39,7 @@ import com.netflix.discovery.shared.transport.EurekaHttpClient;
 import com.netflix.discovery.shared.transport.TransportClientFactory;

 import org.springframework.http.HttpStatus;
-import org.springframework.http.client.support.BasicAuthorizationInterceptor;
+import org.springframework.http.client.support.BasicAuthenticationInterceptor;
 import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
 import org.springframework.web.client.DefaultResponseErrorHandler;
 import org.springframework.web.client.RestTemplate;
@@ -66,7 +66,7 @@ public class RestTemplateTransportClientFactory implements TransportClientFactor
 			if (serviceURI.getUserInfo() != null) {
 				String[] credentials = serviceURI.getUserInfo().split(":");
 				if (credentials.length == 2) {
-					restTemplate.getInterceptors().add(new BasicAuthorizationInterceptor(
+					restTemplate.getInterceptors().add(new BasicAuthenticationInterceptor(
 							credentials[0], credentials[1]));
 				}
 			}
@@ -76,7 +76,7 @@ public class RestTemplateTransportClientFactory implements TransportClientFactor
 		}

 		restTemplate.getMessageConverters().add(0, mappingJacksonHttpMessageConverter());
-		restTemplate.setErrorHandler(new ErrorHanlder());
+		restTemplate.setErrorHandler(new ErrorHandler());

 		return restTemplate;
 	}
@@ -150,7 +150,7 @@ public class RestTemplateTransportClientFactory implements TransportClientFactor
 	public void shutdown() {
 	}

-	class ErrorHanlder extends DefaultResponseErrorHandler {
+	class ErrorHandler extends DefaultResponseErrorHandler {

 		@Override
 		protected boolean hasError(HttpStatus statusCode) {
@@ -1,11 +1,11 @@
 /*
- * Copyright 2015-2019 the original author or authors.
+ * Copyright 2017-2020 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
+ *      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,
@@ -14,18 +14,19 @@
 * limitations under the License.
 */

-package org.springframework.cloud.netflix.zuul.filters.discovery;
+package org.springframework.cloud.netflix.eureka.http;
+
+import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;

 /**
- * @author Stéphane Leroy
- *
- * A simple passthru service route mapper.
+ * @author Daniel Lavoie
+ * @author Haytham Mohamed
 */
-public class SimpleServiceRouteMapper implements ServiceRouteMapper {
+public class WebClientDiscoveryClientOptionalArgs
+		extends AbstractDiscoveryClientOptionalArgs<Void> {

-	@Override
-	public String apply(String serviceId) {
-		return serviceId;
+	public WebClientDiscoveryClientOptionalArgs() {
+		setTransportClientFactories(new WebClientTransportClientFactories());
 	}

 }
@@ -0,0 +1,236 @@
+/*
+ * Copyright 2017-2020 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
+ *
+ * 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.http;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import com.netflix.appinfo.InstanceInfo;
+import com.netflix.appinfo.InstanceInfo.InstanceStatus;
+import com.netflix.discovery.shared.Application;
+import com.netflix.discovery.shared.Applications;
+import com.netflix.discovery.shared.transport.EurekaHttpClient;
+import com.netflix.discovery.shared.transport.EurekaHttpResponse;
+import com.netflix.discovery.shared.transport.EurekaHttpResponse.EurekaHttpResponseBuilder;
+import com.netflix.discovery.util.StringUtil;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.reactive.function.BodyInserters;
+import org.springframework.web.reactive.function.client.ClientResponse;
+import org.springframework.web.reactive.function.client.WebClient;
+
+import static com.netflix.discovery.shared.transport.EurekaHttpResponse.anEurekaHttpResponse;
+
+/**
+ * @author Daniel Lavoie
+ * @author Haytham Mohamed
+ */
+public class WebClientEurekaHttpClient implements EurekaHttpClient {
+
+	protected final Log logger = LogFactory.getLog(getClass());
+
+	private WebClient webClient;
+
+	public WebClientEurekaHttpClient(WebClient webClient) {
+		this.webClient = webClient;
+	}
+
+	@Override
+	public EurekaHttpResponse<Void> register(InstanceInfo info) {
+		return webClient.post().uri("apps/" + info.getAppName(), Void.class)
+				.body(BodyInserters.fromValue(info))
+				.header(HttpHeaders.ACCEPT_ENCODING, "gzip")
+				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+				.exchange().map(response -> eurekaHttpResponse(response)).block();
+	}
+
+	@Override
+	public EurekaHttpResponse<Void> cancel(String appName, String id) {
+		return webClient.delete().uri("apps/" + appName + '/' + id, Void.class).exchange()
+				.map(response -> eurekaHttpResponse(response)).block();
+	}
+
+	@Override
+	public EurekaHttpResponse<InstanceInfo> sendHeartBeat(String appName, String id,
+			InstanceInfo info, InstanceStatus overriddenStatus) {
+		String urlPath = "apps/" + appName + '/' + id + "?status="
+				+ info.getStatus().toString() + "&lastDirtyTimestamp="
+				+ info.getLastDirtyTimestamp().toString() + (overriddenStatus != null
+						? "&overriddenstatus=" + overriddenStatus.name() : "");
+
+		ClientResponse response = webClient.put().uri(urlPath, InstanceInfo.class)
+				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchange()
+				.block();
+
+		EurekaHttpResponseBuilder<InstanceInfo> builder = anEurekaHttpResponse(
+				statusCodeValueOf(response), InstanceInfo.class)
+						.headers(headersOf(response));
+
+		InstanceInfo entity = response.toEntity(InstanceInfo.class).block().getBody();
+
+		if (entity != null) {
+			builder.entity(entity);
+		}
+
+		return builder.build();
+
+	}
+
+	@Override
+	public EurekaHttpResponse<Void> statusUpdate(String appName, String id,
+			InstanceStatus newStatus, InstanceInfo info) {
+		String urlPath = "apps/" + appName + '/' + id + "/status?value="
+				+ newStatus.name() + "&lastDirtyTimestamp="
+				+ info.getLastDirtyTimestamp().toString();
+
+		return webClient.put().uri(urlPath, Void.class)
+				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+				.exchange().map(response -> eurekaHttpResponse(response)).block();
+	}
+
+	@Override
+	public EurekaHttpResponse<Void> deleteStatusOverride(String appName, String id,
+			InstanceInfo info) {
+		String urlPath = "apps/" + appName + '/' + id + "/status?lastDirtyTimestamp="
+				+ info.getLastDirtyTimestamp().toString();
+
+		return webClient.delete().uri(urlPath, Void.class)
+				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+				.exchange().map(response -> eurekaHttpResponse(response)).block();
+	}
+
+	@Override
+	public EurekaHttpResponse<Applications> getApplications(String... regions) {
+		return getApplicationsInternal("apps/", regions);
+	}
+
+	private EurekaHttpResponse<Applications> getApplicationsInternal(String urlPath,
+			String[] regions) {
+		String url = urlPath;
+
+		if (regions != null && regions.length > 0) {
+			url = url + (urlPath.contains("?") ? "&" : "?") + "regions="
+					+ StringUtil.join(regions);
+		}
+
+		ClientResponse response = webClient.get().uri(url, Applications.class)
+				.header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
+				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchange()
+				.block();
+
+		int statusCode = statusCodeValueOf(response);
+
+		Applications body = response.toEntity(Applications.class).block().getBody();
+
+		return anEurekaHttpResponse(statusCode,
+				statusCode == HttpStatus.OK.value() && body != null ? body : null)
+						.headers(headersOf(response)).build();
+	}
+
+	@Override
+	public EurekaHttpResponse<Applications> getDelta(String... regions) {
+		return getApplicationsInternal("apps/delta", regions);
+	}
+
+	@Override
+	public EurekaHttpResponse<Applications> getVip(String vipAddress, String... regions) {
+		return getApplicationsInternal("vips/" + vipAddress, regions);
+	}
+
+	@Override
+	public EurekaHttpResponse<Applications> getSecureVip(String secureVipAddress,
+			String... regions) {
+		return getApplicationsInternal("svips/" + secureVipAddress, regions);
+	}
+
+	@Override
+	public EurekaHttpResponse<Application> getApplication(String appName) {
+
+		ClientResponse response = webClient.get()
+				.uri("apps/" + appName, Application.class)
+				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchange()
+				.block();
+
+		int statusCode = statusCodeValueOf(response);
+		Application body = response.toEntity(Application.class).block().getBody();
+
+		Application application = statusCode == HttpStatus.OK.value() && body != null
+				? body : null;
+
+		return anEurekaHttpResponse(statusCode, application).headers(headersOf(response))
+				.build();
+	}
+
+	@Override
+	public EurekaHttpResponse<InstanceInfo> getInstance(String appName, String id) {
+		return getInstanceInternal("apps/" + appName + '/' + id);
+	}
+
+	@Override
+	public EurekaHttpResponse<InstanceInfo> getInstance(String id) {
+		return getInstanceInternal("instances/" + id);
+	}
+
+	private EurekaHttpResponse<InstanceInfo> getInstanceInternal(String urlPath) {
+		ClientResponse response = webClient.get().uri(urlPath, InstanceInfo.class)
+				.header(HttpHeaders.ACCEPT, MediaType.APPLICATION_JSON_VALUE).exchange()
+				.block();
+
+		int statusCode = statusCodeValueOf(response);
+		InstanceInfo body = response.toEntity(InstanceInfo.class).block().getBody();
+
+		return anEurekaHttpResponse(statusCode,
+				statusCode == HttpStatus.OK.value() && body != null ? body : null)
+						.headers(headersOf(response)).build();
+	}
+
+	@Override
+	public void shutdown() {
+		// Nothing to do
+	}
+
+	private static Map<String, String> headersOf(ClientResponse response) {
+		ClientResponse.Headers httpHeaders = response.headers();
+		if (httpHeaders == null) {
+			return Collections.emptyMap();
+		}
+		HttpHeaders asHeaders = httpHeaders.asHttpHeaders();
+		if (asHeaders == null) {
+			return Collections.emptyMap();
+		}
+		Map<String, String> headers = new HashMap<>();
+		asHeaders.entrySet().stream().forEach(entry -> entry.getValue().stream()
+				.forEach(v -> headers.put(entry.getKey(), v)));
+		return headers;
+	}
+
+	private int statusCodeValueOf(ClientResponse response) {
+		return response.statusCode().value();
+	}
+
+	private EurekaHttpResponse<Void> eurekaHttpResponse(ClientResponse response) {
+		return anEurekaHttpResponse(statusCodeValueOf(response))
+				.headers(headersOf(response)).build();
+	}
+
+}
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2017-2020 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
+ *
+ * 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.http;
+
+import java.util.Collection;
+import java.util.Optional;
+
+import javax.net.ssl.HostnameVerifier;
+import javax.net.ssl.SSLContext;
+
+import com.netflix.appinfo.InstanceInfo;
+import com.netflix.discovery.EurekaClientConfig;
+import com.netflix.discovery.shared.transport.TransportClientFactory;
+import com.netflix.discovery.shared.transport.jersey.EurekaJerseyClient;
+import com.netflix.discovery.shared.transport.jersey.TransportClientFactories;
+
+/**
+ * @author Daniel Lavoie
+ * @author Haytham Mohamed
+ */
+public class WebClientTransportClientFactories implements TransportClientFactories<Void> {
+
+	@Override
+	public TransportClientFactory newTransportClientFactory(
+			Collection<Void> additionalFilters, EurekaJerseyClient providedJerseyClient) {
+		throw new UnsupportedOperationException();
+	}
+
+	@Override
+	public TransportClientFactory newTransportClientFactory(
+			EurekaClientConfig clientConfig, Collection<Void> additionalFilters,
+			InstanceInfo myInstanceInfo) {
+		return new WebClientTransportClientFactory();
+	}
+
+	@Override
+	public TransportClientFactory newTransportClientFactory(
+			final EurekaClientConfig clientConfig,
+			final Collection<Void> additionalFilters, final InstanceInfo myInstanceInfo,
+			final Optional<SSLContext> sslContext,
+			final Optional<HostnameVerifier> hostnameVerifier) {
+		return new WebClientTransportClientFactory();
+	}
+
+}
@@ -0,0 +1,196 @@
+/*
+ * Copyright 2017-2020 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
+ *
+ * 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.http;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import com.fasterxml.jackson.databind.BeanDescription;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.PropertyNamingStrategy;
+import com.fasterxml.jackson.databind.SerializationConfig;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.module.SimpleModule;
+import com.fasterxml.jackson.databind.ser.BeanSerializerModifier;
+import com.fasterxml.jackson.databind.ser.std.BeanSerializerBase;
+import com.netflix.appinfo.InstanceInfo;
+import com.netflix.discovery.converters.jackson.mixin.ApplicationsJsonMixIn;
+import com.netflix.discovery.converters.jackson.mixin.InstanceInfoJsonMixIn;
+import com.netflix.discovery.converters.jackson.serializer.InstanceInfoJsonBeanSerializer;
+import com.netflix.discovery.shared.Applications;
+import com.netflix.discovery.shared.resolver.EurekaEndpoint;
+import com.netflix.discovery.shared.transport.EurekaHttpClient;
+import com.netflix.discovery.shared.transport.TransportClientFactory;
+import reactor.core.publisher.Mono;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.codec.json.Jackson2JsonDecoder;
+import org.springframework.http.codec.json.Jackson2JsonEncoder;
+import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
+import org.springframework.web.reactive.function.client.ClientResponse;
+import org.springframework.web.reactive.function.client.ExchangeFilterFunction;
+import org.springframework.web.reactive.function.client.ExchangeFilterFunctions;
+import org.springframework.web.reactive.function.client.ExchangeStrategies;
+import org.springframework.web.reactive.function.client.WebClient;
+
+/**
+ * Provides the custom {@link WebClient.Builder} required by the
+ * {@link WebClientEurekaHttpClient}. Relies on Jackson for serialization and
+ * deserialization.
+ *
+ * @author Daniel Lavoie
+ * @author Haytham Mohamed
+ */
+public class WebClientTransportClientFactory implements TransportClientFactory {
+
+	@Override
+	public EurekaHttpClient newClient(EurekaEndpoint serviceUrl) {
+		WebClient.Builder builder = of(serviceUrl.getServiceUrl());
+		this.setExchangeStrategies(builder);
+		this.skipHttp400Error(builder);
+		return new WebClientEurekaHttpClient(builder.build());
+	}
+
+	private WebClient.Builder of(String serviceUrl) {
+		String url = serviceUrl;
+		WebClient.Builder builder = WebClient.builder();
+		try {
+			URI serviceURI = new URI(serviceUrl);
+			if (serviceURI.getUserInfo() != null) {
+				String[] credentials = serviceURI.getUserInfo().split(":");
+				if (credentials.length == 2) {
+					builder.filter(ExchangeFilterFunctions
+							.basicAuthentication(credentials[0], credentials[1]));
+					url = serviceUrl.replace(credentials[0] + ":" + credentials[1] + "@",
+							"");
+				}
+			}
+		}
+		catch (URISyntaxException ignore) {
+		}
+		return builder.baseUrl(url);
+	}
+
+	private void setExchangeStrategies(WebClient.Builder builder) {
+		ObjectMapper objectMapper = mappingJacksonHttpMessageConverter()
+				.getObjectMapper();
+		ExchangeStrategies strategies = ExchangeStrategies.builder()
+				.codecs(clientDefaultCodecsConfigurer -> {
+					clientDefaultCodecsConfigurer.defaultCodecs()
+							.jackson2JsonEncoder(new Jackson2JsonEncoder(objectMapper,
+									MediaType.APPLICATION_JSON));
+					clientDefaultCodecsConfigurer.defaultCodecs()
+							.jackson2JsonDecoder(new Jackson2JsonDecoder(objectMapper,
+									MediaType.APPLICATION_JSON));
+
+				}).build();
+		builder.exchangeStrategies(strategies);
+	}
+
+	private void skipHttp400Error(WebClient.Builder builder) {
+		builder.filter(Http4xxErrorExchangeFilterFunction());
+	}
+
+	// Skip over 4xx http errors
+	private ExchangeFilterFunction Http4xxErrorExchangeFilterFunction() {
+		return ExchangeFilterFunction.ofResponseProcessor(clientResponse -> {
+			// literally 400 pass the tests, not 4xxClientError
+			if (clientResponse.statusCode().value() == 400) {
+				ClientResponse newResponse = ClientResponse.from(clientResponse)
+						.statusCode(HttpStatus.OK).build();
+				newResponse.body((clientHttpResponse, context) -> {
+					return clientHttpResponse.getBody();
+				});
+				return Mono.just(newResponse);
+			}
+			return Mono.just(clientResponse);
+		});
+	}
+
+	/**
+	 * Provides the serialization configurations required by the Eureka Server. JSON
+	 * content exchanged with eureka requires a root node matching the entity being
+	 * serialized or deserialized. Achieved with
+	 * {@link SerializationFeature#WRAP_ROOT_VALUE} and
+	 * {@link DeserializationFeature#UNWRAP_ROOT_VALUE}.
+	 * {@link PropertyNamingStrategy.SnakeCaseStrategy} is applied to the underlying
+	 * {@link ObjectMapper}.
+	 * @return a {@link MappingJackson2HttpMessageConverter} object
+	 */
+	public MappingJackson2HttpMessageConverter mappingJacksonHttpMessageConverter() {
+		MappingJackson2HttpMessageConverter converter = new MappingJackson2HttpMessageConverter();
+		converter.setObjectMapper(new ObjectMapper()
+				.setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE));
+
+		SimpleModule jsonModule = new SimpleModule();
+		jsonModule.setSerializerModifier(createJsonSerializerModifier()); // keyFormatter,
+		// compact));
+		converter.getObjectMapper().registerModule(jsonModule);
+
+		converter.getObjectMapper().configure(SerializationFeature.WRAP_ROOT_VALUE, true);
+		converter.getObjectMapper().configure(DeserializationFeature.UNWRAP_ROOT_VALUE,
+				true);
+		converter.getObjectMapper().addMixIn(Applications.class,
+				ApplicationsJsonMixIn.class);
+		converter.getObjectMapper().addMixIn(InstanceInfo.class,
+				InstanceInfoJsonMixIn.class);
+
+		// converter.getObjectMapper().addMixIn(DataCenterInfo.class,
+		// DataCenterInfoXmlMixIn.class);
+		// converter.getObjectMapper().addMixIn(InstanceInfo.PortWrapper.class,
+		// PortWrapperXmlMixIn.class);
+		// converter.getObjectMapper().addMixIn(Application.class,
+		// ApplicationXmlMixIn.class);
+		// converter.getObjectMapper().addMixIn(Applications.class,
+		// ApplicationsXmlMixIn.class);
+
+		return converter;
+	}
+
+	public static BeanSerializerModifier createJsonSerializerModifier() { // final
+		// KeyFormatter
+		// keyFormatter,
+		// final
+		// boolean
+		// compactMode)
+		// {
+		return new BeanSerializerModifier() {
+			@Override
+			public JsonSerializer<?> modifySerializer(SerializationConfig config,
+					BeanDescription beanDesc, JsonSerializer<?> serializer) {
+				/*
+				 * if (beanDesc.getBeanClass().isAssignableFrom(Applications.class)) {
+				 * return new ApplicationsJsonBeanSerializer((BeanSerializerBase)
+				 * serializer, keyFormatter); }
+				 */
+				if (beanDesc.getBeanClass().isAssignableFrom(InstanceInfo.class)) {
+					return new InstanceInfoJsonBeanSerializer(
+							(BeanSerializerBase) serializer, false);
+				}
+				return serializer;
+			}
+		};
+	}
+
+	@Override
+	public void shutdown() {
+	}
+
+}
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2013-2020 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
+ *
+ * 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.loadbalancer;
+
+import javax.annotation.PostConstruct;
+
+import com.netflix.appinfo.EurekaInstanceConfig;
+import com.netflix.discovery.EurekaClientConfig;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
+import org.springframework.cloud.loadbalancer.config.LoadBalancerZoneConfig;
+import org.springframework.cloud.netflix.eureka.support.ZoneUtils;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.util.StringUtils;
+
+import static org.springframework.cloud.netflix.eureka.loadbalancer.LoadBalancerEurekaAutoConfiguration.LOADBALANCER_ZONE;
+
+/**
+ * A configuration for Spring Cloud LoadBalancer that retrieves client instance zone from
+ * Eureka and sets it as a property. Based on
+ * {@link EurekaLoadBalancerClientConfiguration}.
+ *
+ * @author Olga Maciaszek-Sharma
+ * @since 2.2.1
+ * @see EurekaLoadBalancerClientConfiguration
+ */
+@Configuration
+@ConditionalOnBean({ LoadBalancerZoneConfig.class, EurekaLoadBalancerProperties.class })
+public class EurekaLoadBalancerClientConfiguration {
+
+	private static final Log LOG = LogFactory
+			.getLog(EurekaLoadBalancerClientConfiguration.class);
+
+	private final EurekaClientConfig clientConfig;
+
+	private final EurekaInstanceConfig eurekaConfig;
+
+	private final LoadBalancerZoneConfig zoneConfig;
+
+	private final EurekaLoadBalancerProperties eurekaLoadBalancerProperties;
+
+	public EurekaLoadBalancerClientConfiguration(
+			@Autowired(required = false) EurekaClientConfig clientConfig,
+			@Autowired(required = false) EurekaInstanceConfig eurekaInstanceConfig,
+			LoadBalancerZoneConfig zoneConfig,
+			EurekaLoadBalancerProperties eurekaLoadBalancerProperties) {
+		this.clientConfig = clientConfig;
+		this.eurekaConfig = eurekaInstanceConfig;
+		this.zoneConfig = zoneConfig;
+		this.eurekaLoadBalancerProperties = eurekaLoadBalancerProperties;
+	}
+
+	@PostConstruct
+	public void postprocess() {
+		if (!StringUtils.isEmpty(zoneConfig.getZone())) {
+			return;
+		}
+		String zone = getZoneFromEureka();
+		if (!StringUtils.isEmpty(zone)) {
+			if (LOG.isDebugEnabled()) {
+				LOG.debug("Setting the value of '" + LOADBALANCER_ZONE + "' to " + zone);
+			}
+			zoneConfig.setZone(zone);
+		}
+	}
+
+	private String getZoneFromEureka() {
+		String zone;
+		boolean approximateZoneFromHostname = eurekaLoadBalancerProperties
+				.isApproximateZoneFromHostname();
+		if (approximateZoneFromHostname && eurekaConfig != null) {
+			return ZoneUtils.extractApproximateZone(this.eurekaConfig.getHostName(false));
+		}
+		else {
+			zone = eurekaConfig == null ? null
+					: eurekaConfig.getMetadataMap().get("zone");
+			if (StringUtils.isEmpty(zone) && clientConfig != null) {
+				String[] zones = clientConfig
+						.getAvailabilityZones(clientConfig.getRegion());
+				// Pick the first one from the regions we want to connect to
+				zone = zones != null && zones.length > 0 ? zones[0] : null;
+			}
+			return zone;
+		}
+	}
+
+}
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2012-2020 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
+ *
+ * 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.loadbalancer;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+/**
+ * A {@link ConfigurationProperties} bean for the Eureka-specific instrumentation of
+ * Spring Cloud LoadBalancer.
+ *
+ * @author Olga Maciaszek-Sharma
+ * @since 2.2.1
+ */
+@ConfigurationProperties("spring.cloud.loadbalancer.eureka")
+public class EurekaLoadBalancerProperties {
+
+	/**
+	 * Used to determine whether we should try to get the `zone` value from host name.
+	 */
+	private boolean approximateZoneFromHostname = false;
+
+	public boolean isApproximateZoneFromHostname() {
+		return approximateZoneFromHostname;
+	}
+
+	public void setApproximateZoneFromHostname(boolean approximateZoneFromHostname) {
+		this.approximateZoneFromHostname = approximateZoneFromHostname;
+	}
+
+}
@@ -0,0 +1,59 @@
+/*
+ * Copyright 2013-2020 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
+ *
+ * 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.loadbalancer;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClientConfigurationRegistrar;
+import org.springframework.cloud.loadbalancer.annotation.LoadBalancerClients;
+import org.springframework.cloud.loadbalancer.config.LoadBalancerZoneConfig;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+
+/**
+ * An Autoconfiguration that loads default config for Spring Cloud LoadBalancer clients.
+ *
+ * @author Olga Maciaszek-Sharma
+ * @since 2.2.1
+ * @see EurekaLoadBalancerClientConfiguration
+ */
+@Configuration(proxyBeanMethods = false)
+@EnableConfigurationProperties(EurekaLoadBalancerProperties.class)
+@ConditionalOnClass(LoadBalancerClientConfigurationRegistrar.class)
+@LoadBalancerClients(defaultConfiguration = EurekaLoadBalancerClientConfiguration.class)
+public class LoadBalancerEurekaAutoConfiguration {
+
+	/**
+	 * Spring Cloud LoadBalancer Zone property name.
+	 */
+	public static final String LOADBALANCER_ZONE = "spring.cloud.loadbalancer.zone";
+
+	@Bean
+	@ConditionalOnMissingBean
+	EurekaLoadBalancerProperties eurekaLoadBalancerProperties() {
+		return new EurekaLoadBalancerProperties();
+	}
+
+	@Bean
+	@ConditionalOnMissingBean
+	LoadBalancerZoneConfig zoneConfig(Environment environment) {
+		return new LoadBalancerZoneConfig(environment.getProperty(LOADBALANCER_ZONE));
+	}
+
+}
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 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
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 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
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2017-2019 the original author or authors.
+ * Copyright 2017-2020 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
+ *      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,
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2019-2020 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
+ *
+ * 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.reactive;
+
+import com.netflix.discovery.EurekaClient;
+import com.netflix.discovery.EurekaClientConfig;
+import com.netflix.discovery.shared.Application;
+import com.netflix.discovery.shared.Applications;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+import org.springframework.cloud.client.ServiceInstance;
+import org.springframework.cloud.client.discovery.ReactiveDiscoveryClient;
+import org.springframework.cloud.netflix.eureka.EurekaServiceInstance;
+import org.springframework.core.Ordered;
+
+/**
+ * A {@link ReactiveDiscoveryClient} implementation for Eureka.
+ *
+ * @author Tim Ysewyn
+ */
+public class EurekaReactiveDiscoveryClient implements ReactiveDiscoveryClient {
+
+	private final EurekaClient eurekaClient;
+
+	private final EurekaClientConfig clientConfig;
+
+	public EurekaReactiveDiscoveryClient(EurekaClient eurekaClient,
+			EurekaClientConfig clientConfig) {
+		this.eurekaClient = eurekaClient;
+		this.clientConfig = clientConfig;
+	}
+
+	@Override
+	public String description() {
+		return "Spring Cloud Eureka Reactive Discovery Client";
+	}
+
+	@Override
+	public Flux<ServiceInstance> getInstances(String serviceId) {
+		return Flux
+				.defer(() -> Flux.fromIterable(
+						eurekaClient.getInstancesByVipAddress(serviceId, false)))
+				.map(EurekaServiceInstance::new);
+	}
+
+	@Override
+	public Flux<String> getServices() {
+		return Flux.defer(() -> Mono.justOrEmpty(eurekaClient.getApplications()))
+				.flatMapIterable(Applications::getRegisteredApplications)
+				.filter(application -> !application.getInstances().isEmpty())
+				.map(Application::getName).map(String::toLowerCase);
+	}
+
+	@Override
+	public int getOrder() {
+		return clientConfig instanceof Ordered ? ((Ordered) clientConfig).getOrder()
+				: ReactiveDiscoveryClient.DEFAULT_ORDER;
+	}
+
+}
@@ -0,0 +1,74 @@
+/*
+ * Copyright 2019-2020 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
+ *
+ * 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.reactive;
+
+import com.netflix.discovery.EurekaClient;
+import com.netflix.discovery.EurekaClientConfig;
+
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+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.properties.EnableConfigurationProperties;
+import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
+import org.springframework.cloud.client.ConditionalOnDiscoveryHealthIndicatorEnabled;
+import org.springframework.cloud.client.ConditionalOnReactiveDiscoveryEnabled;
+import org.springframework.cloud.client.ReactiveCommonsClientAutoConfiguration;
+import org.springframework.cloud.client.discovery.composite.reactive.ReactiveCompositeDiscoveryClientAutoConfiguration;
+import org.springframework.cloud.client.discovery.health.DiscoveryClientHealthIndicatorProperties;
+import org.springframework.cloud.client.discovery.health.reactive.ReactiveDiscoveryClientHealthIndicator;
+import org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * Configuration related to service discovery when using Netflix Eureka.
+ *
+ * @author Tim Ysewyn
+ */
+@Configuration(proxyBeanMethods = false)
+@ConditionalOnClass(EurekaClientConfig.class)
+@ConditionalOnDiscoveryEnabled
+@ConditionalOnReactiveDiscoveryEnabled
+@ConditionalOnProperty(value = "eureka.client.enabled", matchIfMissing = true)
+@EnableConfigurationProperties
+@AutoConfigureAfter({ EurekaClientAutoConfiguration.class,
+		ReactiveCompositeDiscoveryClientAutoConfiguration.class })
+@AutoConfigureBefore(ReactiveCommonsClientAutoConfiguration.class)
+@ImportAutoConfiguration(EurekaClientAutoConfiguration.class)
+public class EurekaReactiveDiscoveryClientConfiguration {
+
+	@Bean
+	@ConditionalOnMissingBean
+	public EurekaReactiveDiscoveryClient eurekaReactiveDiscoveryClient(
+			EurekaClient client, EurekaClientConfig clientConfig) {
+		return new EurekaReactiveDiscoveryClient(client, clientConfig);
+	}
+
+	@Bean
+	@ConditionalOnClass(
+			name = "org.springframework.boot.actuate.health.ReactiveHealthIndicator")
+	@ConditionalOnDiscoveryHealthIndicatorEnabled
+	public ReactiveDiscoveryClientHealthIndicator eurekaReactiveDiscoveryClientHealthIndicator(
+			EurekaReactiveDiscoveryClient client,
+			DiscoveryClientHealthIndicatorProperties properties) {
+		return new ReactiveDiscoveryClientHealthIndicator(client, properties);
+	}
+
+}
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2016 the original author or authors.
+ * Copyright 2013-2020 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
+ *      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,
@@ -138,11 +138,14 @@ public class EurekaAutoServiceRegistration implements AutoServiceRegistration,

 	public void onApplicationEvent(WebServerInitializedEvent event) {
 		// TODO: take SSL into account
-		int localPort = event.getWebServer().getPort();
-		if (this.port.get() == 0) {
-			log.info("Updating port to " + localPort);
-			this.port.compareAndSet(0, localPort);
-			start();
+		String contextName = event.getApplicationContext().getServerNamespace();
+		if (contextName == null || !contextName.equals("management")) {
+			int localPort = event.getWebServer().getPort();
+			if (this.port.get() == 0) {
+				log.info("Updating port to " + localPort);
+				this.port.compareAndSet(0, localPort);
+				start();
+			}
 		}
 	}

@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 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
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 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
+ *      https://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2019 the original author or authors.
+ * Copyright 2013-2020 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
+ *      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,
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package org.springframework.cloud.netflix.ribbon.eureka;
+package org.springframework.cloud.netflix.eureka.support;

 import org.springframework.util.StringUtils;

@@ -1,74 +0,0 @@
-/*
- * Copyright 2013-2019 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.eureka;
-
-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 com.netflix.discovery.EurekaClient;
-import com.netflix.niws.loadbalancer.DiscoveryEnabledNIWSServerList;
-
-import org.springframework.boot.autoconfigure.condition.AllNestedConditions;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
-import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
-import org.springframework.context.annotation.Conditional;
-
-/**
- * Conditional that requires both Ribbon and Eureka to be enabled.
- * @author Ihor Kryvenko
- * @author Spencer Gibb
- * @author Olga Maciaszek-Sharma
- */
-@Target({ ElementType.TYPE, ElementType.METHOD })
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Conditional(ConditionalOnRibbonAndEurekaEnabled.OnRibbonAndEurekaEnabledCondition.class)
-public @interface ConditionalOnRibbonAndEurekaEnabled {
-
-	class OnRibbonAndEurekaEnabledCondition extends AllNestedConditions {
-
-		OnRibbonAndEurekaEnabledCondition() {
-			super(ConfigurationPhase.REGISTER_BEAN);
-		}
-
-		@ConditionalOnClass(DiscoveryEnabledNIWSServerList.class)
-		@ConditionalOnBean(SpringClientFactory.class)
-		@ConditionalOnProperty(value = "ribbon.eureka.enabled", matchIfMissing = true)
-		static class Defaults {
-
-		}
-
-		@ConditionalOnBean(EurekaClient.class)
-		static class EurekaBeans {
-
-		}
-
-		@ConditionalOnProperty(value = "eureka.client.enabled", matchIfMissing = true)
-		@ConditionalOnDiscoveryEnabled
-		static class OnEurekaClientEnabled {
-
-		}
-
-	}
-
-}
@@ -1,119 +0,0 @@
-/*
- * Copyright 2013-2019 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.eureka;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.client.config.IClientConfig;
-import com.netflix.loadbalancer.Server;
-import com.netflix.loadbalancer.ServerList;
-import com.netflix.niws.loadbalancer.DiscoveryEnabledServer;
-
-import org.springframework.cloud.netflix.ribbon.RibbonProperties;
-
-/**
- * @author Dave Syer
- */
-public class DomainExtractingServerList implements ServerList<DiscoveryEnabledServer> {
-
-	private ServerList<DiscoveryEnabledServer> list;
-
-	private final RibbonProperties ribbon;
-
-	private boolean approximateZoneFromHostname;
-
-	public DomainExtractingServerList(ServerList<DiscoveryEnabledServer> list,
-			IClientConfig clientConfig, boolean approximateZoneFromHostname) {
-		this.list = list;
-		this.ribbon = RibbonProperties.from(clientConfig);
-		this.approximateZoneFromHostname = approximateZoneFromHostname;
-	}
-
-	@Override
-	public List<DiscoveryEnabledServer> getInitialListOfServers() {
-		List<DiscoveryEnabledServer> servers = setZones(
-				this.list.getInitialListOfServers());
-		return servers;
-	}
-
-	@Override
-	public List<DiscoveryEnabledServer> getUpdatedListOfServers() {
-		List<DiscoveryEnabledServer> servers = setZones(
-				this.list.getUpdatedListOfServers());
-		return servers;
-	}
-
-	private List<DiscoveryEnabledServer> setZones(List<DiscoveryEnabledServer> servers) {
-		List<DiscoveryEnabledServer> result = new ArrayList<>();
-		boolean isSecure = this.ribbon.isSecure(true);
-		boolean shouldUseIpAddr = this.ribbon.isUseIPAddrForServer();
-		for (DiscoveryEnabledServer server : servers) {
-			result.add(new DomainExtractingServer(server, isSecure, shouldUseIpAddr,
-					this.approximateZoneFromHostname));
-		}
-		return result;
-	}
-
-}
-
-class DomainExtractingServer extends DiscoveryEnabledServer {
-
-	private String id;
-
-	@Override
-	public String getId() {
-		return id;
-	}
-
-	@Override
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	DomainExtractingServer(DiscoveryEnabledServer server, boolean useSecurePort,
-			boolean useIpAddr, boolean approximateZoneFromHostname) {
-		// host and port are set in super()
-		super(server.getInstanceInfo(), useSecurePort, useIpAddr);
-		if (server.getInstanceInfo().getMetadata().containsKey("zone")) {
-			setZone(server.getInstanceInfo().getMetadata().get("zone"));
-		}
-		else if (approximateZoneFromHostname) {
-			setZone(ZoneUtils.extractApproximateZone(server.getHost()));
-		}
-		else {
-			setZone(server.getZone());
-		}
-		setId(extractId(server));
-		setAlive(server.isAlive());
-		setReadyToServe(server.isReadyToServe());
-	}
-
-	private String extractId(Server server) {
-		if (server instanceof DiscoveryEnabledServer) {
-			DiscoveryEnabledServer enabled = (DiscoveryEnabledServer) server;
-			InstanceInfo instance = enabled.getInstanceInfo();
-			if (instance.getMetadata().containsKey("instanceId")) {
-				return instance.getHostName() + ":"
-						+ instance.getMetadata().get("instanceId");
-			}
-		}
-		return super.getId();
-	}
-
-}
@@ -1,151 +0,0 @@
-/*
- * Copyright 2013-2019 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.eureka;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Provider;
-
-import com.netflix.appinfo.EurekaInstanceConfig;
-import com.netflix.client.config.IClientConfig;
-import com.netflix.config.ConfigurationManager;
-import com.netflix.config.DeploymentContext.ContextKey;
-import com.netflix.discovery.EurekaClient;
-import com.netflix.discovery.EurekaClientConfig;
-import com.netflix.loadbalancer.IPing;
-import com.netflix.loadbalancer.ServerList;
-import com.netflix.niws.loadbalancer.DiscoveryEnabledNIWSServerList;
-import com.netflix.niws.loadbalancer.NIWSDiscoveryPing;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.netflix.ribbon.PropertiesFactory;
-import org.springframework.cloud.netflix.ribbon.RibbonClientName;
-import org.springframework.cloud.netflix.ribbon.RibbonUtils;
-import org.springframework.cloud.netflix.ribbon.ServerIntrospector;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.util.StringUtils;
-
-/**
- * Preprocessor that configures defaults for eureka-discovered ribbon clients. Such as:
- * <code>@zone</code>, NIWSServerListClassName, DeploymentContextBasedVipAddresses,
- * NFLoadBalancerRuleClassName, NIWSServerListFilterClassName and more
- *
- * @author Spencer Gibb
- * @author Dave Syer
- * @author Ryan Baxter
- */
-@Configuration
-public class EurekaRibbonClientConfiguration {
-
-	private static final Log log = LogFactory
-			.getLog(EurekaRibbonClientConfiguration.class);
-
-	@Value("${ribbon.eureka.approximateZoneFromHostname:false}")
-	private boolean approximateZoneFromHostname = false;
-
-	@RibbonClientName
-	private String serviceId = "client";
-
-	@Autowired(required = false)
-	private EurekaClientConfig clientConfig;
-
-	@Autowired(required = false)
-	private EurekaInstanceConfig eurekaConfig;
-
-	@Autowired
-	private PropertiesFactory propertiesFactory;
-
-	public EurekaRibbonClientConfiguration() {
-	}
-
-	public EurekaRibbonClientConfiguration(EurekaClientConfig clientConfig,
-			String serviceId, EurekaInstanceConfig eurekaConfig,
-			boolean approximateZoneFromHostname) {
-		this.clientConfig = clientConfig;
-		this.serviceId = serviceId;
-		this.eurekaConfig = eurekaConfig;
-		this.approximateZoneFromHostname = approximateZoneFromHostname;
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public IPing ribbonPing(IClientConfig config) {
-		if (this.propertiesFactory.isSet(IPing.class, serviceId)) {
-			return this.propertiesFactory.get(IPing.class, config, serviceId);
-		}
-		NIWSDiscoveryPing ping = new NIWSDiscoveryPing();
-		ping.initWithNiwsConfig(config);
-		return ping;
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public ServerList<?> ribbonServerList(IClientConfig config,
-			Provider<EurekaClient> eurekaClientProvider) {
-		if (this.propertiesFactory.isSet(ServerList.class, serviceId)) {
-			return this.propertiesFactory.get(ServerList.class, config, serviceId);
-		}
-		DiscoveryEnabledNIWSServerList discoveryServerList = new DiscoveryEnabledNIWSServerList(
-				config, eurekaClientProvider);
-		DomainExtractingServerList serverList = new DomainExtractingServerList(
-				discoveryServerList, config, this.approximateZoneFromHostname);
-		return serverList;
-	}
-
-	@Bean
-	public ServerIntrospector serverIntrospector() {
-		return new EurekaServerIntrospector();
-	}
-
-	@PostConstruct
-	public void preprocess() {
-		String zone = ConfigurationManager.getDeploymentContext()
-				.getValue(ContextKey.zone);
-		if (this.clientConfig != null && StringUtils.isEmpty(zone)) {
-			if (this.approximateZoneFromHostname && this.eurekaConfig != null) {
-				String approxZone = ZoneUtils
-						.extractApproximateZone(this.eurekaConfig.getHostName(false));
-				log.debug("Setting Zone To " + approxZone);
-				ConfigurationManager.getDeploymentContext().setValue(ContextKey.zone,
-						approxZone);
-			}
-			else {
-				String availabilityZone = this.eurekaConfig == null ? null
-						: this.eurekaConfig.getMetadataMap().get("zone");
-				if (availabilityZone == null) {
-					String[] zones = this.clientConfig
-							.getAvailabilityZones(this.clientConfig.getRegion());
-					// Pick the first one from the regions we want to connect to
-					availabilityZone = zones != null && zones.length > 0 ? zones[0]
-							: null;
-				}
-				if (availabilityZone != null) {
-					// You can set this with archaius.deployment.* (maybe requires
-					// custom deployment context)?
-					ConfigurationManager.getDeploymentContext().setValue(ContextKey.zone,
-							availabilityZone);
-				}
-			}
-		}
-		RibbonUtils.initializeRibbonDefaults(serviceId);
-	}
-
-}
--- a/Show More
+++ b/Show More