diff --git a/circle.yml b/circle.yml index 8152f70fb0..dfbaf27a90 100644 --- a/circle.yml +++ b/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 diff --git a/scripts/downloadDependencies.sh b/scripts/downloadDependencies.sh new file mode 100755 index 0000000000..2c395d469e --- /dev/null +++ b/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 diff --git a/spring-cloud-contract-verifier-gradle-plugin/build.gradle b/spring-cloud-contract-verifier-gradle-plugin/build.gradle index be845d3568..c583bfbe73 100644 --- a/spring-cloud-contract-verifier-gradle-plugin/build.gradle +++ b/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() + } + } + } +} \ No newline at end of file diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/build.gradle b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/build.gradle index e99c3e5fcb..6721b1cd9c 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/build.gradle +++ b/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() + } + } + } +} \ No newline at end of file diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/gradle.properties b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/gradle.properties index 23f6ea0c77..004e3e550a 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/gradle.properties +++ b/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 \ No newline at end of file +BOM_VERSION=Brixton.SR3 \ No newline at end of file diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/build.gradle b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/build.gradle index 743acc1f07..410d605af7 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/build.gradle +++ b/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() + } + } + } +} diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/gradle.properties b/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/gradle.properties index 23f6ea0c77..004e3e550a 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/gradle.properties +++ b/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 \ No newline at end of file +BOM_VERSION=Brixton.SR3 \ No newline at end of file diff --git a/spring-cloud-contract-verifier-standalone-test-samples/downloadGradleDeps.sh b/spring-cloud-contract-verifier-standalone-test-samples/downloadGradleDeps.sh new file mode 100755 index 0000000000..c276a139a4 --- /dev/null +++ b/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 < + subProject.buildscript.configurations.each { configuration -> + configuration.resolve() + } + subProject.configurations.each { configuration -> + configuration.resolve() + } + } + } +} diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/build.gradle b/spring-cloud-contract-verifier-standalone-test-samples/http-server/build.gradle index e556c60ed9..7425ad2cb3 100644 --- a/spring-cloud-contract-verifier-standalone-test-samples/http-server/build.gradle +++ b/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() + } + } + } +}