Update SNAPSHOT to 2.2.0.RC2

Apparently you can build on the command line but Eclipse is fussy
now and wouldn't compile these projects without explicit
dependencies.

.circleci/config.yml

@@ -0,0 +1,41 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: springcloud/pipeline-base
+        user: appuser
+    environment:
+      _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
+      TERM: dumb
+    branches:
+      ignore:
+        - gh-pages # list of branches to ignore
+    steps:
+      - checkout
+      - restore_cache:
+          key: sc-netflix-{{ .Branch }}
+      - run:
+          name: "Download dependencies"
+          command: |
+            cd spring-cloud-netflix-hystrix-contract && ../mvnw clean install && \
+            ./mvnw -s .settings.xml -U --fail-never dependency:go-offline || true
+      - save_cache:
+          key: sc-netflix-{{ .Branch }}
+          paths:
+            - ~/.m2
+      - run:
+          name: "Running build"
+          command: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -P sonar -nsu --batch-mode -Dmaven.test.redirectTestOutputToFile=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
+      - run:
+          name: "Aggregate test results"
+          when: always
+          command: |
+            mkdir -p ~/junit/
+            find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} ~/junit/ \;
+            bash <(curl -s https://codecov.io/bash)
+      - store_artifacts:
+          path: ~/junit/
+          destination: artifacts
+      - store_test_results:
+          path: ~/junit/
+          destination: testartifacts

.editorconfig

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

.flattened-pom.xml

@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.springframework.cloud</groupId>
+    <artifactId>spring-cloud-build</artifactId>
+    <version>2.2.0.RC2</version>
+    <relativePath></relativePath>
+  </parent>
+  <groupId>org.springframework.cloud</groupId>
+  <artifactId>spring-cloud-netflix</artifactId>
+  <version>2.2.0.RC2</version>
+  <packaging>pom</packaging>
+  <name>Spring Cloud Netflix</name>
+  <description>Spring Cloud Netflix</description>
+  <url>https://spring.io/spring-cloud/spring-cloud-netflix</url>
+  <organization>
+    <name>Pivotal Software, Inc.</name>
+    <url>https://www.spring.io</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
+      <comments>Copyright 2014-2015 the original author or authors.
+
+				Licensed under the Apache License, Version 2.0 (the "License");
+				you may not use this file except in compliance with the License.
+				You may obtain a copy of the License at
+
+				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.</comments>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>dsyer</id>
+      <name>Dave Syer</name>
+      <email>dsyer at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>sgibb</id>
+      <name>Spencer Gibb</name>
+      <email>sgibb at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>mgrzejszczak</id>
+      <name>Marcin Grzejszczak</name>
+      <email>mgrzejszczak at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>rbaxter</id>
+      <name>Ryan Baxter</name>
+      <email>rbaxter at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>omaciaszeksharma</id>
+      <name>Olga Maciaszek-Sharma</name>
+      <email>omaciaszeksharma at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git://github.com/spring-cloud/spring-cloud-netflix.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-netflix.git</developerConnection>
+    <url>https://github.com/spring-cloud/spring-cloud-netflix</url>
+  </scm>
+  <profiles>
+    <profile>
+      <id>spring</id>
+      <repositories>
+        <repository>
+          <releases>
+            <enabled>false</enabled>
+          </releases>
+          <snapshots>
+            <enabled>true</enabled>
+          </snapshots>
+          <id>spring-snapshots</id>
+          <name>Spring Snapshots</name>
+          <url>https://repo.spring.io/libs-snapshot-local</url>
+        </repository>
+        <repository>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <id>spring-milestones</id>
+          <name>Spring Milestones</name>
+          <url>https://repo.spring.io/libs-milestone-local</url>
+        </repository>
+        <repository>
+          <snapshots>
+            <enabled>false</enabled>
+          </snapshots>
+          <id>spring-releases</id>
+          <name>Spring Releases</name>
+          <url>https://repo.spring.io/release</url>
+        </repository>
+      </repositories>
+    </profile>
+  </profiles>
+</project>

.github/CONTRIBUTING.md

@@ -0,0 +1,45 @@
+
+# Contributing
+
+Spring Cloud is released under the non-restrictive Apache 2.0 license,
+and follows a very standard Github development process, using Github
+tracker for issues and merging pull requests into master. If you want
+to contribute even something trivial please do not hesitate, but
+follow the guidelines below.
+
+## Sign the Contributor License Agreement
+Before we accept a non-trivial patch or pull request we will need you to sign the
+[Contributor License Agreement](https://cla.pivotal.io/sign/spring).
+Signing the contributor's agreement does not grant anyone commit rights to the main
+repository, but it does mean that we can accept your contributions, and you will get an
+author credit if we do.  Active contributors might be asked to join the core team, and
+given the ability to merge pull requests.
+
+## Code of Conduct
+This project adheres to the Contributor Covenant [code of
+conduct](https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc). By participating, you  are expected to uphold this code. Please report
+unacceptable behavior to spring-code-of-conduct@pivotal.io.
+
+## Code Conventions and Housekeeping
+None of these is essential for a pull request, but they will all help.  They can also be
+added after the original pull request but before a merge.
+
+* Use the Spring Framework code format conventions. If you use Eclipse
+  you can import formatter settings using the
+  `eclipse-code-formatter.xml` file from the
+  [Spring Cloud Build](https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/spring-cloud-dependencies-parent/eclipse-code-formatter.xml) project. If using IntelliJ, you can use the
+  [Eclipse Code Formatter Plugin](https://plugins.jetbrains.com/plugin/6546) to import the same file.
+* Make sure all new `.java` files to have a simple Javadoc class comment with at least an
+  `@author` tag identifying you, and preferably at least a paragraph on what the class is
+  for.
+* Add the ASF license header comment to all new `.java` files (copy from existing files
+  in the project)
+* Add yourself as an `@author` to the .java files that you modify substantially (more
+  than cosmetic changes).
+* Add some Javadocs and, if you change the namespace, some XSD doc elements.
+* A few unit tests would help a lot as well -- someone has to do it.
+* If no-one else is using your branch, please rebase it against the current master (or
+  other target branch in the main project).
+* When writing a commit message please follow [these conventions](https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html),
+  if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
+  message (where XXXX is the issue number).

.github/ISSUE_TEMPLATE.md

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

.gitignore

@@ -7,6 +7,15 @@
 .settings/
 .springBeans
 target/
+bin/
 _site/
 .idea
 *.iml
+*.ipr
+*.iws
+.factorypath
+*.log
+.shelf
+*.swp
+*.swo
+.vscode/

.mvn/jvm.config

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

.mvn/maven.config

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

.mvn/wrapper/MavenWrapperDownloader.java

@@ -0,0 +1,107 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  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.
+*/
+
+import java.util.Properties;
+
+public class MavenWrapperDownloader {
+
+    /**
+     * Default URL to download the maven-wrapper.jar from, if no 'downloadUrl' is provided.
+     */
+    private static final String DEFAULT_DOWNLOAD_URL =
+            "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.0/maven-wrapper-0.4.0.jar";
+
+    /**
+     * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
+     * use instead of the default one.
+     */
+    private static final String MAVEN_WRAPPER_PROPERTIES_PATH =
+            ".mvn/wrapper/maven-wrapper.properties";
+
+    /**
+     * Path where the maven-wrapper.jar will be saved to.
+     */
+    private static final String MAVEN_WRAPPER_JAR_PATH =
+            ".mvn/wrapper/maven-wrapper.jar";
+
+    /**
+     * Name of the property which should be used to override the default download url for the wrapper.
+     */
+    private static final String PROPERTY_NAME_WRAPPER_URL = "wrapperUrl";
+
+    public static void main(String args[]) {
+        System.out.println("- Downloader started");
+        File baseDirectory = new File(args[0]);
+        System.out.println("- Using base directory: " + baseDirectory.getAbsolutePath());
+
+        // If the maven-wrapper.properties exists, read it and check if it contains a custom
+        // wrapperUrl parameter.
+        File mavenWrapperPropertyFile = new File(baseDirectory, MAVEN_WRAPPER_PROPERTIES_PATH);
+        String url = DEFAULT_DOWNLOAD_URL;
+        if(mavenWrapperPropertyFile.exists()) {
+            FileInputStream mavenWrapperPropertyFileInputStream = null;
+            try {
+                mavenWrapperPropertyFileInputStream = new FileInputStream(mavenWrapperPropertyFile);
+                Properties mavenWrapperProperties = new Properties();
+                mavenWrapperProperties.load(mavenWrapperPropertyFileInputStream);
+                url = mavenWrapperProperties.getProperty(PROPERTY_NAME_WRAPPER_URL, url);
+            } catch (IOException e) {
+                System.out.println("- ERROR loading '" + MAVEN_WRAPPER_PROPERTIES_PATH + "'");
+            } finally {
+                try {
+                    if(mavenWrapperPropertyFileInputStream != null) {
+                        mavenWrapperPropertyFileInputStream.close();
+                    }
+                } catch (IOException e) {
+                    // Ignore ...
+                }
+            }
+        }
+        System.out.println("- Downloading from: : " + url);
+
+        File outputFile = new File(baseDirectory.getAbsolutePath(), MAVEN_WRAPPER_JAR_PATH);
+        if(!outputFile.getParentFile().exists()) {
+            if(!outputFile.getParentFile().mkdirs()) {
+                System.out.println(
+                        "- ERROR creating output direcrory '" + outputFile.getParentFile().getAbsolutePath() + "'");
+            }
+        }
+        System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
+        try {
+            downloadFileFromURL(url, outputFile);
+            System.out.println("Done");
+            System.exit(0);
+        } catch (Throwable e) {
+            System.out.println("- Error downloading");
+            e.printStackTrace();
+            System.exit(1);
+        }
+    }
+
+    private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        URL website = new URL(urlString);
+        ReadableByteChannel rbc;
+        rbc = Channels.newChannel(website.openStream());
+        FileOutputStream fos = new FileOutputStream(destination);
+        fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+        fos.close();
+        rbc.close();
+    }
+
+}

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1 @@
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip

.settings.xml

@@ -9,13 +9,19 @@
   </servers>
   <profiles>
 	<profile>
+      <!--
+          N.B. this profile is only here to support users and IDEs that do not use Maven 3.3. 
+          It isn't needed on the command line if you use the wrapper script (mvnw) or if you use 
+          a native Maven with the right version. Eclipse users should points their Maven tooling to
+          this settings file, or copy the profile into their ~/.m2/settings.xml.
+      -->
 	  <id>spring</id>
 	  <activation><activeByDefault>true</activeByDefault></activation>
 	  <repositories>
 		<repository>
 			<id>spring-snapshots</id>
 			<name>Spring Snapshots</name>
-			<url>http://repo.spring.io/libs-snapshot-local</url>
+			<url>https://repo.spring.io/libs-snapshot-local</url>
 			<snapshots>
 				<enabled>true</enabled>
 			</snapshots>
@@ -23,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>
@@ -31,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>
@@ -41,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>
@@ -49,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>

.travis.yml

@@ -1,25 +0,0 @@
-sudo: false
-cache:
-  directories:
-    - $HOME/.m2
-language: java
-jdk:
-  - oraclejdk8
-before_install:
-  - git config user.name "$GIT_NAME"
-  - git config user.email "$GIT_EMAIL"
-  - git config credential.helper "store --file=.git/credentials"
-  - echo "https://$GH_TOKEN:@github.com" > .git/credentials
-  - gem install asciidoctor
-install:
-- mvn --settings .settings.xml install -P docs -q -U -DskipTests=true -Dmaven.test.redirectTestOutputToFile=true
-- ./docs/src/main/asciidoc/ghpages.sh
-script:
-- '[ "${TRAVIS_PULL_REQUEST}" != "false" ] || mvn --settings .settings.xml deploy -nsu -Dmaven.test.redirectTestOutputToFile=true'
-- '[ "${TRAVIS_PULL_REQUEST}" = "false" ] || mvn --settings .settings.xml install -nsu -Dmaven.test.redirectTestOutputToFile=true'
-env:
-  global:
-  - GIT_NAME="Dave Syer"
-  - GIT_EMAIL=dsyer@pivotal.io
-  - CI_DEPLOY_USERNAME=buildmaster
-  - secure: aeLXRC5oFSddwnZt1/7G2/OHr7jDbxz0ET7sej3I+eSbe3N5vbzQ6FC08es4l89l54ciXd90I1g2BMw7DTYKOO373FP78XPdAEbifJTU4DGd6fCELmoTtUPhjunBIk7E49hisPbv82892IYYA7qi/hzG548cPyZ1IgiJjq0NCsc=

Guardfile

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

LICENSE.txt

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

README.adoc

@@ -1,6 +1,9 @@
 // Do not edit this file (e.g. go instead to src/main/asciidoc)
 
-image::https://travis-ci.org/spring-cloud/spring-cloud-netflix.svg?branch=master[Build Status, link=https://travis-ci.org/spring-cloud/spring-cloud-netflix]
+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"]
+
 
 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
@@ -16,44 +19,79 @@ Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon).
 * Service Discovery: an embedded Eureka server can be created with declarative Java configuration
 * Circuit Breaker: Hystrix clients can be built with a simple annotation-driven method decorator
 * Circuit Breaker: embedded Hystrix dashboard with declarative Java configuration
-* Declarative REST Client: Feign creates a dynamic implementation of an interface decorated with JAX-RS or Spring MVC annotations
 * Client Side Load Balancer: Ribbon
-* External Configuration: a bridge from the Sprnig Environment to Archaius (enables native configuration of Netflix components using Spring Boot conventions)
-* Router and Filter: automatic regsitration of Zuul filters, and a simple convention over configuration approach to reverse proxy creation
+* 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
+
+
+== Modules In Maintenance Mode
+
+Placing a module in maintenance mode means that the Spring Cloud team will no longer be adding new features to the module.
+We will fix blocker bugs and security issues, and we will also consider and review small pull requests from the community.
+
+We intend to continue to support these modules for a period of at least a year from the general availability
+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-hystrix-contract
+* spring-cloud-netflix-hystrix-dashboard
+* spring-cloud-netflix-hystrix-stream
+* spring-cloud-netflix-hystrix
+* spring-cloud-netflix-ribbon
+* spring-cloud-netflix-turbine-stream
+* spring-cloud-netflix-turbine
+* spring-cloud-netflix-zuul
+
+NOTE: This does not include the Eureka or concurrency-limits modules.
+
 
 == Building
 
+:jdkversion: 1.8
+
 === Basic Compile and Test
 
-To build the source you will need to install
-http://maven.apache.org/run-maven/index.html[Apache Maven] v3.0.6 or above and JDK 1.7.
+To build the source you will need to install JDK {jdkversion}.
 
 Spring Cloud uses Maven for most build-related activities, and you
 should be able to get off the ground quite quickly by cloning the
 project you are interested in and typing
 
 ----
-$ mvn install -s .settings.xml
+$ ./mvnw install
 ----
 
-NOTE: You may need to increase the amount of memory available to Maven by setting
-a `MAVEN_OPTS` environment variable with the value `-Xmx512m -XX:MaxPermSize=128m`
+NOTE: You can also install Maven (>=3.3.3) yourself and run the `mvn` command
+in place of `./mvnw` in the examples below. If you do that you also
+might need to add `-P spring` if your local Maven settings do not
+contain repository declarations for spring pre-release artifacts.
 
-The `.settings.xml` is only required the first time (or after updates
-to dependencies). It is there to provide repository declarations so
-that those do not need to be hard coded in the project poms.
+NOTE: Be aware that you might need to increase the amount of memory
+available to Maven by setting a `MAVEN_OPTS` environment variable with
+a value like `-Xmx512m -XX:MaxPermSize=128m`. We try to cover this in
+the `.mvn` configuration, so if you find you have to do it to make a
+build succeed, please raise a ticket to get the settings added to
+source control.
 
 For hints on how to build the project look in `.travis.yml` if there
 is one. There should be a "script" and maybe "install" command. Also
 look at the "services" section to see if any services need to be
 running locally (e.g. mongo or rabbit).  Ignore the git-related bits
-that you might find in "before_install" since they will be able git
+that you might find in "before_install" since they're related to setting git
 credentials and you already have those.
 
-If you need mongo, rabbit or redis, see the README in the https://github.com/spring-cloud-samples/scripts[scripts
-demo repository] for
-instructions. For example consider using the "fig.yml" with
-http://www.fig.sh/[Fig] to run them in Docker containers.
+The projects that require middleware generally include a
+`docker-compose.yml`, so consider using
+https://compose.docker.io/[Docker Compose] to run the middeware servers
+in Docker containers. See the README in the
+https://github.com/spring-cloud-samples/scripts[scripts demo
+repository] for specific instructions about the common cases of mongo,
+rabbit and redis.
+
+NOTE: If all else fails, build with the command from `.travis.yml` (usually
+`./mvnw install`).
 
 === Documentation
 
@@ -66,107 +104,62 @@ parsing or rendering it, just copying it to `${main.basedir}`
 any changes in the README it will then show up after a Maven build as
 a modified file in the correct place. Just commit it and push the change.
 
-=== Pull Requests
-
-Spring Cloud is released under the non-restrictive Apache 2.0 license,
-and follows a very standard Github development process, using Github
-tracker for issues and merging pull requests into master. If you want
-to contribute even something trivial please do not hesitate, but
-follow the guidelines below.
-
-==== Sign the Contributor License Agreement
-Before we accept a non-trivial patch or pull request we will need you
-to sign the
-https://support.springsource.com/spring_committer_signup[contributor's
-agreement].  Signing the contributor's agreement does not grant anyone
-commit rights to the main repository, but it does mean that we can
-accept your contributions, and you will get an author credit if we do.
-Active contributors might be asked to join the core team, and given
-the ability to merge pull requests.
-
-==== Code Conventions and Housekeeping
-None of these is essential for a pull request, but they will all help.  They can also be
-added after the original pull request but before a merge.
-
-* Use the Spring Framework code format conventions. If you use Eclipse and you follow
-  the ``Importing into eclipse'' instructions below you should get project specific
-  formatting automatically. You can also import formatter settings using the
-  `eclipse-code-formatter.xml` file from the `eclipse` folder. If using IntelliJ, you can
-  use the http://plugins.jetbrains.com/plugin/6546[Eclipse Code Formatter Plugin]
-  to import the same file.
-* Make sure all new `.java` files to have a simple Javadoc class comment with at least an
-  `@author` tag identifying you, and preferably at least a paragraph on what the class is
-  for.
-* Add the ASF license header comment to all new `.java` files (copy from existing files
-  in the project)
-* Add yourself as an `@author` to the .java files that you modify substantially (more
-  than cosmetic changes).
-* Add some Javadocs and, if you change the namespace, some XSD doc elements.
-* A few unit tests would help a lot as well -- someone has to do it.
-* If no-one else is using your branch, please rebase it against the current master (or
-  other target branch in the main project).
-
 === Working with the code
 If you don't have an IDE preference we would recommend that you use
-http://www.springsource.com/developer/sts[Spring Tools Suite] or
-http://eclipse.org[Eclipse] when working with the code. We use the
-http://eclipse.org/m2e/[m2eclipe] eclipse plugin for maven support. Other IDEs and tools
-should also work without issue.
+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/[m2eclipe] 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".
 
+NOTE: Older versions of m2e do not support Maven 3.3, so once the
+projects are imported into Eclipse you will also need to tell
+m2eclipse to use the right profile for the projects.  If you
+see many different errors related to the POMs in the projects, check
+that you have an up to date installation.  If you can't upgrade m2e,
+add the "spring" profile to your `settings.xml`. Alternatively you can
+copy the repository settings from the "spring" profile of the parent
+pom into your `settings.xml`.
+
 ==== Importing into eclipse without m2eclipse
 If you prefer not to use m2eclipse you can generate eclipse project metadata using the
 following command:
 
 [indent=0]
 ----
-	$ mvn eclipse:eclipse
+	$ ./mvnw eclipse:eclipse
 ----
 
 The generated eclipse projects can be imported by selecting `import existing projects`
 from the `file` menu.
 
-==== Adding Project Lombok Agent
 
-Spring Cloud uses [Project
-Lombok](http://projectlombok.org/features/index.html) to generate
-getters and setters etc. Compiling from the command line this
-shouldn't cause any problems, but in an IDE you need to add an agent
-to the JVM. Full instructions can be found in the Lombok website. The
-sign that you need to do this is a lot of compiler errors to do with
-missing methods and fields, e.g.
-
-[indent=0]
-----
-The method getInitialStatus() is undefined for the type EurekaInstanceConfigBean    EurekaDiscoveryClientConfiguration.java /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka   line 120    Java Problem
-The method getInitialStatus() is undefined for the type EurekaInstanceConfigBean    EurekaDiscoveryClientConfiguration.java /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka   line 121    Java Problem
-The method setNonSecurePort(int) is undefined for the type EurekaInstanceConfigBean EurekaDiscoveryClientConfiguration.java /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka   line 112    Java Problem
-The type EurekaInstanceConfigBean.IdentifyingDataCenterInfo must implement the inherited abstract method DataCenterInfo.getName()   EurekaInstanceConfigBean.java   /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/eureka   line 131    Java Problem
-The method getId() is undefined for the type ProxyRouteLocator.ProxyRouteSpec   PreDecorationFilter.java    /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre line 60 Java Problem
-The method getLocation() is undefined for the type ProxyRouteLocator.ProxyRouteSpec PreDecorationFilter.java    /spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/zuul/filters/pre line 55 Java Problem
-----
-
-==== Importing into other IDEs
-Maven is well supported by most Java IDEs. Refer to you vendor documentation.
 
 == Contributing
 
-Spring Cloud is released under the non-restrictive Apache 2.0 license. If you would like
-to contribute something, or simply want to hack on the code this document should help
-you get started.
+Spring Cloud is released under the non-restrictive Apache 2.0 license,
+and follows a very standard Github development process, using Github
+tracker for issues and merging pull requests into master. If you want
+to contribute even something trivial please do not hesitate, but
+follow the guidelines below.
 
 === Sign the Contributor License Agreement
 Before we accept a non-trivial patch or pull request we will need you to sign the
-https://support.springsource.com/spring_committer_signup[contributor's agreement].
+https://cla.pivotal.io/sign/spring[Contributor License Agreement].
 Signing the contributor's agreement does not grant anyone commit rights to the main
 repository, but it does mean that we can accept your contributions, and you will get an
 author credit if we do.  Active contributors might be asked to join the core team, and
 given the ability to merge pull requests.
 
+=== Code of Conduct
+This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc[code of
+conduct]. By participating, you  are expected to uphold this code. Please report
+unacceptable behavior to spring-code-of-conduct@pivotal.io.
+
 === Code Conventions and Housekeeping
 None of these is essential for a pull request, but they will all help.  They can also be
 added after the original pull request but before a merge.
@@ -174,9 +167,9 @@ added after the original pull request but before a merge.
 * Use the Spring Framework code format conventions. If you use Eclipse
   you can import formatter settings using the
   `eclipse-code-formatter.xml` file from the
-  https://github.com/spring-cloud/build/tree/master/eclipse-coding-conventions.xml[Spring
+  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
@@ -189,6 +182,6 @@ added after the original pull request but before a merge.
 * A few unit tests would help a lot as well -- someone has to do it.
 * If no-one else is using your branch, please rebase it against the current master (or
   other target branch in the main project).
-* When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
+* When writing a commit message please follow https://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
   if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
   message (where XXXX is the issue number).

RUNNING.md

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

TODO.md

@@ -1,22 +0,0 @@
-## TODO List
-
-- [x] Example front end app (currently in sandbox)
-- [x] Example back end service (currently in sandbox)
-- [x] Use platform config
-- [x] Hystrix integration (hystrix-javanica)
-- [x] Feign use spring message converters
-- [x] Ribbon (static server list)
-- [x] Eureka boot app (Service registration)
-- [x] Eureka (apache -> tomcat) see https://github.com/cfregly/fluxcapacitor/wiki/NetflixOSS-FAQ#eureka-service-discovery-load-balancer and https://groups.google.com/forum/?fromgroups#!topic/eureka_netflix/g3p2r7gHnN0
-- [x] Archaius bridge to spring environment
-- [x] Ribbon (Client side load balancing) (Eureka integration)
-  - [x] Remove need for *-eureka.properties
-  - [ ] Use spring boot values as defaults where appropriate
-  - [x] Synchronous removal of service from eureka on shutdown
-- [x] Refresh log levels dynamically
-- [x] Router (Zuul) integrated using hystrix/ribbon/eureka
-- [ ] Better observable example
-- [ ] Distributed refresh environment via platform bus
-- [x] Metrics aggregation (turbine)
-  - [x] Use Eureka for instance discovery rather than static list see https://github.com/Netflix/Turbine/blob/master/turbine-contrib/src/main/java/com/netflix/turbine/discovery/EurekaInstanceDiscovery.java
-  - [ ] Configure InstanceDiscovery.impl using auto config/config props

asciidoctor.css

@@ -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}

config/releaser.yml

@@ -0,0 +1,3 @@
+releaser:
+  maven:
+    buildCommand: ./scripts/build.sh  {{systemProps}}

docs/.flattened-pom.xml

@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.springframework.cloud</groupId>
+    <artifactId>spring-cloud-netflix</artifactId>
+    <version>2.2.0.RC2</version>
+  </parent>
+  <groupId>org.springframework.cloud</groupId>
+  <artifactId>spring-cloud-netflix-docs</artifactId>
+  <version>2.2.0.RC2</version>
+  <packaging>pom</packaging>
+  <name>Spring Cloud Netflix Docs</name>
+  <description>Spring Cloud Docs</description>
+  <url>https://spring.io/spring-cloud/spring-cloud-netflix/spring-cloud-netflix-docs</url>
+  <organization>
+    <name>Pivotal Software, Inc.</name>
+    <url>https://www.spring.io</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
+      <comments>Copyright 2014-2015 the original author or authors.
+
+				Licensed under the Apache License, Version 2.0 (the "License");
+				you may not use this file except in compliance with the License.
+				You may obtain a copy of the License at
+
+				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.</comments>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>dsyer</id>
+      <name>Dave Syer</name>
+      <email>dsyer at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>sgibb</id>
+      <name>Spencer Gibb</name>
+      <email>sgibb at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>mgrzejszczak</id>
+      <name>Marcin Grzejszczak</name>
+      <email>mgrzejszczak at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>rbaxter</id>
+      <name>Ryan Baxter</name>
+      <email>rbaxter at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>omaciaszeksharma</id>
+      <name>Olga Maciaszek-Sharma</name>
+      <email>omaciaszeksharma at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git://github.com/spring-cloud/spring-cloud-netflix.git/spring-cloud-netflix-docs</connection>
+    <developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-netflix.git/spring-cloud-netflix-docs</developerConnection>
+    <url>https://github.com/spring-cloud/spring-cloud-netflix/spring-cloud-netflix-docs</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-netflix-archaius</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-netflix-hystrix-dashboard</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-netflix-turbine</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-netflix-turbine-stream</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-netflix-zuul</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>

docs/README.adoc

@@ -1,11 +1,51 @@
-// 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
-application and build large distributed systems with battle-tested Netflix components. The 
-patterns provided include Service Discovery (Eureka), Circuit Breaker (Hystrix), 
+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).
 
 
@@ -15,8 +55,322 @@ Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon).
 * Service Discovery: an embedded Eureka server can be created with declarative Java configuration
 * Circuit Breaker: Hystrix clients can be built with a simple annotation-driven method decorator
 * Circuit Breaker: embedded Hystrix dashboard with declarative Java configuration
-* Declarative REST Client: Feign creates a dynamic implementation of an interface decorated with JAX-RS or Spring MVC annotations
 * Client Side Load Balancer: Ribbon
-* External Configuration: a bridge from the Sprnig Environment to Archaius (enabls native configuration of Netflix components using Spring Boot conventions)
-* Router and Filter: automatic regsitration of Zuul filters,a nd a simple convention over configuration approach to reverse proxy creation
+* 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
+
+Placing a module in maintenance mode means that the Spring Cloud team will no longer be adding new features to the module.
+We will fix blocker bugs and security issues, and we will also consider and review small pull requests from the community.
+
+We intend to continue to support these modules for a period of at least a year from the general availability
+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-hystrix-contract
+* spring-cloud-netflix-hystrix-dashboard
+* spring-cloud-netflix-hystrix-stream
+* spring-cloud-netflix-hystrix
+* spring-cloud-netflix-ribbon
+* spring-cloud-netflix-turbine-stream
+* spring-cloud-netflix-turbine
+* spring-cloud-netflix-zuul
+
+NOTE: This does not include the Eureka or concurrency-limits modules.
+
+
+== Building
+
+:jdkversion: 1.8
+
+=== Basic Compile and Test
+
+To build the source you will need to install JDK {jdkversion}.
+
+Spring Cloud uses Maven for most build-related activities, and you
+should be able to get off the ground quite quickly by cloning the
+project you are interested in and typing
+
+----
+$ ./mvnw install
+----
+
+NOTE: You can also install Maven (>=3.3.3) yourself and run the `mvn` command
+in place of `./mvnw` in the examples below. If you do that you also
+might need to add `-P spring` if your local Maven settings do not
+contain repository declarations for spring pre-release artifacts.
+
+NOTE: Be aware that you might need to increase the amount of memory
+available to Maven by setting a `MAVEN_OPTS` environment variable with
+a value like `-Xmx512m -XX:MaxPermSize=128m`. We try to cover this in
+the `.mvn` configuration, so if you find you have to do it to make a
+build succeed, please raise a ticket to get the settings added to
+source control.
+
+For hints on how to build the project look in `.travis.yml` if there
+is one. There should be a "script" and maybe "install" command. Also
+look at the "services" section to see if any services need to be
+running locally (e.g. mongo or rabbit).  Ignore the git-related bits
+that you might find in "before_install" since they're related to setting git
+credentials and you already have those.
+
+The projects that require middleware generally include a
+`docker-compose.yml`, so consider using
+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,
+rabbit and redis.
+
+NOTE: If all else fails, build with the command from `.travis.yml` (usually
+`./mvnw install`).
+
+=== Documentation
+
+The spring-cloud-build module has a "docs" profile, and if you switch
+that on it will try to build asciidoc sources from
+`src/main/asciidoc`. As part of that process it will look for a
+`README.adoc` and process it by loading all the includes, but not
+parsing or rendering it, just copying it to `${main.basedir}`
+(defaults to `${basedir}`, i.e. the root of the project). If there are
+any changes in the README it will then show up after a Maven build as
+a modified file in the correct place. Just commit it and push the change.
+
+=== Working with the code
+If you don't have an IDE preference we would recommend that you use
+https://www.springsource.com/developer/sts[Spring Tools Suite] or
+https://eclipse.org[Eclipse] when working with the code. We use the
+https://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs and tools
+should also work without issue as long as they use Maven 3.3.3 or better.
+
+==== Importing into eclipse with m2eclipse
+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".
+
+NOTE: Older versions of m2e do not support Maven 3.3, so once the
+projects are imported into Eclipse you will also need to tell
+m2eclipse to use the right profile for the projects.  If you
+see many different errors related to the POMs in the projects, check
+that you have an up to date installation.  If you can't upgrade m2e,
+add the "spring" profile to your `settings.xml`. Alternatively you can
+copy the repository settings from the "spring" profile of the parent
+pom into your `settings.xml`.
+
+==== Importing into eclipse without m2eclipse
+If you prefer not to use m2eclipse you can generate eclipse project metadata using the
+following command:
+
+[indent=0]
+----
+	$ ./mvnw eclipse:eclipse
+----
+
+The generated eclipse projects can be imported by selecting `import existing projects`
+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
+to contribute even something trivial please do not hesitate, but
+follow the guidelines below.
+
+=== Sign the Contributor License Agreement
+Before we accept a non-trivial patch or pull request we will need you to sign the
+https://cla.pivotal.io/sign/spring[Contributor License Agreement].
+Signing the contributor's agreement does not grant anyone commit rights to the main
+repository, but it does mean that we can accept your contributions, and you will get an
+author credit if we do.  Active contributors might be asked to join the core team, and
+given the ability to merge pull requests.
+
+=== Code of Conduct
+This project adheres to the Contributor Covenant https://github.com/spring-cloud/spring-cloud-build/blob/master/docs/src/main/asciidoc/code-of-conduct.adoc[code of
+conduct]. By participating, you  are expected to uphold this code. Please report
+unacceptable behavior to spring-code-of-conduct@pivotal.io.
+
+=== Code Conventions and Housekeeping
+None of these is essential for a pull request, but they will all help.  They can also be
+added after the original pull request but before a merge.
+
+* Use the Spring Framework code format conventions. If you use Eclipse
+  you can import formatter settings using the
+  `eclipse-code-formatter.xml` file from the
+  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
+  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
+  for.
+* Add the ASF license header comment to all new `.java` files (copy from existing files
+  in the project)
+* Add yourself as an `@author` to the .java files that you modify substantially (more
+  than cosmetic changes).
+* Add some Javadocs and, if you change the namespace, some XSD doc elements.
+* A few unit tests would help a lot as well -- someone has to do it.
+* If no-one else is using your branch, please rebase it against the current master (or
+  other target branch in the main project).
+* When writing a commit message please follow 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).
+
+=== 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.

docs/pom.xml

@@ -1,44 +1,102 @@
 <?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">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.springframework.cloud</groupId>
-	<artifactId>spring-cloud-netflix-docs</artifactId>
-	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
-		<artifactId>spring-cloud-build</artifactId>
-		<version>1.0.0.BUILD-SNAPSHOT</version>
-		<relativePath/>
+		<artifactId>spring-cloud-netflix</artifactId>
+		<version>2.2.0.RC2</version>
 	</parent>
+	<artifactId>spring-cloud-netflix-docs</artifactId>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Netflix Docs</name>
 	<description>Spring Cloud Docs</description>
 	<properties>
-        <docs.main>spring-cloud-netflix</docs.main>
-		<main.basedir>${basedir}/..</main.basedir>
+		<docs.main>spring-cloud-netflix</docs.main>
+		<docs.whitelisted.branches>1.2.x,1.3.x,1.4.x</docs.whitelisted.branches>
+		<configprops.inclusionPattern>
+			.*.eureka.*|.*.hystrix.*|.*.ribbon.*|.*.sidecar.*|.*.turbine.*|.*.zuul.*|.*.archaius.*
+		</configprops.inclusionPattern>
 	</properties>
-    <profiles>
+	<dependencies>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-cloud-starter-netflix-archaius</artifactId>
+		</dependency>
+		<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>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-cloud-starter-netflix-hystrix-dashboard</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-cloud-starter-netflix-turbine</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-cloud-starter-netflix-turbine-stream</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>spring-cloud-starter-netflix-zuul</artifactId>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<configuration>
+					<skip>true</skip>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+	<profiles>
 		<profile>
 			<id>docs</id>
-            <build>
-               <plugins>
-		        <plugin>
-		          <groupId>org.asciidoctor</groupId>
-		          <artifactId>asciidoctor-maven-plugin</artifactId>
-                  <inherited>false</inherited>
-                </plugin>
-			    <plugin>
-				  <groupId>org.apache.maven.plugins</groupId>
-				  <artifactId>maven-antrun-plugin</artifactId>
-                  <inherited>false</inherited>
-                </plugin>
- 				<plugin>
-				  <groupId>org.codehaus.mojo</groupId>
-				  <artifactId>build-helper-maven-plugin</artifactId>
-                  <inherited>false</inherited>
-                </plugin>
-              </plugins>
-            </build>
+			<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.apache.maven.plugins</groupId>
+						<artifactId>maven-resources-plugin</artifactId>
+					</plugin>
+					<plugin>
+						<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>
+					</plugin>
+				</plugins>
+			</build>
 		</profile>
-    </profiles>
+	</profiles>
 </project>

docs/src/main/asciidoc/README.adoc

@@ -1,4 +1,9 @@
-image::https://travis-ci.org/spring-cloud/spring-cloud-netflix.svg?branch=master[Build Status, link=https://travis-ci.org/spring-cloud/spring-cloud-netflix]
+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"]
+
 
 include::intro.adoc[]
 
@@ -8,14 +13,18 @@ include::intro.adoc[]
 * Service Discovery: an embedded Eureka server can be created with declarative Java configuration
 * Circuit Breaker: Hystrix clients can be built with a simple annotation-driven method decorator
 * Circuit Breaker: embedded Hystrix dashboard with declarative Java configuration
-* Declarative REST Client: Feign creates a dynamic implementation of an interface decorated with JAX-RS or Spring MVC annotations
 * Client Side Load Balancer: Ribbon
-* External Configuration: a bridge from the Sprnig Environment to Archaius (enables native configuration of Netflix components using Spring Boot conventions)
-* Router and Filter: automatic regsitration of Zuul filters, and a simple convention over configuration approach to reverse proxy creation
+* 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
+
+include::maintenance-mode.adoc[]
 
 == Building
 
-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/master/docs/src/main/asciidoc/building.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
 

docs/src/main/asciidoc/_attributes.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

docs/src/main/asciidoc/_configprops.adoc

@@ -0,0 +1,26 @@
+|===
+|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 | 
+|eureka.server.peer-eureka-status-refresh-time-interval-ms | 0 | 
+|management.endpoint.hystrix.config |  | Hystrix settings. These are traditionally set using servlet parameters. Refer to the documentation of Hystrix for more details.
+|management.endpoint.hystrix.stream.enabled | true | Whether to enable the hystrix.stream endpoint.
+|management.metrics.binders.hystrix.enabled | true | Enables creation of OK Http Client factory beans.
+|ribbon.eureka.enabled | true | Enables the use of Eureka with Ribbon.
+|spring.cloud.circuitbreaker.hystrix.enabled | true | Enables auto-configuration of the Hystrix Spring Cloud CircuitBreaker API implementation.
+|spring.cloud.loadbalancer.ribbon.enabled | true | Causes `RibbonLoadBalancerClient` to be used by default.
+|zuul.ribbon-isolation-strategy |  | 
+|zuul.ribbon.eager-load.enabled | false | Enables eager loading of Ribbon clients on startup.
+
+|===

docs/src/main/asciidoc/appendix.adoc

@@ -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[]

docs/src/main/asciidoc/ghpages.sh

@@ -1,46 +1,330 @@
 #!/bin/bash -x
 
-git remote set-url --push origin `git config remote.origin.url | sed -e 's/^git:/https:/'`
+set -e
 
-if ! (git remote set-branches --add origin gh-pages && git fetch -q); then
-    echo "No gh-pages, so not syncing"
-    exit 0
-fi
+# Set default props like MAVEN_PATH, ROOT_FOLDER etc.
+function set_default_props() {
+    # The script should be executed from the root folder
+    ROOT_FOLDER=`pwd`
+    echo "Current folder is ${ROOT_FOLDER}"
 
-if ! [ -d docs/target/generated-docs ]; then
-    echo "No gh-pages sources in docs/target/generated-docs, so not syncing"
-    exit 0
-fi
+    if [[ ! -e "${ROOT_FOLDER}/.git" ]]; then
+        echo "You're not in the root folder of the project!"
+        exit 1
+    fi
+
+    # Prop that will let commit the changes
+    COMMIT_CHANGES="no"
+    MAVEN_PATH=${MAVEN_PATH:-}
+    echo "Path to Maven is [${MAVEN_PATH}]"
+    REPO_NAME=${PWD##*/}
+    echo "Repo name is [${REPO_NAME}]"
+    SPRING_CLOUD_STATIC_REPO=${SPRING_CLOUD_STATIC_REPO:-git@github.com:spring-cloud/spring-cloud-static.git}
+    echo "Spring Cloud Static repo is [${SPRING_CLOUD_STATIC_REPO}"
+}
+
+# Check if gh-pages exists and docs have been built
+function check_if_anything_to_sync() {
+    git remote set-url --push origin `git config remote.origin.url | sed -e 's/^git:/https:/'`
+
+    if ! (git remote set-branches --add origin gh-pages && git fetch -q); then
+        echo "No gh-pages, so not syncing"
+        exit 0
+    fi
+
+    if ! [ -d docs/target/generated-docs ] && ! [ "${BUILD}" == "yes" ]; then
+        echo "No gh-pages sources in docs/target/generated-docs, so not syncing"
+        exit 0
+    fi
+}
+
+function retrieve_current_branch() {
+    # Code getting the name of the current branch. For master we want to publish as we did until now
+    # https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch
+    # If there is a branch already passed will reuse it - otherwise will try to find it
+    CURRENT_BRANCH=${BRANCH}
+    if [[ -z "${CURRENT_BRANCH}" ]] ; then
+      CURRENT_BRANCH=$(git symbolic-ref -q HEAD)
+      CURRENT_BRANCH=${CURRENT_BRANCH##refs/heads/}
+      CURRENT_BRANCH=${CURRENT_BRANCH:-HEAD}
+    fi
+    echo "Current branch is [${CURRENT_BRANCH}]"
+    git checkout ${CURRENT_BRANCH} || echo "Failed to check the branch... continuing with the script"
+}
+
+# Switches to the provided value of the release version. We always prefix it with `v`
+function switch_to_tag() {
+    git checkout v${VERSION}
+}
+
+# Build the docs if switch is on
+function build_docs_if_applicable() {
+    if [[ "${BUILD}" == "yes" ]] ; then
+        ./mvnw clean install -P docs -pl docs -DskipTests
+    fi
+}
+
+# Get the name of the `docs.main` property
+# Get whitelisted branches - assumes that a `docs` module is available under `docs` profile
+function retrieve_doc_properties() {
+    MAIN_ADOC_VALUE=$("${MAVEN_PATH}"mvn -q \
+        -Dexec.executable="echo" \
+        -Dexec.args='${docs.main}' \
+        --non-recursive \
+        org.codehaus.mojo:exec-maven-plugin:1.3.1:exec)
+    echo "Extracted 'main.adoc' from Maven build [${MAIN_ADOC_VALUE}]"
+
+
+    WHITELIST_PROPERTY=${WHITELIST_PROPERTY:-"docs.whitelisted.branches"}
+    WHITELISTED_BRANCHES_VALUE=$("${MAVEN_PATH}"mvn -q \
+        -Dexec.executable="echo" \
+        -Dexec.args="\${${WHITELIST_PROPERTY}}" \
+        org.codehaus.mojo:exec-maven-plugin:1.3.1:exec \
+        -P docs \
+        -pl docs)
+    echo "Extracted '${WHITELIST_PROPERTY}' from Maven build [${WHITELISTED_BRANCHES_VALUE}]"
+}
 
 # Stash any outstanding changes
-###################################################################
-git diff-index --quiet HEAD
-dirty=$?
-if [ "$dirty" != "0" ]; then git stash; fi
+function stash_changes() {
+    git diff-index --quiet HEAD && dirty=$? || (echo "Failed to check if the current repo is dirty. Assuming that it is." && dirty="1")
+    if [ "$dirty" != "0" ]; then git stash; fi
+}
 
-# Switch to gh-pages branch to sync it with master
-###################################################################
-git checkout gh-pages
-
-for f in docs/target/generated-docs/*; do
-    file=${f#docs/target/generated-docs/*}
-    if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
-        # Not ignored...
-        cp -rf $f .
-        git add -A $file
+# Switch to gh-pages branch to sync it with current branch
+function add_docs_from_target() {
+    local DESTINATION_REPO_FOLDER
+    if [[ -z "${DESTINATION}" && -z "${CLONE}" ]] ; then
+        DESTINATION_REPO_FOLDER=${ROOT_FOLDER}
+    elif [[ "${CLONE}" == "yes" ]]; then
+        mkdir -p ${ROOT_FOLDER}/target
+        local clonedStatic=${ROOT_FOLDER}/target/spring-cloud-static
+        if [[ ! -e "${clonedStatic}/.git" ]]; then
+            echo "Cloning Spring Cloud Static to target"
+            git clone ${SPRING_CLOUD_STATIC_REPO} ${clonedStatic} && git checkout gh-pages
+        else
+            echo "Spring Cloud Static already cloned - will pull changes"
+            cd ${clonedStatic} && git checkout gh-pages && git pull origin gh-pages
+        fi
+        DESTINATION_REPO_FOLDER=${clonedStatic}/${REPO_NAME}
+        mkdir -p ${DESTINATION_REPO_FOLDER}
+    else
+        if [[ ! -e "${DESTINATION}/.git" ]]; then
+            echo "[${DESTINATION}] is not a git repository"
+            exit 1
+        fi
+        DESTINATION_REPO_FOLDER=${DESTINATION}/${REPO_NAME}
+        mkdir -p ${DESTINATION_REPO_FOLDER}
+        echo "Destination was provided [${DESTINATION}]"
     fi
+    cd ${DESTINATION_REPO_FOLDER}
+    git checkout gh-pages
+    git pull origin gh-pages
+
+    # Add git branches
+    ###################################################################
+    if [[ -z "${VERSION}" ]] ; then
+        copy_docs_for_current_version
+    else
+        copy_docs_for_provided_version
+    fi
+    commit_changes_if_applicable
+}
+
+
+# Copies the docs by using the retrieved properties from Maven build
+function copy_docs_for_current_version() {
+    if [[ "${CURRENT_BRANCH}" == "master" ]] ; then
+        echo -e "Current branch is master - will copy the current docs only to the root folder"
+        for f in docs/target/generated-docs/*; do
+            file=${f#docs/target/generated-docs/*}
+            if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
+                # Not ignored...
+                cp -rf $f ${ROOT_FOLDER}/
+                git add -A ${ROOT_FOLDER}/$file
+            fi
+        done
+        COMMIT_CHANGES="yes"
+    else
+        echo -e "Current branch is [${CURRENT_BRANCH}]"
+        # https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
+        if [[ ",${WHITELISTED_BRANCHES_VALUE}," = *",${CURRENT_BRANCH},"* ]] ; then
+            mkdir -p ${ROOT_FOLDER}/${CURRENT_BRANCH}
+            echo -e "Branch [${CURRENT_BRANCH}] is whitelisted! Will copy the current docs to the [${CURRENT_BRANCH}] folder"
+            for f in docs/target/generated-docs/*; do
+                file=${f#docs/target/generated-docs/*}
+                if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
+                    # Not ignored...
+                    # We want users to access 1.0.0.RELEASE/ instead of 1.0.0.RELEASE/spring-cloud.sleuth.html
+                    if [[ "${file}" == "${MAIN_ADOC_VALUE}.html" ]] ; then
+                        # We don't want to copy the spring-cloud-sleuth.html
+                        # we want it to be converted to index.html
+                        cp -rf $f ${ROOT_FOLDER}/${CURRENT_BRANCH}/index.html
+                        git add -A ${ROOT_FOLDER}/${CURRENT_BRANCH}/index.html
+                    else
+                        cp -rf $f ${ROOT_FOLDER}/${CURRENT_BRANCH}
+                        git add -A ${ROOT_FOLDER}/${CURRENT_BRANCH}/$file
+                    fi
+                fi
+            done
+            COMMIT_CHANGES="yes"
+        else
+            echo -e "Branch [${CURRENT_BRANCH}] is not on the white list! Check out the Maven [${WHITELIST_PROPERTY}] property in
+             [docs] module available under [docs] profile. Won't commit any changes to gh-pages for this branch."
+        fi
+    fi
+}
+
+# Copies the docs by using the explicitly provided version
+function copy_docs_for_provided_version() {
+    local FOLDER=${DESTINATION_REPO_FOLDER}/${VERSION}
+    mkdir -p ${FOLDER}
+    echo -e "Current tag is [v${VERSION}] Will copy the current docs to the [${FOLDER}] folder"
+    for f in ${ROOT_FOLDER}/docs/target/generated-docs/*; do
+        file=${f#${ROOT_FOLDER}/docs/target/generated-docs/*}
+        copy_docs_for_branch ${file} ${FOLDER}
+    done
+    COMMIT_CHANGES="yes"
+    CURRENT_BRANCH="v${VERSION}"
+}
+
+# Copies the docs from target to the provided destination
+# Params:
+# $1 - file from target
+# $2 - destination to which copy the files
+function copy_docs_for_branch() {
+    local file=$1
+    local destination=$2
+    if ! git ls-files -i -o --exclude-standard --directory | grep -q ^${file}$; then
+        # Not ignored...
+        # We want users to access 1.0.0.RELEASE/ instead of 1.0.0.RELEASE/spring-cloud.sleuth.html
+        if [[ ("${file}" == "${MAIN_ADOC_VALUE}.html") || ("${file}" == "${REPO_NAME}.html") ]] ; then
+            # We don't want to copy the spring-cloud-sleuth.html
+            # we want it to be converted to index.html
+            cp -rf $f ${destination}/index.html
+            git add -A ${destination}/index.html
+        else
+            cp -rf $f ${destination}
+            git add -A ${destination}/$file
+        fi
+    fi
+}
+
+function commit_changes_if_applicable() {
+    if [[ "${COMMIT_CHANGES}" == "yes" ]] ; then
+        COMMIT_SUCCESSFUL="no"
+        git commit -a -m "Sync docs from ${CURRENT_BRANCH} to gh-pages" && COMMIT_SUCCESSFUL="yes" || echo "Failed to commit changes"
+
+        # Uncomment the following push if you want to auto push to
+        # the gh-pages branch whenever you commit to master locally.
+        # This is a little extreme. Use with care!
+        ###################################################################
+        if [[ "${COMMIT_SUCCESSFUL}" == "yes" ]] ; then
+            git push origin gh-pages
+        fi
+    fi
+}
+
+# Switch back to the previous branch and exit block
+function checkout_previous_branch() {
+    # If -version was provided we need to come back to root project
+    cd ${ROOT_FOLDER}
+    git checkout ${CURRENT_BRANCH} || echo "Failed to check the branch... continuing with the script"
+    if [ "$dirty" != "0" ]; then git stash pop; fi
+    exit 0
+}
+
+# Assert if properties have been properly passed
+function assert_properties() {
+echo "VERSION [${VERSION}], DESTINATION [${DESTINATION}], CLONE [${CLONE}]"
+if [[ "${VERSION}" != "" && (-z "${DESTINATION}" && -z "${CLONE}") ]] ; then echo "Version was set but destination / clone was not!"; exit 1;fi
+if [[ ("${DESTINATION}" != "" && "${CLONE}" != "") && -z "${VERSION}" ]] ; then echo "Destination / clone was set but version was not!"; exit 1;fi
+if [[ "${DESTINATION}" != "" && "${CLONE}" == "yes" ]] ; then echo "Destination and clone was set. Pick one!"; exit 1;fi
+}
+
+# Prints the usage
+function print_usage() {
+cat <<EOF
+The idea of this script is to update gh-pages branch with the generated docs. Without any options
+the script will work in the following manner:
+
+- if there's no gh-pages / target for docs module then the script ends
+- for master branch the generated docs are copied to the root of gh-pages branch
+- for any other branch (if that branch is whitelisted) a subfolder with branch name is created
+    and docs are copied there
+- if the version switch is passed (-v) then a tag with (v) prefix will be retrieved and a folder
+    with that version number will be created in the gh-pages branch. WARNING! No whitelist verification will take place
+- if the destination switch is passed (-d) then the script will check if the provided dir is a git repo and then will
+    switch to gh-pages of that repo and copy the generated docs to `docs/<project-name>/<version>`
+- if the destination switch is passed (-d) then the script will check if the provided dir is a git repo and then will
+    switch to gh-pages of that repo and copy the generated docs to `docs/<project-name>/<version>`
+
+USAGE:
+
+You can use the following options:
+
+-v|--version        - the script will apply the whole procedure for a particular library version
+-d|--destination    - the root of destination folder where the docs should be copied. You have to use the full path.
+                        E.g. point to spring-cloud-static folder. Can't be used with (-c)
+-b|--build          - will run the standard build process after checking out the branch
+-c|--clone          - will automatically clone the spring-cloud-static repo instead of providing the destination.
+                        Obviously can't be used with (-d)
+
+EOF
+}
+
+
+# ==========================================
+#    ____   ____ _____  _____ _____ _______
+#  / ____|/ ____|  __ \|_   _|  __ \__   __|
+# | (___ | |    | |__) | | | | |__) | | |
+#  \___ \| |    |  _  /  | | |  ___/  | |
+#  ____) | |____| | \ \ _| |_| |      | |
+# |_____/ \_____|_|  \_\_____|_|      |_|
+#
+# ==========================================
+
+while [[ $# > 0 ]]
+do
+key="$1"
+case ${key} in
+    -v|--version)
+    VERSION="$2"
+    shift # past argument
+    ;;
+    -d|--destination)
+    DESTINATION="$2"
+    shift # past argument
+    ;;
+    -b|--build)
+    BUILD="yes"
+    ;;
+    -c|--clone)
+    CLONE="yes"
+    ;;
+    -h|--help)
+    print_usage
+    exit 0
+    ;;
+    *)
+    echo "Invalid option: [$1]"
+    print_usage
+    exit 1
+    ;;
+esac
+shift # past argument or value
 done
 
-git commit -a -m "Sync docs from master to gh-pages"
-
-# Uncomment the following push if you want to auto push to
-# the gh-pages branch whenever you commit to master locally.
-# This is a little extreme. Use with care!
-###################################################################
-git push origin gh-pages
-
-# Finally, switch back to the master branch and exit block
-git checkout master
-if [ "$dirty" != "0" ]; then git stash pop; fi
-
-exit 0
+assert_properties
+set_default_props
+check_if_anything_to_sync
+if [[ -z "${VERSION}" ]] ; then
+    retrieve_current_branch
+else
+    switch_to_tag
+fi
+build_docs_if_applicable
+retrieve_doc_properties
+stash_changes
+add_docs_from_target
+checkout_previous_branch

docs/src/main/asciidoc/index.adoc

@@ -0,0 +1 @@
+spring-cloud-netflix.adoc

docs/src/main/asciidoc/intro.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

docs/src/main/asciidoc/maintenance-mode.adoc

@@ -0,0 +1,24 @@
+include::_attributes.adoc[]
+
+== Modules In Maintenance Mode
+
+Placing a module in maintenance mode means that the Spring Cloud team will no longer be adding new features to the module.
+We will fix blocker bugs and security issues, and we will also consider and review small pull requests from the community.
+
+We intend to continue to support these modules for a period of at least a year from the general availability
+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-hystrix-contract
+* spring-cloud-netflix-hystrix-dashboard
+* spring-cloud-netflix-hystrix-stream
+* spring-cloud-netflix-hystrix
+* spring-cloud-netflix-ribbon
+* spring-cloud-netflix-turbine-stream
+* spring-cloud-netflix-turbine
+* spring-cloud-netflix-zuul
+
+NOTE: This does not include the Eureka or concurrency-limits modules.
+

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

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

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

@@ -0,0 +1,43 @@
+include::_attributes.adoc[]
+
+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 regsitration 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`.

docs/src/main/asciidoc/spring-cloud-circuitbreaker-hystrix.adoc

@@ -0,0 +1,70 @@
+include::_attributes.adoc[]
+=== Disabling Spring Cloud Circuit Breaker Hystrix
+
+You can disable the auto-configuration by setting `spring.cloud.circuitbreaker.hystrix.enabled`
+to `false`.
+
+=== Configuring Hystrix Circuit Breakers
+
+==== Default Configuration
+
+To provide a default configuration for all of your circuit breakers create a `Customize` bean that is passed a
+`HystrixCircuitBreakerFactory` or `ReactiveHystrixCircuitBreakerFactory`.
+The `configureDefault` method can be used to provide a default configuration.
+
+====
+[source,java]
+----
+@Bean
+public Customizer<HystrixCircuitBreakerFactory> defaultConfig() {
+	return factory -> factory.configureDefault(id -> HystrixCommand.Setter
+			.withGroupKey(HystrixCommandGroupKey.Factory.asKey(id))
+			.andCommandPropertiesDefaults(HystrixCommandProperties.Setter()
+			.withExecutionTimeoutInMilliseconds(4000)));
+}
+----
+====
+
+===== Reactive Example
+
+====
+[source,java]
+----
+@Bean
+public Customizer<ReactiveHystrixCircuitBreakerFactory> defaultConfig() {
+	return factory -> factory.configureDefault(id -> HystrixObservableCommand.Setter
+			.withGroupKey(HystrixCommandGroupKey.Factory.asKey(id))
+			.andCommandPropertiesDefaults(HystrixCommandProperties.Setter()
+					.withExecutionTimeoutInMilliseconds(4000)));
+}
+----
+====
+
+==== Specific Circuit Breaker Configuration
+
+Similarly to providing a default configuration, you can create a `Customize` bean this is passed a
+`HystrixCircuitBreakerFactory`
+
+====
+[source,java]
+----
+@Bean
+public Customizer<HystrixCircuitBreakerFactory> customizer() {
+	return factory -> factory.configure(builder -> builder.commandProperties(
+					HystrixCommandProperties.Setter().withExecutionTimeoutInMilliseconds(2000)), "foo", "bar");
+}
+----
+====
+
+===== Reactive Example
+
+====
+[source,java]
+----
+@Bean
+public Customizer<ReactiveHystrixCircuitBreakerFactory> customizer() {
+	return factory -> factory.configure(builder -> builder.commandProperties(
+					HystrixCommandProperties.Setter().withExecutionTimeoutInMilliseconds(2000)), "foo", "bar");
+}
+----
+====

docs/src/main/ruby/generate_readme.sh

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

eclipse/eclipse-code-formatter.xml

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

eclipse/org.eclipse.jdt.core.prefs

@@ -0,0 +1,412 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.codeComplete.argumentPrefixes=
+org.eclipse.jdt.core.codeComplete.argumentSuffixes=
+org.eclipse.jdt.core.codeComplete.fieldPrefixes=
+org.eclipse.jdt.core.codeComplete.fieldSuffixes=
+org.eclipse.jdt.core.codeComplete.localPrefixes=
+org.eclipse.jdt.core.codeComplete.localSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
+org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=warning
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
+org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=disabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTags=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=disabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=default
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagDescription=all_standard_tags
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=default
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=ignore
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nullReference=ignore
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=enabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
+org.eclipse.jdt.core.compiler.problem.unusedImport=warning
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
+org.eclipse.jdt.core.compiler.processAnnotations=disabled
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_assignment=0
+org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
+org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=16
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=false
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_header=false
+org.eclipse.jdt.core.formatter.comment.format_html=true
+org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true
+org.eclipse.jdt.core.formatter.comment.format_line_comments=true
+org.eclipse.jdt.core.formatter.comment.format_source_code=false
+org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=do not insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=90
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=90
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
+org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
+org.eclipse.jdt.core.formatter.tabulation.char=tab
+org.eclipse.jdt.core.formatter.tabulation.size=4
+org.eclipse.jdt.core.formatter.use_on_off_tags=true
+org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
+org.eclipse.jdt.core.formatter.wrap_before_assignment_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true
+org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter

mvnw

@@ -0,0 +1,306 @@
+#!/bin/sh
+# ----------------------------------------------------------------------------
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#    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.
+# ----------------------------------------------------------------------------
+
+# ----------------------------------------------------------------------------
+# Maven2 Start Up Batch script
+#
+# Required ENV vars:
+# ------------------
+#   JAVA_HOME - location of a JDK home dir
+#
+# Optional ENV vars
+# -----------------
+#   M2_HOME - location of maven2's installed home dir
+#   MAVEN_OPTS - parameters passed to the Java VM when running Maven
+#     e.g. to debug Maven itself, use
+#       set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+#   MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+# ----------------------------------------------------------------------------
+
+if [ -z "$MAVEN_SKIP_RC" ] ; then
+
+  if [ -f /etc/mavenrc ] ; then
+    . /etc/mavenrc
+  fi
+
+  if [ -f "$HOME/.mavenrc" ] ; then
+    . "$HOME/.mavenrc"
+  fi
+
+fi
+
+# OS specific support.  $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+mingw=false
+case "`uname`" in
+  CYGWIN*) cygwin=true ;;
+  MINGW*) mingw=true;;
+  Darwin*) darwin=true
+    # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home
+    # See https://developer.apple.com/library/mac/qa/qa1170/_index.html
+    if [ -z "$JAVA_HOME" ]; then
+      if [ -x "/usr/libexec/java_home" ]; then
+        export JAVA_HOME="`/usr/libexec/java_home`"
+      else
+        export JAVA_HOME="/Library/Java/Home"
+      fi
+    fi
+    ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+  if [ -r /etc/gentoo-release ] ; then
+    JAVA_HOME=`java-config --jre-home`
+  fi
+fi
+
+if [ -z "$M2_HOME" ] ; then
+  ## resolve links - $0 may be a link to maven's home
+  PRG="$0"
+
+  # need this for relative symlinks
+  while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+      PRG="$link"
+    else
+      PRG="`dirname "$PRG"`/$link"
+    fi
+  done
+
+  saveddir=`pwd`
+
+  M2_HOME=`dirname "$PRG"`/..
+
+  # make it fully qualified
+  M2_HOME=`cd "$M2_HOME" && pwd`
+
+  cd "$saveddir"
+  # echo Using m2 at $M2_HOME
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --unix "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# For Mingw, ensure paths are in UNIX format before anything is touched
+if $mingw ; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME="`(cd "$M2_HOME"; pwd)`"
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
+  # TODO classpath?
+fi
+
+if [ -z "$JAVA_HOME" ]; then
+  javaExecutable="`which javac`"
+  if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then
+    # readlink(1) is not available as standard on Solaris 10.
+    readLink=`which readlink`
+    if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then
+      if $darwin ; then
+        javaHome="`dirname \"$javaExecutable\"`"
+        javaExecutable="`cd \"$javaHome\" && pwd -P`/javac"
+      else
+        javaExecutable="`readlink -f \"$javaExecutable\"`"
+      fi
+      javaHome="`dirname \"$javaExecutable\"`"
+      javaHome=`expr "$javaHome" : '\(.*\)/bin'`
+      JAVA_HOME="$javaHome"
+      export JAVA_HOME
+    fi
+  fi
+fi
+
+if [ -z "$JAVACMD" ] ; then
+  if [ -n "$JAVA_HOME"  ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+      # IBM's JDK on AIX uses strange locations for the executables
+      JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+      JAVACMD="$JAVA_HOME/bin/java"
+    fi
+  else
+    JAVACMD="`which java`"
+  fi
+fi
+
+if [ ! -x "$JAVACMD" ] ; then
+  echo "Error: JAVA_HOME is not defined correctly." >&2
+  echo "  We cannot execute $JAVACMD" >&2
+  exit 1
+fi
+
+if [ -z "$JAVA_HOME" ] ; then
+  echo "Warning: JAVA_HOME environment variable is not set."
+fi
+
+CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher
+
+# traverses directory structure from process work directory to filesystem root
+# first directory with .mvn subdirectory is considered project base directory
+find_maven_basedir() {
+
+  if [ -z "$1" ]
+  then
+    echo "Path not specified to find_maven_basedir"
+    return 1
+  fi
+
+  basedir="$1"
+  wdir="$1"
+  while [ "$wdir" != '/' ] ; do
+    if [ -d "$wdir"/.mvn ] ; then
+      basedir=$wdir
+      break
+    fi
+    # workaround for JBEAP-8937 (on Solaris 10/Sparc)
+    if [ -d "${wdir}" ]; then
+      wdir=`cd "$wdir/.."; pwd`
+    fi
+    # end of workaround
+  done
+  echo "${basedir}"
+}
+
+# concatenates all lines of a file
+concat_lines() {
+  if [ -f "$1" ]; then
+    echo "$(tr -s '\n' ' ' < "$1")"
+  fi
+}
+
+BASE_DIR=`find_maven_basedir "$(pwd)"`
+if [ -z "$BASE_DIR" ]; then
+  exit 1;
+fi
+
+##########################################################################################
+# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+# This allows using the maven wrapper in projects that prohibit checking in binary data.
+##########################################################################################
+if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Found .mvn/wrapper/maven-wrapper.jar"
+    fi
+else
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..."
+    fi
+    jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.0/maven-wrapper-0.4.0.jar"
+    while IFS="=" read key value; do
+      case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
+      esac
+    done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties"
+    if [ "$MVNW_VERBOSE" = true ]; then
+      echo "Downloading from: $jarUrl"
+    fi
+    wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+
+    if command -v wget > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found wget ... using wget"
+        fi
+        wget "$jarUrl" -O "$wrapperJarPath"
+    elif command -v curl > /dev/null; then
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Found curl ... using curl"
+        fi
+        curl -o "$wrapperJarPath" "$jarUrl"
+    else
+        if [ "$MVNW_VERBOSE" = true ]; then
+          echo "Falling back to using Java to download"
+        fi
+        javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        if [ -e "$javaClass" ]; then
+            if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Compiling MavenWrapperDownloader.java ..."
+                fi
+                # Compiling the Java class
+                ("$JAVA_HOME/bin/javac" "$javaClass")
+            fi
+            if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
+                # Running the downloader
+                if [ "$MVNW_VERBOSE" = true ]; then
+                  echo " - Running MavenWrapperDownloader.java ..."
+                fi
+                ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR")
+            fi
+        fi
+    fi
+fi
+##########################################################################################
+# End of extension
+##########################################################################################
+
+export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"}
+if [ "$MVNW_VERBOSE" = true ]; then
+  echo $MAVEN_PROJECTBASEDIR
+fi
+MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS"
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin; then
+  [ -n "$M2_HOME" ] &&
+    M2_HOME=`cygpath --path --windows "$M2_HOME"`
+  [ -n "$JAVA_HOME" ] &&
+    JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"`
+  [ -n "$CLASSPATH" ] &&
+    CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
+  [ -n "$MAVEN_PROJECTBASEDIR" ] &&
+    MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
+fi
+
+WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+echo "Running version check"
+VERSION=$( sed '\!<parent!,\!</parent!d' `dirname $0`/pom.xml | grep '<version' | head -1 | sed -e 's/.*<version>//' -e 's!</version>.*$!!' )
+echo "The found version is [${VERSION}]"
+
+if echo $VERSION | egrep -q 'M|RC'; then
+    echo Activating \"milestone\" profile for version=\"$VERSION\"
+    echo $MAVEN_CONFIG | grep -q milestone || MAVEN_CONFIG="$MAVEN_CONFIG -Pmilestone"
+else
+    echo Deactivating \"milestone\" profile for version=\"$VERSION\"
+    echo $MAVEN_CONFIG | grep -q milestone && MAVEN_CONFIG=$(echo $MAVEN_CONFIG | sed -e 's/-Pmilestone//')
+fi
+
+if echo $VERSION | egrep -q 'RELEASE'; then
+    echo Activating \"central\" profile for version=\"$VERSION\"
+    echo $MAVEN_CONFIG | grep -q milestone || MAVEN_CONFIG="$MAVEN_CONFIG -Pcentral"
+else
+    echo Deactivating \"central\" profile for version=\"$VERSION\"
+    echo $MAVEN_CONFIG | grep -q central && MAVEN_CONFIG=$(echo $MAVEN_CONFIG | sed -e 's/-Pcentral//')
+fi
+
+exec "$JAVACMD" \
+  $MAVEN_OPTS \
+  -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \
+  "-Dmaven.home=${M2_HOME}" "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \
+  ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@"

mvnw.cmd

@@ -0,0 +1,161 @@
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    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
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven2 Start Up Batch script
+@REM
+@REM Required ENV vars:
+@REM JAVA_HOME - location of a JDK home dir
+@REM
+@REM Optional ENV vars
+@REM M2_HOME - location of maven2's installed home dir
+@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands
+@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a key stroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing my setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_pre.bat" call "%HOME%\mavenrc_pre.bat"
+if exist "%HOME%\mavenrc_pre.cmd" call "%HOME%\mavenrc_pre.cmd"
+:skipRcPre
+
+@setlocal
+
+set ERROR_CODE=0
+
+@REM To isolate internal variables from possible post scripts, we use another setlocal
+@setlocal
+
+@REM ==== START VALIDATION ====
+if not "%JAVA_HOME%" == "" goto OkJHome
+
+echo.
+echo Error: JAVA_HOME not found in your environment. >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+:OkJHome
+if exist "%JAVA_HOME%\bin\java.exe" goto init
+
+echo.
+echo Error: JAVA_HOME is set to an invalid directory. >&2
+echo JAVA_HOME = "%JAVA_HOME%" >&2
+echo Please set the JAVA_HOME variable in your environment to match the >&2
+echo location of your Java installation. >&2
+echo.
+goto error
+
+@REM ==== END VALIDATION ====
+
+:init
+
+@REM Find the project base dir, i.e. the directory that contains the folder ".mvn".
+@REM Fallback to current working directory if not found.
+
+set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR%
+IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir
+
+set EXEC_DIR=%CD%
+set WDIR=%EXEC_DIR%
+:findBaseDir
+IF EXIST "%WDIR%"\.mvn goto baseDirFound
+cd ..
+IF "%WDIR%"=="%CD%" goto baseDirNotFound
+set WDIR=%CD%
+goto findBaseDir
+
+:baseDirFound
+set MAVEN_PROJECTBASEDIR=%WDIR%
+cd "%EXEC_DIR%"
+goto endDetectBaseDir
+
+:baseDirNotFound
+set MAVEN_PROJECTBASEDIR=%EXEC_DIR%
+cd "%EXEC_DIR%"
+
+:endDetectBaseDir
+
+IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig
+
+@setlocal EnableExtensions EnableDelayedExpansion
+for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a
+@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS%
+
+:endReadAdditionalConfig
+
+SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe"
+set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar"
+set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
+
+set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.4.0/maven-wrapper-0.4.0.jar"
+FOR /F "tokens=1,2 delims==" %%A IN (%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties) DO (
+	IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B 
+)
+
+@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central
+@REM This allows using the maven wrapper in projects that prohibit checking in binary data.
+if exist %WRAPPER_JAR% (
+    echo Found %WRAPPER_JAR%
+) else (
+    echo Couldn't find %WRAPPER_JAR%, downloading it ...
+	echo Downloading from: %DOWNLOAD_URL%
+    powershell -Command "(New-Object Net.WebClient).DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"
+    echo Finished downloading %WRAPPER_JAR%
+)
+@REM End of extension
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%HOME%\mavenrc_post.bat" call "%HOME%\mavenrc_post.bat"
+if exist "%HOME%\mavenrc_post.cmd" call "%HOME%\mavenrc_post.cmd"
+:skipRcPost
+
+@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on'
+if "%MAVEN_BATCH_PAUSE%" == "on" pause
+
+if "%MAVEN_TERMINATE_CMD%" == "on" exit %ERROR_CODE%
+
+exit /B %ERROR_CODE%

pom.xml

@@ -1,290 +1,314 @@
 <?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>
-
-    <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-netflix</artifactId>
-    <version>1.0.0.BUILD-SNAPSHOT</version>
-    <packaging>pom</packaging>
-    <name>Spring Cloud Netflix</name>
-    <description>Spring Cloud Netflix</description>
-
-    <parent>
-        <groupId>org.springframework.cloud</groupId>
-        <artifactId>spring-cloud-build</artifactId>
-        <version>1.0.0.BUILD-SNAPSHOT</version>
-        <relativePath/>
-        <!-- lookup parent from repository -->
-    </parent>
-
+	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.2.0.RC2</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.2.0.RC2</version>
+		<relativePath />
+	</parent>
 	<scm>
 		<url>https://github.com/spring-cloud/spring-cloud-netflix</url>
 		<connection>scm:git:git://github.com/spring-cloud/spring-cloud-netflix.git</connection>
 		<developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-netflix.git</developerConnection>
 		<tag>HEAD</tag>
 	</scm>
+	<properties>
+		<bintray.package>netflix</bintray.package>
+		<spring-cloud-commons.version>2.2.0.RC2</spring-cloud-commons.version>
+		<spring-cloud-config.version>2.2.0.RC2</spring-cloud-config.version>
+		<spring-cloud-stream.version>Horsham.RC2</spring-cloud-stream.version>
+		<!-- Has to be a stable version (not one that depends on this version of netflix): -->
+		<donotreplacespring-cloud-contract.version>2.1.3.RELEASE</donotreplacespring-cloud-contract.version>
 
-    <modules>
-        <module>spring-cloud-netflix-core</module>
-        <module>spring-cloud-netflix-hystrix-dashboard</module>
-        <module>spring-cloud-netflix-hystrix-amqp</module>
-        <module>spring-cloud-netflix-eureka-server</module>
-        <module>spring-cloud-netflix-turbine</module>
-        <module>spring-cloud-netflix-turbine-amqp</module>
-        <module>spring-cloud-netflix-sidecar</module>
-        <module>docs</module>
+		<!-- 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>
+		<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>
+				<version>${maven-eclipse-plugin.version}</version>
+				<configuration>
+					<useProjectReferences>false</useProjectReferences>
+					<additionalConfig>
+						<file>
+							<name>.settings/org.eclipse.jdt.ui.prefs</name>
+							<location>${maven.multiModuleProjectDirectory}/eclipse/org.eclipse.jdt.ui.prefs</location>
+						</file>
+						<file>
+							<name>.settings/org.eclipse.jdt.core.prefs</name>
+							<location>${maven.multiModuleProjectDirectory}/eclipse/org.eclipse.jdt.core.prefs</location>
+						</file>
+					</additionalConfig>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>${maven-compiler-plugin.version}</version>
+				<configuration>
+					<source>1.8</source>
+					<target>1.8</target>
+				</configuration>
+			</plugin>
+			<plugin>
+				<groupId>io.spring.javaformat</groupId>
+				<artifactId>spring-javaformat-maven-plugin</artifactId>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</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>
+				<version>${project.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-commons-dependencies</artifactId>
+				<version>${spring-cloud-commons.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-test-support</artifactId>
+				<scope>test</scope>
+				<version>${spring-cloud-commons.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-config-dependencies</artifactId>
+				<version>${spring-cloud-config.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</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 -->
+			<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>
+			</dependency>
+			<!-- end archaius deps -->
+			<!-- Eureka core dep that is now optional -->
+			<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.thoughtworks.xstream</groupId>
+				<artifactId>xstream</artifactId>
+				<version>${xstream.version}</version>
+			</dependency>
+			<!-- end eureka deps -->
+		</dependencies>
+	</dependencyManagement>
+	<reporting>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-checkstyle-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</reporting>
+	<modules>
+		<module>spring-cloud-netflix-dependencies</module>
+		<module>spring-cloud-netflix-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>docs</module>
     </modules>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-commons</artifactId>
-                <version>1.0.0.BUILD-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-              <groupId>org.springframework.cloud</groupId>
-              <artifactId>spring-cloud-config-client</artifactId>
-              <version>1.0.0.BUILD-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-              <groupId>org.springframework.cloud</groupId>
-              <artifactId>spring-cloud-config-server</artifactId>
-              <version>1.0.0.BUILD-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-              <groupId>org.springframework.cloud</groupId>
-              <artifactId>spring-cloud-netflix-core</artifactId>
-              <version>1.0.0.BUILD-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-              <groupId>org.springframework.cloud</groupId>
-              <artifactId>spring-cloud-netflix-eureka-server</artifactId>
-              <version>1.0.0.BUILD-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-              <groupId>org.springframework.cloud</groupId>
-              <artifactId>spring-cloud-netflix-hystrix-dashboard</artifactId>
-              <version>1.0.0.BUILD-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-netflix-hystrix-amqp</artifactId>
-                <version>1.0.0.BUILD-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-netflix-turbine</artifactId>
-                <version>1.0.0.BUILD-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-netflix-turbine-amqp</artifactId>
-                <version>1.0.0.BUILD-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-netflix-zuul-server</artifactId>
-                <version>1.0.0.BUILD-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>com.netflix.archaius</groupId>
-                <artifactId>archaius-core</artifactId>
-                <version>${archaius.version}</version>
-			    <exclusions>
-				  <exclusion>
-					<artifactId>commons-logging</artifactId>
-					<groupId>commons-logging</groupId>
-				  </exclusion>
-			    </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>com.netflix.eureka</groupId>
-                <artifactId>eureka-client</artifactId>
-                <version>${eureka.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>servlet-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>com.netflix.eureka</groupId>
-                <artifactId>eureka-core</artifactId>
-                <version>${eureka.version}</version>
-			    <exclusions>
-				  <exclusion>
-					<groupId>javax.servlet</groupId>
-					<artifactId>servlet-api</artifactId>
-				  </exclusion>
-				  <exclusion>
-					<artifactId>commons-logging</artifactId>
-					<groupId>commons-logging</groupId>
-				  </exclusion>
-				  <exclusion>
-					<artifactId>log4j</artifactId>
-					<groupId>log4j</groupId>
-				  </exclusion>
-			    </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>com.netflix.feign</groupId>
-                <artifactId>feign-core</artifactId>
-                <version>${feign.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.netflix.feign</groupId>
-                <artifactId>feign-ribbon</artifactId>
-                <version>${feign.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>com.netflix.ribbon</groupId>
-                        <artifactId>ribbon-loadbalancer</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <!--<dependency>
-                <groupId>com.netflix.feign</groupId>
-                <artifactId>feign-slf4j</artifactId>
-                <version>${feign.version}</version>
-            </dependency>-->
-            <dependency>
-                <groupId>com.netflix.hystrix</groupId>
-                <artifactId>hystrix-core</artifactId>
-                <version>${hystrix.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.netflix.hystrix</groupId>
-                <artifactId>hystrix-metrics-event-stream</artifactId>
-                <version>${hystrix.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.netflix.hystrix</groupId>
-                <artifactId>hystrix-javanica</artifactId>
-                <version>${hystrix.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.netflix.ribbon</groupId>
-                <artifactId>ribbon</artifactId>
-                <version>${ribbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.netflix.ribbon</groupId>
-                <artifactId>ribbon-core</artifactId>
-                <version>${ribbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.netflix.ribbon</groupId>
-                <artifactId>ribbon-httpclient</artifactId>
-                <version>${ribbon.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.netflix.ribbon</groupId>
-                <artifactId>ribbon-eureka</artifactId>
-                <version>${ribbon.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.servlet</groupId>
-                        <artifactId>servlet-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>com.netflix.rxjava</groupId>
-                <artifactId>rxjava-core</artifactId>
-                <version>${netflix.rxjava.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.netflix.zuul</groupId>
-                <artifactId>zuul-core</artifactId>
-                <version>${zuul.version}</version>
-			    <exclusions>
-				  <exclusion>
-					<artifactId>groovy-all</artifactId>
-					<groupId>org.codehaus.groovy</groupId>
-				  </exclusion>
-			    </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>org.springframework.integration</groupId>
-                <artifactId>spring-integration-java-dsl</artifactId>
-                <version>${spring-integration-dsl.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.projectlombok</groupId>
-                <artifactId>lombok</artifactId>
-                <version>1.12.6</version>
-                <scope>provided</scope>
-            </dependency>
-            <dependency>
-                <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>18.0</version>
-            </dependency>
-		    <dependency>
-			  <groupId>com.sun.jersey</groupId>
-			  <artifactId>jersey-servlet</artifactId>
-			  <version>1.13</version>
-		    </dependency>
-		    <dependency>
-			  <groupId>com.sun.jersey</groupId>
-			  <artifactId>jersey-core</artifactId>
-			  <version>1.13</version>
-		    </dependency>
-		    <dependency>
-			  <groupId>com.sun.jersey</groupId>
-			  <artifactId>jersey-client</artifactId>
-			  <version>1.13</version>
-		    </dependency>
-		    <dependency>
-			  <groupId>com.sun.jersey</groupId>
-			  <artifactId>jersey-server</artifactId>
-			  <version>1.13</version>
-		    </dependency>
-		    <dependency>
-			  <groupId>org.webjars</groupId>
-			  <artifactId>d3js</artifactId>
-			  <version>3.4.11</version>
-		    </dependency>
-		    <dependency>
-			  <groupId>org.webjars</groupId>
-			  <artifactId>jquery</artifactId>
-			  <version>2.1.1</version>
-		    </dependency>
-		    <dependency>
-			  <groupId>org.webjars</groupId>
-			  <artifactId>bootstrap</artifactId>
-			  <version>3.2.0</version>
-		    </dependency>
-        </dependencies>
-    </dependencyManagement>
-
-    <properties>
-        <archaius.version>0.6.3</archaius.version>
-        <eureka.version>1.1.145</eureka.version>
-        <feign.version>6.1.3</feign.version>
-        <hystrix.version>1.4.0-RC5</hystrix.version>
-        <ribbon.version>2.0-RC13</ribbon.version>
-        <zuul.version>1.0.28</zuul.version>
-        <netflix.rxjava.version>0.20.7</netflix.rxjava.version>
-        <java.version>1.7</java.version>
-        <spring-integration-dsl.version>1.0.0.RELEASE</spring-integration-dsl.version>
-        <cloud-connectors.version>1.1.1.BUILD-SNAPSHOT</cloud-connectors.version>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.1</version>
-                <configuration>
-                    <source>1.7</source>
-                    <target>1.7</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
+	<profiles>
+		<profile>
+			<id>spring</id>
+			<repositories>
+				<repository>
+					<id>spring-snapshots</id>
+					<name>Spring Snapshots</name>
+					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+					<releases>
+						<enabled>false</enabled>
+					</releases>
+				</repository>
+				<repository>
+					<id>spring-milestones</id>
+					<name>Spring Milestones</name>
+					<url>https://repo.spring.io/libs-milestone-local</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+				<repository>
+					<id>spring-releases</id>
+					<name>Spring Releases</name>
+					<url>https://repo.spring.io/release</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</repository>
+			</repositories>
+			<pluginRepositories>
+				<pluginRepository>
+					<id>spring-snapshots</id>
+					<name>Spring Snapshots</name>
+					<url>https://repo.spring.io/libs-snapshot-local</url>
+					<snapshots>
+						<enabled>true</enabled>
+					</snapshots>
+					<releases>
+						<enabled>false</enabled>
+					</releases>
+				</pluginRepository>
+				<pluginRepository>
+					<id>spring-milestones</id>
+					<name>Spring Milestones</name>
+					<url>https://repo.spring.io/libs-milestone-local</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</pluginRepository>
+				<pluginRepository>
+					<id>spring-releases</id>
+					<name>Spring Releases</name>
+					<url>https://repo.spring.io/libs-release-local</url>
+					<snapshots>
+						<enabled>false</enabled>
+					</snapshots>
+				</pluginRepository>
+			</pluginRepositories>
+		</profile>
+		<profile>
+			<id>sonar</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.jacoco</groupId>
+						<artifactId>jacoco-maven-plugin</artifactId>
+						<executions>
+							<execution>
+								<id>pre-unit-test</id>
+								<goals>
+									<goal>prepare-agent</goal>
+								</goals>
+								<configuration>
+									<propertyName>surefireArgLine</propertyName>
+									<destFile>${project.build.directory}/jacoco.exec</destFile>
+								</configuration>
+							</execution>
+							<execution>
+								<id>post-unit-test</id>
+								<phase>test</phase>
+								<goals>
+									<goal>report</goal>
+								</goals>
+								<configuration>
+									<!-- Sets the path to the file which contains the execution data. -->
+									<dataFile>${project.build.directory}/jacoco.exec</dataFile>
+								</configuration>
+							</execution>
+						</executions>
+					</plugin>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-surefire-plugin</artifactId>
+						<configuration>
+							<!-- Sets the VM argument line used when unit tests are run. -->
+							<argLine>${surefireArgLine}</argLine>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>

scripts/build.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+(cd spring-cloud-netflix-hystrix-contract && ../mvnw clean install -B -Pdocs ${@})
+./mvnw clean install -B -Pdocs ${@}

scripts/compileOnly.sh

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

scripts/runAcceptanceTests.sh

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

spring-cloud-netflix-archaius/.flattened-pom.xml

@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.springframework.cloud</groupId>
+    <artifactId>spring-cloud-netflix</artifactId>
+    <version>2.2.0.RC2</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <groupId>org.springframework.cloud</groupId>
+  <artifactId>spring-cloud-netflix-archaius</artifactId>
+  <version>2.2.0.RC2</version>
+  <name>Spring Cloud Netflix Archaius</name>
+  <description>Spring Cloud Netflix Archaius</description>
+  <url>https://spring.io/spring-cloud/spring-cloud-netflix/spring-cloud-netflix-archaius</url>
+  <organization>
+    <name>Pivotal Software, Inc.</name>
+    <url>https://www.spring.io</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
+      <comments>Copyright 2014-2015 the original author or authors.
+
+				Licensed under the Apache License, Version 2.0 (the "License");
+				you may not use this file except in compliance with the License.
+				You may obtain a copy of the License at
+
+				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.</comments>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>dsyer</id>
+      <name>Dave Syer</name>
+      <email>dsyer at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>sgibb</id>
+      <name>Spencer Gibb</name>
+      <email>sgibb at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>mgrzejszczak</id>
+      <name>Marcin Grzejszczak</name>
+      <email>mgrzejszczak at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>rbaxter</id>
+      <name>Ryan Baxter</name>
+      <email>rbaxter at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>omaciaszeksharma</id>
+      <name>Olga Maciaszek-Sharma</name>
+      <email>omaciaszeksharma at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git://github.com/spring-cloud/spring-cloud-netflix.git/spring-cloud-netflix-archaius</connection>
+    <developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-netflix.git/spring-cloud-netflix-archaius</developerConnection>
+    <url>https://github.com/spring-cloud/spring-cloud-netflix/spring-cloud-netflix-archaius</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-actuator</artifactId>
+      <version>2.2.1.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-context</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.netflix.archaius</groupId>
+      <artifactId>archaius-core</artifactId>
+      <version>0.7.6</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+        <exclusion>
+          <artifactId>annotations</artifactId>
+          <groupId>com.google.code.findbugs</groupId>
+        </exclusion>
+      </exclusions>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>commons-configuration</groupId>
+      <artifactId>commons-configuration</artifactId>
+      <version>1.8</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <artifactId>commons-logging</artifactId>
+          <groupId>commons-logging</groupId>
+        </exclusion>
+      </exclusions>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+</project>

spring-cloud-netflix-archaius/pom.xml

@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <artifactId>spring-cloud-netflix</artifactId>
+        <groupId>org.springframework.cloud</groupId>
+        <version>2.2.0.RC2</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>

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

@@ -0,0 +1,238 @@
+/*
+ * 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
+ *
+ *      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.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));
+				}
+			}
+		}
+
+	}
+
+}

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * 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
+ *      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,
@@ -13,25 +13,33 @@
  * 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;
 
-import com.netflix.config.ConfigurationManager;
-
 /**
  * @author Dave Syer
- *
  */
-public class ArchaiusDelegatingProxyUtils {
-	
+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;
+		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) {
@@ -41,7 +49,7 @@ public class ArchaiusDelegatingProxyUtils {
 
 	public static void addApplicationContext(ConfigurableApplicationContext context) {
 		AbstractConfiguration config = ConfigurationManager.getConfigInstance();
-		config .clearProperty(APPLICATION_CONTEXT);
+		config.clearProperty(APPLICATION_CONTEXT);
 		config.setProperty(APPLICATION_CONTEXT, context);
 	}
 

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

@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * 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
+ *      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,
@@ -13,34 +13,34 @@
  * 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.AbstractEndpoint;
 
-import com.netflix.config.ConcurrentCompositeConfiguration;
-import com.netflix.config.ConfigurationManager;
+import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
+import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
 
 /**
- * @author Dave Syer
+ * An actuator endpoint that returns Archaius configuration.
  *
+ * @author Dave Syer
  */
-public class ArchaiusEndpoint extends AbstractEndpoint<Map<String, Object>> {
+@Endpoint(id = "archaius")
+public class ArchaiusEndpoint {
 
-	public ArchaiusEndpoint() {
-		super("archaius");
-	}
-
-	@Override
+	@ReadOperation
 	public Map<String, Object> invoke() {
-		Map<String, Object> map = new LinkedHashMap<String, Object>();
+		Map<String, Object> map = new LinkedHashMap<>();
 		AbstractConfiguration config = ConfigurationManager.getConfigInstance();
 		if (config instanceof ConcurrentCompositeConfiguration) {
 			ConcurrentCompositeConfiguration composite = (ConcurrentCompositeConfiguration) config;

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

@@ -0,0 +1,107 @@
+/*
+ * 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
+ *
+ *      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.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);
+		}
+	}
+
+}

spring-cloud-netflix-archaius/src/main/resources/META-INF/additional-spring-configuration-metadata.json

@@ -0,0 +1,10 @@
+{
+  "properties": [
+    {
+      "defaultValue": "true",
+      "name": "archaius.propagate.environmentChangedEvent",
+      "description": "Propagates EnvironmentChanged events to Archaius ConfigurationManager.",
+      "type": "java.lang.Boolean"
+    }
+  ]
+}

spring-cloud-netflix-archaius/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration

spring-cloud-netflix-archaius/src/test/java/org/springframework/cloud/netflix/archaius/ArchaiusAutoConfigurationTests.java

@@ -0,0 +1,108 @@
+/*
+ * 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
+ *
+ *      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.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");
+	}
+
+}

spring-cloud-netflix-archaius/src/test/java/org/springframework/cloud/netflix/archaius/ArchaiusEndpointTests.java

@@ -1,11 +1,11 @@
 /*
- * Copyright 2013-2014 the original author or authors.
+ * 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
+ *      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,
@@ -13,22 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.cloud.netflix.archaius;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
+package org.springframework.cloud.netflix.archaius;
 
 import java.util.Map;
 
-import org.junit.Test;
-import org.springframework.core.env.StandardEnvironment;
-
 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 {
 
@@ -37,19 +36,21 @@ public class ArchaiusEndpointTests {
 	@Test
 	public void detectsPropertiesWhenSet() {
 		ConfigurationManager.getConfigInstance().setProperty("foo", "bar");
-		assertTrue(endpoint.invoke().containsKey("foo"));
+		assertThat(this.endpoint.invoke().containsKey("foo")).isTrue();
 	}
 
 	@Test
 	public void doesNotIncludeSpringEnvironment() {
-		ConcurrentCompositeConfiguration composite = new ConcurrentCompositeConfiguration(ConfigurationManager.getConfigInstance());
-		ConfigurableEnvironmentConfiguration config = new ConfigurableEnvironmentConfiguration(new StandardEnvironment());
-		assertTrue(config.containsKey("user.dir"));
+		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 = endpoint.invoke();
-		assertTrue(map.containsKey("foo"));
-		assertFalse(map.containsKey("user.dir"));
+		Map<String, Object> map = this.endpoint.invoke();
+		assertThat(map.containsKey("foo")).isTrue();
+		assertThat(map.containsKey("user.dir")).isFalse();
 	}
 
 }

spring-cloud-netflix-archaius/src/test/java/org/springframework/cloud/netflix/archaius/TestArchaiusExternalConfiguration.java

@@ -0,0 +1,41 @@
+/*
+ * 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
+ *
+ *      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.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;
+	}
+
+}

spring-cloud-netflix-archaius/src/test/resources/config.properties

@@ -0,0 +1,2 @@
+archaius.file.property=Static config file property
+db.second.property=It should be overridden

spring-cloud-netflix-concurrency-limits/.flattened-pom.xml

@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.springframework.cloud</groupId>
+    <artifactId>spring-cloud-netflix</artifactId>
+    <version>2.2.0.RC2</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <groupId>org.springframework.cloud</groupId>
+  <artifactId>spring-cloud-netflix-concurrency-limits</artifactId>
+  <version>2.2.0.RC2</version>
+  <name>Spring Cloud Netflix Concurrency Limits</name>
+  <description>Spring Cloud Netflix</description>
+  <url>https://projects.spring.io/spring-cloud/</url>
+  <organization>
+    <name>Pivotal Software, Inc.</name>
+    <url>https://www.spring.io</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
+      <comments>Copyright 2014-2015 the original author or authors.
+
+				Licensed under the Apache License, Version 2.0 (the "License");
+				you may not use this file except in compliance with the License.
+				You may obtain a copy of the License at
+
+				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.</comments>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>dsyer</id>
+      <name>Dave Syer</name>
+      <email>dsyer at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>sgibb</id>
+      <name>Spencer Gibb</name>
+      <email>sgibb at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>mgrzejszczak</id>
+      <name>Marcin Grzejszczak</name>
+      <email>mgrzejszczak at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>rbaxter</id>
+      <name>Ryan Baxter</name>
+      <email>rbaxter at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>omaciaszeksharma</id>
+      <name>Olga Maciaszek-Sharma</name>
+      <email>omaciaszeksharma at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git://github.com/spring-cloud/spring-cloud-netflix.git/spring-cloud-netflix-concurrency-limits</connection>
+    <developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-netflix.git/spring-cloud-netflix-concurrency-limits</developerConnection>
+    <url>https://github.com/spring-cloud/spring-cloud-netflix/spring-cloud-netflix-concurrency-limits</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>com.netflix.concurrency-limits</groupId>
+      <artifactId>concurrency-limits-core</artifactId>
+      <version>0.1.12</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.netflix.concurrency-limits</groupId>
+      <artifactId>concurrency-limits-servlet</artifactId>
+      <version>0.1.12</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-web</artifactId>
+      <version>2.2.1.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-configuration-processor</artifactId>
+      <version>2.2.1.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-webflux</artifactId>
+      <version>2.2.1.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-actuator</artifactId>
+      <version>2.2.1.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+</project>

spring-cloud-netflix-concurrency-limits/pom.xml

@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.springframework.cloud</groupId>
+		<artifactId>spring-cloud-netflix</artifactId>
+		<version>2.2.0.RC2</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>

spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/micrometer/MicrometerMetricRegistry.java

@@ -0,0 +1,53 @@
+/*
+ * 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
+ *
+ *      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.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());
+	}
+
+}

spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ConcurrencyLimitsWebFilter.java

@@ -0,0 +1,54 @@
+/*
+ * 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
+ *
+ *      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.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();
+				});
+	}
+
+}

spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ReactiveConcurrencyLimitsAutoConfiguration.java

@@ -0,0 +1,67 @@
+/*
+ * 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
+ *
+ *      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.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);
+	}
+
+}

spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ServerWebExchangeLimiterBuilder.java

@@ -0,0 +1,100 @@
+/*
+ * 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
+ *
+ *      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.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;
+	}
+
+}

spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/web/ConcurrencyLimitsHandlerInterceptor.java

@@ -0,0 +1,91 @@
+/*
+ * 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
+ *
+ *      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.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();
+			}
+		}
+	}
+
+}

spring-cloud-netflix-concurrency-limits/src/main/java/org/springframework/cloud/netflix/concurrency/limits/web/MvcConcurrencyLimitsAutoConfiguration.java

@@ -0,0 +1,78 @@
+/*
+ * 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
+ *
+ *      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.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));
+		}
+
+	}
+
+}

spring-cloud-netflix-concurrency-limits/src/main/resources/META-INF/spring.factories

@@ -0,0 +1,3 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+org.springframework.cloud.netflix.concurrency.limits.reactive.ReactiveConcurrencyLimitsAutoConfiguration,\
+org.springframework.cloud.netflix.concurrency.limits.web.MvcConcurrencyLimitsAutoConfiguration

spring-cloud-netflix-concurrency-limits/src/test/java/org/springframework/cloud/netflix/concurrency/limits/micrometer/MicrometerMetricRegistryTests.java

@@ -0,0 +1,56 @@
+/*
+ * 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
+ *
+ *      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.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);
+
+	}
+
+}

spring-cloud-netflix-concurrency-limits/src/test/java/org/springframework/cloud/netflix/concurrency/limits/reactive/ConcurrencyLimitsWebFilterTests.java

@@ -0,0 +1,75 @@
+/*
+ * 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
+ *
+ *      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.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));
+		}
+
+	}
+
+}

spring-cloud-netflix-concurrency-limits/src/test/java/org/springframework/cloud/netflix/concurrency/limits/test/AbstractConcurrencyLimitsTests.java

@@ -0,0 +1,80 @@
+/*
+ * 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
+ *
+ *      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.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";
+		}
+
+	}
+
+}

spring-cloud-netflix-concurrency-limits/src/test/java/org/springframework/cloud/netflix/concurrency/limits/test/Responses.java

@@ -0,0 +1,37 @@
+/*
+ * 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
+ *
+ *      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.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();
+	}
+
+}

spring-cloud-netflix-concurrency-limits/src/test/java/org/springframework/cloud/netflix/concurrency/limits/web/ConcurrencyLimitsHandlerInterceptorTests.java

@@ -0,0 +1,70 @@
+/*
+ * 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
+ *
+ *      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.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));
+		}
+
+	}
+
+}

spring-cloud-netflix-core/.flattened-pom.xml

@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.springframework.cloud</groupId>
+    <artifactId>spring-cloud-netflix</artifactId>
+    <version>2.2.0.RC2</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <groupId>org.springframework.cloud</groupId>
+  <artifactId>spring-cloud-netflix-core</artifactId>
+  <version>2.2.0.RC2</version>
+  <name>Spring Cloud Netflix Core - Deprecated</name>
+  <description>Deprecated Spring Cloud Netflix Core - will be removed. Please use spring-cloud-netflix-hystrix instead.</description>
+  <url>https://spring.io/spring-cloud/spring-cloud-netflix/spring-cloud-netflix-core</url>
+  <organization>
+    <name>Pivotal Software, Inc.</name>
+    <url>https://www.spring.io</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>https://www.apache.org/licenses/LICENSE-2.0</url>
+      <comments>Copyright 2014-2015 the original author or authors.
+
+				Licensed under the Apache License, Version 2.0 (the "License");
+				you may not use this file except in compliance with the License.
+				You may obtain a copy of the License at
+
+				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.</comments>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>dsyer</id>
+      <name>Dave Syer</name>
+      <email>dsyer at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>sgibb</id>
+      <name>Spencer Gibb</name>
+      <email>sgibb at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>lead</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>mgrzejszczak</id>
+      <name>Marcin Grzejszczak</name>
+      <email>mgrzejszczak at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>rbaxter</id>
+      <name>Ryan Baxter</name>
+      <email>rbaxter at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>omaciaszeksharma</id>
+      <name>Olga Maciaszek-Sharma</name>
+      <email>omaciaszeksharma at pivotal.io</email>
+      <organization>Pivotal Software, Inc.</organization>
+      <organizationUrl>https://www.spring.io</organizationUrl>
+      <roles>
+        <role>developer</role>
+      </roles>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:git:git://github.com/spring-cloud/spring-cloud-netflix.git/spring-cloud-netflix-core</connection>
+    <developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-netflix.git/spring-cloud-netflix-core</developerConnection>
+    <url>https://github.com/spring-cloud/spring-cloud-netflix/spring-cloud-netflix-core</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-netflix-hystrix</artifactId>
+      <version>2.2.0.RC2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-autoconfigure</artifactId>
+      <version>2.2.1.RELEASE</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+</project>

spring-cloud-netflix-core/pom.xml

@@ -1,145 +1,47 @@
 <?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-core</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Cloud Netflix Core</name>
-	<description>Spring Cloud Netflix Core</description>
-
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-netflix</artifactId>
-		<version>1.0.0.BUILD-SNAPSHOT</version>
-		<relativePath>..</relativePath>
+		<version>2.2.0.RC2</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.boot</groupId>
-			<artifactId>spring-boot-starter-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-actuator</artifactId>
-		</dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-commons</artifactId>
-            <optional>true</optional>
-        </dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-config-client</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-config-server</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.archaius</groupId>
-			<artifactId>archaius-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.eureka</groupId>
-			<artifactId>eureka-client</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.eureka</groupId>
-			<artifactId>eureka-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>net.java.dev.rome</groupId>
-			<artifactId>rome</artifactId>
-			<version>1.0.0</version>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.feign</groupId>
-			<artifactId>feign-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.feign</groupId>
-			<artifactId>feign-ribbon</artifactId>
-            <optional>true</optional>
-		</dependency>
-		<!--<dependency> <groupId>com.netflix.feign</groupId> <artifactId>feign-slf4j</artifactId> 
-			</dependency> -->
-		<dependency>
-			<groupId>com.netflix.hystrix</groupId>
-			<artifactId>hystrix-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.hystrix</groupId>
-			<artifactId>hystrix-metrics-event-stream</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.hystrix</groupId>
-			<artifactId>hystrix-javanica</artifactId>
-			<optional>true</optional>
-		</dependency>
-        <dependency>
-            <groupId>com.netflix.ribbon</groupId>
-            <artifactId>ribbon</artifactId>
-            <optional>true</optional>
-        </dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon-eureka</artifactId>
-			<optional>true</optional>
-		</dependency>
-        <dependency>
-            <groupId>com.netflix.ribbon</groupId>
-            <artifactId>ribbon-httpclient</artifactId>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>com.netflix.zuul</groupId>
-            <artifactId>zuul-core</artifactId>
-            <optional>true</optional>
-            <exclusions>
-            	<exclusion>
-            		<artifactId>groovy-all</artifactId>
-            		<groupId>org.codehaus.groovy</groupId>
-            	</exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>com.netflix.rxjava</groupId>
-            <artifactId>rxjava-core</artifactId>
-            <optional>true</optional>
-        </dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<!-- Only needed at compile time -->
-			<scope>compile</scope>
-			<optional>true</optional>
+			<artifactId>spring-cloud-netflix-hystrix</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
+			<artifactId>spring-boot-autoconfigure</artifactId>
+			<optional>true</optional>
 		</dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-        </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>

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

@@ -1,8 +0,0 @@
-package org.springframework.cloud.netflix;
-
-/**
- * @author Spencer Gibb
- */
-public interface Constants {
-	String HYSTRIX_STREAM_NAME = "spring.cloud.hystrix.stream";
-}

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

@@ -1,133 +0,0 @@
-package org.springframework.cloud.netflix.archaius;
-
-import static com.netflix.config.ConfigurationBasedDeploymentContext.DEPLOYMENT_APPLICATION_ID_PROPERTY;
-import static com.netflix.config.ConfigurationManager.APPLICATION_PROPERTIES;
-import static com.netflix.config.ConfigurationManager.DISABLE_DEFAULT_ENV_CONFIG;
-import static com.netflix.config.ConfigurationManager.DISABLE_DEFAULT_SYS_CONFIG;
-import static com.netflix.config.ConfigurationManager.ENV_CONFIG_NAME;
-import static com.netflix.config.ConfigurationManager.SYS_CONFIG_NAME;
-import static com.netflix.config.ConfigurationManager.URL_CONFIG_NAME;
-
-import java.lang.reflect.Field;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-import javax.annotation.PreDestroy;
-
-import org.apache.commons.configuration.ConfigurationBuilder;
-import org.apache.commons.configuration.EnvironmentConfiguration;
-import org.apache.commons.configuration.SystemConfiguration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.util.ReflectionUtils;
-
-import com.netflix.config.ConcurrentCompositeConfiguration;
-import com.netflix.config.ConfigurationManager;
-import com.netflix.config.DynamicPropertyFactory;
-import com.netflix.config.DynamicURLConfiguration;
-
-/**
- * @author Spencer Gibb
- */
-@Configuration
-@ConditionalOnClass({ ConcurrentCompositeConfiguration.class, ConfigurationBuilder.class })
-public class ArchaiusAutoConfiguration {
-
-	private static final Logger logger = LoggerFactory
-			.getLogger(ArchaiusAutoConfiguration.class);
-	private static final AtomicBoolean initialized = new AtomicBoolean(false);
-
-	@Autowired
-	private ConfigurableEnvironment env;
-
-	@PreDestroy
-	public void close() {
-		setStatic(ConfigurationManager.class, "instance", null);
-		setStatic(ConfigurationManager.class, "customConfigurationInstalled", false);
-		setStatic(DynamicPropertyFactory.class, "config", null);
-		setStatic(DynamicPropertyFactory.class, "initializedWithDefaultConfig", false);
-		initialized.compareAndSet(true, false);
-	}
-
-	@Bean
-	public ConfigurableEnvironmentConfiguration configurableEnvironmentConfiguration() {
-		ConfigurableEnvironmentConfiguration envConfig = new ConfigurableEnvironmentConfiguration(
-				env);
-		configureArchaius(envConfig);
-		return envConfig;
-	}
-
-	@Bean
-	protected ArchaiusEndpoint archaiusEndpoint() {
-		return new ArchaiusEndpoint();
-	}
-
-	@SuppressWarnings("deprecation")
-	protected void configureArchaius(ConfigurableEnvironmentConfiguration envConfig) {
-		if (initialized.compareAndSet(false, true)) {
-			String appName = env.getProperty("spring.application.name");
-			if (appName == null) {
-				appName = "application";
-				logger.warn("No spring.application.name found, defaulting to 'application'");
-			}
-			// this is deprecated, but currently it seams the only way to set it initially
-			System.setProperty(DEPLOYMENT_APPLICATION_ID_PROPERTY, appName);
-
-			// TODO: support for other DeploymentContexts
-
-			ConcurrentCompositeConfiguration config = new ConcurrentCompositeConfiguration();
-
-			// support to add other Configurations (Jdbc, DynamoDb, Zookeeper, jclouds,
-			// etc...)
-			/*
-			 * if (factories != null && !factories.isEmpty()) { for
-			 * (PropertiesSourceFactory factory: factories) {
-			 * config.addConfiguration(factory.getConfiguration(), factory.getName()); } }
-			 */
-			config.addConfiguration(envConfig,
-					ConfigurableEnvironmentConfiguration.class.getSimpleName());
-
-			// below come from ConfigurationManager.createDefaultConfigInstance()
-			DynamicURLConfiguration defaultURLConfig = new DynamicURLConfiguration();
-			try {
-				config.addConfiguration(defaultURLConfig, URL_CONFIG_NAME);
-			}
-			catch (Throwable e) {
-				logger.error("Cannot create config from " + defaultURLConfig, e);
-			}
-
-			// TODO: sys/env above urls?
-			if (!Boolean.getBoolean(DISABLE_DEFAULT_SYS_CONFIG)) {
-				SystemConfiguration sysConfig = new SystemConfiguration();
-				config.addConfiguration(sysConfig, SYS_CONFIG_NAME);
-			}
-			if (!Boolean.getBoolean(DISABLE_DEFAULT_ENV_CONFIG)) {
-				EnvironmentConfiguration environmentConfiguration = new EnvironmentConfiguration();
-				config.addConfiguration(environmentConfiguration, ENV_CONFIG_NAME);
-			}
-
-			ConcurrentCompositeConfiguration appOverrideConfig = new ConcurrentCompositeConfiguration();
-			config.addConfiguration(appOverrideConfig, APPLICATION_PROPERTIES);
-			config.setContainerConfigurationIndex(config
-					.getIndexOfConfiguration(appOverrideConfig));
-
-			ConfigurationManager.install(config);
-		}
-		else {
-			// TODO: reinstall ConfigurationManager
-			logger.warn("Netflix ConfigurationManager has already been installed, unable to re-install");
-		}
-	}
-
-	private static void setStatic(Class<?> type, String name, Object value) {
-		// Hack a private static field
-		Field field = ReflectionUtils.findField(type, name);
-		ReflectionUtils.makeAccessible(field);
-		ReflectionUtils.setField(field, null, value);
-	}
-
-}

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

@@ -1,90 +0,0 @@
-package org.springframework.cloud.netflix.archaius;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.springframework.core.env.CompositePropertySource;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.EnumerablePropertySource;
-import org.springframework.core.env.MutablePropertySources;
-import org.springframework.core.env.PropertySource;
-import org.springframework.core.env.StandardEnvironment;
-
-/**
- * @author Spencer Gibb
- */
-public class ConfigurableEnvironmentConfiguration extends AbstractConfiguration {
-    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 environment.containsProperty(key);
-    }
-
-    @Override
-    public Object getProperty(String key) {
-        return 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;
-        if (this.environment != null
-                && this.environment instanceof ConfigurableEnvironment) {
-            sources = this.environment.getPropertySources();
-        }
-        else {
-            sources = new StandardEnvironment().getPropertySources();
-        }
-        for (PropertySource<?> source : sources) {
-            extract("", map, source);
-        }
-        return map;
-    }
-
-    private void extract(String root, Map<String, PropertySource<?>> map,
-                         PropertySource<?> source) {
-        if (source instanceof CompositePropertySource) {
-            for (PropertySource<?> nest : ((CompositePropertySource) source).getPropertySources()) {
-                extract(source.getName() + ":", map, nest);
-            }
-        }
-        else {
-            map.put(root + source.getName(), source);
-        }
-    }
-
-}

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

@@ -1,92 +0,0 @@
-/*
- * Copyright 2013-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.cloud.netflix.config;
-
-import lombok.extern.slf4j.Slf4j;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
-import org.springframework.cloud.config.client.ConfigClientProperties;
-import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator;
-import org.springframework.cloud.netflix.eureka.EurekaClientAutoConfiguration;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Import;
-import org.springframework.context.event.ContextRefreshedEvent;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.core.env.Environment;
-
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.discovery.DiscoveryClient;
-
-/**
- * Bootstrap configuration for a config client that wants to lookup the config server via
- * discovery.
- * 
- * @author Dave Syer
- *
- */
-@ConditionalOnClass({ DiscoveryClient.class, ConfigServicePropertySourceLocator.class })
-@ConditionalOnExpression("${spring.cloud.config.discovery.enabled:false}")
-@Configuration
-@EnableDiscoveryClient
-@Import(EurekaClientAutoConfiguration.class)
-@Slf4j
-public class DiscoveryClientConfigServiceBootstrapConfiguration implements
-		ApplicationListener<ContextRefreshedEvent> {
-
-	@Autowired
-	private DiscoveryClient client;
-
-	@Autowired
-	private ConfigClientProperties config;
-
-	@Override
-	public void onApplicationEvent(ContextRefreshedEvent event) {
-		try {
-			log.info("Locating configserver via discovery");
-			Environment environment = event.getApplicationContext().getEnvironment();
-			if (!(environment instanceof ConfigurableEnvironment)) {
-				log.info("Environment is not ConfigurableEnvironment so cannot look up configserver");
-				return;
-			}
-			InstanceInfo server = client.getNextServerFromEureka(config.getDiscovery()
-					.getServiceId(), false);
-			String url = server.getHomePageUrl();
-			if (server.getMetadata().containsKey("password")) {
-				String user = server.getMetadata().get("user");
-				user = user == null ? "user" : user;
-				config.setUsername(user);
-				String password = server.getMetadata().get("password");
-				config.setPassword(password);
-			}
-			if (server.getMetadata().containsKey("configPath")) {
-				String path = server.getMetadata().get("configPath");
-				if (url.endsWith("/") && path.startsWith("/")) {
-					url = url.substring(0, url.length()-1);
-				}
-				url = url + path;
-			}
-			config.setUri(url);
-		}
-		catch (Exception e) {
-			log.warn("Could not locate configserver via discovery", e);
-		}
-	}
-
-}

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

@@ -0,0 +1,42 @@
+/*
+ * 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
+ *
+ *      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.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.");
+	}
+
+}

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

@@ -1,76 +0,0 @@
-package org.springframework.cloud.netflix.endpoint;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.boot.actuate.endpoint.Endpoint;
-import org.springframework.boot.actuate.endpoint.mvc.MvcEndpoint;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.context.ServletContextAware;
-import org.springframework.web.servlet.ModelAndView;
-import org.springframework.web.servlet.mvc.ServletWrappingController;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * TODO: move to spring-boot?
- * User: spencergibb
- * Date: 4/24/14
- * Time: 9:13 PM
- */
-public abstract class ServletWrappingEndpoint implements InitializingBean,
-        ApplicationContextAware, ServletContextAware, MvcEndpoint {
-
-    protected String path;
-    protected boolean sensitive;
-    protected boolean enabled = true;
-
-    protected final ServletWrappingController controller = new ServletWrappingController();
-
-    @Override
-    public void afterPropertiesSet() throws Exception {
-        this.controller.afterPropertiesSet();
-    }
-
-    @Override
-    public void setServletContext(ServletContext servletContext) {
-        this.controller.setServletContext(servletContext);
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        this.controller.setApplicationContext(applicationContext);
-    }
-
-    protected ServletWrappingEndpoint(Class<?> servletClass, String servletName, String path,
-                                      boolean sensitive, boolean enabled) {
-        controller.setServletClass(servletClass);
-        controller.setServletName(servletName);
-        this.path = path;
-        this.sensitive = sensitive;
-        this.enabled = enabled;
-    }
-
-    @RequestMapping("**")
-    public ModelAndView handle(HttpServletRequest request, HttpServletResponse response) throws Exception {
-        return this.controller.handleRequest(request, response);
-    }
-
-    @Override
-    public String getPath() {
-        return path;
-    }
-
-    @Override
-    public boolean isSensitive() {
-        return sensitive;
-    }
-
-    @Override
-    public Class<? extends Endpoint<?>> getEndpointType() {
-        return null;
-    }
-}

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

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

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

@@ -1,26 +0,0 @@
-package org.springframework.cloud.netflix.eureka;
-
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.netflix.appinfo.EurekaInstanceConfig;
-import com.netflix.discovery.DiscoveryManager;
-import com.netflix.discovery.EurekaClientConfig;
-
-/**
- * @author Spencer Gibb
- */
-public class DiscoveryManagerInitializer {
-
-    @Autowired
-    private EurekaClientConfig clientConfig;
-
-    @Autowired
-    private EurekaInstanceConfig instanceConfig;
-
-
-    public synchronized void init() {
-        if (DiscoveryManager.getInstance().getDiscoveryClient() == null) {
-            DiscoveryManager.getInstance().initComponent(instanceConfig, clientConfig);
-        }
-    }
-}

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

@@ -1,68 +0,0 @@
-/*
- * Copyright 2013-2014 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.cloud.netflix.eureka;
-
-import javax.annotation.PostConstruct;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import com.netflix.appinfo.EurekaInstanceConfig;
-import com.netflix.discovery.EurekaClientConfig;
-import com.netflix.discovery.converters.JsonXStream;
-import com.netflix.discovery.converters.XmlXStream;
-
-/**
- * @author Dave Syer
- *
- */
-@Configuration
-@EnableConfigurationProperties
-@ConditionalOnClass(EurekaClientConfig.class)
-@ConditionalOnExpression("${eureka.client.enabled:true}")
-public class EurekaClientAutoConfiguration {
-
-	@Autowired
-	ApplicationContext context;
-
-	@PostConstruct
-	public void init() {
-		XmlXStream.getInstance().setMarshallingStrategy(
-				new DataCenterAwareMarshallingStrategy(context));
-		JsonXStream.getInstance().setMarshallingStrategy(
-				new DataCenterAwareMarshallingStrategy(context));
-	}
-
-	@Bean
-	@ConditionalOnMissingBean(EurekaClientConfig.class)
-	public EurekaClientConfigBean eurekaClientConfigBean() {
-		return new EurekaClientConfigBean();
-	}
-
-	@Bean
-	@ConditionalOnMissingBean(EurekaInstanceConfig.class)
-	public EurekaInstanceConfigBean eurekaInstanceConfigBean() {
-		return new EurekaInstanceConfigBean();
-	}
-
-
-}

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

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

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

@@ -1,130 +0,0 @@
-package org.springframework.cloud.netflix.eureka;
-
-import com.google.common.base.Function;
-import com.google.common.base.Predicates;
-import com.google.common.collect.Lists;
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.discovery.shared.Application;
-import com.netflix.discovery.shared.Applications;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.discovery.DiscoveryClient;
-
-import javax.annotation.Nullable;
-import java.util.Collections;
-import java.util.List;
-
-import static com.google.common.collect.Iterables.*;
-
-/**
- * @author Spencer Gibb
- */
-public class EurekaDiscoveryClient implements DiscoveryClient {
-
-	public static final String DESCRIPTION = "Spring Cloud Eureka Discovery Client";
-
-	@Autowired
-    private EurekaInstanceConfigBean config;
-
-    @Autowired
-    private com.netflix.discovery.DiscoveryClient discovery;
-
-	@Override
-	public String description() {
-		return DESCRIPTION;
-	}
-
-	@Override
-    public ServiceInstance getLocalServiceInstance() {
-        return new ServiceInstance() {
-            @Override
-            public String getServiceId() {
-                return config.getAppname();
-            }
-
-            @Override
-            public String getHost() {
-                return config.getHostname();
-            }
-
-            @Override
-            public int getPort() {
-                return config.getNonSecurePort();
-            }
-        };
-    }
-
-    @Override
-    public List<ServiceInstance> getInstances(String serviceId) {
-        List<InstanceInfo> infos = discovery.getInstancesByVipAddress(serviceId, false);
-        Iterable<ServiceInstance> instances = transform(infos, new Function<InstanceInfo, ServiceInstance>() {
-            @Nullable
-            @Override
-            public ServiceInstance apply(@Nullable InstanceInfo info) {
-                return new EurekaServiceInstance(info);
-            }
-        });
-        return Lists.newArrayList(instances);
-    }
-
-    static class EurekaServiceInstance implements ServiceInstance {
-        InstanceInfo instance;
-
-        EurekaServiceInstance(InstanceInfo instance) {
-            this.instance = instance;
-        }
-
-        @Override
-        public String getServiceId() {
-            return instance.getAppName();
-        }
-
-        @Override
-        public String getHost() {
-            return instance.getHostName();
-        }
-
-        @Override
-        public int getPort() {
-            return instance.getPort();
-        }
-    }
-
-    @Override
-    public List<String> getServices() {
-        Applications applications = discovery.getApplications();
-        if (applications == null) {
-            return Collections.emptyList();
-        }
-        return Lists.newArrayList(filter(transform(applications.getRegisteredApplications(), new Function<Application, String>() {
-            @Nullable
-            @Override
-            public String apply(@Nullable Application app) {
-                if (app.getInstances().isEmpty()) {
-                    return null;
-                }
-                return app.getName().toLowerCase();
-            }
-        }), Predicates.notNull()));
-    }
-
-    @Override
-    public List<ServiceInstance> getAllInstances() {
-        Applications applications = discovery.getApplications();
-        if (applications == null) {
-            return Collections.emptyList();
-        }
-        Iterable<ServiceInstance> instances = transform(concat(transform(applications.getRegisteredApplications(), new Function<Application, List<InstanceInfo>>() {
-            public List<InstanceInfo> apply(@Nullable Application app) {
-                return app.getInstances();
-            }
-        })), new Function<InstanceInfo, ServiceInstance>() {
-            @Nullable
-            @Override
-            public ServiceInstance apply(@Nullable InstanceInfo info) {
-                return new EurekaServiceInstance(info);
-            }
-        });
-        return Lists.newArrayList(instances);
-    }
-}

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

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

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

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

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

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

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

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

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

@@ -1,48 +0,0 @@
-package org.springframework.cloud.netflix.feign;
-
-import feign.Client;
-import feign.Contract;
-import feign.Feign;
-import feign.Logger;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.cloud.netflix.feign.ribbon.FeignRibbonClient;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.cloud.netflix.archaius.ArchaiusAutoConfiguration;
-
-import com.netflix.loadbalancer.ILoadBalancer;
-
-/**
- * @author Spencer Gibb
- * @author Julien Roy
- */
-@Configuration
-@ConditionalOnClass(Feign.class)
-@AutoConfigureAfter(ArchaiusAutoConfiguration.class)
-public class FeignAutoConfiguration {
-    @Bean
-    SpringDecoder feignDecoder() {
-        return new SpringDecoder();
-    }
-
-    @Bean
-    SpringEncoder feignEncoder() {
-        return new SpringEncoder();
-    }
-
-    @Bean
-    public Logger feignLogger() {
-        //return new Slf4jLogger(); //TODO pass Client classname in
-        return new Logger.JavaLogger();
-    }
-
-    @Bean
-    public Contract feignContract() {
-        return new SpringMvcContract();
-    }
-
-    @Bean
-    @ConditionalOnClass(ILoadBalancer.class)
-    public Client feignRibbonClient() { return new FeignRibbonClient(); }
-}

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

@@ -1,18 +0,0 @@
-package org.springframework.cloud.netflix.feign;
-
-import java.lang.annotation.*;
-
-/**
- * @author Spencer Gibb
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-public @interface FeignClient {
-	/**
-	 * @return serviceId if loadbalance is true, url otherwise
-	 * No need to prefix serviceId with http://
-	 */
-	String value();
-	boolean loadbalance() default true;
-}

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

@@ -1,39 +0,0 @@
-package org.springframework.cloud.netflix.feign;
-
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import org.springframework.beans.factory.FactoryBean;
-
-/**
-* @author Spencer Gibb
-*/
-@Data
-@EqualsAndHashCode(callSuper=false)
-class FeignClientFactoryBean extends FeignConfiguration implements FactoryBean<Object> {
-
-	private boolean loadbalance;
-	private Class<?> type;
-	private String schemeName;
-
-	@Override
-	public Object getObject() throws Exception {
-		if (!schemeName.startsWith("http")) {
-			schemeName = "http://"+schemeName;
-		}
-		if (loadbalance) {
-			return loadBalance(type, schemeName);
-		}
-		return feign().target(type, schemeName);
-	}
-
-	@Override
-	public Class<?> getObjectType() {
-		return type;
-	}
-
-	@Override
-	public boolean isSingleton() {
-		return true;
-	}
-}

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

@@ -1,53 +0,0 @@
-package org.springframework.cloud.netflix.feign;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.springframework.context.annotation.Import;
-
-/**
- * Configures component scanning directives for use with @{@link org.springframework.context.annotation.Configuration} classes.
- * Scan Spring Integration specific components.
- *
- * @author Artem Bilan
- * @since 4.0
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-@Documented
-@Import(FeignClientScanRegistrar.class)
-public @interface FeignClientScan {
-
-	/**
-	 * Alias for the {@link #basePackages()} attribute.
-	 * Allows for more concise annotation declarations e.g.:
-	 * {@code @ComponentScan("org.my.pkg")} instead of
-	 * {@code @ComponentScan(basePackages="org.my.pkg")}.
-	 *
-	 * @return the array of 'basePackages'.
-	 */
-	String[] value() default {};
-
-	/**
-	 * Base packages to scan for annotated components.
-	 * <p>{@link #value()} is an alias for (and mutually exclusive with) this attribute.
-	 * <p>Use {@link #basePackageClasses()} for a type-safe alternative to String-based package names.
-	 *
-	 * @return the array of 'basePackages'.
-	 */
-	String[] basePackages() default {};
-
-	/**
-	 * Type-safe alternative to {@link #basePackages()} for specifying the packages
-	 * to scan for annotated components. The package of each class specified will be scanned.
-	 * <p>Consider creating a special no-op marker class or interface in each package
-	 * that serves no purpose other than being referenced by this attribute.
-	 *
-	 * @return the array of 'basePackageClasses'.
-	 */
-	Class<?>[] basePackageClasses() default {};
-
-}

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

@@ -1,138 +0,0 @@
-package org.springframework.cloud.netflix.feign;
-
-import java.lang.annotation.Annotation;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.springframework.beans.factory.BeanClassLoaderAware;
-import org.springframework.beans.factory.annotation.AnnotatedBeanDefinition;
-import org.springframework.beans.factory.config.BeanDefinition;
-import org.springframework.beans.factory.config.BeanDefinitionHolder;
-import org.springframework.beans.factory.support.BeanDefinitionBuilder;
-import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
-import org.springframework.beans.factory.support.BeanDefinitionRegistry;
-import org.springframework.context.ResourceLoaderAware;
-import org.springframework.context.annotation.ClassPathScanningCandidateComponentProvider;
-import org.springframework.context.annotation.ImportBeanDefinitionRegistrar;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.core.type.AnnotationMetadata;
-import org.springframework.core.type.filter.AnnotationTypeFilter;
-import org.springframework.util.Assert;
-import org.springframework.util.ClassUtils;
-import org.springframework.util.StringUtils;
-
-/**
- * @author Spencer Gibb
- * patterned after Spring Integration IntegrationComponentScanRegistrar
- */
-public class FeignClientScanRegistrar extends FeignConfiguration
-		implements ImportBeanDefinitionRegistrar, ResourceLoaderAware, BeanClassLoaderAware {
-
-	private ResourceLoader resourceLoader;
-
-	private ClassLoader classLoader;
-
-	public FeignClientScanRegistrar() {
-	}
-
-	@Override
-	public void setResourceLoader(ResourceLoader resourceLoader) {
-		this.resourceLoader = resourceLoader;
-	}
-
-	@Override
-	public void setBeanClassLoader(ClassLoader classLoader) {
-		this.classLoader = classLoader;
-	}
-
-	@Override
-	public void registerBeanDefinitions(AnnotationMetadata importingClassMetadata, BeanDefinitionRegistry registry) {
-
-		Set<String> basePackages = getBasePackages(importingClassMetadata);
-
-		ClassPathScanningCandidateComponentProvider scanner = getScanner();
-		scanner.addIncludeFilter(new AnnotationTypeFilter(FeignClient.class));
-		scanner.setResourceLoader(resourceLoader);
-
-		for (String basePackage : basePackages) {
-			Set<BeanDefinition> candidateComponents = scanner.findCandidateComponents(basePackage);
-			for (BeanDefinition candidateComponent : candidateComponents) {
-				if (candidateComponent instanceof AnnotatedBeanDefinition) {
-					//verify annotated class is an interface
-					AnnotatedBeanDefinition beanDefinition = (AnnotatedBeanDefinition) candidateComponent;
-					AnnotationMetadata annotationMetadata = beanDefinition.getMetadata();
-					Assert.isTrue(annotationMetadata.isInterface(), "@FeignClient can only be specified on an interface");
-
-					BeanDefinitionHolder holder = createBeanDefinition(annotationMetadata);
-					BeanDefinitionReaderUtils.registerBeanDefinition(holder, registry);
-				}
-			}
-		}
-	}
-
-	public BeanDefinitionHolder createBeanDefinition(AnnotationMetadata annotationMetadata) {
-		Map<String, Object> attributes = annotationMetadata.getAnnotationAttributes(FeignClient.class.getCanonicalName());
-
-		String className = annotationMetadata.getClassName();
-		BeanDefinitionBuilder definition = BeanDefinitionBuilder.genericBeanDefinition(FeignClientFactoryBean.class);
-		definition.addPropertyValue("loadbalance", attributes.get("loadbalance"));
-		definition.addPropertyValue("type", className);
-		definition.addPropertyValue("schemeName", attributes.get("value"));
-
-		String beanName = StringUtils.uncapitalize(className.substring(className.lastIndexOf(".") + 1));
-		return new BeanDefinitionHolder(definition.getBeanDefinition(), beanName);
-	}
-
-	protected ClassPathScanningCandidateComponentProvider getScanner() {
-		return new ClassPathScanningCandidateComponentProvider(false) {
-
-				@Override
-				protected boolean isCandidateComponent(AnnotatedBeanDefinition beanDefinition) {
-					if (beanDefinition.getMetadata().isIndependent()) {
-						// TODO until SPR-11711 will be resolved
-						if (beanDefinition.getMetadata().isInterface() &&
-								beanDefinition.getMetadata().getInterfaceNames().length == 1 &&
-								Annotation.class.getName().equals(beanDefinition.getMetadata().getInterfaceNames()[0])) {
-							try {
-								Class<?> target = ClassUtils.forName(beanDefinition.getMetadata().getClassName(), classLoader);
-								return !target.isAnnotation();
-							}
-							catch (Exception e) {
-								logger.error("Could not load target class: " + beanDefinition.getMetadata().getClassName(), e);
-
-							}
-						}
-						return true;
-					}
-					return false;
-				}
-			};
-	}
-
-	protected Set<String> getBasePackages(AnnotationMetadata importingClassMetadata) {
-		Map<String, Object> attributes = importingClassMetadata
-				.getAnnotationAttributes(FeignClientScan.class.getCanonicalName());
-
-		Set<String> basePackages = new HashSet<>();
-		for (String pkg : (String[]) attributes.get("value")) {
-			if (StringUtils.hasText(pkg)) {
-				basePackages.add(pkg);
-			}
-		}
-		for (String pkg : (String[]) attributes.get("basePackages")) {
-			if (StringUtils.hasText(pkg)) {
-				basePackages.add(pkg);
-			}
-		}
-		for (Class<?> clazz : (Class[]) attributes.get("basePackageClasses")) {
-			basePackages.add(ClassUtils.getPackageName(clazz));
-		}
-
-		if (basePackages.isEmpty()) {
-			basePackages.add(ClassUtils.getPackageName(importingClassMetadata.getClassName()));
-		}
-		return basePackages;
-	}
-
-}

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

@@ -1,86 +0,0 @@
-package org.springframework.cloud.netflix.feign;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.netflix.archaius.ConfigurableEnvironmentConfiguration;
-import org.springframework.context.annotation.Configuration;
-
-import feign.Client;
-import feign.Contract;
-import feign.Feign;
-import feign.Logger;
-import feign.Request;
-import feign.Retryer;
-import feign.codec.Decoder;
-import feign.codec.Encoder;
-import feign.codec.ErrorDecoder;
-import feign.ribbon.LoadBalancingTarget;
-
-/**
- * @author Spencer Gibb
- */
-@Configuration
-public class FeignConfiguration {
-    @Autowired
-    ConfigurableEnvironmentConfiguration envConfig; //FIXME: howto enforce this?
-
-    @Autowired
-    Decoder decoder;
-
-    @Autowired
-    Encoder encoder;
-
-    @Autowired
-    Logger logger;
-
-    @Autowired
-    Contract contract;
-
-	@Autowired(required = false)
-	Logger.Level logLevel;
-
-	@Autowired(required = false)
-	Retryer retryer;
-
-	@Autowired(required = false)
-	ErrorDecoder errorDecoder;
-
-	@Autowired(required = false)
-	Request.Options options;
-
-    @Autowired(required = false)
-    Client ribbonClient;
-
-    protected Feign.Builder feign() {
-		Feign.Builder builder = Feign.builder()
-				//required values
-				.logger(logger)
-				.encoder(encoder)
-				.decoder(decoder)
-				.contract(contract);
-
-		//optional values
-		if (logLevel != null)
-			builder.logLevel(logLevel);
-		if (retryer != null)
-			builder.retryer(retryer);
-		if (errorDecoder != null)
-			builder.errorDecoder(errorDecoder);
-		if (options != null)
-			builder.options(options);
-
-		return builder;
-    }
-
-    protected <T> T loadBalance(Class<T> type, String schemeName) {
-        return loadBalance(feign(), type, schemeName);
-    }
-
-    protected <T> T loadBalance(Feign.Builder builder, Class<T> type, String schemeName) {
-        if(ribbonClient != null) {
-            return builder.client(ribbonClient).target(type, schemeName);
-        } else {
-            return builder.target(LoadBalancingTarget.create(type, schemeName));
-        }
-    }
-
-}

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

@@ -1,20 +0,0 @@
-package org.springframework.cloud.netflix.feign;
-
-import org.springframework.http.HttpHeaders;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Map;
-
-/**
- * @author Spencer Gibb
- */
-public class FeignUtils {
-    static HttpHeaders getHttpHeaders(Map<String, Collection<String>> headers) {
-        HttpHeaders httpHeaders = new HttpHeaders();
-        for (Map.Entry<String, Collection<String>> entry : headers.entrySet()) {
-            httpHeaders.put(entry.getKey(), new ArrayList<>(entry.getValue()));
-        }
-        return httpHeaders;
-    }
-}

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

@@ -1,88 +0,0 @@
-package org.springframework.cloud.netflix.feign;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.web.HttpMessageConverters;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.client.ClientHttpResponse;
-import org.springframework.web.client.HttpMessageConverterExtractor;
-
-import feign.FeignException;
-import feign.Response;
-import feign.codec.DecodeException;
-import feign.codec.Decoder;
-
-import static org.springframework.cloud.netflix.feign.FeignUtils.getHttpHeaders;
-
-/**
- * @author Spencer Gibb
- */
-public class SpringDecoder implements Decoder {
-
-    @Autowired
-    HttpMessageConverters messageConverters;
-
-	public SpringDecoder() {
-	}
-
-	@Override
-	public Object decode(final Response response, Type type) throws IOException, FeignException {
-		if (type instanceof Class || type instanceof ParameterizedType) {
-            @SuppressWarnings({ "unchecked", "rawtypes" })
-            HttpMessageConverterExtractor<?> extractor = new HttpMessageConverterExtractor(
-                    type, messageConverters.getConverters());
-
-            return extractor.extractData(new FeignResponseAdapter(response));
-        }
-		throw new DecodeException("type is not an instance of Class or ParameterizedType: " + type);
-	}
-
-    private class FeignResponseAdapter implements ClientHttpResponse {
-		private final Response response;
-
-		private FeignResponseAdapter(Response response) {
-			this.response = response;
-		}
-
-		@Override
-		public HttpStatus getStatusCode() throws IOException {
-			return HttpStatus.valueOf(response.status());
-		}
-
-		@Override
-		public int getRawStatusCode() throws IOException {
-			return response.status();
-		}
-
-		@Override
-		public String getStatusText() throws IOException {
-			return response.reason();
-		}
-
-		@Override
-		public void close() {
-			try {
-				response.body().close();
-			}
-			catch (IOException e) {
-				e.printStackTrace();
-			}
-		}
-
-		@Override
-		public InputStream getBody() throws IOException {
-			return response.body().asInputStream();
-		}
-
-		@Override
-		public HttpHeaders getHeaders() {
-			return getHttpHeaders(response.headers());
-		}
-
-	}
-}

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

@@ -1,111 +0,0 @@
-package org.springframework.cloud.netflix.feign;
-
-import com.google.common.base.Charsets;
-
-import feign.RequestTemplate;
-import feign.codec.EncodeException;
-import feign.codec.Encoder;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.web.HttpMessageConverters;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpOutputMessage;
-import org.springframework.http.MediaType;
-import org.springframework.http.converter.HttpMessageConverter;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.util.Collection;
-
-import static org.springframework.cloud.netflix.feign.FeignUtils.getHttpHeaders;
-
-/**
- * @author Spencer Gibb
- */
-public class SpringEncoder implements Encoder {
-	private static final Logger logger = LoggerFactory.getLogger(SpringEncoder.class);
-
-    @Autowired
-    HttpMessageConverters messageConverters;
-
-	public SpringEncoder() {
-	}
-
-	@Override
-	public void encode(Object requestBody, RequestTemplate request)
-			throws EncodeException {
-		// template.body(conversionService.convert(object, String.class));
-		if (requestBody != null) {
-			Class<?> requestType = requestBody.getClass();
-			Collection<String> contentTypes = request.headers().get("Content-Type");
-
-			MediaType requestContentType = null;
-			if (contentTypes != null && !contentTypes.isEmpty()) {
-				String type = contentTypes.iterator().next();
-				requestContentType = MediaType.valueOf(type);
-			}
-
-			for (HttpMessageConverter<?> messageConverter : messageConverters.getConverters()) {
-				if (messageConverter.canWrite(requestType, requestContentType)) {
-					if (logger.isDebugEnabled()) {
-						if (requestContentType != null) {
-							logger.debug("Writing [" + requestBody + "] as \""
-									+ requestContentType + "\" using ["
-									+ messageConverter + "]");
-						}
-						else {
-							logger.debug("Writing [" + requestBody + "] using ["
-									+ messageConverter + "]");
-						}
-
-					}
-
-					FeignOutputMessage outputMessage = new FeignOutputMessage(request);
-					try {
-						@SuppressWarnings("unchecked")
-						HttpMessageConverter<Object> copy = (HttpMessageConverter<Object>) messageConverter;
-						copy.write(requestBody, requestContentType, outputMessage);
-					}
-					catch (IOException e) {
-						throw new EncodeException("Error converting request body", e);
-					}
-					request.body(outputMessage.getOutputStream().toByteArray(),
-							Charsets.UTF_8); // TODO: set charset
-					return;
-				}
-			}
-			String message = "Could not write request: no suitable HttpMessageConverter found for request type ["
-					+ requestType.getName() + "]";
-			if (requestContentType != null) {
-				message += " and content type [" + requestContentType + "]";
-			}
-			throw new EncodeException(message);
-		}
-	}
-
-	private class FeignOutputMessage implements HttpOutputMessage {
-		final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-		RequestTemplate request;
-
-		private FeignOutputMessage(RequestTemplate request) {
-			this.request = request;
-		}
-
-		@Override
-		public OutputStream getBody() throws IOException {
-			return outputStream;
-		}
-
-		@Override
-		public HttpHeaders getHeaders() {
-			return getHttpHeaders(request.headers());
-		}
-
-		public ByteArrayOutputStream getOutputStream() {
-			return outputStream;
-		}
-	}
-}

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

@@ -1,139 +0,0 @@
-package org.springframework.cloud.netflix.feign;
-
-import static feign.Util.checkState;
-import static feign.Util.emptyToNull;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Map;
-
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import feign.Contract;
-import feign.MethodMetadata;
-import org.springframework.web.bind.annotation.RequestParam;
-
-/**
- * @author Spencer Gibb
- */
-public class SpringMvcContract extends Contract.BaseContract {
-    static final String ACCEPT = "Accept";
-    static final String CONTENT_TYPE = "Content-Type";
-
-    @Override
-    protected void processAnnotationOnMethod(MethodMetadata data, Annotation methodAnnotation, Method method) {
-        RequestMapping mapping = RequestMapping.class.cast(methodAnnotation);
-        if (mapping != null) {
-            //HTTP Method
-            checkOne(method, mapping.method(), "method");
-            data.template().method(mapping.method()[0].name());
-
-            //path
-            checkOne(method, mapping.value(), "value");
-
-            String methodAnnotationValue = mapping.value()[0];
-            String pathValue = emptyToNull(methodAnnotationValue);
-            checkState(pathValue != null, "value was empty on method %s", method.getName());
-            if (!methodAnnotationValue.startsWith("/") && !data.template().toString().endsWith("/")) {
-                methodAnnotationValue = "/" + methodAnnotationValue;
-            }
-            data.template().append(methodAnnotationValue);
-
-            //produces
-            checkAtMostOne(method, mapping.produces(), "produces");
-            String[] serverProduces = mapping.produces();
-            String clientAccepts = serverProduces.length == 0 ? null: emptyToNull(serverProduces[0]);
-            if (clientAccepts != null) {
-                data.template().header(ACCEPT, clientAccepts);
-            }
-
-            //consumes
-            checkAtMostOne(method, mapping.consumes(), "consumes");
-            String[] serverConsumes = mapping.consumes();
-            String clientProduces = serverConsumes.length == 0 ? null: emptyToNull(serverConsumes[0]);
-            if (clientProduces != null) {
-                data.template().header(CONTENT_TYPE, clientProduces);
-            }
-
-            //headers
-            //TODO: only supports one header value per key
-            if (mapping.headers() != null && mapping.headers().length > 0)
-            for (String header : mapping.headers()) {
-                int colon = header.indexOf(':');
-                data.template().header(header.substring(0, colon), header.substring(colon + 2));
-            }
-        }
-    }
-
-    private void checkAtMostOne(Method method, Object[] values, String fieldName) {
-        checkState(values != null && (values.length == 0 || values.length == 1),
-                "Method %s can only contain at most 1 %s field. Found: %s", method.getName(), fieldName,
-                values == null ? null : Arrays.asList(values));
-    }
-
-    private void checkOne(Method method, Object[] values, String fieldName) {
-        checkState(values != null && values.length == 1,
-                "Method %s can only contain 1 %s field. Found: %s", method.getName(), fieldName,
-                values == null ? null : Arrays.asList(values));
-    }
-
-    @Override
-    protected boolean processAnnotationsOnParameter(MethodMetadata data, Annotation[] annotations, int paramIndex) {
-        boolean isHttpAnnotation = false;
-        //TODO: support spring parameter annotations?
-        for (Annotation parameterAnnotation : annotations) {
-            Class<? extends Annotation> annotationType = parameterAnnotation.annotationType();
-            if (annotationType == PathVariable.class) {
-                String name = PathVariable.class.cast(parameterAnnotation).value();
-                checkState(emptyToNull(name) != null, "PathVariable annotation was empty on param %s.", paramIndex);
-                nameParam(data, name, paramIndex);
-                isHttpAnnotation = true;
-                String varName = '{' + name + '}';
-                if (data.template().url().indexOf(varName) == -1 &&
-                        !searchMapValues(data.template().queries(), varName) &&
-                        !searchMapValues(data.template().headers(), varName)) {
-                    data.formParams().add(name);
-                }
-            } else if (annotationType == RequestParam.class) {
-                String name = RequestParam.class.cast(parameterAnnotation).value();
-                checkState(emptyToNull(name) != null, "QueryParam.value() was empty on parameter %s", paramIndex);
-                Collection<String> query = addTemplatedParam(data.template().queries().get(name), name);
-                data.template().query(name, query);
-                nameParam(data, name, paramIndex);
-                isHttpAnnotation = true;
-            } else if (annotationType == RequestHeader.class) {
-                String name = RequestHeader.class.cast(parameterAnnotation).value();
-                checkState(emptyToNull(name) != null, "HeaderParam.value() was empty on parameter %s", paramIndex);
-                Collection<String> header = addTemplatedParam(data.template().headers().get(name), name);
-                data.template().header(name, header);
-                nameParam(data, name, paramIndex);
-                isHttpAnnotation = true;
-            }/* else if (annotationType == FormParam.class) {
-                String name = FormParam.class.cast(parameterAnnotation).value();
-                checkState(emptyToNull(name) != null, "FormParam.value() was empty on parameter %s", paramIndex);
-                data.formParams().add(name);
-                nameParam(data, name, paramIndex);
-                isHttpAnnotation = true;
-            }*/
-
-        }
-        return isHttpAnnotation;
-    }
-
-    private <K, V> boolean searchMapValues(Map<K, Collection<V>> map, V search) {
-        Collection<Collection<V>> values = map.values();
-        if (values == null)
-            return false;
-
-        for (Collection<V> entry : values) {
-            if (entry.contains(search))
-                return true;
-        }
-
-        return false;
-    }
-}