Update branches in antora-playbook.yml

Signed-off-by: Ryan Baxter <rbaxter85@gmail.com>

.circleci/config.yml

@@ -1,41 +0,0 @@
-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

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

.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 https://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>4.1.0-SNAPSHOT</version>
+    <relativePath></relativePath>
+  </parent>
+  <groupId>org.springframework.cloud</groupId>
+  <artifactId>spring-cloud-netflix</artifactId>
+  <version>4.1.0-SNAPSHOT</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-2021 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

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

.github/ISSUE_TEMPLATE.md

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

.github/ISSUE_TEMPLATE/bug_report.md

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

.github/ISSUE_TEMPLATE/feature_request.md

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

.github/workflows/deploy-docs.yml

@@ -0,0 +1,31 @@
+# Generated by the rollout-deploy-docs workflow in
+# spring-cloud/spring-cloud-github-actions.
+#
+# Do not edit this file directly - update examples/deploy-docs.yml there
+# and re-run the rollout, otherwise your change will be overwritten.
+
+name: Deploy Docs
+run-name: ${{ format('{0} ({1})', github.workflow, github.event.inputs.build-refname || 'all') }}
+
+on:
+  workflow_dispatch:
+    inputs:
+      build-refname:
+        description: Enter git refname to build (e.g., 4.3.x).
+        required: false
+  push:
+    branches: docs-build
+
+permissions: read-all
+
+jobs:
+  deploy-docs:
+    uses: spring-cloud/spring-cloud-github-actions/.github/workflows/deploy-docs.yml@b6a6b1963b8762420526591c3d363bd7d09e7d4b # v1.1.1
+    with:
+      build_refname: ${{ github.event.inputs.build-refname }}
+      # Optional overrides - the defaults are correct for every current project:
+      # java_version: '17'
+      # build_command: './mvnw --no-transfer-progress -B antora -Pdocs'
+      # runs_on: 'ubuntu-latest'
+      # context_root: 'spring-cloud-<project>'
+    secrets: inherit

.gitignore

@@ -1,23 +1,23 @@
-*~
-#*
-*#
-.#*
-.classpath
-.project
-.settings/
-.springBeans
 target/
-bin/
-_site/
-.idea
+.settings/
+.project
+.classpath
+*.orig
+.springBeans
+.factorypath
+.sts4-cache
+.ant-targets-build.xml
+src/ant/.ant-targets-upload-dist.xml
+*.sonar4clipse*
+.DS_Store
 *.iml
 *.ipr
 *.iws
-.factorypath
-*.log
-.shelf
-*.swp
-*.swo
-.vscode/
-.flattened-pom.xml
-.sdkmanrc
+/.idea/
+*.graphml
+node
+node_modules
+build
+docs/package.json
+package-lock.json
+.flattened-pom.xml

.mvn/maven.config

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

.mvn/wrapper/MavenWrapperDownloader.java

@@ -1,31 +1,31 @@
 /*
-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.
-*/
-
+ * Copyright 2007-present 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.
+ */
+import java.net.*;
+import java.io.*;
+import java.nio.channels.*;
 import java.util.Properties;
 
 public class MavenWrapperDownloader {
 
+    private static final String WRAPPER_VERSION = "0.5.6";
     /**
      * 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";
+    private static final String DEFAULT_DOWNLOAD_URL = "https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/"
+        + WRAPPER_VERSION + "/maven-wrapper-" + WRAPPER_VERSION + ".jar";
 
     /**
      * Path to the maven-wrapper.properties file, which might contain a downloadUrl property to
@@ -73,13 +73,13 @@ public class MavenWrapperDownloader {
                 }
             }
         }
-        System.out.println("- Downloading from: : " + url);
+        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() + "'");
+                        "- ERROR creating output directory '" + outputFile.getParentFile().getAbsolutePath() + "'");
             }
         }
         System.out.println("- Downloading to: " + outputFile.getAbsolutePath());
@@ -95,6 +95,16 @@ public class MavenWrapperDownloader {
     }
 
     private static void downloadFileFromURL(String urlString, File destination) throws Exception {
+        if (System.getenv("MVNW_USERNAME") != null && System.getenv("MVNW_PASSWORD") != null) {
+            String username = System.getenv("MVNW_USERNAME");
+            char[] password = System.getenv("MVNW_PASSWORD").toCharArray();
+            Authenticator.setDefault(new Authenticator() {
+                @Override
+                protected PasswordAuthentication getPasswordAuthentication() {
+                    return new PasswordAuthentication(username, password);
+                }
+            });
+        }
         URL website = new URL(urlString);
         ReadableByteChannel rbc;
         rbc = Channels.newChannel(website.openStream());

.mvn/wrapper/maven-wrapper.properties

@@ -1 +1,2 @@
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.5.2/apache-maven-3.5.2-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.6.3/apache-maven-3.6.3-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar

.settings.xml

@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<settings>
-  <servers>
-	<server>
-	  <id>repo.spring.io</id>
-	  <username>${env.CI_DEPLOY_USERNAME}</username>
-	  <password>${env.CI_DEPLOY_PASSWORD}</password>
-	</server>
-  </servers>
-  <profiles>
-	<profile>
-      <!--
-          N.B. this profile is only here to support users and IDEs that do not use Maven 3.3. 
-          It isn't needed on the command line if you use the wrapper script (mvnw) or if you use 
-          a native Maven with the right version. Eclipse users should points their Maven tooling to
-          this settings file, or copy the profile into their ~/.m2/settings.xml.
-      -->
-	  <id>spring</id>
-	  <activation><activeByDefault>true</activeByDefault></activation>
-	  <repositories>
-		<repository>
-			<id>spring-snapshots</id>
-			<name>Spring Snapshots</name>
-			<url>https://repo.spring.io/libs-snapshot-local</url>
-			<snapshots>
-				<enabled>true</enabled>
-			</snapshots>
-		</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>
-		</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>
-	  </pluginRepositories>
-    </profile>
-  </profiles>
-</settings>

LICENSE.txt

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

README.adoc

@@ -1,387 +1,23 @@
-////
-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.
-////
+= Spring Cloud Netflix Docs Build
 
+You're currently viewing the Antora playbook branch.
+The playbook branch hosts the docs build that is used to build and publish the production docs site.
 
-:doctype: book
-:idprefix:
-:idseparator: -
-:toc: left
-:toclevels: 4
-:tabsize: 4
-:numbered:
-:sectanchors:
-:sectnums:
-:icons: font
-:hide-uri-scheme:
-:docinfo: shared,private
+The Spring Cloud Netflix reference docs are built using https://antora.org[Antora].
+This README covers how to build the docs in a software branch as well as how to build the production docs site locally.
 
-:sc-ext: java
-:project-full-name: Spring Cloud Netflix
+== Building the Site
 
-image::https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/main.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/main"]
-image::https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/main/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/main"]
-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),
-Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon).
-
-
-== Features
-
-* Service Discovery: Eureka instances can be registered and clients can discover the instances using Spring-managed beans
-* Service Discovery: an embedded Eureka server can be created with declarative Java configuration
-* Circuit Breaker: Hystrix clients can be built with a simple annotation-driven method decorator
-* Circuit Breaker: embedded Hystrix dashboard with declarative Java configuration
-* Client Side Load Balancer: Ribbon
-* External Configuration: a bridge from the Spring Environment to Archaius (enables native configuration of Netflix components using Spring Boot conventions)
-* Router and Filter: automatic registration of Zuul filters, and a simple convention over configuration approach to reverse proxy creation
-
-: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-concurrency-limits
-* 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 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
+You can build the entire site by invoking the following on the docs-build branch and then viewing the site at `target/site/index.html`
 
+[source,bash]
 ----
-$ ./mvnw install
+./mvnw antora
 ----
 
-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.
+== Building a Specific Branch
 
-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.
-
-==== Activate the Spring Maven profile
-Spring Cloud projects require the 'spring' Maven profile to be activated to resolve
-the spring milestone and snapshot repositories. Use your preferred IDE to set this
-profile to be active, or you may experience build errors.
-
-==== Importing into eclipse with m2eclipse
-We recommend the 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]
+[source,bash]
 ----
-	$ ./mvnw eclipse:eclipse
+./mvnw antora
 ----
-
-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.
-
-== License
-
-The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-netflix/main/LICENSE.txt[here].

antora-playbook.yml

@@ -0,0 +1,39 @@
+antora:
+  extensions:
+    - require: '@springio/antora-extensions'
+      root_component_name: 'cloud-netflix'
+site:
+  title: Spring Cloud Netflix
+  url: https://docs.spring.io/spring-cloud-netflix/reference
+  robots: allow
+git:
+  ensure_git_suffix: false
+content:
+  sources:
+    - url: https://github.com/spring-cloud/spring-cloud-netflix
+      # Refname matching:
+      # https://docs.antora.org/antora/latest/playbook/content-refname-matching/
+      branches: [ main, 5.0.x ]
+      tags: [ 'v{4..9}.+({0..9}).+({0..9})?(-{RC,M}*)', '!v4.1.0-M1', '!v4.0.*' ]
+      start_path: docs
+asciidoc:
+  attributes:
+    page-stackoverflow-url: https://stackoverflow.com/tags/spring-cloud
+    page-pagination: ''
+    hide-uri-scheme: '@'
+    tabs-sync-option: '@'
+  extensions:
+    - '@asciidoctor/tabs'
+    - '@springio/asciidoctor-extensions'
+urls:
+  latest_version_segment_strategy: redirect:to
+  latest_version_segment: ''
+  redirect_facility: httpd
+ui:
+  bundle:
+    url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.18/ui-bundle.zip
+    snapshot: true
+runtime:
+  log:
+    failure_level: warn
+    format: pretty

asciidoctor.css

@@ -1,399 +0,0 @@
-/* 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}
-audio,canvas,video{display:inline-block}
-audio:not([controls]){display:none;height:0}
-[hidden],template{display:none}
-script{display:none!important}
-html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}
-body{margin:0}
-a{background:transparent}
-a:focus{outline:thin dotted}
-a:active,a:hover{outline:0}
-h1{font-size:2em;margin:.67em 0}
-abbr[title]{border-bottom:1px dotted}
-b,strong{font-weight:bold}
-dfn{font-style:italic}
-hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}
-mark{background:#ff0;color:#000}
-code,kbd,pre,samp{font-family:monospace;font-size:1em}
-pre{white-space:pre-wrap}
-q{quotes:"\201C" "\201D" "\2018" "\2019"}
-small{font-size:80%}
-sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
-sup{top:-.5em}
-sub{bottom:-.25em}
-img{border:0}
-svg:not(:root){overflow:hidden}
-figure{margin:0}
-fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}
-legend{border:0;padding:0}
-button,input,select,textarea{font-family:inherit;font-size:100%;margin:0}
-button,input{line-height:normal}
-button,select{text-transform:none}
-button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}
-button[disabled],html input[disabled]{cursor:default}
-input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}
-input[type="search"]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}
-input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}
-button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}
-textarea{overflow:auto;vertical-align:top}
-table{border-collapse:collapse;border-spacing:0}
-*,*:before,*:after{-moz-box-sizing:border-box;-webkit-box-sizing:border-box;box-sizing:border-box}
-html,body{font-size:100%}
-body{background:#fff;color:rgba(0,0,0,.8);padding:0;margin:0;font-family:"Noto Serif","DejaVu Serif",serif;font-weight:400;font-style:normal;line-height:1;position:relative;cursor:auto}
-a:hover{cursor:pointer}
-img,object,embed{max-width:100%;height:auto}
-object,embed{height:100%}
-img{-ms-interpolation-mode:bicubic}
-#map_canvas img,#map_canvas embed,#map_canvas object,.map_canvas img,.map_canvas embed,.map_canvas object{max-width:none!important}
-.left{float:left!important}
-.right{float:right!important}
-.text-left{text-align:left!important}
-.text-right{text-align:right!important}
-.text-center{text-align:center!important}
-.text-justify{text-align:justify!important}
-.hide{display:none}
-.antialiased,body{-webkit-font-smoothing:antialiased}
-img{display:inline-block;vertical-align:middle}
-textarea{height:auto;min-height:50px}
-select{width:100%}
-p.lead,.paragraph.lead>p,#preamble>.sectionbody>.paragraph:first-of-type p{font-size:1.21875em;line-height:1.6}
-.subheader,.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{line-height:1.45;color:#7a2518;font-weight:400;margin-top:0;margin-bottom:.25em}
-div,dl,dt,dd,ul,ol,li,h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6,pre,form,p,blockquote,th,td{margin:0;padding:0;direction:ltr}
-a{color:#2156a5;text-decoration:underline;line-height:inherit}
-a:hover,a:focus{color:#1d4b8f}
-a img{border:none}
-p{font-family:inherit;font-weight:400;font-size:1em;line-height:1.6;margin-bottom:1.25em;text-rendering:optimizeLegibility}
-p aside{font-size:.875em;line-height:1.35;font-style:italic}
-h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{font-family:"Open Sans","DejaVu Sans",sans-serif;font-weight:300;font-style:normal;color:#ba3925;text-rendering:optimizeLegibility;margin-top:1em;margin-bottom:.5em;line-height:1.0125em}
-h1 small,h2 small,h3 small,#toctitle small,.sidebarblock>.content>.title small,h4 small,h5 small,h6 small{font-size:60%;color:#e99b8f;line-height:0}
-h1{font-size:2.125em}
-h2{font-size:1.6875em}
-h3,#toctitle,.sidebarblock>.content>.title{font-size:1.375em}
-h4,h5{font-size:1.125em}
-h6{font-size:1em}
-hr{border:solid #ddddd8;border-width:1px 0 0;clear:both;margin:1.25em 0 1.1875em;height:0}
-em,i{font-style:italic;line-height:inherit}
-strong,b{font-weight:bold;line-height:inherit}
-small{font-size:60%;line-height:inherit}
-code{font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;color:rgba(0,0,0,.9)}
-ul,ol,dl{font-size:1em;line-height:1.6;margin-bottom:1.25em;list-style-position:outside;font-family:inherit}
-ul,ol,ul.no-bullet,ol.no-bullet{margin-left:1.5em}
-ul li ul,ul li ol{margin-left:1.25em;margin-bottom:0;font-size:1em}
-ul.square li ul,ul.circle li ul,ul.disc li ul{list-style:inherit}
-ul.square{list-style-type:square}
-ul.circle{list-style-type:circle}
-ul.disc{list-style-type:disc}
-ul.no-bullet{list-style:none}
-ol li ul,ol li ol{margin-left:1.25em;margin-bottom:0}
-dl dt{margin-bottom:.3125em;font-weight:bold}
-dl dd{margin-bottom:1.25em}
-abbr,acronym{text-transform:uppercase;font-size:90%;color:rgba(0,0,0,.8);border-bottom:1px dotted #ddd;cursor:help}
-abbr{text-transform:none}
-blockquote{margin:0 0 1.25em;padding:.5625em 1.25em 0 1.1875em;border-left:1px solid #ddd}
-blockquote cite{display:block;font-size:.9375em;color:rgba(0,0,0,.6)}
-blockquote cite:before{content:"\2014 \0020"}
-blockquote cite a,blockquote cite a:visited{color:rgba(0,0,0,.6)}
-blockquote,blockquote p{line-height:1.6;color:rgba(0,0,0,.85)}
-@media only screen and (min-width:768px){h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2}
-h1{font-size:2.75em}
-h2{font-size:2.3125em}
-h3,#toctitle,.sidebarblock>.content>.title{font-size:1.6875em}
-h4{font-size:1.4375em}}table{background:#fff;margin-bottom:1.25em;border:solid 1px #dedede}
-table thead,table tfoot{background:#f7f8f7;font-weight:bold}
-table thead tr th,table thead tr td,table tfoot tr th,table tfoot tr td{padding:.5em .625em .625em;font-size:inherit;color:rgba(0,0,0,.8);text-align:left}
-table tr th,table tr td{padding:.5625em .625em;font-size:inherit;color:rgba(0,0,0,.8)}
-table tr.even,table tr.alt,table tr:nth-of-type(even){background:#f8f8f7}
-table thead tr th,table tfoot tr th,table tbody tr td,table tr td,table tfoot tr td{display:table-cell;line-height:1.6}
-h1,h2,h3,#toctitle,.sidebarblock>.content>.title,h4,h5,h6{line-height:1.2;word-spacing:-.05em}
-h1 strong,h2 strong,h3 strong,#toctitle strong,.sidebarblock>.content>.title strong,h4 strong,h5 strong,h6 strong{font-weight:400}
-.clearfix:before,.clearfix:after,.float-group:before,.float-group:after{content:" ";display:table}
-.clearfix:after,.float-group:after{clear:both}
-*:not(pre)>code{font-size:.9375em;font-style:normal!important;letter-spacing:0;padding:.1em .5ex;word-spacing:-.15em;background-color:#f7f7f8;-webkit-border-radius:4px;border-radius:4px;line-height:1.45;text-rendering:optimizeSpeed}
-pre,pre>code{line-height:1.45;color:rgba(0,0,0,.9);font-family:"Droid Sans Mono","DejaVu Sans Mono",monospace;font-weight:400;text-rendering:optimizeSpeed}
-.keyseq{color:rgba(51,51,51,.8)}
-kbd{display:inline-block;color:rgba(0,0,0,.8);font-size:.75em;line-height:1.4;background-color:#f7f7f7;border:1px solid #ccc;-webkit-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em white inset;box-shadow:0 1px 0 rgba(0,0,0,.2),0 0 0 .1em #fff inset;margin:-.15em .15em 0 .15em;padding:.2em .6em .2em .5em;vertical-align:middle;white-space:nowrap}
-.keyseq kbd:first-child{margin-left:0}
-.keyseq kbd:last-child{margin-right:0}
-.menuseq,.menu{color:rgba(0,0,0,.8)}
-b.button:before,b.button:after{position:relative;top:-1px;font-weight:400}
-b.button:before{content:"[";padding:0 3px 0 2px}
-b.button:after{content:"]";padding:0 2px 0 3px}
-p a>code:hover{color:rgba(0,0,0,.9)}
-#header,#content,#footnotes,#footer{width:100%;margin-left:auto;margin-right:auto;margin-top:0;margin-bottom:0;max-width:62.5em;*zoom:1;position:relative;padding-left:.9375em;padding-right:.9375em}
-#header:before,#header:after,#content:before,#content:after,#footnotes:before,#footnotes:after,#footer:before,#footer:after{content:" ";display:table}
-#header:after,#content:after,#footnotes:after,#footer:after{clear:both}
-#content{margin-top:1.25em}
-#content:before{content:none}
-#header>h1:first-child{color:rgba(0,0,0,.85);margin-top:2.25rem;margin-bottom:0}
-#header>h1:first-child+#toc{margin-top:8px;border-top:1px solid #ddddd8}
-#header>h1:only-child,body.toc2 #header>h1:nth-last-child(2){border-bottom:1px solid #ddddd8;padding-bottom:8px}
-#header .details{border-bottom:1px solid #ddddd8;line-height:1.45;padding-top:.25em;padding-bottom:.25em;padding-left:.25em;color:rgba(0,0,0,.6);display:-ms-flexbox;display:-webkit-flex;display:flex;-ms-flex-flow:row wrap;-webkit-flex-flow:row wrap;flex-flow:row wrap}
-#header .details span:first-child{margin-left:-.125em}
-#header .details span.email a{color:rgba(0,0,0,.85)}
-#header .details br{display:none}
-#header .details br+span:before{content:"\00a0\2013\00a0"}
-#header .details br+span.author:before{content:"\00a0\22c5\00a0";color:rgba(0,0,0,.85)}
-#header .details br+span#revremark:before{content:"\00a0|\00a0"}
-#header #revnumber{text-transform:capitalize}
-#header #revnumber:after{content:"\00a0"}
-#content>h1:first-child:not([class]){color:rgba(0,0,0,.85);border-bottom:1px solid #ddddd8;padding-bottom:8px;margin-top:0;padding-top:1rem;margin-bottom:1.25rem}
-#toc{border-bottom:1px solid #efefed;padding-bottom:.5em}
-#toc>ul{margin-left:.125em}
-#toc ul.sectlevel0>li>a{font-style:italic}
-#toc ul.sectlevel0 ul.sectlevel1{margin:.5em 0}
-#toc ul{font-family:"Open Sans","DejaVu Sans",sans-serif;list-style-type:none}
-#toc a{text-decoration:none}
-#toc a:active{text-decoration:underline}
-#toctitle{color:#7a2518;font-size:1.2em}
-@media only screen and (min-width:768px){#toctitle{font-size:1.375em}
-body.toc2{padding-left:15em;padding-right:0}
-#toc.toc2{margin-top:0!important;background-color:#f8f8f7;position:fixed;width:15em;left:0;top:0;border-right:1px solid #efefed;border-top-width:0!important;border-bottom-width:0!important;z-index:1000;padding:1.25em 1em;height:100%;overflow:auto}
-#toc.toc2 #toctitle{margin-top:0;font-size:1.2em}
-#toc.toc2>ul{font-size:.9em;margin-bottom:0}
-#toc.toc2 ul ul{margin-left:0;padding-left:1em}
-#toc.toc2 ul.sectlevel0 ul.sectlevel1{padding-left:0;margin-top:.5em;margin-bottom:.5em}
-body.toc2.toc-right{padding-left:0;padding-right:15em}
-body.toc2.toc-right #toc.toc2{border-right-width:0;border-left:1px solid #efefed;left:auto;right:0}}@media only screen and (min-width:1280px){body.toc2{padding-left:20em;padding-right:0}
-#toc.toc2{width:20em}
-#toc.toc2 #toctitle{font-size:1.375em}
-#toc.toc2>ul{font-size:.95em}
-#toc.toc2 ul ul{padding-left:1.25em}
-body.toc2.toc-right{padding-left:0;padding-right:20em}}#content #toc{border-style:solid;border-width:1px;border-color:#e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;-webkit-border-radius:4px;border-radius:4px}
-#content #toc>:first-child{margin-top:0}
-#content #toc>:last-child{margin-bottom:0}
-#footer{max-width:100%;background-color:rgba(0,0,0,.8);padding:1.25em}
-#footer-text{color:rgba(255,255,255,.8);line-height:1.44}
-.sect1{padding-bottom:.625em}
-@media only screen and (min-width:768px){.sect1{padding-bottom:1.25em}}.sect1+.sect1{border-top:1px solid #efefed}
-#content h1>a.anchor,h2>a.anchor,h3>a.anchor,#toctitle>a.anchor,.sidebarblock>.content>.title>a.anchor,h4>a.anchor,h5>a.anchor,h6>a.anchor{position:absolute;z-index:1001;width:1.5ex;margin-left:-1.5ex;display:block;text-decoration:none!important;visibility:hidden;text-align:center;font-weight:400}
-#content h1>a.anchor:before,h2>a.anchor:before,h3>a.anchor:before,#toctitle>a.anchor:before,.sidebarblock>.content>.title>a.anchor:before,h4>a.anchor:before,h5>a.anchor:before,h6>a.anchor:before{content:"\00A7";font-size:.85em;display:block;padding-top:.1em}
-#content h1:hover>a.anchor,#content h1>a.anchor:hover,h2:hover>a.anchor,h2>a.anchor:hover,h3:hover>a.anchor,#toctitle:hover>a.anchor,.sidebarblock>.content>.title:hover>a.anchor,h3>a.anchor:hover,#toctitle>a.anchor:hover,.sidebarblock>.content>.title>a.anchor:hover,h4:hover>a.anchor,h4>a.anchor:hover,h5:hover>a.anchor,h5>a.anchor:hover,h6:hover>a.anchor,h6>a.anchor:hover{visibility:visible}
-#content h1>a.link,h2>a.link,h3>a.link,#toctitle>a.link,.sidebarblock>.content>.title>a.link,h4>a.link,h5>a.link,h6>a.link{color:#ba3925;text-decoration:none}
-#content h1>a.link:hover,h2>a.link:hover,h3>a.link:hover,#toctitle>a.link:hover,.sidebarblock>.content>.title>a.link:hover,h4>a.link:hover,h5>a.link:hover,h6>a.link:hover{color:#a53221}
-.audioblock,.imageblock,.literalblock,.listingblock,.stemblock,.videoblock{margin-bottom:1.25em}
-.admonitionblock td.content>.title,.audioblock>.title,.exampleblock>.title,.imageblock>.title,.listingblock>.title,.literalblock>.title,.stemblock>.title,.openblock>.title,.paragraph>.title,.quoteblock>.title,table.tableblock>.title,.verseblock>.title,.videoblock>.title,.dlist>.title,.olist>.title,.ulist>.title,.qlist>.title,.hdlist>.title{text-rendering:optimizeLegibility;text-align:left;font-family:"Noto Serif","DejaVu Serif",serif;font-size:1rem;font-style:italic}
-table.tableblock>caption.title{white-space:nowrap;overflow:visible;max-width:0}
-.paragraph.lead>p,#preamble>.sectionbody>.paragraph:first-of-type p{color:rgba(0,0,0,.85)}
-table.tableblock #preamble>.sectionbody>.paragraph:first-of-type p{font-size:inherit}
-.admonitionblock>table{border-collapse:separate;border:0;background:none;width:100%}
-.admonitionblock>table td.icon{text-align:center;width:80px}
-.admonitionblock>table td.icon img{max-width:none}
-.admonitionblock>table td.icon .title{font-weight:bold;font-family:"Open Sans","DejaVu Sans",sans-serif;text-transform:uppercase}
-.admonitionblock>table td.content{padding-left:1.125em;padding-right:1.25em;border-left:1px solid #ddddd8;color:rgba(0,0,0,.6)}
-.admonitionblock>table td.content>:last-child>:last-child{margin-bottom:0}
-.exampleblock>.content{border-style:solid;border-width:1px;border-color:#e6e6e6;margin-bottom:1.25em;padding:1.25em;background:#fff;-webkit-border-radius:4px;border-radius:4px}
-.exampleblock>.content>:first-child{margin-top:0}
-.exampleblock>.content>:last-child{margin-bottom:0}
-.sidebarblock{border-style:solid;border-width:1px;border-color:#e0e0dc;margin-bottom:1.25em;padding:1.25em;background:#f8f8f7;-webkit-border-radius:4px;border-radius:4px}
-.sidebarblock>:first-child{margin-top:0}
-.sidebarblock>:last-child{margin-bottom:0}
-.sidebarblock>.content>.title{color:#7a2518;margin-top:0;text-align:center}
-.exampleblock>.content>:last-child>:last-child,.exampleblock>.content .olist>ol>li:last-child>:last-child,.exampleblock>.content .ulist>ul>li:last-child>:last-child,.exampleblock>.content .qlist>ol>li:last-child>:last-child,.sidebarblock>.content>:last-child>:last-child,.sidebarblock>.content .olist>ol>li:last-child>:last-child,.sidebarblock>.content .ulist>ul>li:last-child>:last-child,.sidebarblock>.content .qlist>ol>li:last-child>:last-child{margin-bottom:0}
-.literalblock pre,.listingblock pre:not(.highlight),.listingblock pre[class="highlight"],.listingblock pre[class^="highlight "],.listingblock pre.CodeRay,.listingblock pre.prettyprint{background:#f7f7f8}
-.sidebarblock .literalblock pre,.sidebarblock .listingblock pre:not(.highlight),.sidebarblock .listingblock pre[class="highlight"],.sidebarblock .listingblock pre[class^="highlight "],.sidebarblock .listingblock pre.CodeRay,.sidebarblock .listingblock pre.prettyprint{background:#f2f1f1}
-.literalblock pre,.literalblock pre[class],.listingblock pre,.listingblock pre[class]{-webkit-border-radius:4px;border-radius:4px;word-wrap:break-word;padding:1em;font-size:.8125em}
-.literalblock pre.nowrap,.literalblock pre[class].nowrap,.listingblock pre.nowrap,.listingblock pre[class].nowrap{overflow-x:auto;white-space:pre;word-wrap:normal}
-@media only screen and (min-width:768px){.literalblock pre,.literalblock pre[class],.listingblock pre,.listingblock pre[class]{font-size:.90625em}}@media only screen and (min-width:1280px){.literalblock pre,.literalblock pre[class],.listingblock pre,.listingblock pre[class]{font-size:1em}}.literalblock.output pre{color:#f7f7f8;background-color:rgba(0,0,0,.9)}
-.listingblock pre.highlightjs{padding:0}
-.listingblock pre.highlightjs>code{padding:1em;-webkit-border-radius:4px;border-radius:4px}
-.listingblock pre.prettyprint{border-width:0}
-.listingblock>.content{position:relative}
-.listingblock code[data-lang]:before{display:none;content:attr(data-lang);position:absolute;font-size:.75em;top:.425rem;right:.5rem;line-height:1;text-transform:uppercase;color:#999}
-.listingblock:hover code[data-lang]:before{display:block}
-.listingblock.terminal pre .command:before{content:attr(data-prompt);padding-right:.5em;color:#999}
-.listingblock.terminal pre .command:not([data-prompt]):before{content:"$"}
-table.pyhltable{border-collapse:separate;border:0;margin-bottom:0;background:none}
-table.pyhltable td{vertical-align:top;padding-top:0;padding-bottom:0}
-table.pyhltable td.code{padding-left:.75em;padding-right:0}
-pre.pygments .lineno,table.pyhltable td:not(.code){color:#999;padding-left:0;padding-right:.5em;border-right:1px solid #ddddd8}
-pre.pygments .lineno{display:inline-block;margin-right:.25em}
-table.pyhltable .linenodiv{background:none!important;padding-right:0!important}
-.quoteblock{margin:0 1em 1.25em 1.5em;display:table}
-.quoteblock>.title{margin-left:-1.5em;margin-bottom:.75em}
-.quoteblock blockquote,.quoteblock blockquote p{color:rgba(0,0,0,.85);font-size:1.15rem;line-height:1.75;word-spacing:.1em;letter-spacing:0;font-style:italic;text-align:justify}
-.quoteblock blockquote{margin:0;padding:0;border:0}
-.quoteblock blockquote:before{content:"\201c";float:left;font-size:2.75em;font-weight:bold;line-height:.6em;margin-left:-.6em;color:#7a2518;text-shadow:0 1px 2px rgba(0,0,0,.1)}
-.quoteblock blockquote>.paragraph:last-child p{margin-bottom:0}
-.quoteblock .attribution{margin-top:.5em;margin-right:.5ex;text-align:right}
-.quoteblock .quoteblock{margin-left:0;margin-right:0;padding:.5em 0;border-left:3px solid rgba(0,0,0,.6)}
-.quoteblock .quoteblock blockquote{padding:0 0 0 .75em}
-.quoteblock .quoteblock blockquote:before{display:none}
-.verseblock{margin:0 1em 1.25em 1em}
-.verseblock pre{font-family:"Open Sans","DejaVu Sans",sans;font-size:1.15rem;color:rgba(0,0,0,.85);font-weight:300;text-rendering:optimizeLegibility}
-.verseblock pre strong{font-weight:400}
-.verseblock .attribution{margin-top:1.25rem;margin-left:.5ex}
-.quoteblock .attribution,.verseblock .attribution{font-size:.9375em;line-height:1.45;font-style:italic}
-.quoteblock .attribution br,.verseblock .attribution br{display:none}
-.quoteblock .attribution cite,.verseblock .attribution cite{display:block;letter-spacing:-.05em;color:rgba(0,0,0,.6)}
-.quoteblock.abstract{margin:0 0 1.25em 0;display:block}
-.quoteblock.abstract blockquote,.quoteblock.abstract blockquote p{text-align:left;word-spacing:0}
-.quoteblock.abstract blockquote:before,.quoteblock.abstract blockquote p:first-of-type:before{display:none}
-table.tableblock{max-width:100%;border-collapse:separate}
-table.tableblock td>.paragraph:last-child p>p:last-child,table.tableblock th>p:last-child,table.tableblock td>p:last-child{margin-bottom:0}
-table.spread{width:100%}
-table.tableblock,th.tableblock,td.tableblock{border:0 solid #dedede}
-table.grid-all th.tableblock,table.grid-all td.tableblock{border-width:0 1px 1px 0}
-table.grid-all tfoot>tr>th.tableblock,table.grid-all tfoot>tr>td.tableblock{border-width:1px 1px 0 0}
-table.grid-cols th.tableblock,table.grid-cols td.tableblock{border-width:0 1px 0 0}
-table.grid-all *>tr>.tableblock:last-child,table.grid-cols *>tr>.tableblock:last-child{border-right-width:0}
-table.grid-rows th.tableblock,table.grid-rows td.tableblock{border-width:0 0 1px 0}
-table.grid-all tbody>tr:last-child>th.tableblock,table.grid-all tbody>tr:last-child>td.tableblock,table.grid-all thead:last-child>tr>th.tableblock,table.grid-rows tbody>tr:last-child>th.tableblock,table.grid-rows tbody>tr:last-child>td.tableblock,table.grid-rows thead:last-child>tr>th.tableblock{border-bottom-width:0}
-table.grid-rows tfoot>tr>th.tableblock,table.grid-rows tfoot>tr>td.tableblock{border-width:1px 0 0 0}
-table.frame-all{border-width:1px}
-table.frame-sides{border-width:0 1px}
-table.frame-topbot{border-width:1px 0}
-th.halign-left,td.halign-left{text-align:left}
-th.halign-right,td.halign-right{text-align:right}
-th.halign-center,td.halign-center{text-align:center}
-th.valign-top,td.valign-top{vertical-align:top}
-th.valign-bottom,td.valign-bottom{vertical-align:bottom}
-th.valign-middle,td.valign-middle{vertical-align:middle}
-table thead th,table tfoot th{font-weight:bold}
-tbody tr th{display:table-cell;line-height:1.6;background:#f7f8f7}
-tbody tr th,tbody tr th p,tfoot tr th,tfoot tr th p{color:rgba(0,0,0,.8);font-weight:bold}
-p.tableblock>code:only-child{background:none;padding:0}
-p.tableblock{font-size:1em}
-td>div.verse{white-space:pre}
-ol{margin-left:1.75em}
-ul li ol{margin-left:1.5em}
-dl dd{margin-left:1.125em}
-dl dd:last-child,dl dd:last-child>:last-child{margin-bottom:0}
-ol>li p,ul>li p,ul dd,ol dd,.olist .olist,.ulist .ulist,.ulist .olist,.olist .ulist{margin-bottom:.625em}
-ul.unstyled,ol.unnumbered,ul.checklist,ul.none{list-style-type:none}
-ul.unstyled,ol.unnumbered,ul.checklist{margin-left:.625em}
-ul.checklist li>p:first-child>.fa-check-square-o:first-child,ul.checklist li>p:first-child>input[type="checkbox"]:first-child{margin-right:.25em}
-ul.checklist li>p:first-child>input[type="checkbox"]:first-child{position:relative;top:1px}
-ul.inline{margin:0 auto .625em auto;margin-left:-1.375em;margin-right:0;padding:0;list-style:none;overflow:hidden}
-ul.inline>li{list-style:none;float:left;margin-left:1.375em;display:block}
-ul.inline>li>*{display:block}
-.unstyled dl dt{font-weight:400;font-style:normal}
-ol.arabic{list-style-type:decimal}
-ol.decimal{list-style-type:decimal-leading-zero}
-ol.loweralpha{list-style-type:lower-alpha}
-ol.upperalpha{list-style-type:upper-alpha}
-ol.lowerroman{list-style-type:lower-roman}
-ol.upperroman{list-style-type:upper-roman}
-ol.lowergreek{list-style-type:lower-greek}
-.hdlist>table,.colist>table{border:0;background:none}
-.hdlist>table>tbody>tr,.colist>table>tbody>tr{background:none}
-td.hdlist1{padding-right:.75em;font-weight:bold}
-td.hdlist1,td.hdlist2{vertical-align:top}
-.literalblock+.colist,.listingblock+.colist{margin-top:-.5em}
-.colist>table tr>td:first-of-type{padding:0 .75em;line-height:1}
-.colist>table tr>td:last-of-type{padding:.25em 0}
-.thumb,.th{line-height:0;display:inline-block;border:solid 4px #fff;-webkit-box-shadow:0 0 0 1px #ddd;box-shadow:0 0 0 1px #ddd}
-.imageblock.left,.imageblock[style*="float: left"]{margin:.25em .625em 1.25em 0}
-.imageblock.right,.imageblock[style*="float: right"]{margin:.25em 0 1.25em .625em}
-.imageblock>.title{margin-bottom:0}
-.imageblock.thumb,.imageblock.th{border-width:6px}
-.imageblock.thumb>.title,.imageblock.th>.title{padding:0 .125em}
-.image.left,.image.right{margin-top:.25em;margin-bottom:.25em;display:inline-block;line-height:0}
-.image.left{margin-right:.625em}
-.image.right{margin-left:.625em}
-a.image{text-decoration:none}
-span.footnote,span.footnoteref{vertical-align:super;font-size:.875em}
-span.footnote a,span.footnoteref a{text-decoration:none}
-span.footnote a:active,span.footnoteref a:active{text-decoration:underline}
-#footnotes{padding-top:.75em;padding-bottom:.75em;margin-bottom:.625em}
-#footnotes hr{width:20%;min-width:6.25em;margin:-.25em 0 .75em 0;border-width:1px 0 0 0}
-#footnotes .footnote{padding:0 .375em;line-height:1.3;font-size:.875em;margin-left:1.2em;text-indent:-1.2em;margin-bottom:.2em}
-#footnotes .footnote a:first-of-type{font-weight:bold;text-decoration:none}
-#footnotes .footnote:last-of-type{margin-bottom:0}
-#content #footnotes{margin-top:-.625em;margin-bottom:0;padding:.75em 0}
-.gist .file-data>table{border:0;background:#fff;width:100%;margin-bottom:0}
-.gist .file-data>table td.line-data{width:99%}
-div.unbreakable{page-break-inside:avoid}
-.big{font-size:larger}
-.small{font-size:smaller}
-.underline{text-decoration:underline}
-.overline{text-decoration:overline}
-.line-through{text-decoration:line-through}
-.aqua{color:#00bfbf}
-.aqua-background{background-color:#00fafa}
-.black{color:#000}
-.black-background{background-color:#000}
-.blue{color:#0000bf}
-.blue-background{background-color:#0000fa}
-.fuchsia{color:#bf00bf}
-.fuchsia-background{background-color:#fa00fa}
-.gray{color:#606060}
-.gray-background{background-color:#7d7d7d}
-.green{color:#006000}
-.green-background{background-color:#007d00}
-.lime{color:#00bf00}
-.lime-background{background-color:#00fa00}
-.maroon{color:#600000}
-.maroon-background{background-color:#7d0000}
-.navy{color:#000060}
-.navy-background{background-color:#00007d}
-.olive{color:#606000}
-.olive-background{background-color:#7d7d00}
-.purple{color:#600060}
-.purple-background{background-color:#7d007d}
-.red{color:#bf0000}
-.red-background{background-color:#fa0000}
-.silver{color:#909090}
-.silver-background{background-color:#bcbcbc}
-.teal{color:#006060}
-.teal-background{background-color:#007d7d}
-.white{color:#bfbfbf}
-.white-background{background-color:#fafafa}
-.yellow{color:#bfbf00}
-.yellow-background{background-color:#fafa00}
-span.icon>.fa{cursor:default}
-.admonitionblock td.icon [class^="fa icon-"]{font-size:2.5em;text-shadow:1px 1px 2px rgba(0,0,0,.5);cursor:default}
-.admonitionblock td.icon .icon-note:before{content:"\f05a";color:#19407c}
-.admonitionblock td.icon .icon-tip:before{content:"\f0eb";text-shadow:1px 1px 2px rgba(155,155,0,.8);color:#111}
-.admonitionblock td.icon .icon-warning:before{content:"\f071";color:#bf6900}
-.admonitionblock td.icon .icon-caution:before{content:"\f06d";color:#bf3400}
-.admonitionblock td.icon .icon-important:before{content:"\f06a";color:#bf0000}
-.conum[data-value]{display:inline-block;color:#fff!important;background-color:rgba(0,0,0,.8);-webkit-border-radius:100px;border-radius:100px;text-align:center;font-size:.75em;width:1.67em;height:1.67em;line-height:1.67em;font-family:"Open Sans","DejaVu Sans",sans-serif;font-style:normal;font-weight:bold}
-.conum[data-value] *{color:#fff!important}
-.conum[data-value]+b{display:none}
-.conum[data-value]:after{content:attr(data-value)}
-pre .conum[data-value]{position:relative;top:-.125em}
-b.conum *{color:inherit!important}
-.conum:not([data-value]):empty{display:none}
-h1,h2{letter-spacing:-.01em}
-dt,th.tableblock,td.content{text-rendering:optimizeLegibility}
-p,td.content{letter-spacing:-.01em}
-p strong,td.content strong{letter-spacing:-.005em}
-p,blockquote,dt,td.content{font-size:1.0625rem}
-p{margin-bottom:1.25rem}
-.sidebarblock p,.sidebarblock dt,.sidebarblock td.content,p.tableblock{font-size:1em}
-.exampleblock>.content{background-color:#fffef7;border-color:#e0e0dc;-webkit-box-shadow:0 1px 4px #e0e0dc;box-shadow:0 1px 4px #e0e0dc}
-.print-only{display:none!important}
-@media print{@page{margin:1.25cm .75cm}
-*{-webkit-box-shadow:none!important;box-shadow:none!important;text-shadow:none!important}
-a{color:inherit!important;text-decoration:underline!important}
-a.bare,a[href^="#"],a[href^="mailto:"]{text-decoration:none!important}
-a[href^="http:"]:not(.bare):after,a[href^="https:"]:not(.bare):after{content:"(" attr(href) ")";display:inline-block;font-size:.875em;padding-left:.25em}
-abbr[title]:after{content:" (" attr(title) ")"}
-pre,blockquote,tr,img{page-break-inside:avoid}
-thead{display:table-header-group}
-img{max-width:100%!important}
-p,blockquote,dt,td.content{font-size:1em;orphans:3;widows:3}
-h2,h3,#toctitle,.sidebarblock>.content>.title{page-break-after:avoid}
-#toc,.sidebarblock,.exampleblock>.content{background:none!important}
-#toc{border-bottom:1px solid #ddddd8!important;padding-bottom:0!important}
-.sect1{padding-bottom:0!important}
-.sect1+.sect1{border:0!important}
-#header>h1:first-child{margin-top:1.25rem}
-body.book #header{text-align:center}
-body.book #header>h1:first-child{border:0!important;margin:2.5em 0 1em 0}
-body.book #header .details{border:0!important;display:block;padding:0!important}
-body.book #header .details span:first-child{margin-left:0!important}
-body.book #header .details br{display:block}
-body.book #header .details br+span:before{content:none!important}
-body.book #toc{border:0!important;text-align:left!important;padding:0!important;margin:0!important}
-body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-break-before:always}
-.listingblock code[data-lang]:before{display:block}
-#footer{background:none!important;padding:0 .9375em}
-#footer-text{color:rgba(0,0,0,.6)!important;font-size:.9em}
-.hide-on-print{display:none!important}
-.print-only{display:block!important}
-.hide-for-print{display:none!important}
-.show-for-print{display:inherit!important}}

config/releaser.yml

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

docs/.flattened-pom.xml

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://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>4.1.0-SNAPSHOT</version>
+  </parent>
+  <groupId>org.springframework.cloud</groupId>
+  <artifactId>spring-cloud-netflix-docs</artifactId>
+  <version>4.1.0-SNAPSHOT</version>
+  <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-2021 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-eureka-client</artifactId>
+      <version>4.1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
+      <version>4.1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>

docs/pom.xml

@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 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.9.BUILD-SNAPSHOT</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>
-		<configprops.inclusionPattern>
-			.*.eureka.*|.*.hystrix.*|.*.ribbon.*|.*.sidecar.*|.*.turbine.*|.*.zuul.*|.*.archaius.*
-		</configprops.inclusionPattern>
-		<upload-docs-zip.phase>deploy</upload-docs-zip.phase>
-	</properties>
-	<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>
-	<profiles>
-		<profile>
-			<id>docs</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>pl.project13.maven</groupId>
-						<artifactId>git-commit-id-plugin</artifactId>
-					</plugin>
-					<plugin>
-						<artifactId>maven-dependency-plugin</artifactId>
-					</plugin>
-					<plugin>
-						<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>
-						<artifactId>maven-antrun-plugin</artifactId>
-					</plugin>
-					<plugin>
-						<artifactId>maven-deploy-plugin</artifactId>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>

docs/src/main/asciidoc/README.adoc

@@ -1,35 +0,0 @@
-include::_attributes.adoc[]
-
-image::https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/main.svg?style=svg["CircleCI", link="https://circleci.com/gh/spring-cloud/spring-cloud-netflix/tree/main"]
-image::https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/main/graph/badge.svg["Codecov", link="https://codecov.io/gh/spring-cloud/spring-cloud-netflix/branch/main"]
-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[]
-
-== 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
-* Client Side Load Balancer: Ribbon
-* External Configuration: a bridge from the Spring Environment to Archaius (enables native configuration of Netflix components using Spring Boot conventions)
-* Router and Filter: automatic registration of Zuul filters, and a simple convention over configuration approach to reverse proxy creation
-
-include::maintenance-mode.adoc[]
-
-== Building
-
-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/building-jdk8.adoc[]
-
-NOTE:  To build the module `spring-cloud-netflix-hystrix-contract` along with the entire Netflix project run the
-`build.sh` script in the `scripts` directory.
-
-== Contributing
-
-include::https://raw.githubusercontent.com/spring-cloud/spring-cloud-build/main/docs/src/main/asciidoc/contributing.adoc[]
-
-== License
-
-The project license file is available https://raw.githubusercontent.com/spring-cloud/spring-cloud-netflix/main/LICENSE.txt[here].

docs/src/main/asciidoc/_attributes.adoc

@@ -1,15 +0,0 @@
-: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

@@ -1,27 +0,0 @@
-|===
-|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.eureka.approximate-zone-from-hostname | `false` | Used to determine whether we should try to get the `zone` value from host name.
-|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

@@ -1,14 +0,0 @@
-: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,330 +0,0 @@
-#!/bin/bash -x
-
-set -e
-
-# 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 [[ ! -e "${ROOT_FOLDER}/.git" ]]; then
-        echo "You're not in the root folder of the project!"
-        exit 1
-    fi
-
-    # Prop that will let commit the changes
-    COMMIT_CHANGES="no"
-    MAVEN_PATH=${MAVEN_PATH:-}
-    echo "Path to Maven is [${MAVEN_PATH}]"
-    REPO_NAME=${PWD##*/}
-    echo "Repo name is [${REPO_NAME}]"
-    SPRING_CLOUD_STATIC_REPO=${SPRING_CLOUD_STATIC_REPO:-git@github.com:spring-cloud/spring-cloud-static.git}
-    echo "Spring Cloud Static repo is [${SPRING_CLOUD_STATIC_REPO}"
-}
-
-# Check if gh-pages exists and docs have been built
-function check_if_anything_to_sync() {
-    git remote set-url --push origin `git config remote.origin.url | sed -e 's/^git:/https:/'`
-
-    if ! (git remote set-branches --add origin gh-pages && git fetch -q); then
-        echo "No gh-pages, so not syncing"
-        exit 0
-    fi
-
-    if ! [ -d docs/target/generated-docs ] && ! [ "${BUILD}" == "yes" ]; then
-        echo "No gh-pages sources in docs/target/generated-docs, so not syncing"
-        exit 0
-    fi
-}
-
-function retrieve_current_branch() {
-    # Code getting the name of the current branch. For main we want to publish as we did until now
-    # https://stackoverflow.com/questions/1593051/how-to-programmatically-determine-the-current-checked-out-git-branch
-    # If there is a branch already passed will reuse it - otherwise will try to find it
-    CURRENT_BRANCH=${BRANCH}
-    if [[ -z "${CURRENT_BRANCH}" ]] ; then
-      CURRENT_BRANCH=$(git symbolic-ref -q HEAD)
-      CURRENT_BRANCH=${CURRENT_BRANCH##refs/heads/}
-      CURRENT_BRANCH=${CURRENT_BRANCH:-HEAD}
-    fi
-    echo "Current branch is [${CURRENT_BRANCH}]"
-    git checkout ${CURRENT_BRANCH} || echo "Failed to check the branch... continuing with the script"
-}
-
-# Switches to the provided value of the release version. We always prefix it with `v`
-function switch_to_tag() {
-    git checkout v${VERSION}
-}
-
-# Build the docs if switch is on
-function build_docs_if_applicable() {
-    if [[ "${BUILD}" == "yes" ]] ; then
-        ./mvnw clean install -P docs -pl docs -DskipTests
-    fi
-}
-
-# Get the name of the `docs.main` property
-# Get 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
-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 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}" == "main" ]] ; then
-        echo -e "Current branch is main - will copy the current docs only to the root folder"
-        for f in docs/target/generated-docs/*; do
-            file=${f#docs/target/generated-docs/*}
-            if ! git ls-files -i -o --exclude-standard --directory | grep -q ^$file$; then
-                # Not ignored...
-                cp -rf $f ${ROOT_FOLDER}/
-                git add -A ${ROOT_FOLDER}/$file
-            fi
-        done
-        COMMIT_CHANGES="yes"
-    else
-        echo -e "Current branch is [${CURRENT_BRANCH}]"
-        # https://stackoverflow.com/questions/29300806/a-bash-script-to-check-if-a-string-is-present-in-a-comma-separated-list-of-strin
-        if [[ ",${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 main locally.
-        # This is a little extreme. Use with care!
-        ###################################################################
-        if [[ "${COMMIT_SUCCESSFUL}" == "yes" ]] ; then
-            git push origin gh-pages
-        fi
-    fi
-}
-
-# Switch back to the previous branch and exit block
-function checkout_previous_branch() {
-    # If -version was provided we need to come back to root project
-    cd ${ROOT_FOLDER}
-    git checkout ${CURRENT_BRANCH} || echo "Failed to check the branch... continuing with the script"
-    if [ "$dirty" != "0" ]; then git stash pop; fi
-    exit 0
-}
-
-# Assert if properties have been properly passed
-function assert_properties() {
-echo "VERSION [${VERSION}], DESTINATION [${DESTINATION}], CLONE [${CLONE}]"
-if [[ "${VERSION}" != "" && (-z "${DESTINATION}" && -z "${CLONE}") ]] ; then echo "Version was set but destination / clone was not!"; exit 1;fi
-if [[ ("${DESTINATION}" != "" && "${CLONE}" != "") && -z "${VERSION}" ]] ; then echo "Destination / clone was set but version was not!"; exit 1;fi
-if [[ "${DESTINATION}" != "" && "${CLONE}" == "yes" ]] ; then echo "Destination and clone was set. Pick one!"; exit 1;fi
-}
-
-# Prints the usage
-function print_usage() {
-cat <<EOF
-The idea of this script is to update gh-pages branch with the generated docs. Without any options
-the script will work in the following manner:
-
-- if there's no gh-pages / target for docs module then the script ends
-- for main branch the generated docs are copied to the root of gh-pages branch
-- for any other branch (if that branch is 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
-
-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

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

docs/src/main/asciidoc/intro.adoc

@@ -1,9 +0,0 @@
-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
-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).
-

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

@@ -1,25 +0,0 @@
-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-concurrency-limits
-* 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 modules.
-

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

@@ -1,55 +0,0 @@
-Spring Cloud Netflix provides Netflix OSS integrations for Spring Boot apps through autoconfiguration and binding to the Spring Environment and other Spring programming model idioms. With a few simple annotations you can quickly enable and configure the common patterns inside your application and build large distributed systems with battle-tested Netflix components. The patterns provided include Service Discovery (Eureka), Circuit Breaker (Hystrix), Intelligent Routing (Zuul) and Client Side Load Balancing (Ribbon)..
-
-## Features
-
-Spring Cloud Netflix features:
-
-* Service Discovery: Eureka instances can be registered and clients can discover the instances using Spring-managed beans
-* Service Discovery: an embedded Eureka server can be created with declarative Java configuration
-* Circuit Breaker: Hystrix clients can be built with a simple annotation-driven method decorator
-* Circuit Breaker: embedded Hystrix dashboard with declarative Java configuration
-* Declarative REST Client: Feign creates a dynamic implementation of an interface decorated with JAX-RS or Spring MVC annotations
-* Client Side Load Balancer: Ribbon
-* External Configuration: a bridge from the Spring Environment to Archaius (enables native configuration of Netflix components using Spring Boot conventions)
-* Router and Filter: automatic registration of Zuul filters, and a simple convention over configuration approach to reverse proxy creation
-
-## Getting Started
-
-As long as Spring Cloud Netflix and Eureka Core are on the
-classpath any Spring Boot application with `@EnableEurekaClient` will try to contact a Eureka
-server on `http://localhost:8761` (the default value of
-`eureka.client.serviceUrl.defaultZone`):
-
-```java
-@SpringBootApplication
-@EnableEurekaClient
-@RestController
-public class Application {
-
-  @RequestMapping("/")
-  public String home() {
-    return "Hello World";
-  }
-
-  public static void main(String[] args) {
-    SpringApplication.run(Application.class, args);
-  }
-
-}
-```
-
-To run your own server use the `spring-cloud-starter-netflix-eureka-server` dependency and `@EnableEurekaServer`.
-
-## Contributing
-
-We welcome contributions. You can read more on how to contribute to the project https://github.com/spring-cloud/spring-cloud-netflix#contributing[here].
-
-## Community Support
-
-* You can report issues through https://github.com/spring-cloud/spring-cloud-netflix/issues[Github].
-* We monitor https://stackoverflow.com/[StackOverflow] for questions with the `spring-cloud-netflix` tag.
-* You can contact our team at https://gitter.im/spring-cloud/spring-cloud[Gitter].
-
-## Commercial Support
-
-Commercial Support is provided as part of the https://spring.io/support[VMware Spring Runtime] offering.

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

@@ -1,70 +0,0 @@
-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");
-}
-----
-====

eclipse/eclipse-code-formatter.xml

@@ -1,315 +0,0 @@
-<?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

@@ -1,412 +0,0 @@
-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

@@ -8,7 +8,7 @@
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
 #
-#    https://www.apache.org/licenses/LICENSE-2.0
+#    http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
@@ -19,7 +19,7 @@
 # ----------------------------------------------------------------------------
 
 # ----------------------------------------------------------------------------
-# Maven2 Start Up Batch script
+# Maven Start Up Batch script
 #
 # Required ENV vars:
 # ------------------
@@ -114,7 +114,6 @@ if $mingw ; then
     M2_HOME="`(cd "$M2_HOME"; pwd)`"
   [ -n "$JAVA_HOME" ] &&
     JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`"
-  # TODO classpath?
 fi
 
 if [ -z "$JAVA_HOME" ]; then
@@ -212,7 +211,11 @@ 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"
+    if [ -n "$MVNW_REPOURL" ]; then
+      jarUrl="$MVNW_REPOURL/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    else
+      jarUrl="https://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    fi
     while IFS="=" read key value; do
       case "$key" in (wrapperUrl) jarUrl="$value"; break ;;
       esac
@@ -221,22 +224,38 @@ else
       echo "Downloading from: $jarUrl"
     fi
     wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar"
+    if $cygwin; then
+      wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"`
+    fi
 
     if command -v wget > /dev/null; then
         if [ "$MVNW_VERBOSE" = true ]; then
           echo "Found wget ... using wget"
         fi
-        wget "$jarUrl" -O "$wrapperJarPath"
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            wget "$jarUrl" -O "$wrapperJarPath"
+        else
+            wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath"
+        fi
     elif command -v curl > /dev/null; then
         if [ "$MVNW_VERBOSE" = true ]; then
           echo "Found curl ... using curl"
         fi
-        curl -o "$wrapperJarPath" "$jarUrl"
+        if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then
+            curl -o "$wrapperJarPath" "$jarUrl" -f
+        else
+            curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f
+        fi
+
     else
         if [ "$MVNW_VERBOSE" = true ]; then
           echo "Falling back to using Java to download"
         fi
         javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java"
+        # For Cygwin, switch paths to Windows format before running javac
+        if $cygwin; then
+          javaClass=`cygpath --path --windows "$javaClass"`
+        fi
         if [ -e "$javaClass" ]; then
             if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then
                 if [ "$MVNW_VERBOSE" = true ]; then
@@ -277,28 +296,13 @@ if $cygwin; then
     MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"`
 fi
 
+# Provide a "standardized" way to retrieve the CLI args that will
+# work with both Windows and non-Windows executions.
+MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@"
+export MAVEN_CMD_LINE_ARGS
+
 WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain
 
-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" \

mvnw.cmd

@@ -1,161 +1,182 @@
-@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%
+@REM ----------------------------------------------------------------------------
+@REM Licensed to the Apache Software Foundation (ASF) under one
+@REM or more contributor license agreements.  See the NOTICE file
+@REM distributed with this work for additional information
+@REM regarding copyright ownership.  The ASF licenses this file
+@REM to you under the Apache License, Version 2.0 (the
+@REM "License"); you may not use this file except in compliance
+@REM with the License.  You may obtain a copy of the License at
+@REM
+@REM    http://www.apache.org/licenses/LICENSE-2.0
+@REM
+@REM Unless required by applicable law or agreed to in writing,
+@REM software distributed under the License is distributed on an
+@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+@REM KIND, either express or implied.  See the License for the
+@REM specific language governing permissions and limitations
+@REM under the License.
+@REM ----------------------------------------------------------------------------
+
+@REM ----------------------------------------------------------------------------
+@REM Maven 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 keystroke before ending
+@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven
+@REM     e.g. to debug Maven itself, use
+@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000
+@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files
+@REM ----------------------------------------------------------------------------
+
+@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on'
+@echo off
+@REM set title of command window
+title %0
+@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on'
+@if "%MAVEN_BATCH_ECHO%" == "on"  echo %MAVEN_BATCH_ECHO%
+
+@REM set %HOME% to equivalent of $HOME
+if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%")
+
+@REM Execute a user defined script before this one
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre
+@REM check for pre script, once with legacy .bat ending and once with .cmd ending
+if exist "%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.5.6/maven-wrapper-0.5.6.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% (
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Found %WRAPPER_JAR%
+    )
+) else (
+    if not "%MVNW_REPOURL%" == "" (
+        SET DOWNLOAD_URL="%MVNW_REPOURL%/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar"
+    )
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Couldn't find %WRAPPER_JAR%, downloading it ...
+        echo Downloading from: %DOWNLOAD_URL%
+    )
+
+    powershell -Command "&{"^
+		"$webclient = new-object System.Net.WebClient;"^
+		"if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^
+		"$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^
+		"}"^
+		"[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^
+		"}"
+    if "%MVNW_VERBOSE%" == "true" (
+        echo Finished downloading %WRAPPER_JAR%
+    )
+)
+@REM End of extension
+
+@REM Provide a "standardized" way to retrieve the CLI args that will
+@REM work with both Windows and non-Windows executions.
+set MAVEN_CMD_LINE_ARGS=%*
+
+%MAVEN_JAVA_EXE% %JVM_CONFIG_MAVEN_PROPS% %MAVEN_OPTS% %MAVEN_DEBUG_OPTS% -classpath %WRAPPER_JAR% "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %*
+if ERRORLEVEL 1 goto error
+goto end
+
+:error
+set ERROR_CODE=1
+
+:end
+@endlocal & set ERROR_CODE=%ERROR_CODE%
+
+if not "%MAVEN_SKIP_RC%" == "" goto skipRcPost
+@REM check for post script, once with legacy .bat ending and once with .cmd ending
+if exist "%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%

package.json

@@ -0,0 +1,10 @@
+{
+  "dependencies": {
+    "antora": "3.2.0",
+    "@antora/atlas-extension": "1.0.0-alpha.5",
+    "@antora/collector-extension": "1.0.3",
+    "@asciidoctor/tabs": "1.0.0-beta.6",
+    "@springio/antora-extensions": "1.14.13",
+    "@springio/asciidoctor-extensions": "1.0.0-alpha.18"
+  }
+}

pom.xml

@@ -1,309 +1,63 @@
-<?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>
-	<artifactId>spring-cloud-netflix</artifactId>
-	<version>2.2.9.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>2.3.4.RELEASE</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.9.BUILD-SNAPSHOT</spring-cloud-commons.version>
-		<spring-cloud-config.version>2.2.9.BUILD-SNAPSHOT</spring-cloud-config.version>
-		<spring-cloud-stream.version>Horsham.SR12</spring-cloud-stream.version>
-		<!-- Has to be a stable version (not one that depends on this version of netflix): -->
-		<donotreplacespring-cloud-contract.version>2.2.4.RELEASE</donotreplacespring-cloud-contract.version>
-
-		<!-- Sonar -->
-		<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
-		<sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-		<sonar.jacoco.reportPath>${project.basedir}/../target/jacoco.exec</sonar.jacoco.reportPath>
-		<sonar.language>java</sonar.language>
-		<eureka-jersey.version>1.19.4</eureka-jersey.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>
-			<!-- 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>spring-cloud-netflix-eureka-client-tls-tests</module>
-		<module>docs</module>
-    </modules>
-	<profiles>
-		<profile>
-			<id>spring</id>
-			<repositories>
-				<repository>
-					<id>spring-snapshots</id>
-					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/libs-snapshot-local</url>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-					<releases>
-						<enabled>false</enabled>
-					</releases>
-				</repository>
-				<repository>
-					<id>spring-milestones</id>
-					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</repository>
-				<repository>
-					<id>spring-releases</id>
-					<name>Spring Releases</name>
-					<url>https://repo.spring.io/release</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</repository>
-			</repositories>
-			<pluginRepositories>
-				<pluginRepository>
-					<id>spring-snapshots</id>
-					<name>Spring Snapshots</name>
-					<url>https://repo.spring.io/libs-snapshot-local</url>
-					<snapshots>
-						<enabled>true</enabled>
-					</snapshots>
-					<releases>
-						<enabled>false</enabled>
-					</releases>
-				</pluginRepository>
-				<pluginRepository>
-					<id>spring-milestones</id>
-					<name>Spring Milestones</name>
-					<url>https://repo.spring.io/libs-milestone-local</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</pluginRepository>
-				<pluginRepository>
-					<id>spring-releases</id>
-					<name>Spring Releases</name>
-					<url>https://repo.spring.io/libs-release-local</url>
-					<snapshots>
-						<enabled>false</enabled>
-					</snapshots>
-				</pluginRepository>
-			</pluginRepositories>
-		</profile>
-		<profile>
-			<id>sonar</id>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.jacoco</groupId>
-						<artifactId>jacoco-maven-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>pre-unit-test</id>
-								<goals>
-									<goal>prepare-agent</goal>
-								</goals>
-								<configuration>
-									<propertyName>surefireArgLine</propertyName>
-									<destFile>${project.build.directory}/jacoco.exec</destFile>
-								</configuration>
-							</execution>
-							<execution>
-								<id>post-unit-test</id>
-								<phase>test</phase>
-								<goals>
-									<goal>report</goal>
-								</goals>
-								<configuration>
-									<!-- Sets the path to the file which contains the execution data. -->
-									<dataFile>${project.build.directory}/jacoco.exec</dataFile>
-								</configuration>
-							</execution>
-						</executions>
-					</plugin>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-surefire-plugin</artifactId>
-						<configuration>
-							<!-- Sets the VM argument line used when unit tests are run. -->
-							<argLine>${surefireArgLine}</argLine>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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>
+  <artifactId>spring-cloud-netflix-docs-build</artifactId>
+  <version>0.0.1-SNAPSHOT</version>
+  <parent>
+    <groupId>org.springframework.cloud</groupId>
+    <artifactId>spring-cloud-netflix</artifactId>
+    <version>5.0.2-SNAPSHOT</version>
+  </parent>
+  <name>Spring Cloud Netflix Docs Build</name>
+  <description>Builds Spring Cloud Netflix Docs.</description>
+  <url>https://spring.io/projects/spring-cloud-netflix</url>
+  <scm>
+    <connection>scm:git:https://github.com/spring-cloud/spring-cloud-netflix.git
+		</connection>
+    <developerConnection>
+			scm:git:git@github.com:spring-cloud/spring-cloud-netflix.git
+		</developerConnection>
+    <url>https://github.com/spring-cloud/spring-cloud-netflix</url>
+  </scm>
+  <issueManagement>
+    <url>https://github.com/spring-cloud/spring-cloud-netflix/issues</url>
+  </issueManagement>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.antora</groupId>
+        <artifactId>antora-maven-plugin</artifactId>
+      </plugin>
+    </plugins>
+  </build>
+    <repositories>
+    <repository>
+      <id>spring-snapshots</id>
+      <name>Spring Snapshots</name>
+      <url>https://repo.spring.io/snapshot</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/milestone</url>
+      <snapshots><enabled>false</enabled></snapshots>
+    </repository>
+  </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <id>spring-snapshots</id>
+      <name>Spring Snapshots</name>
+      <url>https://repo.spring.io/snapshot</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/milestone</url>
+      <snapshots><enabled>false</enabled></snapshots>
+    </pluginRepository>
+  </pluginRepositories>
 </project>

scripts/build.sh

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

scripts/compileOnly.sh

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

scripts/runAcceptanceTests.sh

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

spring-cloud-netflix-archaius/pom.xml

@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 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.9.BUILD-SNAPSHOT</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

@@ -1,241 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.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.ConditionalOnAvailableEndpoint;
-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.context.annotation.Lazy;
-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
- * @author Liang Yong
- */
-@Lazy(false)
-@Configuration(proxyBeanMethods = false)
-@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(proxyBeanMethods = false)
-	@ConditionalOnClass(Health.class)
-	protected static class ArchaiusEndpointConfiguration {
-
-		@Bean
-		@ConditionalOnAvailableEndpoint
-		protected ArchaiusEndpoint archaiusEndpoint() {
-			return new ArchaiusEndpoint();
-		}
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@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,56 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.archaius;
-
-import com.netflix.config.ConfigurationManager;
-import org.apache.commons.configuration.AbstractConfiguration;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ConfigurableApplicationContext;
-
-/**
- * @author Dave Syer
- */
-public final class ArchaiusDelegatingProxyUtils {
-
-	private ArchaiusDelegatingProxyUtils() {
-	}
-
-	/**
-	 * {@code ApplicationContext} class name.
-	 */
-	public static String APPLICATION_CONTEXT = ApplicationContext.class.getName();
-
-	public static <T> T getNamedInstance(Class<T> type, String name) {
-		ApplicationContext context = (ApplicationContext) ConfigurationManager
-				.getConfigInstance().getProperty(APPLICATION_CONTEXT);
-		return context != null && context.containsBean(name) ? context.getBean(name, type)
-				: null;
-	}
-
-	public static <T> T getInstanceWithPrefix(Class<T> type, String prefix) {
-		String name = prefix + type.getSimpleName();
-		return getNamedInstance(type, name);
-	}
-
-	public static void addApplicationContext(ConfigurableApplicationContext context) {
-		AbstractConfiguration config = ConfigurationManager.getConfigInstance();
-		config.clearProperty(APPLICATION_CONTEXT);
-		config.setProperty(APPLICATION_CONTEXT, context);
-	}
-
-}

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

@@ -1,73 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.archaius;
-
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import com.netflix.config.ConcurrentCompositeConfiguration;
-import com.netflix.config.ConfigurationManager;
-import org.apache.commons.configuration.AbstractConfiguration;
-import org.apache.commons.configuration.Configuration;
-import org.apache.commons.configuration.EnvironmentConfiguration;
-import org.apache.commons.configuration.SystemConfiguration;
-
-import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
-import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
-
-/**
- * An actuator endpoint that returns Archaius configuration.
- *
- * @author Dave Syer
- */
-@Endpoint(id = "archaius")
-public class ArchaiusEndpoint {
-
-	@ReadOperation
-	public Map<String, Object> invoke() {
-		Map<String, Object> map = new LinkedHashMap<>();
-		AbstractConfiguration config = ConfigurationManager.getConfigInstance();
-		if (config instanceof ConcurrentCompositeConfiguration) {
-			ConcurrentCompositeConfiguration composite = (ConcurrentCompositeConfiguration) config;
-			for (Configuration item : composite.getConfigurations()) {
-				append(map, item);
-			}
-		}
-		else {
-			append(map, config);
-		}
-		return map;
-	}
-
-	private void append(Map<String, Object> map, Configuration config) {
-		if (config instanceof ConfigurableEnvironmentConfiguration) {
-			return;
-		}
-		if (config instanceof SystemConfiguration) {
-			return;
-		}
-		if (config instanceof EnvironmentConfiguration) {
-			return;
-		}
-		for (Iterator<String> iter = config.getKeys(); iter.hasNext();) {
-			String key = iter.next();
-			map.put(key, config.getProperty(key));
-		}
-	}
-
-}

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

@@ -1,107 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.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

@@ -1,10 +0,0 @@
-{
-  "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

@@ -1,2 +0,0 @@
-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

@@ -1,108 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.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,56 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.archaius;
-
-import java.util.Map;
-
-import com.netflix.config.ConcurrentCompositeConfiguration;
-import com.netflix.config.ConfigurationManager;
-import org.junit.Test;
-
-import org.springframework.core.env.StandardEnvironment;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Dave Syer
- */
-public class ArchaiusEndpointTests {
-
-	private ArchaiusEndpoint endpoint = new ArchaiusEndpoint();
-
-	@Test
-	public void detectsPropertiesWhenSet() {
-		ConfigurationManager.getConfigInstance().setProperty("foo", "bar");
-		assertThat(this.endpoint.invoke().containsKey("foo")).isTrue();
-	}
-
-	@Test
-	public void doesNotIncludeSpringEnvironment() {
-		ConcurrentCompositeConfiguration composite = new ConcurrentCompositeConfiguration(
-				ConfigurationManager.getConfigInstance());
-		ConfigurableEnvironmentConfiguration config = new ConfigurableEnvironmentConfiguration(
-				new StandardEnvironment());
-		assertThat(config.containsKey("user.dir")).isTrue();
-		composite.addConfiguration(config);
-		ConfigurationManager.getConfigInstance().setProperty("foo", "bar");
-		Map<String, Object> map = this.endpoint.invoke();
-		assertThat(map.containsKey("foo")).isTrue();
-		assertThat(map.containsKey("user.dir")).isFalse();
-	}
-
-}

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

@@ -1,50 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.archaius;
-
-import com.netflix.config.DynamicProperty;
-import org.junit.jupiter.api.Test;
-
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-/**
- * @author Liang Yong
- */
-
-@SpringBootTest(classes = LazyLoadConfigurationTests.TestConfig.class,
-		properties = { "client.ribbon.listOfServers=foo.com,bar.com",
-				"spring.main.lazy-initialization=true" })
-public class LazyLoadConfigurationTests {
-
-	@Test
-	public void enableLazyInitialization() {
-		DynamicProperty instance = DynamicProperty
-				.getInstance("client.ribbon.listOfServers");
-		assertThat(instance.getString()).isEqualTo("foo.com,bar.com");
-	}
-
-	@SpringBootConfiguration
-	@EnableAutoConfiguration
-	static class TestConfig {
-
-	}
-
-}

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

@@ -1,41 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.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(proxyBeanMethods = false)
-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

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

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

@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 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.9.BUILD-SNAPSHOT</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

@@ -1,55 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.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
- * @deprecated to be removed in 3.0.0
- */
-@Deprecated
-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

@@ -1,56 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.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
- * @deprecated to be removed in 3.0.0
- */
-@Deprecated
-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

@@ -1,69 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.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
- * @deprecated to be removed in 3.0.0
- */
-@Deprecated
-@Configuration(proxyBeanMethods = false)
-@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

@@ -1,102 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.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
- * @deprecated to be removed in 3.0.0
- */
-@Deprecated
-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

@@ -1,93 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.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
- * @deprecated to be removed in 3.0.0
- */
-@Deprecated
-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

@@ -1,80 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.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
- * @deprecated to be removed in 3.0.0
- */
-@Configuration(proxyBeanMethods = false)
-@ConditionalOnWebApplication(type = Type.SERVLET)
-@ConditionalOnClass({ HttpServletRequest.class, HandlerInterceptor.class })
-@Deprecated
-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(proxyBeanMethods = false)
-	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

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

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

@@ -1,56 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.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

@@ -1,75 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.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

@@ -1,80 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.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(proxyBeanMethods = false)
-	@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

@@ -1,37 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.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

@@ -1,70 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.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/pom.xml

@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 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.9.BUILD-SNAPSHOT</version>
-		<relativePath>..</relativePath> <!-- lookup parent from repository -->
-	</parent>
-	<artifactId>spring-cloud-netflix-core</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Cloud Netflix Core - Deprecated</name>
-	<description>Deprecated Spring Cloud Netflix Core - will be removed. Please use spring-cloud-netflix-hystrix instead.</description>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-netflix-hystrix</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-autoconfigure</artifactId>
-			<optional>true</optional>
-		</dependency>
-	</dependencies>
-	<profiles>
-		<profile>
-			<id>java8plus</id>
-				<activation>
-					<jdk>[1.8,2.0)</jdk>
-				</activation>
-				<build>
-					<plugins>
-						<plugin>
-							<groupId>org.apache.maven.plugins</groupId>
-							<artifactId>maven-compiler-plugin</artifactId>
-							<configuration>
-								<compilerArgs>
-									<arg>-parameters</arg>
-								</compilerArgs>
-						</configuration>
-					</plugin>
-				</plugins>
-			</build>
-		</profile>
-	</profiles>
-</project>

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

@@ -1,42 +0,0 @@
-/*
- * Copyright 2018-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.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(proxyBeanMethods = false)
-@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/resources/META-INF/spring.factories

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

spring-cloud-netflix-dependencies/pom.xml

@@ -1,429 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<parent>
-		<artifactId>spring-cloud-dependencies-parent</artifactId>
-		<groupId>org.springframework.cloud</groupId>
-		<version>2.3.5.BUILD-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
-	<artifactId>spring-cloud-netflix-dependencies</artifactId>
-	<version>2.2.9.BUILD-SNAPSHOT</version>
-	<packaging>pom</packaging>
-	<name>spring-cloud-netflix-dependencies</name>
-	<description>Spring Cloud Netflix Dependencies</description>
-	<properties>
-		<archaius.version>0.7.7</archaius.version>
-		<concurrency-limits.version>0.1.12</concurrency-limits.version>
-		<eureka.version>1.10.14</eureka.version>
-		<eventbus.version>0.3.0</eventbus.version>
-		<hystrix.version>1.5.18</hystrix.version>
-		<ribbon.version>2.3.0</ribbon.version>
-		<servo.version>0.12.21</servo.version>
-		<zuul.version>1.3.1</zuul.version>
-		<turbine.version>1.0.0</turbine.version>
-	</properties>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-eureka-client</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-archaius</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-netflix-archaius</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-netflix-eureka-server</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-netflix-hystrix</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-netflix-hystrix-dashboard</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-netflix-ribbon</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-netflix-turbine</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-netflix-turbine-stream</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-starter-netflix-zuul</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-core</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-hystrix</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-eureka-server</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-hystrix-dashboard</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-hystrix-stream</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-sidecar</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-turbine</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-turbine-stream</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-zuul</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-netflix-ribbon</artifactId>
-				<version>${project.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.netflix-commons</groupId>
-				<artifactId>netflix-commons-util</artifactId>
-				<version>0.3.0</version>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.archaius</groupId>
-				<artifactId>archaius-core</artifactId>
-				<version>${archaius.version}</version>
-				<exclusions>
-					<exclusion>
-						<artifactId>commons-logging</artifactId>
-						<groupId>commons-logging</groupId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.concurrency-limits</groupId>
-				<artifactId>concurrency-limits-core</artifactId>
-				<version>${concurrency-limits.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.concurrency-limits</groupId>
-				<artifactId>concurrency-limits-servlet</artifactId>
-				<version>${concurrency-limits.version}</version>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.servo</groupId>
-				<artifactId>servo-core</artifactId>
-				<version>${servo.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.eureka</groupId>
-				<artifactId>eureka-client</artifactId>
-				<version>${eureka.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>com.github.vlsi.compactmap</groupId>
-						<artifactId>compactmap</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>javax.servlet</groupId>
-						<artifactId>servlet-api</artifactId>
-					</exclusion>
-					<exclusion>
-						<artifactId>commons-logging</artifactId>
-						<groupId>commons-logging</groupId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>jsr305</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.eureka</groupId>
-				<artifactId>eureka-core</artifactId>
-				<version>${eureka.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>javax.servlet</groupId>
-						<artifactId>servlet-api</artifactId>
-					</exclusion>
-					<exclusion>
-						<artifactId>commons-logging</artifactId>
-						<groupId>commons-logging</groupId>
-					</exclusion>
-					<exclusion>
-						<artifactId>log4j</artifactId>
-						<groupId>log4j</groupId>
-					</exclusion>
-					<exclusion>
-						<artifactId>com.netflix.blitz4j</artifactId>
-						<groupId>blitz4j</groupId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>jsr305</artifactId>
-					</exclusion>
-					<exclusion>
-						<artifactId>jackson-dataformat-xml</artifactId>
-						<groupId>com.fasterxml.jackson.dataformat</groupId>
-					</exclusion>
-					<exclusion>
-						<artifactId>*</artifactId>
-						<groupId>com.amazonaws</groupId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.hystrix</groupId>
-				<artifactId>hystrix-core</artifactId>
-				<version>${hystrix.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.hystrix</groupId>
-				<artifactId>hystrix-serialization</artifactId>
-				<version>${hystrix.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.hystrix</groupId>
-				<artifactId>hystrix-metrics-event-stream</artifactId>
-				<version>${hystrix.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>javax.servlet</groupId>
-						<artifactId>servlet-api</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.hystrix</groupId>
-				<artifactId>hystrix-javanica</artifactId>
-				<version>${hystrix.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>jsr305</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>org.aspectj</groupId>
-						<artifactId>aspectjrt</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.ribbon</groupId>
-				<artifactId>ribbon</artifactId>
-				<version>${ribbon.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>commons-logging</groupId>
-						<artifactId>commons-logging</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.ribbon</groupId>
-				<artifactId>ribbon-core</artifactId>
-				<version>${ribbon.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.ribbon</groupId>
-				<artifactId>ribbon-httpclient</artifactId>
-				<version>${ribbon.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.ribbon</groupId>
-				<artifactId>ribbon-eureka</artifactId>
-				<version>${ribbon.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-					<exclusion>
-						<groupId>javax.servlet</groupId>
-						<artifactId>servlet-api</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.ribbon</groupId>
-				<artifactId>ribbon-loadbalancer</artifactId>
-				<version>${ribbon.version}</version>
-				<exclusions>
-					<exclusion>
-						<groupId>com.google.code.findbugs</groupId>
-						<artifactId>annotations</artifactId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.zuul</groupId>
-				<artifactId>zuul-core</artifactId>
-				<version>${zuul.version}</version>
-				<exclusions>
-					<exclusion>
-						<artifactId>groovy-all</artifactId>
-						<groupId>org.codehaus.groovy</groupId>
-					</exclusion>
-					<exclusion>
-						<artifactId>mockito-all</artifactId>
-						<groupId>org.mockito</groupId>
-					</exclusion>
-				</exclusions>
-			</dependency>
-			<dependency>
-				<groupId>com.netflix.netflix-commons</groupId>
-				<artifactId>netflix-eventbus</artifactId>
-				<version>${eventbus.version}</version>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-	<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>
-			</pluginRepositories>
-		</profile>
-	</profiles>
-</project>

spring-cloud-netflix-eureka-client-tls-tests/.flattened-pom.xml

@@ -0,0 +1,196 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://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>4.1.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <groupId>org.springframework.cloud</groupId>
+  <artifactId>spring-cloud-netflix-eureka-client-tls-tests</artifactId>
+  <version>4.1.0-SNAPSHOT</version>
+  <name>Spring Cloud Netflix Eureka Client TLS Tests</name>
+  <description>Spring Cloud Netflix Eureka Client TLS Tests</description>
+  <url>https://spring.io/spring-cloud/spring-cloud-netflix/spring-cloud-netflix-eureka-client-tls-tests</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-2021 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-eureka-client-tls-tests</connection>
+    <developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-netflix.git/spring-cloud-netflix-eureka-client-tls-tests</developerConnection>
+    <url>https://github.com/spring-cloud/spring-cloud-netflix/spring-cloud-netflix-eureka-client-tls-tests</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-netflix-eureka-client</artifactId>
+      <version>4.1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-netflix-eureka-server</artifactId>
+      <version>4.1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot</artifactId>
+      <version>3.2.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-autoconfigure</artifactId>
+      <version>3.2.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-logging</artifactId>
+      <version>3.2.0-SNAPSHOT</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-commons</artifactId>
+      <version>4.1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-context</artifactId>
+      <version>4.1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-web</artifactId>
+      <version>6.1.0-M5</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+      <version>2.15.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.retry</groupId>
+      <artifactId>spring-retry</artifactId>
+      <version>2.0.3</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.annotation</groupId>
+          <artifactId>javax.annotation-api</artifactId>
+        </exclusion>
+      </exclusions>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-actuator</artifactId>
+      <version>3.2.0-SNAPSHOT</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-aop</artifactId>
+      <version>3.2.0-SNAPSHOT</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>2.15.2</version>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-autoconfigure-processor</artifactId>
+      <version>3.2.0-SNAPSHOT</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+  </dependencies>
+</project>

spring-cloud-netflix-eureka-client-tls-tests/pom.xml

@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 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.9.BUILD-SNAPSHOT</version>
-		<relativePath>..</relativePath> <!-- lookup parent from repository -->
-	</parent>
-	<artifactId>spring-cloud-netflix-eureka-client-tls-tests</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Cloud Netflix Eureka Client TLS Tests</name>
-	<description>Spring Cloud Netflix Eureka Client TLS Tests</description>
-
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-netflix-eureka-client</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-netflix-eureka-server</artifactId>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-autoconfigure</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-logging</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>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-web</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-annotations</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.retry</groupId>
-			<artifactId>spring-retry</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-aop</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.fasterxml.jackson.core</groupId>
-			<artifactId>jackson-databind</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-autoconfigure-processor</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		
-		<dependency>
-			<groupId>org.junit.vintage</groupId>
-			<artifactId>junit-vintage-engine</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcpkix-jdk15on</artifactId>
-			<version>1.68</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>javax.xml</groupId>
-			<artifactId>jaxb-impl</artifactId>
-			<version>2.1</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-</project>

spring-cloud-netflix-eureka-client-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/AppRunner.java

@@ -1,125 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import java.util.ArrayList;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.util.SocketUtils;
-
-public class AppRunner implements AutoCloseable {
-
-	private Class<?> appClass;
-
-	private Map<String, String> props;
-
-	private ConfigurableApplicationContext app;
-
-	public AppRunner(Class<?> appClass) {
-		this.appClass = appClass;
-		props = new LinkedHashMap<>();
-	}
-
-	public void property(String key, String value) {
-		props.put(key, value);
-	}
-
-	public void start() {
-		if (app == null) {
-			SpringApplicationBuilder builder = new SpringApplicationBuilder(appClass);
-			builder.properties("spring.jmx.enabled=false");
-			builder.properties(String.format("server.port=%d", availabeTcpPort()));
-			builder.properties(props());
-
-			app = builder.build().run();
-		}
-	}
-
-	private int availabeTcpPort() {
-		return SocketUtils.findAvailableTcpPort();
-	}
-
-	private String[] props() {
-		List<String> result = new ArrayList<>();
-
-		for (String key : props.keySet()) {
-			String value = props.get(key);
-			result.add(String.format("%s=%s", key, value));
-		}
-
-		return result.toArray(new String[0]);
-	}
-
-	public void stop() {
-		if (app != null) {
-			app.stop();
-			app = null;
-		}
-	}
-
-	public ConfigurableApplicationContext app() {
-		return app;
-	}
-
-	public String getProperty(String key) {
-		return app.getEnvironment().getProperty(key);
-	}
-
-	public <T> T getBean(Class<T> type) {
-		return app.getBean(type);
-	}
-
-	public ApplicationContext parent() {
-		return app.getParent();
-	}
-
-	public <T> Map<String, T> getParentBeans(Class<T> type) {
-		return parent().getBeansOfType(type);
-	}
-
-	public int port() {
-		if (app == null) {
-			throw new RuntimeException("App is not running.");
-		}
-		return app.getEnvironment().getProperty("server.port", Integer.class, -1);
-	}
-
-	public String root() {
-		if (app == null) {
-			throw new RuntimeException("App is not running.");
-		}
-
-		String protocol = tlsEnabled() ? "https" : "http";
-		return String.format("%s://localhost:%d/", protocol, port());
-	}
-
-	private boolean tlsEnabled() {
-		return app.getEnvironment().getProperty("server.ssl.enabled", Boolean.class,
-				false);
-	}
-
-	@Override
-	public void close() {
-		stop();
-	}
-
-}

spring-cloud-netflix-eureka-client-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/BaseCertTest.java

@@ -1,93 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.OutputStream;
-import java.security.KeyStore;
-
-import org.junit.BeforeClass;
-
-public abstract class BaseCertTest {
-
-	protected static final String KEY_STORE_PASSWORD = "test-key-store-password";
-
-	protected static final String KEY_PASSWORD = "test-key-password";
-
-	protected static final String WRONG_PASSWORD = "test-wrong-password";
-
-	protected static File caCert;
-
-	protected static File wrongCaCert;
-
-	protected static File serverCert;
-
-	protected static File clientCert;
-
-	protected static File wrongClientCert;
-
-	protected BaseCertTest() {
-	}
-
-	@BeforeClass
-	public static void createCertificates() throws Exception {
-		KeyTool tool = new KeyTool();
-
-		KeyAndCert ca = tool.createCA("MyCA");
-		KeyAndCert server = ca.sign("server");
-		KeyAndCert client = ca.sign("client");
-
-		caCert = saveCert(ca);
-		serverCert = saveKeyAndCert(server);
-		clientCert = saveKeyAndCert(client);
-
-		KeyAndCert wrongCa = tool.createCA("WrongCA");
-		KeyAndCert wrongClient = wrongCa.sign("client");
-
-		wrongCaCert = saveCert(wrongCa);
-		wrongClientCert = saveKeyAndCert(wrongClient);
-	}
-
-	private static File saveKeyAndCert(KeyAndCert keyCert) throws Exception {
-		return saveKeyStore(keyCert.subject(),
-				() -> keyCert.storeKeyAndCert(KEY_PASSWORD));
-	}
-
-	private static File saveCert(KeyAndCert keyCert) throws Exception {
-		return saveKeyStore(keyCert.subject(), () -> keyCert.storeCert());
-	}
-
-	private static File saveKeyStore(String prefix, KeyStoreSupplier func)
-			throws Exception {
-		File result = File.createTempFile(prefix, ".p12");
-		result.deleteOnExit();
-
-		try (OutputStream output = new FileOutputStream(result)) {
-			KeyStore store = func.createKeyStore();
-			store.store(output, KEY_STORE_PASSWORD.toCharArray());
-		}
-		return result;
-	}
-
-	interface KeyStoreSupplier {
-
-		KeyStore createKeyStore() throws Exception;
-
-	}
-
-}

spring-cloud-netflix-eureka-client-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientRunner.java

@@ -1,99 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import java.io.File;
-import java.util.function.BooleanSupplier;
-
-import org.springframework.cloud.client.discovery.DiscoveryClient;
-
-public class EurekaClientRunner extends AppRunner {
-
-	public EurekaClientRunner(Class<?> appClass, AppRunner server) {
-		super(appClass);
-
-		property("eureka.client.registerWithEureka", "false");
-		property("eureka.client.fetchRegistry", "true");
-		property("eureka.client.serviceUrl.defaultZone", server.root() + "eureka/");
-		property("eureka.client.refresh.enable", "true");
-	}
-
-	public EurekaClientRunner(Class<?> appClass, AppRunner server, String service) {
-		this(appClass, server);
-		property("eureka.client.registerWithEureka", "true");
-		property("spring.application.name", service);
-	}
-
-	public void enableTls() {
-		property("eureka.client.tls.enabled", "true");
-	}
-
-	public void disableTls() {
-		property("eureka.client.tls.enabled", "false");
-	}
-
-	public void setKeyStore(File keyStore, String keyStorePassword, String keyPassword) {
-		property("eureka.client.tls.key-store", pathOf(keyStore));
-		property("eureka.client.tls.key-store-password", keyStorePassword);
-		property("eureka.client.tls.key-password", keyPassword);
-	}
-
-	public void setKeyStore(File keyStore) {
-		property("eureka.client.tls.key-store", pathOf(keyStore));
-	}
-
-	public void setTrustStore(File trustStore, String password) {
-		property("eureka.client.tls.trust-store", pathOf(trustStore));
-		property("eureka.client.tls.trust-store-password", password);
-	}
-
-	public void setTrustStore(File trustStore) {
-		property("eureka.client.tls.trust-store", pathOf(trustStore));
-	}
-
-	private String pathOf(File file) {
-		return String.format("file:%s", file.getAbsolutePath());
-	}
-
-	public void waitServiceViaEureka(int seconds) {
-		assertInSeconds(() -> foundServiceViaEureka(), seconds);
-	}
-
-	private void assertInSeconds(BooleanSupplier assertion, int seconds) {
-		long start = System.currentTimeMillis();
-		long limit = 1000L * seconds;
-		long duration = 0;
-
-		do {
-			if (assertion.getAsBoolean()) {
-				return;
-			}
-			duration = System.currentTimeMillis() - start;
-			Thread.yield();
-
-		}
-		while (duration < limit);
-
-		throw new RuntimeException();
-	}
-
-	public boolean foundServiceViaEureka() {
-		DiscoveryClient discovery = getBean(DiscoveryClient.class);
-		return !discovery.getServices().isEmpty();
-	}
-
-}

spring-cloud-netflix-eureka-client-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/EurekaClientTest.java

@@ -1,158 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import java.io.File;
-
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.boot.SpringBootConfiguration;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.cloud.netflix.eureka.server.EnableEurekaServer;
-
-import static org.assertj.core.api.Assertions.assertThat;
-
-public class EurekaClientTest extends BaseCertTest {
-
-	private static EurekaServerRunner server;
-
-	private static EurekaClientRunner service;
-
-	@BeforeClass
-	public static void setupAll() {
-		startEurekaServer();
-		startService();
-		waitForRegistration();
-	}
-
-	@AfterClass
-	public static void tearDownAll() {
-		stopService();
-		stopEurekaServer();
-	}
-
-	private static void startEurekaServer() {
-		server = new EurekaServerRunner(TestEurekaServer.class);
-		server.enableTls();
-		server.setKeyStore(serverCert, KEY_STORE_PASSWORD, "server", KEY_PASSWORD);
-		server.setTrustStore(caCert, KEY_STORE_PASSWORD);
-
-		server.start();
-	}
-
-	private static void stopEurekaServer() {
-		server.stop();
-	}
-
-	private static void startService() {
-		service = new EurekaClientRunner(TestApp.class, server, "testservice");
-		enableTlsClient(service);
-		service.start();
-	}
-
-	private static void stopService() {
-		service.stop();
-	}
-
-	private static void waitForRegistration() {
-		try (EurekaClientRunner client = createEurekaClient()) {
-			enableTlsClient(client);
-			client.start();
-			client.waitServiceViaEureka(60);
-		}
-	}
-
-	private static EurekaClientRunner createEurekaClient() {
-		return new EurekaClientRunner(TestApp.class, server);
-	}
-
-	private static void enableTlsClient(EurekaClientRunner runner) {
-		runner.enableTls();
-		runner.setKeyStore(clientCert, KEY_STORE_PASSWORD, KEY_PASSWORD);
-		runner.setTrustStore(caCert, KEY_STORE_PASSWORD);
-	}
-
-	/**
-	 * Already proved this in waitForRegistration(). Keep this Test to express test
-	 * purpose explicitly.
-	 */
-	@Test
-	public void clientCertCanWork() {
-	}
-
-	@Test
-	public void noCertCannotWork() {
-		try (EurekaClientRunner client = createEurekaClient()) {
-			client.disableTls();
-			client.start();
-			assertThat(client.foundServiceViaEureka()).isFalse();
-		}
-	}
-
-	@Test
-	public void wrongCertCannotWork() {
-		try (EurekaClientRunner client = createEurekaClient()) {
-			enableTlsClient(client);
-			client.setKeyStore(wrongClientCert);
-			client.start();
-			assertThat(client.foundServiceViaEureka()).isFalse();
-		}
-	}
-
-	@Test(expected = BeanCreationException.class)
-	public void wrongPasswordCauseFailure() {
-		EurekaClientRunner client = createEurekaClient();
-		enableTlsClient(client);
-		client.setKeyStore(clientCert, WRONG_PASSWORD, WRONG_PASSWORD);
-		client.start();
-	}
-
-	@Test(expected = BeanCreationException.class)
-	public void nonExistKeyStoreCauseFailure() {
-		EurekaClientRunner client = createEurekaClient();
-		enableTlsClient(client);
-		client.setKeyStore(new File("nonExistFile"));
-		client.start();
-	}
-
-	@Test
-	public void wrongTrustStoreCannotWork() {
-		try (EurekaClientRunner client = createEurekaClient()) {
-			enableTlsClient(client);
-			client.setTrustStore(wrongCaCert);
-			client.start();
-			assertThat(client.foundServiceViaEureka()).isFalse();
-		}
-	}
-
-	@SpringBootConfiguration
-	@EnableAutoConfiguration
-	public static class TestApp {
-
-	}
-
-	@SpringBootConfiguration
-	@EnableAutoConfiguration
-	@EnableEurekaServer
-	public static class TestEurekaServer {
-
-	}
-
-}

spring-cloud-netflix-eureka-client-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/EurekaServerRunner.java

@@ -1,56 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import java.io.File;
-
-public class EurekaServerRunner extends AppRunner {
-
-	public EurekaServerRunner(Class<?> appClass) {
-		super(appClass);
-
-		property("eureka.client.registerWithEureka", "false");
-		property("eureka.client.fetchRegistry", "false");
-		property("eureka.server.waitTimeInMsWhenSyncEmpty", "0");
-		property("eureka.client.refresh.enable", "true");
-	}
-
-	public void enableTls() {
-		property("server.ssl.enabled", "true");
-		property("server.ssl.client-auth", "need");
-	}
-
-	public void setKeyStore(File keyStore, String keyStorePassword, String key,
-			String keyPassword) {
-		property("server.ssl.key-store", pathOf(keyStore));
-		property("server.ssl.key-store-type", "PKCS12");
-		property("server.ssl.key-store-password", keyStorePassword);
-		property("server.ssl.key-alias", key);
-		property("server.ssl.key-password", keyPassword);
-	}
-
-	public void setTrustStore(File trustStore, String password) {
-		property("server.ssl.trust-store", pathOf(trustStore));
-		property("server.ssl.trust-store-type", "PKCS12");
-		property("server.ssl.trust-store-password", password);
-	}
-
-	private String pathOf(File file) {
-		return String.format("file:%s", file.getAbsolutePath());
-	}
-
-}

spring-cloud-netflix-eureka-client-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/KeyAndCert.java

@@ -1,94 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import java.security.KeyPair;
-import java.security.KeyStore;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.cert.Certificate;
-import java.security.cert.X509Certificate;
-
-public class KeyAndCert {
-
-	private KeyPair keyPair;
-
-	private X509Certificate certificate;
-
-	public KeyAndCert(KeyPair keyPair, X509Certificate certificate) {
-		this.keyPair = keyPair;
-		this.certificate = certificate;
-	}
-
-	public KeyPair keyPair() {
-		return keyPair;
-	}
-
-	public PublicKey publicKey() {
-		return keyPair.getPublic();
-	}
-
-	public PrivateKey privateKey() {
-		return keyPair.getPrivate();
-	}
-
-	public X509Certificate certificate() {
-		return certificate;
-	}
-
-	public String subject() {
-		String dn = certificate.getSubjectDN().getName();
-		int index = dn.indexOf('=');
-		return dn.substring(index + 1);
-	}
-
-	public KeyAndCert sign(String subject) throws Exception {
-		KeyTool tool = new KeyTool();
-		return tool.signCertificate(subject, this);
-	}
-
-	public KeyAndCert sign(KeyPair keyPair, String subject) throws Exception {
-		KeyTool tool = new KeyTool();
-		return tool.signCertificate(keyPair, subject, this);
-	}
-
-	public KeyStore storeKeyAndCert(String keyPassword) throws Exception {
-		KeyStore result = KeyStore.getInstance("PKCS12");
-		result.load(null);
-
-		result.setKeyEntry(subject(), keyPair.getPrivate(), keyPassword.toCharArray(),
-				certChain());
-		return result;
-	}
-
-	private Certificate[] certChain() {
-		return new Certificate[] { certificate() };
-	}
-
-	public KeyStore storeCert() throws Exception {
-		return storeCert("PKCS12");
-	}
-
-	public KeyStore storeCert(String storeType) throws Exception {
-		KeyStore result = KeyStore.getInstance(storeType);
-		result.load(null);
-
-		result.setCertificateEntry(subject(), certificate());
-		return result;
-	}
-
-}

spring-cloud-netflix-eureka-client-tls-tests/src/test/java/org/springframework/cloud/netflix/eureka/KeyTool.java

@@ -1,126 +0,0 @@
-/*
- * Copyright 2018-2019 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import java.math.BigInteger;
-import java.security.KeyPair;
-import java.security.KeyPairGenerator;
-import java.security.PrivateKey;
-import java.security.PublicKey;
-import java.security.SecureRandom;
-import java.security.cert.X509Certificate;
-import java.util.Date;
-
-import org.bouncycastle.asn1.DERSequence;
-import org.bouncycastle.asn1.x500.X500Name;
-import org.bouncycastle.asn1.x509.BasicConstraints;
-import org.bouncycastle.asn1.x509.Extension;
-import org.bouncycastle.asn1.x509.GeneralName;
-import org.bouncycastle.asn1.x509.GeneralNames;
-import org.bouncycastle.asn1.x509.KeyUsage;
-import org.bouncycastle.cert.X509CertificateHolder;
-import org.bouncycastle.cert.jcajce.JcaX509CertificateConverter;
-import org.bouncycastle.cert.jcajce.JcaX509v3CertificateBuilder;
-import org.bouncycastle.operator.ContentSigner;
-import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
-
-public class KeyTool {
-
-	private static final long ONE_DAY = 1000L * 60L * 60L * 24L;
-
-	private static final long TEN_YEARS = ONE_DAY * 365L * 10L;
-
-	public KeyAndCert createCA(String ca) throws Exception {
-		KeyPair keyPair = createKeyPair();
-		X509Certificate certificate = createCert(keyPair, ca);
-		return new KeyAndCert(keyPair, certificate);
-	}
-
-	public KeyAndCert signCertificate(String subject, KeyAndCert signer)
-			throws Exception {
-		return signCertificate(createKeyPair(), subject, signer);
-	}
-
-	public KeyAndCert signCertificate(KeyPair keyPair, String subject, KeyAndCert signer)
-			throws Exception {
-		X509Certificate certificate = createCert(keyPair.getPublic(), signer.privateKey(),
-				signer.subject(), subject);
-		KeyAndCert result = new KeyAndCert(keyPair, certificate);
-
-		return result;
-	}
-
-	public KeyPair createKeyPair() throws Exception {
-		return createKeyPair(1024);
-	}
-
-	public KeyPair createKeyPair(int keySize) throws Exception {
-		KeyPairGenerator gen = KeyPairGenerator.getInstance("RSA");
-		gen.initialize(keySize, new SecureRandom());
-		return gen.generateKeyPair();
-	}
-
-	public X509Certificate createCert(KeyPair keyPair, String ca) throws Exception {
-		JcaX509v3CertificateBuilder builder = certBuilder(keyPair.getPublic(), ca, ca);
-		builder.addExtension(Extension.keyUsage, true,
-				new KeyUsage(KeyUsage.keyCertSign));
-		builder.addExtension(Extension.basicConstraints, false,
-				new BasicConstraints(true));
-
-		return signCert(builder, keyPair.getPrivate());
-	}
-
-	public X509Certificate createCert(PublicKey publicKey, PrivateKey privateKey,
-			String issuer, String subject) throws Exception {
-		JcaX509v3CertificateBuilder builder = certBuilder(publicKey, issuer, subject);
-		builder.addExtension(Extension.keyUsage, true,
-				new KeyUsage(KeyUsage.digitalSignature));
-		builder.addExtension(Extension.basicConstraints, false,
-				new BasicConstraints(false));
-
-		GeneralName[] names = new GeneralName[] {
-				new GeneralName(GeneralName.dNSName, "localhost") };
-		builder.addExtension(Extension.subjectAlternativeName, false,
-				GeneralNames.getInstance(new DERSequence(names)));
-
-		return signCert(builder, privateKey);
-	}
-
-	private JcaX509v3CertificateBuilder certBuilder(PublicKey publicKey, String issuer,
-			String subject) {
-		X500Name issuerName = new X500Name(String.format("dc=%s", issuer));
-		X500Name subjectName = new X500Name(String.format("dc=%s", subject));
-
-		long now = System.currentTimeMillis();
-		BigInteger serialNum = BigInteger.valueOf(now);
-		Date notBefore = new Date(now - ONE_DAY);
-		Date notAfter = new Date(now + TEN_YEARS);
-
-		return new JcaX509v3CertificateBuilder(issuerName, serialNum, notBefore, notAfter,
-				subjectName, publicKey);
-	}
-
-	private X509Certificate signCert(JcaX509v3CertificateBuilder builder,
-			PrivateKey privateKey) throws Exception {
-		ContentSigner signer = new JcaContentSignerBuilder("SHA256WithRSA")
-				.build(privateKey);
-		X509CertificateHolder holder = builder.build(signer);
-
-		return new JcaX509CertificateConverter().getCertificate(holder);
-	}
-
-}

spring-cloud-netflix-eureka-client/.flattened-pom.xml

@@ -0,0 +1,237 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://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>4.1.0-SNAPSHOT</version>
+    <relativePath>..</relativePath>
+  </parent>
+  <groupId>org.springframework.cloud</groupId>
+  <artifactId>spring-cloud-netflix-eureka-client</artifactId>
+  <version>4.1.0-SNAPSHOT</version>
+  <name>Spring Cloud Netflix Eureka Client</name>
+  <description>Spring Cloud Netflix Eureka Client</description>
+  <url>https://spring.io/spring-cloud/spring-cloud-netflix/spring-cloud-netflix-eureka-client</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-2021 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-eureka-client</connection>
+    <developerConnection>scm:git:ssh://git@github.com/spring-cloud/spring-cloud-netflix.git/spring-cloud-netflix-eureka-client</developerConnection>
+    <url>https://github.com/spring-cloud/spring-cloud-netflix/spring-cloud-netflix-eureka-client</url>
+  </scm>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-configuration-processor</artifactId>
+      <version>3.2.0-SNAPSHOT</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-actuator</artifactId>
+      <version>3.2.0-SNAPSHOT</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-starter-webflux</artifactId>
+      <version>3.2.0-SNAPSHOT</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-config-client</artifactId>
+      <version>4.1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.cloud</groupId>
+      <artifactId>spring-cloud-loadbalancer</artifactId>
+      <version>4.1.0-SNAPSHOT</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.netflix.eureka</groupId>
+      <artifactId>eureka-client</artifactId>
+      <version>2.0.1</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.netflix.archaius</groupId>
+          <artifactId>archaius-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.github.vlsi.compactmap</groupId>
+          <artifactId>compactmap</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.code.findbugs</groupId>
+          <artifactId>jsr305</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.code.findbugs</groupId>
+          <artifactId>annotations</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>org.glassfish.jersey.core</groupId>
+          <artifactId>jersey-client</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+    <dependency>
+      <groupId>javax.inject</groupId>
+      <artifactId>javax.inject</artifactId>
+      <version>1</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>com.netflix.eureka</groupId>
+      <artifactId>eureka-core</artifactId>
+      <version>2.0.1</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>com.netflix.archaius</groupId>
+          <artifactId>archaius-core</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>javax.servlet</groupId>
+          <artifactId>servlet-api</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>log4j</groupId>
+          <artifactId>log4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>blitz4j</groupId>
+          <artifactId>com.netflix.blitz4j</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.code.findbugs</groupId>
+          <artifactId>annotations</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.code.findbugs</groupId>
+          <artifactId>jsr305</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.fasterxml.jackson.dataformat</groupId>
+          <artifactId>jackson-dataformat-xml</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.amazonaws</groupId>
+          <artifactId>*</artifactId>
+        </exclusion>
+      </exclusions>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-autoconfigure-processor</artifactId>
+      <version>3.2.0-SNAPSHOT</version>
+      <scope>compile</scope>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents.client5</groupId>
+      <artifactId>httpclient5</artifactId>
+      <version>5.2.1</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>

spring-cloud-netflix-eureka-client/pom.xml

@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 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.9.BUILD-SNAPSHOT</version>
-		<relativePath>..</relativePath> <!-- lookup parent from repository -->
-	</parent>
-	<artifactId>spring-cloud-netflix-eureka-client</artifactId>
-	<packaging>jar</packaging>
-	<name>Spring Cloud Netflix Eureka Client</name>
-	<description>Spring Cloud Netflix Eureka Client</description>
-	<properties>
-		<!-- Why do I need this now? -->
-		<maven.javadoc.failOnError>false</maven.javadoc.failOnError>		
-	</properties>
-	<dependencies>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-configuration-processor</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-webflux</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-netflix-hystrix</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-netflix-ribbon</artifactId>
-			<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>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-loadbalancer</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.eureka</groupId>
-			<artifactId>eureka-client</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>javax.inject</groupId>
-			<artifactId>javax.inject</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.eureka</groupId>
-			<artifactId>eureka-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<!-- Eureka core deps that are now optional -->
-		<dependency>
-			<groupId>com.sun.jersey.contribs</groupId>
-			<artifactId>jersey-apache-client4</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.archaius</groupId>
-			<artifactId>archaius-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.netflix-commons</groupId>
-			<artifactId>netflix-eventbus</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon-core</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon-loadbalancer</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon-eureka</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>com.netflix.ribbon</groupId>
-			<artifactId>ribbon-httpclient</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-autoconfigure-processor</artifactId>
-			<optional>true</optional>
-		</dependency>
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-security</artifactId>
-			<scope>test</scope>
-		</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>org.springframework.retry</groupId>
-			<artifactId>spring-retry</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>io.projectreactor</groupId>
-			<artifactId>reactor-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-</project>

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/CloudEurekaClient.java

@@ -1,127 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import java.lang.reflect.Field;
-import java.util.concurrent.atomic.AtomicLong;
-import java.util.concurrent.atomic.AtomicReference;
-
-import com.netflix.appinfo.ApplicationInfoManager;
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.appinfo.InstanceInfo.InstanceStatus;
-import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;
-import com.netflix.discovery.DiscoveryClient;
-import com.netflix.discovery.EurekaClientConfig;
-import com.netflix.discovery.shared.transport.EurekaHttpClient;
-import com.netflix.discovery.shared.transport.EurekaHttpResponse;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import org.springframework.cloud.client.discovery.event.HeartbeatEvent;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.http.HttpStatus;
-import org.springframework.util.ReflectionUtils;
-
-/**
- * Subclass of {@link DiscoveryClient} that sends a {@link HeartbeatEvent} when
- * {@link CloudEurekaClient#onCacheRefreshed()} is called.
- *
- * @author Spencer Gibb
- */
-public class CloudEurekaClient extends DiscoveryClient {
-
-	private static final Log log = LogFactory.getLog(CloudEurekaClient.class);
-
-	private final AtomicLong cacheRefreshedCount = new AtomicLong(0);
-
-	private ApplicationEventPublisher publisher;
-
-	private Field eurekaTransportField;
-
-	private ApplicationInfoManager applicationInfoManager;
-
-	private AtomicReference<EurekaHttpClient> eurekaHttpClient = new AtomicReference<>();
-
-	public CloudEurekaClient(ApplicationInfoManager applicationInfoManager,
-			EurekaClientConfig config, ApplicationEventPublisher publisher) {
-		this(applicationInfoManager, config, null, publisher);
-	}
-
-	public CloudEurekaClient(ApplicationInfoManager applicationInfoManager,
-			EurekaClientConfig config, AbstractDiscoveryClientOptionalArgs<?> args,
-			ApplicationEventPublisher publisher) {
-		super(applicationInfoManager, config, args);
-		this.applicationInfoManager = applicationInfoManager;
-		this.publisher = publisher;
-		this.eurekaTransportField = ReflectionUtils.findField(DiscoveryClient.class,
-				"eurekaTransport");
-		ReflectionUtils.makeAccessible(this.eurekaTransportField);
-	}
-
-	public ApplicationInfoManager getApplicationInfoManager() {
-		return applicationInfoManager;
-	}
-
-	public void cancelOverrideStatus(InstanceInfo info) {
-		getEurekaHttpClient().deleteStatusOverride(info.getAppName(), info.getId(), info);
-	}
-
-	public InstanceInfo getInstanceInfo(String appname, String instanceId) {
-		EurekaHttpResponse<InstanceInfo> response = getEurekaHttpClient()
-				.getInstance(appname, instanceId);
-		HttpStatus httpStatus = HttpStatus.valueOf(response.getStatusCode());
-		if (httpStatus.is2xxSuccessful() && response.getEntity() != null) {
-			return response.getEntity();
-		}
-		return null;
-	}
-
-	EurekaHttpClient getEurekaHttpClient() {
-		if (this.eurekaHttpClient.get() == null) {
-			try {
-				Object eurekaTransport = this.eurekaTransportField.get(this);
-				Field registrationClientField = ReflectionUtils
-						.findField(eurekaTransport.getClass(), "registrationClient");
-				ReflectionUtils.makeAccessible(registrationClientField);
-				this.eurekaHttpClient.compareAndSet(null,
-						(EurekaHttpClient) registrationClientField.get(eurekaTransport));
-			}
-			catch (IllegalAccessException e) {
-				log.error("error getting EurekaHttpClient", e);
-			}
-		}
-		return this.eurekaHttpClient.get();
-	}
-
-	public void setStatus(InstanceStatus newStatus, InstanceInfo info) {
-		getEurekaHttpClient().statusUpdate(info.getAppName(), info.getId(), newStatus,
-				info);
-	}
-
-	@Override
-	protected void onCacheRefreshed() {
-		super.onCacheRefreshed();
-
-		if (this.cacheRefreshedCount != null) { // might be called during construction and
-			// will be null
-			long newCount = this.cacheRefreshedCount.incrementAndGet();
-			log.trace("onCacheRefreshed called with count: " + newCount);
-			this.publisher.publishEvent(new HeartbeatEvent(this, newCount));
-		}
-	}
-
-}

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/CloudEurekaInstanceConfig.java

@@ -1,33 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import com.netflix.appinfo.EurekaInstanceConfig;
-import com.netflix.appinfo.InstanceInfo;
-
-/**
- * @author Spencer Gibb
- */
-public interface CloudEurekaInstanceConfig extends EurekaInstanceConfig {
-
-	void setNonSecurePort(int port);
-
-	void setSecurePort(int securePort);
-
-	InstanceInfo.InstanceStatus getInitialStatus();
-
-}

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/CloudEurekaTransportConfig.java

@@ -1,226 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import java.util.Objects;
-
-import com.netflix.discovery.shared.transport.EurekaTransportConfig;
-
-/**
- * @author Spencer Gibb
- * @author Gregor Zurowski
- */
-public class CloudEurekaTransportConfig implements EurekaTransportConfig {
-
-	private int sessionedClientReconnectIntervalSeconds = 20 * 60;
-
-	private double retryableClientQuarantineRefreshPercentage = 0.66;
-
-	private int bootstrapResolverRefreshIntervalSeconds = 5 * 60;
-
-	private int applicationsResolverDataStalenessThresholdSeconds = 5 * 60;
-
-	private int asyncResolverRefreshIntervalMs = 5 * 60 * 1000;
-
-	private int asyncResolverWarmUpTimeoutMs = 5000;
-
-	private int asyncExecutorThreadPoolSize = 5;
-
-	private String readClusterVip;
-
-	private String writeClusterVip;
-
-	private boolean bootstrapResolverForQuery = true;
-
-	private String bootstrapResolverStrategy;
-
-	private boolean applicationsResolverUseIp = false;
-
-	@Override
-	public boolean useBootstrapResolverForQuery() {
-		return this.bootstrapResolverForQuery;
-	}
-
-	@Override
-	public boolean applicationsResolverUseIp() {
-		return this.applicationsResolverUseIp;
-	}
-
-	public int getSessionedClientReconnectIntervalSeconds() {
-		return sessionedClientReconnectIntervalSeconds;
-	}
-
-	public void setSessionedClientReconnectIntervalSeconds(
-			int sessionedClientReconnectIntervalSeconds) {
-		this.sessionedClientReconnectIntervalSeconds = sessionedClientReconnectIntervalSeconds;
-	}
-
-	public double getRetryableClientQuarantineRefreshPercentage() {
-		return retryableClientQuarantineRefreshPercentage;
-	}
-
-	public void setRetryableClientQuarantineRefreshPercentage(
-			double retryableClientQuarantineRefreshPercentage) {
-		this.retryableClientQuarantineRefreshPercentage = retryableClientQuarantineRefreshPercentage;
-	}
-
-	public int getBootstrapResolverRefreshIntervalSeconds() {
-		return bootstrapResolverRefreshIntervalSeconds;
-	}
-
-	public void setBootstrapResolverRefreshIntervalSeconds(
-			int bootstrapResolverRefreshIntervalSeconds) {
-		this.bootstrapResolverRefreshIntervalSeconds = bootstrapResolverRefreshIntervalSeconds;
-	}
-
-	public int getApplicationsResolverDataStalenessThresholdSeconds() {
-		return applicationsResolverDataStalenessThresholdSeconds;
-	}
-
-	public void setApplicationsResolverDataStalenessThresholdSeconds(
-			int applicationsResolverDataStalenessThresholdSeconds) {
-		this.applicationsResolverDataStalenessThresholdSeconds = applicationsResolverDataStalenessThresholdSeconds;
-	}
-
-	public int getAsyncResolverRefreshIntervalMs() {
-		return asyncResolverRefreshIntervalMs;
-	}
-
-	public void setAsyncResolverRefreshIntervalMs(int asyncResolverRefreshIntervalMs) {
-		this.asyncResolverRefreshIntervalMs = asyncResolverRefreshIntervalMs;
-	}
-
-	public int getAsyncResolverWarmUpTimeoutMs() {
-		return asyncResolverWarmUpTimeoutMs;
-	}
-
-	public void setAsyncResolverWarmUpTimeoutMs(int asyncResolverWarmUpTimeoutMs) {
-		this.asyncResolverWarmUpTimeoutMs = asyncResolverWarmUpTimeoutMs;
-	}
-
-	public int getAsyncExecutorThreadPoolSize() {
-		return asyncExecutorThreadPoolSize;
-	}
-
-	public void setAsyncExecutorThreadPoolSize(int asyncExecutorThreadPoolSize) {
-		this.asyncExecutorThreadPoolSize = asyncExecutorThreadPoolSize;
-	}
-
-	public String getReadClusterVip() {
-		return readClusterVip;
-	}
-
-	public void setReadClusterVip(String readClusterVip) {
-		this.readClusterVip = readClusterVip;
-	}
-
-	public String getWriteClusterVip() {
-		return writeClusterVip;
-	}
-
-	public void setWriteClusterVip(String writeClusterVip) {
-		this.writeClusterVip = writeClusterVip;
-	}
-
-	public boolean isBootstrapResolverForQuery() {
-		return bootstrapResolverForQuery;
-	}
-
-	public void setBootstrapResolverForQuery(boolean bootstrapResolverForQuery) {
-		this.bootstrapResolverForQuery = bootstrapResolverForQuery;
-	}
-
-	public String getBootstrapResolverStrategy() {
-		return bootstrapResolverStrategy;
-	}
-
-	public void setBootstrapResolverStrategy(String bootstrapResolverStrategy) {
-		this.bootstrapResolverStrategy = bootstrapResolverStrategy;
-	}
-
-	public boolean isApplicationsResolverUseIp() {
-		return applicationsResolverUseIp;
-	}
-
-	public void setApplicationsResolverUseIp(boolean applicationsResolverUseIp) {
-		this.applicationsResolverUseIp = applicationsResolverUseIp;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		CloudEurekaTransportConfig that = (CloudEurekaTransportConfig) o;
-		return sessionedClientReconnectIntervalSeconds == that.sessionedClientReconnectIntervalSeconds
-				&& Double.compare(retryableClientQuarantineRefreshPercentage,
-						that.retryableClientQuarantineRefreshPercentage) == 0
-				&& bootstrapResolverRefreshIntervalSeconds == that.bootstrapResolverRefreshIntervalSeconds
-				&& applicationsResolverDataStalenessThresholdSeconds == that.applicationsResolverDataStalenessThresholdSeconds
-				&& asyncResolverRefreshIntervalMs == that.asyncResolverRefreshIntervalMs
-				&& asyncResolverWarmUpTimeoutMs == that.asyncResolverWarmUpTimeoutMs
-				&& asyncExecutorThreadPoolSize == that.asyncExecutorThreadPoolSize
-				&& Objects.equals(readClusterVip, that.readClusterVip)
-				&& Objects.equals(writeClusterVip, that.writeClusterVip)
-				&& bootstrapResolverForQuery == that.bootstrapResolverForQuery
-				&& Objects.equals(bootstrapResolverStrategy,
-						that.bootstrapResolverStrategy)
-				&& applicationsResolverUseIp == that.applicationsResolverUseIp;
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(sessionedClientReconnectIntervalSeconds,
-				retryableClientQuarantineRefreshPercentage,
-				bootstrapResolverRefreshIntervalSeconds,
-				applicationsResolverDataStalenessThresholdSeconds,
-				asyncResolverRefreshIntervalMs, asyncResolverWarmUpTimeoutMs,
-				asyncExecutorThreadPoolSize, readClusterVip, writeClusterVip,
-				bootstrapResolverForQuery, bootstrapResolverStrategy,
-				applicationsResolverUseIp);
-	}
-
-	@Override
-	public String toString() {
-		return new StringBuilder("CloudEurekaTransportConfig{")
-				.append("sessionedClientReconnectIntervalSeconds=")
-				.append(sessionedClientReconnectIntervalSeconds).append(", ")
-				.append("retryableClientQuarantineRefreshPercentage=")
-				.append(retryableClientQuarantineRefreshPercentage).append(", ")
-				.append("bootstrapResolverRefreshIntervalSeconds=")
-				.append(bootstrapResolverRefreshIntervalSeconds).append(", ")
-				.append("applicationsResolverDataStalenessThresholdSeconds=")
-				.append(applicationsResolverDataStalenessThresholdSeconds).append(", ")
-				.append("asyncResolverRefreshIntervalMs=")
-				.append(asyncResolverRefreshIntervalMs).append(", ")
-				.append("asyncResolverWarmUpTimeoutMs=")
-				.append(asyncResolverWarmUpTimeoutMs).append(", ")
-				.append("asyncExecutorThreadPoolSize=")
-				.append(asyncExecutorThreadPoolSize).append(", ")
-				.append("readClusterVip='").append(readClusterVip).append("', ")
-				.append("writeClusterVip='").append(writeClusterVip).append("', ")
-				.append("bootstrapResolverForQuery=").append(bootstrapResolverForQuery)
-				.append(", ").append("bootstrapResolverStrategy='")
-				.append(bootstrapResolverStrategy).append("', ")
-				.append("applicationsResolverUseIp=").append(applicationsResolverUseIp)
-				.append(", ").append("}").toString();
-	}
-
-}

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

@@ -1,42 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Convenience annotation for clients to enable Eureka discovery configuration
- * (specifically). Use this (optionally) in case you want discovery and know for sure that
- * it is Eureka you want. All it does is turn on discovery and let the autoconfiguration
- * find the eureka classes if they are available (i.e. you need Eureka on the classpath as
- * well).
- *
- * @author Dave Syer
- * @author Spencer Gibb
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Documented
-@Inherited
-public @interface EnableEurekaClient {
-
-}

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

@@ -1,406 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.util.Map;
-
-import com.netflix.appinfo.ApplicationInfoManager;
-import com.netflix.appinfo.EurekaInstanceConfig;
-import com.netflix.appinfo.HealthCheckHandler;
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.discovery.AbstractDiscoveryClientOptionalArgs;
-import com.netflix.discovery.EurekaClient;
-import com.netflix.discovery.EurekaClientConfig;
-
-import org.springframework.aop.support.AopUtils;
-import org.springframework.beans.factory.ObjectProvider;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator;
-import org.springframework.boot.actuate.health.Health;
-import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.condition.AnyNestedCondition;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.autoconfigure.condition.SearchStrategy;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.autoconfigure.RefreshAutoConfiguration;
-import org.springframework.cloud.client.CommonsClientAutoConfiguration;
-import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
-import org.springframework.cloud.client.actuator.HasFeatures;
-import org.springframework.cloud.client.discovery.noop.NoopDiscoveryClientAutoConfiguration;
-import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
-import org.springframework.cloud.client.serviceregistry.ServiceRegistryAutoConfiguration;
-import org.springframework.cloud.commons.util.InetUtils;
-import org.springframework.cloud.context.scope.refresh.RefreshScope;
-import org.springframework.cloud.netflix.eureka.metadata.DefaultManagementMetadataProvider;
-import org.springframework.cloud.netflix.eureka.metadata.ManagementMetadata;
-import org.springframework.cloud.netflix.eureka.metadata.ManagementMetadataProvider;
-import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaAutoServiceRegistration;
-import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaRegistration;
-import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaServiceRegistry;
-import org.springframework.cloud.util.ProxyUtils;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.core.env.ConfigurableEnvironment;
-import org.springframework.util.StringUtils;
-
-import static org.springframework.cloud.commons.util.IdUtils.getDefaultInstanceId;
-
-/**
- * @author Dave Syer
- * @author Spencer Gibb
- * @author Jon Schneider
- * @author Matt Jenkins
- * @author Ryan Baxter
- * @author Daniel Lavoie
- * @author Olga Maciaszek-Sharma
- * @author Tim Ysewyn
- */
-@Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties
-@ConditionalOnClass(EurekaClientConfig.class)
-@ConditionalOnProperty(value = "eureka.client.enabled", matchIfMissing = true)
-@ConditionalOnDiscoveryEnabled
-@AutoConfigureBefore({ NoopDiscoveryClientAutoConfiguration.class,
-		CommonsClientAutoConfiguration.class, ServiceRegistryAutoConfiguration.class })
-@AutoConfigureAfter(name = {
-		"org.springframework.cloud.netflix.eureka.config.DiscoveryClientOptionalArgsConfiguration",
-		"org.springframework.cloud.autoconfigure.RefreshAutoConfiguration",
-		"org.springframework.cloud.netflix.eureka.EurekaDiscoveryClientConfiguration",
-		"org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration" })
-public class EurekaClientAutoConfiguration {
-
-	private ConfigurableEnvironment env;
-
-	public EurekaClientAutoConfiguration(ConfigurableEnvironment env) {
-		this.env = env;
-	}
-
-	@Bean
-	public HasFeatures eurekaFeature() {
-		return HasFeatures.namedFeature("Eureka Client", EurekaClient.class);
-	}
-
-	@Bean
-	@ConditionalOnMissingBean(value = EurekaClientConfig.class,
-			search = SearchStrategy.CURRENT)
-	public EurekaClientConfigBean eurekaClientConfigBean(ConfigurableEnvironment env) {
-		return new EurekaClientConfigBean();
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public ManagementMetadataProvider serviceManagementMetadataProvider() {
-		return new DefaultManagementMetadataProvider();
-	}
-
-	private String getProperty(String property) {
-		return this.env.containsProperty(property) ? this.env.getProperty(property) : "";
-	}
-
-	@Bean
-	@ConditionalOnMissingBean(value = EurekaInstanceConfig.class,
-			search = SearchStrategy.CURRENT)
-	public EurekaInstanceConfigBean eurekaInstanceConfigBean(InetUtils inetUtils,
-			ManagementMetadataProvider managementMetadataProvider) {
-		String hostname = getProperty("eureka.instance.hostname");
-		boolean preferIpAddress = Boolean
-				.parseBoolean(getProperty("eureka.instance.prefer-ip-address"));
-		String ipAddress = getProperty("eureka.instance.ip-address");
-		boolean isSecurePortEnabled = Boolean
-				.parseBoolean(getProperty("eureka.instance.secure-port-enabled"));
-
-		String serverContextPath = env.getProperty("server.servlet.context-path", "/");
-		int serverPort = Integer.parseInt(
-				env.getProperty("server.port", env.getProperty("port", "8080")));
-
-		Integer managementPort = env.getProperty("management.server.port", Integer.class);
-		String managementContextPath = env
-				.getProperty("management.server.servlet.context-path");
-		Integer jmxPort = env.getProperty("com.sun.management.jmxremote.port",
-				Integer.class);
-		EurekaInstanceConfigBean instance = new EurekaInstanceConfigBean(inetUtils);
-
-		instance.setNonSecurePort(serverPort);
-		instance.setInstanceId(getDefaultInstanceId(env));
-		instance.setPreferIpAddress(preferIpAddress);
-		instance.setSecurePortEnabled(isSecurePortEnabled);
-		if (StringUtils.hasText(ipAddress)) {
-			instance.setIpAddress(ipAddress);
-		}
-
-		if (isSecurePortEnabled) {
-			instance.setSecurePort(serverPort);
-		}
-
-		if (StringUtils.hasText(hostname)) {
-			instance.setHostname(hostname);
-		}
-		String statusPageUrlPath = getProperty("eureka.instance.status-page-url-path");
-		String healthCheckUrlPath = getProperty("eureka.instance.health-check-url-path");
-
-		if (StringUtils.hasText(statusPageUrlPath)) {
-			instance.setStatusPageUrlPath(statusPageUrlPath);
-		}
-		if (StringUtils.hasText(healthCheckUrlPath)) {
-			instance.setHealthCheckUrlPath(healthCheckUrlPath);
-		}
-
-		ManagementMetadata metadata = managementMetadataProvider.get(instance, serverPort,
-				serverContextPath, managementContextPath, managementPort);
-
-		if (metadata != null) {
-			instance.setStatusPageUrl(metadata.getStatusPageUrl());
-			instance.setHealthCheckUrl(metadata.getHealthCheckUrl());
-			if (instance.isSecurePortEnabled()) {
-				instance.setSecureHealthCheckUrl(metadata.getSecureHealthCheckUrl());
-			}
-			Map<String, String> metadataMap = instance.getMetadataMap();
-			metadataMap.computeIfAbsent("management.port",
-					k -> String.valueOf(metadata.getManagementPort()));
-		}
-		else {
-			// without the metadata the status and health check URLs will not be set
-			// and the status page and health check url paths will not include the
-			// context path so set them here
-			if (StringUtils.hasText(managementContextPath)) {
-				instance.setHealthCheckUrlPath(
-						managementContextPath + instance.getHealthCheckUrlPath());
-				instance.setStatusPageUrlPath(
-						managementContextPath + instance.getStatusPageUrlPath());
-			}
-		}
-
-		setupJmxPort(instance, jmxPort);
-		return instance;
-	}
-
-	private void setupJmxPort(EurekaInstanceConfigBean instance, Integer jmxPort) {
-		Map<String, String> metadataMap = instance.getMetadataMap();
-		if (metadataMap.get("jmx.port") == null && jmxPort != null) {
-			metadataMap.put("jmx.port", String.valueOf(jmxPort));
-		}
-	}
-
-	@Bean
-	public EurekaServiceRegistry eurekaServiceRegistry() {
-		return new EurekaServiceRegistry();
-	}
-
-	// @Bean
-	// @ConditionalOnBean(AutoServiceRegistrationProperties.class)
-	// @ConditionalOnProperty(value =
-	// "spring.cloud.service-registry.auto-registration.enabled", matchIfMissing = true)
-	// public EurekaRegistration eurekaRegistration(EurekaClient eurekaClient,
-	// CloudEurekaInstanceConfig instanceConfig, ApplicationInfoManager
-	// applicationInfoManager, ObjectProvider<HealthCheckHandler> healthCheckHandler) {
-	// return EurekaRegistration.builder(instanceConfig)
-	// .with(applicationInfoManager)
-	// .with(eurekaClient)
-	// .with(healthCheckHandler)
-	// .build();
-	// }
-
-	@Bean
-	@ConditionalOnBean(AutoServiceRegistrationProperties.class)
-	@ConditionalOnProperty(
-			value = "spring.cloud.service-registry.auto-registration.enabled",
-			matchIfMissing = true)
-	public EurekaAutoServiceRegistration eurekaAutoServiceRegistration(
-			ApplicationContext context, EurekaServiceRegistry registry,
-			EurekaRegistration registration) {
-		return new EurekaAutoServiceRegistration(context, registry, registration);
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnMissingRefreshScope
-	protected static class EurekaClientConfiguration {
-
-		@Autowired
-		private ApplicationContext context;
-
-		@Autowired
-		private AbstractDiscoveryClientOptionalArgs<?> optionalArgs;
-
-		@Bean(destroyMethod = "shutdown")
-		@ConditionalOnMissingBean(value = EurekaClient.class,
-				search = SearchStrategy.CURRENT)
-		public EurekaClient eurekaClient(ApplicationInfoManager manager,
-				EurekaClientConfig config) {
-			return new CloudEurekaClient(manager, config, this.optionalArgs,
-					this.context);
-		}
-
-		@Bean
-		@ConditionalOnMissingBean(value = ApplicationInfoManager.class,
-				search = SearchStrategy.CURRENT)
-		public ApplicationInfoManager eurekaApplicationInfoManager(
-				EurekaInstanceConfig config) {
-			InstanceInfo instanceInfo = new InstanceInfoFactory().create(config);
-			return new ApplicationInfoManager(config, instanceInfo);
-		}
-
-		@Bean
-		@ConditionalOnBean(AutoServiceRegistrationProperties.class)
-		@ConditionalOnProperty(
-				value = "spring.cloud.service-registry.auto-registration.enabled",
-				matchIfMissing = true)
-		public EurekaRegistration eurekaRegistration(EurekaClient eurekaClient,
-				CloudEurekaInstanceConfig instanceConfig,
-				ApplicationInfoManager applicationInfoManager, @Autowired(
-						required = false) ObjectProvider<HealthCheckHandler> healthCheckHandler) {
-			return EurekaRegistration.builder(instanceConfig).with(applicationInfoManager)
-					.with(eurekaClient).with(healthCheckHandler).build();
-		}
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnRefreshScope
-	protected static class RefreshableEurekaClientConfiguration {
-
-		@Autowired
-		private ApplicationContext context;
-
-		@Autowired
-		private AbstractDiscoveryClientOptionalArgs<?> optionalArgs;
-
-		@Bean(destroyMethod = "shutdown")
-		@ConditionalOnMissingBean(value = EurekaClient.class,
-				search = SearchStrategy.CURRENT)
-		@org.springframework.cloud.context.config.annotation.RefreshScope
-		@Lazy
-		public EurekaClient eurekaClient(ApplicationInfoManager manager,
-				EurekaClientConfig config, EurekaInstanceConfig instance,
-				@Autowired(required = false) HealthCheckHandler healthCheckHandler) {
-			// If we use the proxy of the ApplicationInfoManager we could run into a
-			// problem
-			// when shutdown is called on the CloudEurekaClient where the
-			// ApplicationInfoManager bean is
-			// requested but wont be allowed because we are shutting down. To avoid this
-			// we use the
-			// object directly.
-			ApplicationInfoManager appManager;
-			if (AopUtils.isAopProxy(manager)) {
-				appManager = ProxyUtils.getTargetObject(manager);
-			}
-			else {
-				appManager = manager;
-			}
-			CloudEurekaClient cloudEurekaClient = new CloudEurekaClient(appManager,
-					config, this.optionalArgs, this.context);
-			cloudEurekaClient.registerHealthCheck(healthCheckHandler);
-			return cloudEurekaClient;
-		}
-
-		@Bean
-		@ConditionalOnMissingBean(value = ApplicationInfoManager.class,
-				search = SearchStrategy.CURRENT)
-		@org.springframework.cloud.context.config.annotation.RefreshScope
-		@Lazy
-		public ApplicationInfoManager eurekaApplicationInfoManager(
-				EurekaInstanceConfig config) {
-			InstanceInfo instanceInfo = new InstanceInfoFactory().create(config);
-			return new ApplicationInfoManager(config, instanceInfo);
-		}
-
-		@Bean
-		@org.springframework.cloud.context.config.annotation.RefreshScope
-		@ConditionalOnBean(AutoServiceRegistrationProperties.class)
-		@ConditionalOnProperty(
-				value = "spring.cloud.service-registry.auto-registration.enabled",
-				matchIfMissing = true)
-		public EurekaRegistration eurekaRegistration(EurekaClient eurekaClient,
-				CloudEurekaInstanceConfig instanceConfig,
-				ApplicationInfoManager applicationInfoManager, @Autowired(
-						required = false) ObjectProvider<HealthCheckHandler> healthCheckHandler) {
-			return EurekaRegistration.builder(instanceConfig).with(applicationInfoManager)
-					.with(eurekaClient).with(healthCheckHandler).build();
-		}
-
-	}
-
-	@Target({ ElementType.TYPE, ElementType.METHOD })
-	@Retention(RetentionPolicy.RUNTIME)
-	@Documented
-	@Conditional(OnMissingRefreshScopeCondition.class)
-	@interface ConditionalOnMissingRefreshScope {
-
-	}
-
-	@Target({ ElementType.TYPE, ElementType.METHOD })
-	@Retention(RetentionPolicy.RUNTIME)
-	@Documented
-	@ConditionalOnClass(RefreshScope.class)
-	@ConditionalOnBean(RefreshAutoConfiguration.class)
-	@ConditionalOnProperty(value = "eureka.client.refresh.enable", havingValue = "true",
-			matchIfMissing = true)
-	@interface ConditionalOnRefreshScope {
-
-	}
-
-	private static class OnMissingRefreshScopeCondition extends AnyNestedCondition {
-
-		OnMissingRefreshScopeCondition() {
-			super(ConfigurationPhase.REGISTER_BEAN);
-		}
-
-		@ConditionalOnMissingClass("org.springframework.cloud.context.scope.refresh.RefreshScope")
-		static class MissingClass {
-
-		}
-
-		@ConditionalOnMissingBean(RefreshAutoConfiguration.class)
-		static class MissingScope {
-
-		}
-
-		@ConditionalOnProperty(value = "eureka.client.refresh.enable",
-				havingValue = "false")
-		static class OnPropertyDisabled {
-
-		}
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnClass(Health.class)
-	protected static class EurekaHealthIndicatorConfiguration {
-
-		@Bean
-		@ConditionalOnMissingBean
-		@ConditionalOnEnabledHealthIndicator("eureka")
-		public EurekaHealthIndicator eurekaHealthIndicator(EurekaClient eurekaClient,
-				EurekaInstanceConfig instanceConfig, EurekaClientConfig clientConfig) {
-			return new EurekaHealthIndicator(eurekaClient, instanceConfig, clientConfig);
-		}
-
-	}
-
-}

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaConstants.java

@@ -1,35 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-/**
- * Class containing Eureka-specific constants.
- *
- * @author Spencer Gibb
- */
-public final class EurekaConstants {
-
-	/**
-	 * Default Eureka prefix.
-	 */
-	public static final String DEFAULT_PREFIX = "/eureka";
-
-	private EurekaConstants() {
-		throw new AssertionError("Must not instantiate constant utility class");
-	}
-
-}

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

@@ -1,120 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import com.netflix.appinfo.EurekaInstanceConfig;
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.discovery.EurekaClient;
-import com.netflix.discovery.EurekaClientConfig;
-import com.netflix.discovery.shared.Application;
-import com.netflix.discovery.shared.Applications;
-
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.cloud.client.discovery.DiscoveryClient;
-import org.springframework.core.Ordered;
-
-/**
- * A {@link DiscoveryClient} implementation for Eureka.
- *
- * @author Spencer Gibb
- * @author Tim Ysewyn
- */
-public class EurekaDiscoveryClient implements DiscoveryClient {
-
-	/**
-	 * Client description {@link String}.
-	 */
-	public static final String DESCRIPTION = "Spring Cloud Eureka Discovery Client";
-
-	private final EurekaClient eurekaClient;
-
-	private final EurekaClientConfig clientConfig;
-
-	@Deprecated
-	public EurekaDiscoveryClient(EurekaInstanceConfig config, EurekaClient eurekaClient) {
-		this(eurekaClient, eurekaClient.getEurekaClientConfig());
-	}
-
-	public EurekaDiscoveryClient(EurekaClient eurekaClient,
-			EurekaClientConfig clientConfig) {
-		this.clientConfig = clientConfig;
-		this.eurekaClient = eurekaClient;
-	}
-
-	@Override
-	public String description() {
-		return DESCRIPTION;
-	}
-
-	@Override
-	public List<ServiceInstance> getInstances(String serviceId) {
-		List<InstanceInfo> infos = this.eurekaClient.getInstancesByVipAddress(serviceId,
-				false);
-		List<ServiceInstance> instances = new ArrayList<>();
-		for (InstanceInfo info : infos) {
-			instances.add(new EurekaServiceInstance(info));
-		}
-		return instances;
-	}
-
-	@Override
-	public List<String> getServices() {
-		Applications applications = this.eurekaClient.getApplications();
-		if (applications == null) {
-			return Collections.emptyList();
-		}
-		List<Application> registered = applications.getRegisteredApplications();
-		List<String> names = new ArrayList<>();
-		for (Application app : registered) {
-			if (app.getInstances().isEmpty()) {
-				continue;
-			}
-			names.add(app.getName().toLowerCase());
-
-		}
-		return names;
-	}
-
-	@Override
-	public int getOrder() {
-		return clientConfig instanceof Ordered ? ((Ordered) clientConfig).getOrder()
-				: DiscoveryClient.DEFAULT_ORDER;
-	}
-
-	/**
-	 * An Eureka-specific {@link ServiceInstance} implementation. Extends
-	 * {@link org.springframework.cloud.netflix.eureka.EurekaServiceInstance} for
-	 * backwards compatibility.
-	 *
-	 * @deprecated In favor of
-	 * {@link org.springframework.cloud.netflix.eureka.EurekaServiceInstance}.
-	 */
-	@Deprecated
-	public static class EurekaServiceInstance
-			extends org.springframework.cloud.netflix.eureka.EurekaServiceInstance {
-
-		public EurekaServiceInstance(InstanceInfo instance) {
-			super(instance);
-		}
-
-	}
-
-}

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

@@ -1,124 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import com.netflix.appinfo.HealthCheckHandler;
-import com.netflix.discovery.EurekaClient;
-import com.netflix.discovery.EurekaClientConfig;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.actuate.health.SimpleStatusAggregator;
-import org.springframework.boot.actuate.health.StatusAggregator;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.client.ConditionalOnBlockingDiscoveryEnabled;
-import org.springframework.cloud.client.ConditionalOnDiscoveryEnabled;
-import org.springframework.cloud.context.scope.refresh.RefreshScopeRefreshedEvent;
-import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaAutoServiceRegistration;
-import org.springframework.context.ApplicationListener;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Dave Syer
- * @author Spencer Gibb
- * @author Jon Schneider
- * @author Jakub Narloch
- * @author Olga Maciaszek-Sharma
- * @author Tim Ysewyn
- */
-@Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties
-@ConditionalOnClass(EurekaClientConfig.class)
-@ConditionalOnProperty(value = "eureka.client.enabled", matchIfMissing = true)
-@ConditionalOnDiscoveryEnabled
-@ConditionalOnBlockingDiscoveryEnabled
-public class EurekaDiscoveryClientConfiguration {
-
-	/**
-	 * Deprecated in favor of auto configuration order.
-	 * @return Marker bean
-	 * @deprecated in favor of auto configuration order.
-	 */
-	@Deprecated
-	@Bean
-	public Marker eurekaDiscoverClientMarker() {
-		return new Marker();
-	}
-
-	@Bean
-	@ConditionalOnMissingBean
-	public EurekaDiscoveryClient discoveryClient(EurekaClient client,
-			EurekaClientConfig clientConfig) {
-		return new EurekaDiscoveryClient(client, clientConfig);
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnProperty(value = "eureka.client.healthcheck.enabled",
-			matchIfMissing = false)
-	protected static class EurekaHealthCheckHandlerConfiguration {
-
-		@Autowired(required = false)
-		private StatusAggregator statusAggregator = new SimpleStatusAggregator();
-
-		@Bean
-		@ConditionalOnMissingBean(HealthCheckHandler.class)
-		public EurekaHealthCheckHandler eurekaHealthCheckHandler() {
-			return new EurekaHealthCheckHandler(this.statusAggregator);
-		}
-
-	}
-
-	/**
-	 * Deprecated in favor of auto configuration order.
-	 *
-	 * @deprecated in favor of auto configuration order.
-	 */
-	@Deprecated
-	class Marker {
-
-	}
-
-	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnClass(RefreshScopeRefreshedEvent.class)
-	protected static class EurekaClientConfigurationRefresher
-			implements ApplicationListener<RefreshScopeRefreshedEvent> {
-
-		@Autowired(required = false)
-		private EurekaClient eurekaClient;
-
-		@Autowired(required = false)
-		private EurekaAutoServiceRegistration autoRegistration;
-
-		public void onApplicationEvent(RefreshScopeRefreshedEvent event) {
-			// This will force the creation of the EurkaClient bean if not already created
-			// to make sure the client will be reregistered after a refresh event
-			if (eurekaClient != null) {
-				eurekaClient.getApplications();
-			}
-			if (autoRegistration != null) {
-				// register in case meta data changed
-				this.autoRegistration.stop();
-				this.autoRegistration.start();
-			}
-		}
-
-	}
-
-}

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaHealthCheckHandler.java

@@ -1,287 +0,0 @@
-/*
- * Copyright 2013-2021 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import com.netflix.appinfo.HealthCheckHandler;
-import com.netflix.appinfo.InstanceInfo;
-import com.netflix.appinfo.InstanceInfo.InstanceStatus;
-import reactor.core.publisher.Mono;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.InitializingBean;
-import org.springframework.boot.actuate.health.CompositeHealthIndicator;
-import org.springframework.boot.actuate.health.DefaultHealthIndicatorRegistry;
-import org.springframework.boot.actuate.health.Health;
-import org.springframework.boot.actuate.health.HealthAggregator;
-import org.springframework.boot.actuate.health.HealthIndicator;
-import org.springframework.boot.actuate.health.HealthIndicatorRegistryFactory;
-import org.springframework.boot.actuate.health.ReactiveHealthIndicator;
-import org.springframework.boot.actuate.health.Status;
-import org.springframework.boot.actuate.health.StatusAggregator;
-import org.springframework.cloud.client.discovery.health.DiscoveryCompositeHealthContributor;
-import org.springframework.cloud.client.discovery.health.DiscoveryCompositeHealthIndicator;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.context.Lifecycle;
-import org.springframework.core.Ordered;
-import org.springframework.util.Assert;
-
-/**
- * A Eureka health checker, maps the application status into {@link InstanceStatus} that
- * will be propagated to Eureka registry.
- *
- * On each heartbeat Eureka performs the health check invoking registered
- * {@link HealthCheckHandler}. By default this implementation will perform aggregation of
- * all registered {@link HealthIndicator} through registered {@link HealthAggregator}.
- *
- * A {@code null} status is returned when the application context is closed (or in the
- * process of being closed). This prevents Eureka from updating the health status and only
- * consider the status present in the current InstanceInfo.
- *
- * @author Jakub Narloch
- * @author Spencer Gibb
- * @author Nowrin Anwar Joyita
- * @author Bertrand Renuart
- * @see HealthCheckHandler
- * @see StatusAggregator
- * @see HealthAggregator
- */
-public class EurekaHealthCheckHandler implements HealthCheckHandler,
-		ApplicationContextAware, InitializingBean, Ordered, Lifecycle {
-
-	private static final Map<Status, InstanceInfo.InstanceStatus> STATUS_MAPPING = new HashMap<Status, InstanceInfo.InstanceStatus>() {
-		{
-			put(Status.UNKNOWN, InstanceStatus.UNKNOWN);
-			put(Status.OUT_OF_SERVICE, InstanceStatus.OUT_OF_SERVICE);
-			put(Status.DOWN, InstanceStatus.DOWN);
-			put(Status.UP, InstanceStatus.UP);
-		}
-	};
-
-	private StatusAggregator statusAggregator;
-
-	private ApplicationContext applicationContext;
-
-	/**
-	 * {@code true} until the context is stopped.
-	 */
-	private boolean running = true;
-
-	private Map<String, HealthIndicator> healthIndicators;
-
-	private Map<String, ReactiveHealthIndicator> reactiveHealthIndicators = new HashMap<>();
-
-	@Deprecated
-	private CompositeHealthIndicator healthIndicator;
-
-	@Deprecated
-	private HealthIndicatorRegistryFactory healthIndicatorRegistryFactory;
-
-	@Deprecated
-	private HealthAggregator healthAggregator;
-
-	@Deprecated
-	public EurekaHealthCheckHandler(HealthAggregator healthAggregator) {
-		Assert.notNull(healthAggregator, "HealthAggregator must not be null");
-		this.healthAggregator = healthAggregator;
-		healthIndicatorRegistryFactory = new HealthIndicatorRegistryFactory();
-		healthIndicator = new CompositeHealthIndicator(this.healthAggregator,
-				new DefaultHealthIndicatorRegistry());
-	}
-
-	public EurekaHealthCheckHandler(StatusAggregator statusAggregator) {
-		this.statusAggregator = statusAggregator;
-		Assert.notNull(statusAggregator, "StatusAggregator must not be null");
-
-	}
-
-	@Override
-	public void setApplicationContext(ApplicationContext applicationContext)
-			throws BeansException {
-		this.applicationContext = applicationContext;
-	}
-
-	@Override
-	public void afterPropertiesSet() throws Exception {
-		final Map<String, HealthIndicator> healthIndicators = applicationContext
-				.getBeansOfType(HealthIndicator.class);
-		this.healthIndicators = new HashMap<>();
-
-		final Map<String, ReactiveHealthIndicator> reactiveHealthIndicators = applicationContext
-				.getBeansOfType(ReactiveHealthIndicator.class);
-
-		if (statusAggregator != null) {
-			populateHealthIndicators(healthIndicators);
-			populateReactiveHealthIndicators(reactiveHealthIndicators);
-		}
-		else {
-			createHealthIndicator(healthIndicators);
-		}
-	}
-
-	@Deprecated
-	void createHealthIndicator(Map<String, HealthIndicator> healthIndicators) {
-		for (Map.Entry<String, HealthIndicator> entry : healthIndicators.entrySet()) {
-
-			// ignore EurekaHealthIndicator and flatten the rest of the composite
-			// otherwise there is a never ending cycle of down. See gh-643
-			if (entry.getValue() instanceof DiscoveryCompositeHealthIndicator) {
-				DiscoveryCompositeHealthIndicator indicator = (DiscoveryCompositeHealthIndicator) entry
-						.getValue();
-				for (DiscoveryCompositeHealthIndicator.Holder holder : indicator
-						.getHealthIndicators()) {
-					if (!(holder.getDelegate() instanceof EurekaHealthIndicator)) {
-						this.healthIndicators.put(holder.getDelegate().getName(), holder);
-					}
-				}
-
-			}
-			else {
-				this.healthIndicators.put(entry.getKey(), entry.getValue());
-			}
-		}
-		healthIndicator = new CompositeHealthIndicator(healthAggregator,
-				healthIndicatorRegistryFactory
-						.createHealthIndicatorRegistry(this.healthIndicators));
-	}
-
-	void populateHealthIndicators(Map<String, HealthIndicator> healthIndicators) {
-		for (Map.Entry<String, HealthIndicator> entry : healthIndicators.entrySet()) {
-			// ignore EurekaHealthIndicator and flatten the rest of the composite
-			// otherwise there is a never ending cycle of down. See gh-643
-			if (entry.getValue() instanceof DiscoveryCompositeHealthContributor) {
-				DiscoveryCompositeHealthContributor indicator = (DiscoveryCompositeHealthContributor) entry
-						.getValue();
-				indicator.forEach(contributor -> {
-					if (!(contributor
-							.getContributor() instanceof EurekaHealthIndicator)) {
-						this.healthIndicators.put(contributor.getName(),
-								(HealthIndicator) contributor.getContributor());
-					}
-				});
-			}
-			else {
-				this.healthIndicators.put(entry.getKey(), entry.getValue());
-			}
-		}
-	}
-
-	void populateReactiveHealthIndicators(
-			Map<String, ReactiveHealthIndicator> reactiveHealthIndicators) {
-		for (Map.Entry<String, ReactiveHealthIndicator> entry : reactiveHealthIndicators
-				.entrySet()) {
-			this.reactiveHealthIndicators.put(entry.getKey(), entry.getValue());
-		}
-	}
-
-	@Override
-	public InstanceStatus getStatus(InstanceStatus instanceStatus) {
-		if (running) {
-			return getHealthStatus();
-		}
-		else {
-			// Return nothing if the context is not running, so the status held by the
-			// InstanceInfo remains unchanged.
-			// See gh-1571
-			return null;
-		}
-	}
-
-	protected InstanceStatus getHealthStatus() {
-		final Status status;
-		if (statusAggregator != null) {
-			status = getStatus(statusAggregator);
-		}
-		else {
-			status = getStatus(getHealthIndicator());
-		}
-		return mapToInstanceStatus(status);
-	}
-
-	@Deprecated
-	private Status getStatus(CompositeHealthIndicator healthIndicator) {
-		Status status;
-		status = healthIndicator.health().getStatus();
-		return status;
-	}
-
-	protected Status getStatus(StatusAggregator statusAggregator) {
-		Status status;
-
-		Set<Status> statusSet = new HashSet<>();
-		if (healthIndicators != null) {
-			statusSet.addAll(
-					healthIndicators.values().stream().map(HealthIndicator::health)
-							.map(Health::getStatus).collect(Collectors.toSet()));
-		}
-
-		if (reactiveHealthIndicators != null) {
-			statusSet.addAll(reactiveHealthIndicators.values().stream()
-					.map(ReactiveHealthIndicator::health).map(Mono::block)
-					.filter(Objects::nonNull).map(Health::getStatus)
-					.collect(Collectors.toSet()));
-		}
-
-		status = statusAggregator.getAggregateStatus(statusSet);
-		return status;
-	}
-
-	protected InstanceStatus mapToInstanceStatus(Status status) {
-		if (!STATUS_MAPPING.containsKey(status)) {
-			return InstanceStatus.UNKNOWN;
-		}
-		return STATUS_MAPPING.get(status);
-	}
-
-	@Deprecated
-	protected CompositeHealthIndicator getHealthIndicator() {
-		return healthIndicator;
-	}
-
-	@Override
-	public int getOrder() {
-		// registered with a high order priority so the close() method is invoked early
-		// and *BEFORE* EurekaAutoServiceRegistration
-		// (must be in effect when the registration is closed and the eureka replication
-		// triggered -> health check handler is
-		// consulted at that moment)
-		return Ordered.HIGHEST_PRECEDENCE;
-	}
-
-	@Override
-	public void start() {
-		running = true;
-	}
-
-	@Override
-	public void stop() {
-		running = false;
-	}
-
-	@Override
-	public boolean isRunning() {
-		return true;
-	}
-
-}

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

@@ -1,118 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import com.netflix.appinfo.EurekaInstanceConfig;
-import com.netflix.discovery.DiscoveryClient;
-import com.netflix.discovery.EurekaClient;
-import com.netflix.discovery.EurekaClientConfig;
-import com.netflix.discovery.shared.Application;
-import com.netflix.discovery.shared.Applications;
-
-import org.springframework.aop.support.AopUtils;
-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.cloud.client.discovery.health.DiscoveryHealthIndicator;
-import org.springframework.cloud.util.ProxyUtils;
-
-/**
- * @author Dave Syer
- */
-public class EurekaHealthIndicator implements DiscoveryHealthIndicator {
-
-	private final EurekaClient eurekaClient;
-
-	private final EurekaInstanceConfig instanceConfig;
-
-	private final EurekaClientConfig clientConfig;
-
-	public EurekaHealthIndicator(EurekaClient eurekaClient,
-			EurekaInstanceConfig instanceConfig, EurekaClientConfig clientConfig) {
-		super();
-		this.eurekaClient = eurekaClient;
-		this.instanceConfig = instanceConfig;
-		this.clientConfig = clientConfig;
-	}
-
-	@Override
-	public String getName() {
-		return "eureka";
-	}
-
-	@Override
-	public Health health() {
-		Builder builder = Health.unknown();
-		Status status = getStatus(builder);
-		return builder.status(status).withDetail("applications", getApplications())
-				.build();
-	}
-
-	private Status getStatus(Builder builder) {
-		Status status = new Status(this.eurekaClient.getInstanceRemoteStatus().toString(),
-				"Remote status from Eureka server");
-		DiscoveryClient discoveryClient = getDiscoveryClient();
-		if (discoveryClient != null && clientConfig.shouldFetchRegistry()) {
-			long lastFetch = discoveryClient.getLastSuccessfulRegistryFetchTimePeriod();
-
-			if (lastFetch < 0) {
-				status = new Status("UP",
-						"Eureka discovery client has not yet successfully connected to a Eureka server");
-			}
-			else if (lastFetch > clientConfig.getRegistryFetchIntervalSeconds() * 2000) {
-				status = new Status("UP",
-						"Eureka discovery client is reporting failures to connect to a Eureka server");
-				builder.withDetail("renewalPeriod",
-						instanceConfig.getLeaseRenewalIntervalInSeconds());
-				builder.withDetail("failCount",
-						lastFetch / clientConfig.getRegistryFetchIntervalSeconds());
-			}
-		}
-
-		return status;
-	}
-
-	private DiscoveryClient getDiscoveryClient() {
-		DiscoveryClient discoveryClient = null;
-		if (AopUtils.isAopProxy(eurekaClient)) {
-			discoveryClient = ProxyUtils.getTargetObject(eurekaClient);
-		}
-		else if (DiscoveryClient.class.isInstance(eurekaClient)) {
-			discoveryClient = (DiscoveryClient) eurekaClient;
-		}
-		return discoveryClient;
-	}
-
-	private Map<String, Object> getApplications() {
-		Applications applications = this.eurekaClient.getApplications();
-		if (applications == null) {
-			return Collections.emptyMap();
-		}
-		Map<String, Object> result = new HashMap<>();
-		for (Application application : applications.getRegisteredApplications()) {
-			if (!application.getInstances().isEmpty()) {
-				result.put(application.getName(), application.getInstances().size());
-			}
-		}
-		return result;
-	}
-
-}

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

@@ -1,666 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Objects;
-
-import com.netflix.appinfo.DataCenterInfo;
-import com.netflix.appinfo.InstanceInfo.InstanceStatus;
-import com.netflix.appinfo.MyDataCenterInfo;
-
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.commons.util.InetUtils;
-import org.springframework.cloud.commons.util.InetUtils.HostInfo;
-import org.springframework.context.EnvironmentAware;
-import org.springframework.core.env.Environment;
-import org.springframework.util.StringUtils;
-
-/**
- * @author Dave Syer
- * @author Spencer Gibb
- * @author Ryan Baxter
- * @author Gregor Zurowski
- */
-@ConfigurationProperties("eureka.instance")
-public class EurekaInstanceConfigBean
-		implements CloudEurekaInstanceConfig, EnvironmentAware {
-
-	private static final String UNKNOWN = "unknown";
-
-	private HostInfo hostInfo;
-
-	private InetUtils inetUtils;
-
-	/**
-	 * Default prefix for actuator endpoints.
-	 */
-	private String actuatorPrefix = "/actuator";
-
-	/**
-	 * Get the name of the application to be registered with eureka.
-	 */
-	private String appname = UNKNOWN;
-
-	/**
-	 * Get the name of the application group to be registered with eureka.
-	 */
-	private String appGroupName;
-
-	/**
-	 * Indicates whether the instance should be enabled for taking traffic as soon as it
-	 * is registered with eureka. Sometimes the application might need to do some
-	 * pre-processing before it is ready to take traffic.
-	 */
-	private boolean instanceEnabledOnit;
-
-	/**
-	 * Get the non-secure port on which the instance should receive traffic.
-	 */
-	private int nonSecurePort = 80;
-
-	/**
-	 * Get the Secure port on which the instance should receive traffic.
-	 */
-	private int securePort = 443;
-
-	/**
-	 * Indicates whether the non-secure port should be enabled for traffic or not.
-	 */
-	private boolean nonSecurePortEnabled = true;
-
-	/**
-	 * Indicates whether the secure port should be enabled for traffic or not.
-	 */
-	private boolean securePortEnabled;
-
-	/**
-	 * Indicates how often (in seconds) the eureka client needs to send heartbeats to
-	 * eureka server to indicate that it is still alive. If the heartbeats are not
-	 * received for the period specified in leaseExpirationDurationInSeconds, eureka
-	 * server will remove the instance from its view, there by disallowing traffic to this
-	 * instance.
-	 *
-	 * Note that the instance could still not take traffic if it implements
-	 * HealthCheckCallback and then decides to make itself unavailable.
-	 */
-	private int leaseRenewalIntervalInSeconds = 30;
-
-	/**
-	 * Indicates the time in seconds that the eureka server waits since it received the
-	 * last heartbeat before it can remove this instance from its view and there by
-	 * disallowing traffic to this instance.
-	 *
-	 * Setting this value too long could mean that the traffic could be routed to the
-	 * instance even though the instance is not alive. Setting this value too small could
-	 * mean, the instance may be taken out of traffic because of temporary network
-	 * glitches.This value to be set to atleast higher than the value specified in
-	 * leaseRenewalIntervalInSeconds.
-	 */
-	private int leaseExpirationDurationInSeconds = 90;
-
-	/**
-	 * Gets the virtual host name defined for this instance.
-	 *
-	 * This is typically the way other instance would find this instance by using the
-	 * virtual host name.Think of this as similar to the fully qualified domain name, that
-	 * the users of your services will need to find this instance.
-	 */
-	private String virtualHostName = UNKNOWN;
-
-	/**
-	 * Get the unique Id (within the scope of the appName) of this instance to be
-	 * registered with eureka.
-	 */
-	private String instanceId;
-
-	/**
-	 * Gets the secure virtual host name defined for this instance.
-	 *
-	 * This is typically the way other instance would find this instance by using the
-	 * secure virtual host name.Think of this as similar to the fully qualified domain
-	 * name, that the users of your services will need to find this instance.
-	 */
-	private String secureVirtualHostName = UNKNOWN;
-
-	/**
-	 * Gets the AWS autoscaling group name associated with this instance. This information
-	 * is specifically used in an AWS environment to automatically put an instance out of
-	 * service after the instance is launched and it has been disabled for traffic..
-	 */
-	private String aSGName;
-
-	/**
-	 * Gets the metadata name/value pairs associated with this instance. This information
-	 * is sent to eureka server and can be used by other instances.
-	 */
-	private Map<String, String> metadataMap = new HashMap<>();
-
-	/**
-	 * Returns the data center this instance is deployed. This information is used to get
-	 * some AWS specific instance information if the instance is deployed in AWS.
-	 */
-	private DataCenterInfo dataCenterInfo = new MyDataCenterInfo(
-			DataCenterInfo.Name.MyOwn);
-
-	/**
-	 * Get the IPAdress of the instance. This information is for academic purposes only as
-	 * the communication from other instances primarily happen using the information
-	 * supplied in {@link #getHostName(boolean)}.
-	 */
-	private String ipAddress;
-
-	/**
-	 * Gets the relative status page URL path for this instance. The status page URL is
-	 * then constructed out of the hostName and the type of communication - secure or
-	 * unsecure as specified in securePort and nonSecurePort.
-	 *
-	 * It is normally used for informational purposes for other services to find about the
-	 * status of this instance. Users can provide a simple HTML indicating what is the
-	 * current status of the instance.
-	 */
-	private String statusPageUrlPath = actuatorPrefix + "/info";
-
-	/**
-	 * Gets the absolute status page URL path for this instance. The users can provide the
-	 * statusPageUrlPath if the status page resides in the same instance talking to
-	 * eureka, else in the cases where the instance is a proxy for some other server,
-	 * users can provide the full URL. If the full URL is provided it takes precedence.
-	 *
-	 * It is normally used for informational purposes for other services to find about the
-	 * status of this instance. Users can provide a simple HTML indicating what is the
-	 * current status of the instance.
-	 */
-	private String statusPageUrl;
-
-	/**
-	 * Gets the relative home page URL Path for this instance. The home page URL is then
-	 * constructed out of the hostName and the type of communication - secure or unsecure.
-	 *
-	 * It is normally used for informational purposes for other services to use it as a
-	 * landing page.
-	 */
-	private String homePageUrlPath = "/";
-
-	/**
-	 * Gets the absolute home page URL for this instance. The users can provide the
-	 * homePageUrlPath if the home page resides in the same instance talking to eureka,
-	 * else in the cases where the instance is a proxy for some other server, users can
-	 * provide the full URL. If the full URL is provided it takes precedence.
-	 *
-	 * It is normally used for informational purposes for other services to use it as a
-	 * landing page. The full URL should follow the format http://${eureka.hostname}:7001/
-	 * where the value ${eureka.hostname} is replaced at runtime.
-	 */
-	private String homePageUrl;
-
-	/**
-	 * Gets the relative health check URL path for this instance. The health check page
-	 * URL is then constructed out of the hostname and the type of communication - secure
-	 * or unsecure as specified in securePort and nonSecurePort.
-	 *
-	 * It is normally used for making educated decisions based on the health of the
-	 * instance - for example, it can be used to determine whether to proceed deployments
-	 * to an entire farm or stop the deployments without causing further damage.
-	 */
-	private String healthCheckUrlPath = actuatorPrefix + "/health";
-
-	/**
-	 * Gets the absolute health check page URL for this instance. The users can provide
-	 * the healthCheckUrlPath if the health check page resides in the same instance
-	 * talking to eureka, else in the cases where the instance is a proxy for some other
-	 * server, users can provide the full URL. If the full URL is provided it takes
-	 * precedence.
-	 *
-	 * <p>
-	 * It is normally used for making educated decisions based on the health of the
-	 * instance - for example, it can be used to determine whether to proceed deployments
-	 * to an entire farm or stop the deployments without causing further damage. The full
-	 * URL should follow the format http://${eureka.hostname}:7001/ where the value
-	 * ${eureka.hostname} is replaced at runtime.
-	 */
-	private String healthCheckUrl;
-
-	/**
-	 * Gets the absolute secure health check page URL for this instance. The users can
-	 * provide the secureHealthCheckUrl if the health check page resides in the same
-	 * instance talking to eureka, else in the cases where the instance is a proxy for
-	 * some other server, users can provide the full URL. If the full URL is provided it
-	 * takes precedence.
-	 *
-	 * <p>
-	 * It is normally used for making educated decisions based on the health of the
-	 * instance - for example, it can be used to determine whether to proceed deployments
-	 * to an entire farm or stop the deployments without causing further damage. The full
-	 * URL should follow the format http://${eureka.hostname}:7001/ where the value
-	 * ${eureka.hostname} is replaced at runtime.
-	 */
-	private String secureHealthCheckUrl;
-
-	/**
-	 * Get the namespace used to find properties. Ignored in Spring Cloud.
-	 */
-	private String namespace = "eureka";
-
-	/**
-	 * The hostname if it can be determined at configuration time (otherwise it will be
-	 * guessed from OS primitives).
-	 */
-	private String hostname;
-
-	/**
-	 * Flag to say that, when guessing a hostname, the IP address of the server should be
-	 * used in preference to the hostname reported by the OS.
-	 */
-	private boolean preferIpAddress = false;
-
-	/**
-	 * Initial status to register with remote Eureka server.
-	 */
-	private InstanceStatus initialStatus = InstanceStatus.UP;
-
-	private String[] defaultAddressResolutionOrder = new String[0];
-
-	private Environment environment;
-
-	public String getHostname() {
-		return getHostName(false);
-	}
-
-	@SuppressWarnings("unused")
-	private EurekaInstanceConfigBean() {
-	}
-
-	public EurekaInstanceConfigBean(InetUtils inetUtils) {
-		this.inetUtils = inetUtils;
-		this.hostInfo = this.inetUtils.findFirstNonLoopbackHostInfo();
-		this.ipAddress = this.hostInfo.getIpAddress();
-		this.hostname = this.hostInfo.getHostname();
-	}
-
-	@Override
-	public String getInstanceId() {
-		if (this.instanceId == null && this.metadataMap != null) {
-			return this.metadataMap.get("instanceId");
-		}
-		return this.instanceId;
-	}
-
-	@Override
-	public boolean getSecurePortEnabled() {
-		return this.securePortEnabled;
-	}
-
-	public void setHostname(String hostname) {
-		this.hostname = hostname;
-		this.hostInfo.override = true;
-	}
-
-	public void setIpAddress(String ipAddress) {
-		this.ipAddress = ipAddress;
-		this.hostInfo.override = true;
-	}
-
-	@Override
-	public String getHostName(boolean refresh) {
-		if (refresh && !this.hostInfo.override) {
-			this.ipAddress = this.hostInfo.getIpAddress();
-			this.hostname = this.hostInfo.getHostname();
-		}
-		return this.preferIpAddress ? this.ipAddress : this.hostname;
-	}
-
-	@Override
-	public void setEnvironment(Environment environment) {
-		this.environment = environment;
-		// set some defaults from the environment, but allow the defaults to use relaxed
-		// binding
-		String springAppName = this.environment.getProperty("spring.application.name",
-				"");
-		if (StringUtils.hasText(springAppName)) {
-			setAppname(springAppName);
-			setVirtualHostName(springAppName);
-			setSecureVirtualHostName(springAppName);
-		}
-	}
-
-	private HostInfo getHostInfo() {
-		return hostInfo;
-	}
-
-	private void setHostInfo(HostInfo hostInfo) {
-		this.hostInfo = hostInfo;
-	}
-
-	private InetUtils getInetUtils() {
-		return inetUtils;
-	}
-
-	private void setInetUtils(InetUtils inetUtils) {
-		this.inetUtils = inetUtils;
-	}
-
-	public String getAppname() {
-		return appname;
-	}
-
-	public void setAppname(String appname) {
-		this.appname = appname;
-	}
-
-	public String getAppGroupName() {
-		return appGroupName;
-	}
-
-	public void setAppGroupName(String appGroupName) {
-		this.appGroupName = appGroupName;
-	}
-
-	public boolean isInstanceEnabledOnit() {
-		return instanceEnabledOnit;
-	}
-
-	public void setInstanceEnabledOnit(boolean instanceEnabledOnit) {
-		this.instanceEnabledOnit = instanceEnabledOnit;
-	}
-
-	public int getNonSecurePort() {
-		return nonSecurePort;
-	}
-
-	public void setNonSecurePort(int nonSecurePort) {
-		this.nonSecurePort = nonSecurePort;
-	}
-
-	public int getSecurePort() {
-		return securePort;
-	}
-
-	public void setSecurePort(int securePort) {
-		this.securePort = securePort;
-	}
-
-	public boolean isNonSecurePortEnabled() {
-		return nonSecurePortEnabled;
-	}
-
-	public void setNonSecurePortEnabled(boolean nonSecurePortEnabled) {
-		this.nonSecurePortEnabled = nonSecurePortEnabled;
-	}
-
-	public boolean isSecurePortEnabled() {
-		return securePortEnabled;
-	}
-
-	public void setSecurePortEnabled(boolean securePortEnabled) {
-		this.securePortEnabled = securePortEnabled;
-	}
-
-	public int getLeaseRenewalIntervalInSeconds() {
-		return leaseRenewalIntervalInSeconds;
-	}
-
-	public void setLeaseRenewalIntervalInSeconds(int leaseRenewalIntervalInSeconds) {
-		this.leaseRenewalIntervalInSeconds = leaseRenewalIntervalInSeconds;
-	}
-
-	public int getLeaseExpirationDurationInSeconds() {
-		return leaseExpirationDurationInSeconds;
-	}
-
-	public void setLeaseExpirationDurationInSeconds(
-			int leaseExpirationDurationInSeconds) {
-		this.leaseExpirationDurationInSeconds = leaseExpirationDurationInSeconds;
-	}
-
-	public String getVirtualHostName() {
-		return virtualHostName;
-	}
-
-	public void setVirtualHostName(String virtualHostName) {
-		this.virtualHostName = virtualHostName;
-	}
-
-	public void setInstanceId(String instanceId) {
-		this.instanceId = instanceId;
-	}
-
-	public String getSecureVirtualHostName() {
-		return secureVirtualHostName;
-	}
-
-	public void setSecureVirtualHostName(String secureVirtualHostName) {
-		this.secureVirtualHostName = secureVirtualHostName;
-	}
-
-	public String getASGName() {
-		return aSGName;
-	}
-
-	public void setASGName(String aSGName) {
-		this.aSGName = aSGName;
-	}
-
-	public Map<String, String> getMetadataMap() {
-		return metadataMap;
-	}
-
-	public void setMetadataMap(Map<String, String> metadataMap) {
-		this.metadataMap = metadataMap;
-	}
-
-	public DataCenterInfo getDataCenterInfo() {
-		return dataCenterInfo;
-	}
-
-	public void setDataCenterInfo(DataCenterInfo dataCenterInfo) {
-		this.dataCenterInfo = dataCenterInfo;
-	}
-
-	public String getIpAddress() {
-		return ipAddress;
-	}
-
-	public String getStatusPageUrlPath() {
-		return statusPageUrlPath;
-	}
-
-	public void setStatusPageUrlPath(String statusPageUrlPath) {
-		this.statusPageUrlPath = statusPageUrlPath;
-	}
-
-	public String getStatusPageUrl() {
-		return statusPageUrl;
-	}
-
-	public void setStatusPageUrl(String statusPageUrl) {
-		this.statusPageUrl = statusPageUrl;
-	}
-
-	public String getHomePageUrlPath() {
-		return homePageUrlPath;
-	}
-
-	public void setHomePageUrlPath(String homePageUrlPath) {
-		this.homePageUrlPath = homePageUrlPath;
-	}
-
-	public String getHomePageUrl() {
-		return homePageUrl;
-	}
-
-	public void setHomePageUrl(String homePageUrl) {
-		this.homePageUrl = homePageUrl;
-	}
-
-	public String getHealthCheckUrlPath() {
-		return healthCheckUrlPath;
-	}
-
-	public void setHealthCheckUrlPath(String healthCheckUrlPath) {
-		this.healthCheckUrlPath = healthCheckUrlPath;
-	}
-
-	public String getHealthCheckUrl() {
-		return healthCheckUrl;
-	}
-
-	public void setHealthCheckUrl(String healthCheckUrl) {
-		this.healthCheckUrl = healthCheckUrl;
-	}
-
-	public String getSecureHealthCheckUrl() {
-		return secureHealthCheckUrl;
-	}
-
-	public void setSecureHealthCheckUrl(String secureHealthCheckUrl) {
-		this.secureHealthCheckUrl = secureHealthCheckUrl;
-	}
-
-	public String getNamespace() {
-		return namespace;
-	}
-
-	public void setNamespace(String namespace) {
-		this.namespace = namespace;
-	}
-
-	public boolean isPreferIpAddress() {
-		return preferIpAddress;
-	}
-
-	public void setPreferIpAddress(boolean preferIpAddress) {
-		this.preferIpAddress = preferIpAddress;
-	}
-
-	public InstanceStatus getInitialStatus() {
-		return initialStatus;
-	}
-
-	public void setInitialStatus(InstanceStatus initialStatus) {
-		this.initialStatus = initialStatus;
-	}
-
-	public String[] getDefaultAddressResolutionOrder() {
-		return defaultAddressResolutionOrder;
-	}
-
-	public void setDefaultAddressResolutionOrder(String[] defaultAddressResolutionOrder) {
-		this.defaultAddressResolutionOrder = defaultAddressResolutionOrder;
-	}
-
-	public Environment getEnvironment() {
-		return environment;
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		EurekaInstanceConfigBean that = (EurekaInstanceConfigBean) o;
-		return Objects.equals(hostInfo, that.hostInfo)
-				&& Objects.equals(inetUtils, that.inetUtils)
-				&& Objects.equals(appname, that.appname)
-				&& Objects.equals(appGroupName, that.appGroupName)
-				&& instanceEnabledOnit == that.instanceEnabledOnit
-				&& nonSecurePort == that.nonSecurePort && securePort == that.securePort
-				&& nonSecurePortEnabled == that.nonSecurePortEnabled
-				&& securePortEnabled == that.securePortEnabled
-				&& leaseRenewalIntervalInSeconds == that.leaseRenewalIntervalInSeconds
-				&& leaseExpirationDurationInSeconds == that.leaseExpirationDurationInSeconds
-				&& Objects.equals(virtualHostName, that.virtualHostName)
-				&& Objects.equals(instanceId, that.instanceId)
-				&& Objects.equals(secureVirtualHostName, that.secureVirtualHostName)
-				&& Objects.equals(aSGName, that.aSGName)
-				&& Objects.equals(metadataMap, that.metadataMap)
-				&& Objects.equals(dataCenterInfo, that.dataCenterInfo)
-				&& Objects.equals(ipAddress, that.ipAddress)
-				&& Objects.equals(statusPageUrlPath, that.statusPageUrlPath)
-				&& Objects.equals(statusPageUrl, that.statusPageUrl)
-				&& Objects.equals(homePageUrlPath, that.homePageUrlPath)
-				&& Objects.equals(homePageUrl, that.homePageUrl)
-				&& Objects.equals(healthCheckUrlPath, that.healthCheckUrlPath)
-				&& Objects.equals(healthCheckUrl, that.healthCheckUrl)
-				&& Objects.equals(secureHealthCheckUrl, that.secureHealthCheckUrl)
-				&& Objects.equals(namespace, that.namespace)
-				&& Objects.equals(hostname, that.hostname)
-				&& preferIpAddress == that.preferIpAddress
-				&& Objects.equals(initialStatus, that.initialStatus)
-				&& Arrays.equals(defaultAddressResolutionOrder,
-						that.defaultAddressResolutionOrder)
-				&& Objects.equals(environment, that.environment);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(hostInfo, inetUtils, appname, appGroupName,
-				instanceEnabledOnit, nonSecurePort, securePort, nonSecurePortEnabled,
-				securePortEnabled, leaseRenewalIntervalInSeconds,
-				leaseExpirationDurationInSeconds, virtualHostName, instanceId,
-				secureVirtualHostName, aSGName, metadataMap, dataCenterInfo, ipAddress,
-				statusPageUrlPath, statusPageUrl, homePageUrlPath, homePageUrl,
-				healthCheckUrlPath, healthCheckUrl, secureHealthCheckUrl, namespace,
-				hostname, preferIpAddress, initialStatus, defaultAddressResolutionOrder,
-				environment);
-	}
-
-	@Override
-	public String toString() {
-		return new StringBuilder("EurekaInstanceConfigBean{").append("hostInfo=")
-				.append(hostInfo).append(", ").append("inetUtils=").append(inetUtils)
-				.append(", ").append("appname='").append(appname).append("', ")
-				.append("appGroupName='").append(appGroupName).append("', ")
-				.append("instanceEnabledOnit=").append(instanceEnabledOnit).append(", ")
-				.append("nonSecurePort=").append(nonSecurePort).append(", ")
-				.append("securePort=").append(securePort).append(", ")
-				.append("nonSecurePortEnabled=").append(nonSecurePortEnabled).append(", ")
-				.append("securePortEnabled=").append(securePortEnabled).append(", ")
-				.append("leaseRenewalIntervalInSeconds=")
-				.append(leaseRenewalIntervalInSeconds).append(", ")
-				.append("leaseExpirationDurationInSeconds=")
-				.append(leaseExpirationDurationInSeconds).append(", ")
-				.append("virtualHostName='").append(virtualHostName).append("', ")
-				.append("instanceId='").append(instanceId).append("', ")
-				.append("secureVirtualHostName='").append(secureVirtualHostName)
-				.append("', ").append("aSGName='").append(aSGName).append("', ")
-				.append("metadataMap=").append(metadataMap).append(", ")
-				.append("dataCenterInfo=").append(dataCenterInfo).append(", ")
-				.append("ipAddress='").append(ipAddress).append("', ")
-				.append("statusPageUrlPath='").append(statusPageUrlPath).append("', ")
-				.append("statusPageUrl='").append(statusPageUrl).append("', ")
-				.append("homePageUrlPath='").append(homePageUrlPath).append("', ")
-				.append("homePageUrl='").append(homePageUrl).append("', ")
-				.append("healthCheckUrlPath='").append(healthCheckUrlPath).append("', ")
-				.append("healthCheckUrl='").append(healthCheckUrl).append("', ")
-				.append("secureHealthCheckUrl='").append(secureHealthCheckUrl)
-				.append("', ").append("namespace='").append(namespace).append("', ")
-				.append("hostname='").append(hostname).append("', ")
-				.append("preferIpAddress=").append(preferIpAddress).append(", ")
-				.append("initialStatus=").append(initialStatus).append(", ")
-				.append("defaultAddressResolutionOrder=")
-				.append(Arrays.toString(defaultAddressResolutionOrder)).append(", ")
-				.append("environment=").append(environment).append(", ").append("}")
-				.toString();
-	}
-
-}

spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/EurekaServiceInstance.java

@@ -1,120 +0,0 @@
-/*
- * Copyright 2013-2020 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.netflix.eureka;
-
-import java.net.URI;
-import java.util.Map;
-import java.util.Objects;
-
-import com.netflix.appinfo.InstanceInfo;
-
-import org.springframework.cloud.client.DefaultServiceInstance;
-import org.springframework.cloud.client.ServiceInstance;
-import org.springframework.core.style.ToStringCreator;
-import org.springframework.util.Assert;
-
-import static com.netflix.appinfo.InstanceInfo.PortType.SECURE;
-
-/**
- * An Eureka-specific {@link ServiceInstance} implementation.
- *
- * @author Spencer Gibb
- * @author Dave Syer
- * @author Olga Maciaszek-Sharma
- * @author Tim Ysewyn
- */
-public class EurekaServiceInstance implements ServiceInstance {
-
-	private InstanceInfo instance;
-
-	public EurekaServiceInstance(InstanceInfo instance) {
-		Assert.notNull(instance, "Service instance required");
-		this.instance = instance;
-	}
-
-	public InstanceInfo getInstanceInfo() {
-		return instance;
-	}
-
-	@Override
-	public String getInstanceId() {
-		return this.instance.getId();
-	}
-
-	@Override
-	public String getServiceId() {
-		return this.instance.getAppName();
-	}
-
-	@Override
-	public String getHost() {
-		return this.instance.getHostName();
-	}
-
-	@Override
-	public int getPort() {
-		if (isSecure()) {
-			return this.instance.getSecurePort();
-		}
-		return this.instance.getPort();
-	}
-
-	@Override
-	public boolean isSecure() {
-		// assume if secure is enabled, that is the default
-		return this.instance.isPortEnabled(SECURE);
-	}
-
-	@Override
-	public URI getUri() {
-		return DefaultServiceInstance.getUri(this);
-	}
-
-	@Override
-	public Map<String, String> getMetadata() {
-		return this.instance.getMetadata();
-	}
-
-	@Override
-	public String getScheme() {
-		return getUri().getScheme();
-	}
-
-	@Override
-	public boolean equals(Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-		EurekaServiceInstance that = (EurekaServiceInstance) o;
-		return Objects.equals(this.instance, that.instance);
-	}
-
-	@Override
-	public int hashCode() {
-		return Objects.hash(this.instance);
-	}
-
-	@Override
-	public String toString() {
-		return new ToStringCreator(this).append("instance", instance).toString();
-
-	}
-
-}