Fixed CircleCI caching

circle.yml

@@ -21,8 +21,7 @@ dependencies:
         sudo service postgresql stop || echo "Service not running"
     - touch ~/.gradle/gradle.properties && echo "org.gradle.daemon=false" >> ~/.gradle/gradle.properties
   override:
-    - ./mvnw -s .settings.xml --fail-never dependency:go-offline || true
-    - cd spring-cloud-contract-verifier-samples && ./mvnw --fail-never dependency:go-offline || true
+    - ./scripts/downloadDependencies.sh || true
 test:
   override:
     # docs take 15 minutes to run

scripts/downloadDependencies.sh

@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -o errexit
+
+ROOT_FOLDER=`pwd`
+echo "Current folder is $ROOT_FOLDER"
+
+if [[ ! -e "${ROOT_FOLDER}/.git" ]]; then
+    cd ..
+    ROOT_FOLDER=`pwd`
+fi
+
+./mvnw -s .settings.xml --fail-never dependency:go-offline || true
+cd $ROOT_FOLDER/spring-cloud-contact-verifier-gradle-plugin && ./gradlew resolveDependencies || true
+cd $ROOT_FOLDER/spring-cloud-contract-verifier-standalone-test-samples && ./mvnw --fail-never dependency:go-offline || true
+cd $ROOT_FOLDER/spring-cloud-contract-verifier-standalone-test-samples && ./downloadGradleDeps.sh

spring-cloud-contract-verifier-gradle-plugin/build.gradle

@@ -121,3 +121,15 @@ configurations {
 	}
 }
 
+task resolveDependencies {
+	doLast {
+		project.rootProject.allprojects.each { subProject ->
+			subProject.buildscript.configurations.each { configuration ->
+				configuration.resolve()
+			}
+			subProject.configurations.each { configuration ->
+				configuration.resolve()
+			}
+		}
+	}
+}

spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/build.gradle

@@ -55,3 +55,16 @@ test {
 task wrapper(type: Wrapper) {
     gradleVersion = '2.14'
 }
+
+task resolveDependencies {
+	doLast {
+		project.rootProject.allprojects.each { subProject ->
+			subProject.buildscript.configurations.each { configuration ->
+				configuration.resolve()
+			}
+			subProject.configurations.each { configuration ->
+				configuration.resolve()
+			}
+		}
+	}
+}

spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/gradle.properties

@@ -1,2 +1,2 @@
 verifierVersion=1.0.0.BUILD-SNAPSHOT
-BOM_VERSION=Brixton.SR1
+BOM_VERSION=Brixton.SR3

spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/build.gradle

@@ -89,3 +89,16 @@ test {
 task wrapper(type: Wrapper) {
     gradleVersion = '2.14'
 }
+
+task resolveDependencies {
+	doLast {
+		project.rootProject.allprojects.each { subProject ->
+			subProject.buildscript.configurations.each { configuration ->
+				configuration.resolve()
+			}
+			subProject.configurations.each { configuration ->
+				configuration.resolve()
+			}
+		}
+	}
+}

spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/gradle.properties

@@ -1,2 +1,2 @@
 verifierVersion=1.0.0.BUILD-SNAPSHOT
-BOM_VERSION=Brixton.SR1
+BOM_VERSION=Brixton.SR3

spring-cloud-contract-verifier-standalone-test-samples/downloadGradleDeps.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -o errexit
+
+LOCAL_MAVEN_REPO=${LOCAL_MAVEN_REPO-~/.m2}
+VERIFIER_VERSION=${VERIFIER_VERSION:-1.0.0.BUILD-SNAPSHOT}
+ROOT=`pwd`
+
+cat <<EOF
+Downloading deps
+LOCAL_MAVEN_REPO=${LOCAL_MAVEN_REPO}
+VERIFIER_VERSION=${VERIFIER_VERSION}
+EOF
+
+cd http-server
+./gradlew resolveDependencies -PverifierVersion=${VERIFIER_VERSION}
+cd $ROOT
+cd http-client
+./gradlew resolveDependencies -PverifierVersion=${VERIFIER_VERSION} --stacktrace
+cd $ROOT
+
+cd contract-verifier-sample-stream-source
+./gradlew resolveDependencies -PverifierVersion=${VERIFIER_VERSION} --stacktrace
+cd $ROOT
+cd contract-verifier-sample-stream-sink
+./gradlew resolveDependencies -PverifierVersion=${VERIFIER_VERSION} --stacktrace
+cd $ROOT

spring-cloud-contract-verifier-standalone-test-samples/http-client/build.gradle

@@ -48,3 +48,16 @@ test {
 task wrapper(type: Wrapper) {
     gradleVersion = '2.14'
 }
+
+task resolveDependencies {
+	doLast {
+		project.rootProject.allprojects.each { subProject ->
+			subProject.buildscript.configurations.each { configuration ->
+				configuration.resolve()
+			}
+			subProject.configurations.each { configuration ->
+				configuration.resolve()
+			}
+		}
+	}
+}

spring-cloud-contract-verifier-standalone-test-samples/http-server/build.gradle

@@ -60,3 +60,16 @@ test {
 task wrapper(type: Wrapper) {
     gradleVersion = '2.14'
 }
+
+task resolveDependencies {
+	doLast {
+		project.rootProject.allprojects.each { subProject ->
+			subProject.buildscript.configurations.each { configuration ->
+				configuration.resolve()
+			}
+			subProject.configurations.each { configuration ->
+				configuration.resolve()
+			}
+		}
+	}
+}