From e549837f4fc5bf4a729d99f6ca10b1dcdbc8d29b Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <mgrzejszczak@pivotal.io>
Date: Tue, 18 Jul 2017 10:25:56 +0200
Subject: [PATCH] Added Circle CI 2.0 support

---
 .circleci/config.yml | 53 ++++++++++++++++++++++++++++++++++++++++++++
 circle.yml           |  4 ++--
 2 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 .circleci/config.yml

diff --git a/.circleci/config.yml b/.circleci/config.yml
new file mode 100644
index 0000000000..426013ec63
--- /dev/null
+++ b/.circleci/config.yml
@@ -0,0 +1,53 @@
+version: 2
+jobs:
+  build:
+    docker:
+      - image: springcloud/pipeline-base
+    environment:
+      _JAVA_OPTIONS: "-Xms512m -Xmx768m"
+      GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx768m -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=false'
+      TERM: dumb
+    branches:
+      ignore:
+        - gh-pages # list of branches to ignore
+    resource_class: large
+    steps:
+      - checkout
+      - restore_cache:
+          key: sc-contract-{{ .Branch }}
+      - run:
+          name: "Download dependencies"
+          command: ./scripts/downloadDependencies.sh
+      - save_cache:
+          key: sc-contract-{{ .Branch }}
+          paths:
+            - ~/.m2
+            - ~/.gradle
+      - run:
+          name: "Adding daemon entries for Gradle"
+          command: touch ~/.gradle/gradle.properties && echo "org.gradle.daemon=false" >> ~/.gradle/gradle.properties
+      - run:
+          name: "Clearing caches"
+          command: rm -rf ~/.m2/repository/org/springframework/cloud/contract && rm -rf ~/.m2/repository/com/example
+      - run:
+          name: "Running build"
+          command: ./mvnw -s .settings.xml clean org.jacoco:jacoco-maven-plugin:prepare-agent install -U -Pdocs,integration,sonar -nsu --batch-mode -Dsurefire.rerunFailingTestsCount=2 -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 $CIRCLE_TEST_REPORTS/junit/
+            find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
+            find . -type f -regex ".*/build/test-results/.*" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \;
+            bash <(curl -s https://codecov.io/bash)
+      - store_artifacts:
+          path: /junit/
+          destination: artifacts
+      - store_test_results:
+          path: /junit/
+          destination: testartifacts
+notify:
+  webhooks:
+    # A list of hook hashes, containing the url field
+    # gitter hook
+    - url: https://webhooks.gitter.im/e/ece0ece9a76a5af2aa91
diff --git a/circle.yml b/circle.yml
index 2b9494db26..36a3437564 100644
--- a/circle.yml
+++ b/circle.yml
@@ -6,8 +6,8 @@ machine:
   java:
     version: oraclejdk8
   environment:
-    _JAVA_OPTIONS: "-Xms512m -Xmx600m"
-    GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx600m -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=false'
+    _JAVA_OPTIONS: "-Xms512m -Xmx768m"
+    GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx768m -XX:+HeapDumpOnOutOfMemoryError" -Dorg.gradle.daemon=false'
     TERM: dumb
 dependencies:
   pre: