diff --git a/.circleci/config.yml b/.circleci/config.yml
index 84c7190d..729c8019 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,77 +1,48 @@
-#
-# Copyright (C) 2018 to the original 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.
-#
-
-version: 2
-jobs:
-  build:
-    branches:
-      ignore:
-        - gh-pages
-    docker:
-      - image: circleci/openjdk:8-jdk-node-browsers
-    environment:
-      _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
-      _SERVICE_OCCURENCE: 5
-    steps:
-      - checkout
-      - run:
-          name: dependencies
-          command: |
-            ./mvnw -s .settings.xml -U --fail-never dependency:go-offline -Dservice.occurence=${_SERVICE_OCCURENCE} || true
-      - run:
-          name: test
-          command: |
-            ./mvnw -s .settings.xml clean install -Dservice.occurence=${_SERVICE_OCCURENCE} #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
-            find . -type f -regex ".*/spring-cloud-*.*/target/*.*" | cpio -pdm $CIRCLE_ARTIFACTS
-            mkdir -p $CIRCLE_TEST_REPORTS/junit/
-            find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
-            bash <(curl -s https://codecov.io/bash)
-      - store_test_results:
-          path: $CIRCLE_TEST_REPORTS/junit/
-      - store_artifacts:
-          path: $CIRCLE_ARTIFACTS
-  notify:
-    webhooks:
-      - url: https://webhooks.gitter.im/e/22e6bb4eb945dd61ba54
-
-############################ OLD ###############################
-# general:
-#   branches:
-#     ignore:
-#       - gh-pages # list of branches to ignore
-# machine:
-#   java:
-#     version: oraclejdk8
-#   environment:
-#     _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
-#     _SERVICE_OCCURENCE: 5
-# dependencies:
-#   override:
-#     - ./mvnw -s .settings.xml -U --fail-never dependency:go-offline -Dservice.occurence=${_SERVICE_OCCURENCE} || true
-# test:
-#   override:
-#     - ./mvnw -s .settings.xml clean install -Dservice.occurence=${_SERVICE_OCCURENCE} #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
-#   post:
-#     - find . -type f -regex ".*/spring-cloud-*.*/target/*.*" | cpio -pdm $CIRCLE_ARTIFACTS
-#     - mkdir -p $CIRCLE_TEST_REPORTS/junit/
-#     - find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
-#     - bash <(curl -s https://codecov.io/bash)
-#
-# notify:
-#   webhooks:
-#     # A list of hook hashes, containing the url field
-#     # gitter hook
-#     - url: https://webhooks.gitter.im/e/22e6bb4eb945dd61ba54
+#
+# Copyright (C) 2018 to the original 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.
+#
+
+version: 2
+jobs:
+  build:
+    branches:
+      ignore:
+        - gh-pages
+    docker:
+      - image: circleci/openjdk:8-jdk-node-browsers
+    environment:
+      _JAVA_OPTIONS: "-Xms1024m -Xmx2048m"
+      _SERVICE_OCCURENCE: 5
+    steps:
+      - checkout
+      - run:
+          name: dependencies
+          command: |
+            ./mvnw -s .settings.xml -U --fail-never dependency:go-offline -Dservice.occurence=${_SERVICE_OCCURENCE} || true
+      - run:
+          name: test
+          command: |
+            ./mvnw -s .settings.xml clean install -Dservice.occurence=${_SERVICE_OCCURENCE} #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
+            find . -type f -regex ".*/spring-cloud-*.*/target/*.*" | cpio -pdm $CIRCLE_ARTIFACTS
+            mkdir -p $CIRCLE_TEST_REPORTS/junit/
+            find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
+            bash <(curl -s https://codecov.io/bash)
+      - store_test_results:
+          path: $CIRCLE_TEST_REPORTS/junit/
+      - store_artifacts:
+          path: $CIRCLE_ARTIFACTS
+notify:
+  webhooks:
+    - url: https://webhooks.gitter.im/e/22e6bb4eb945dd61ba54