diff --git a/pom.xml b/pom.xml index bf1fdc9b9e..51049478d1 100644 --- a/pom.xml +++ b/pom.xml @@ -200,12 +200,6 @@ target - - ${env.HOME}/.m2/repository/com/example/ - - **/* - - ${env.HOME}/.m2/repository/org/springframework/cloud/contract/verifier/stubs/ @@ -218,7 +212,6 @@ - spring diff --git a/samples/pom.xml b/samples/pom.xml index 13a997514b..a0b575190b 100644 --- a/samples/pom.xml +++ b/samples/pom.xml @@ -37,36 +37,47 @@ true - - - org.apache.maven.plugins - maven-invoker-plugin - false - - src/it/settings.xml - standalone - ${skipTests} - true - - integration - - - */pom.xml - - - - - integration - install - - install - run - - - - + + + integration + + + + + org.apache.maven.plugins + maven-invoker-plugin + + src/it/settings.xml + standalone + ${skipTests} + true + + integration + + + */pom.xml + + + clean + install + + + + + integration + + run + + + + + + + + + diff --git a/samples/standalone/dsl/http-client/build.gradle b/samples/standalone/dsl/http-client/build.gradle index 47600cdecf..383f8e79bb 100644 --- a/samples/standalone/dsl/http-client/build.gradle +++ b/samples/standalone/dsl/http-client/build.gradle @@ -42,6 +42,7 @@ dependencies { } test { + systemProperty 'spring.profiles.active', 'gradle' testLogging { exceptionFormat = 'full' } diff --git a/samples/standalone/dsl/http-client/gradle.properties b/samples/standalone/dsl/http-client/gradle.properties index fc29ae128a..3a4bf021b7 100644 --- a/samples/standalone/dsl/http-client/gradle.properties +++ b/samples/standalone/dsl/http-client/gradle.properties @@ -1,2 +1,3 @@ +org.gradle.daemon=false verifierVersion=1.0.0.BUILD-SNAPSHOT BOM_VERSION=Brixton.SR4 \ No newline at end of file diff --git a/samples/standalone/dsl/http-client/gradle/wrapper/gradle-wrapper.jar b/samples/standalone/dsl/http-client/gradle/wrapper/gradle-wrapper.jar index d3b83982b9..3baa851b28 100644 Binary files a/samples/standalone/dsl/http-client/gradle/wrapper/gradle-wrapper.jar and b/samples/standalone/dsl/http-client/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/standalone/dsl/http-client/gradle/wrapper/gradle-wrapper.properties b/samples/standalone/dsl/http-client/gradle/wrapper/gradle-wrapper.properties index fe18faa66a..ff3de523bd 100644 --- a/samples/standalone/dsl/http-client/gradle/wrapper/gradle-wrapper.properties +++ b/samples/standalone/dsl/http-client/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jul 21 10:16:50 CEST 2016 +#Fri Aug 19 15:39:05 CEST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip diff --git a/samples/standalone/dsl/http-client/settings.gradle b/samples/standalone/dsl/http-client/settings.gradle index 882c555fec..35a147b560 100644 --- a/samples/standalone/dsl/http-client/settings.gradle +++ b/samples/standalone/dsl/http-client/settings.gradle @@ -1 +1 @@ -rootProject.name = 'http-client-dsl' +rootProject.name = 'http-client-dsl-gradle' diff --git a/samples/standalone/dsl/http-client/src/test/resources/application-gradle.yaml b/samples/standalone/dsl/http-client/src/test/resources/application-gradle.yaml new file mode 100644 index 0000000000..a029079b57 --- /dev/null +++ b/samples/standalone/dsl/http-client/src/test/resources/application-gradle.yaml @@ -0,0 +1,3 @@ +stubrunner: + work-offline: true + stubs.ids: 'com.example:http-server-dsl-gradle:+:stubs:8080' \ No newline at end of file diff --git a/samples/standalone/dsl/http-server/build.gradle b/samples/standalone/dsl/http-server/build.gradle index 4cfcbf5de7..8d6a2ce3de 100644 --- a/samples/standalone/dsl/http-server/build.gradle +++ b/samples/standalone/dsl/http-server/build.gradle @@ -49,6 +49,7 @@ dependencies { } test { + systemProperty 'spring.profiles.active', 'gradle' testLogging { exceptionFormat = 'full' } @@ -59,7 +60,7 @@ task wrapper(type: Wrapper) { } clean.doFirst { - delete "~/.m2/repository/com/example/" + delete "~/.m2/repository/com/example/http-server-dsl-gradle" } task resolveDependencies { diff --git a/samples/standalone/dsl/http-server/gradle.properties b/samples/standalone/dsl/http-server/gradle.properties index fc29ae128a..3a4bf021b7 100644 --- a/samples/standalone/dsl/http-server/gradle.properties +++ b/samples/standalone/dsl/http-server/gradle.properties @@ -1,2 +1,3 @@ +org.gradle.daemon=false verifierVersion=1.0.0.BUILD-SNAPSHOT BOM_VERSION=Brixton.SR4 \ No newline at end of file diff --git a/samples/standalone/dsl/http-server/gradle/wrapper/gradle-wrapper.jar b/samples/standalone/dsl/http-server/gradle/wrapper/gradle-wrapper.jar index d3b83982b9..3baa851b28 100644 Binary files a/samples/standalone/dsl/http-server/gradle/wrapper/gradle-wrapper.jar and b/samples/standalone/dsl/http-server/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/standalone/dsl/http-server/gradle/wrapper/gradle-wrapper.properties b/samples/standalone/dsl/http-server/gradle/wrapper/gradle-wrapper.properties index fe18faa66a..95d7279349 100644 --- a/samples/standalone/dsl/http-server/gradle/wrapper/gradle-wrapper.properties +++ b/samples/standalone/dsl/http-server/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jul 21 10:16:50 CEST 2016 +#Fri Aug 19 15:38:58 CEST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip diff --git a/samples/standalone/dsl/http-server/pom.xml b/samples/standalone/dsl/http-server/pom.xml index 8c8adf7951..9565266463 100644 --- a/samples/standalone/dsl/http-server/pom.xml +++ b/samples/standalone/dsl/http-server/pom.xml @@ -97,12 +97,6 @@ target - - ${env.HOME}/.m2/repository/com/example/ - - **/* - - diff --git a/samples/standalone/dsl/http-server/settings.gradle b/samples/standalone/dsl/http-server/settings.gradle index 74f9e986d4..90a672de8a 100644 --- a/samples/standalone/dsl/http-server/settings.gradle +++ b/samples/standalone/dsl/http-server/settings.gradle @@ -1 +1 @@ -rootProject.name = 'http-server-dsl' +rootProject.name = 'http-server-dsl-gradle' diff --git a/samples/standalone/messaging/stream-sink/build.gradle b/samples/standalone/messaging/stream-sink/build.gradle index bce74b0836..33d066554d 100644 --- a/samples/standalone/messaging/stream-sink/build.gradle +++ b/samples/standalone/messaging/stream-sink/build.gradle @@ -43,6 +43,7 @@ dependencies { } test { + systemProperty 'spring.profiles.active', 'gradle' testLogging { exceptionFormat = 'full' } diff --git a/samples/standalone/messaging/stream-sink/gradle.properties b/samples/standalone/messaging/stream-sink/gradle.properties index fc29ae128a..3a4bf021b7 100644 --- a/samples/standalone/messaging/stream-sink/gradle.properties +++ b/samples/standalone/messaging/stream-sink/gradle.properties @@ -1,2 +1,3 @@ +org.gradle.daemon=false verifierVersion=1.0.0.BUILD-SNAPSHOT BOM_VERSION=Brixton.SR4 \ No newline at end of file diff --git a/samples/standalone/messaging/stream-sink/gradle/wrapper/gradle-wrapper.jar b/samples/standalone/messaging/stream-sink/gradle/wrapper/gradle-wrapper.jar index d3b83982b9..3baa851b28 100644 Binary files a/samples/standalone/messaging/stream-sink/gradle/wrapper/gradle-wrapper.jar and b/samples/standalone/messaging/stream-sink/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/standalone/messaging/stream-sink/gradle/wrapper/gradle-wrapper.properties b/samples/standalone/messaging/stream-sink/gradle/wrapper/gradle-wrapper.properties index fe18faa66a..d7cdc356ad 100644 --- a/samples/standalone/messaging/stream-sink/gradle/wrapper/gradle-wrapper.properties +++ b/samples/standalone/messaging/stream-sink/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jul 21 10:16:50 CEST 2016 +#Fri Aug 19 15:39:28 CEST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip diff --git a/samples/standalone/messaging/stream-sink/settings.gradle b/samples/standalone/messaging/stream-sink/settings.gradle index eed1c62d9a..6cac6f4dc1 100644 --- a/samples/standalone/messaging/stream-sink/settings.gradle +++ b/samples/standalone/messaging/stream-sink/settings.gradle @@ -1 +1 @@ -rootProject.name = 'stream-sink' +rootProject.name = 'stream-sink-gradle' diff --git a/samples/standalone/messaging/stream-sink/src/test/resources/application-gradle.yml b/samples/standalone/messaging/stream-sink/src/test/resources/application-gradle.yml new file mode 100644 index 0000000000..e6dd107c89 --- /dev/null +++ b/samples/standalone/messaging/stream-sink/src/test/resources/application-gradle.yml @@ -0,0 +1,3 @@ +stubrunner: + work-offline: true + stubs.ids: 'com.example:stream-source-gradle' \ No newline at end of file diff --git a/samples/standalone/messaging/stream-source/build.gradle b/samples/standalone/messaging/stream-source/build.gradle index 779854fe75..413afaa979 100644 --- a/samples/standalone/messaging/stream-source/build.gradle +++ b/samples/standalone/messaging/stream-source/build.gradle @@ -73,6 +73,7 @@ publishing { } test { + systemProperty 'spring.profiles.active', 'gradle' testLogging { exceptionFormat = 'full' } @@ -83,7 +84,7 @@ task wrapper(type: Wrapper) { } clean.doFirst { - delete "~/.m2/repository/com/example/" + delete "~/.m2/repository/com/example/stream-source-gradle" } task resolveDependencies { diff --git a/samples/standalone/messaging/stream-source/gradle.properties b/samples/standalone/messaging/stream-source/gradle.properties index fc29ae128a..3a4bf021b7 100644 --- a/samples/standalone/messaging/stream-source/gradle.properties +++ b/samples/standalone/messaging/stream-source/gradle.properties @@ -1,2 +1,3 @@ +org.gradle.daemon=false verifierVersion=1.0.0.BUILD-SNAPSHOT BOM_VERSION=Brixton.SR4 \ No newline at end of file diff --git a/samples/standalone/messaging/stream-source/gradle/wrapper/gradle-wrapper.jar b/samples/standalone/messaging/stream-source/gradle/wrapper/gradle-wrapper.jar index d3b83982b9..3baa851b28 100644 Binary files a/samples/standalone/messaging/stream-source/gradle/wrapper/gradle-wrapper.jar and b/samples/standalone/messaging/stream-source/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/standalone/messaging/stream-source/gradle/wrapper/gradle-wrapper.properties b/samples/standalone/messaging/stream-source/gradle/wrapper/gradle-wrapper.properties index fe18faa66a..fed2c38616 100644 --- a/samples/standalone/messaging/stream-source/gradle/wrapper/gradle-wrapper.properties +++ b/samples/standalone/messaging/stream-source/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jul 21 10:16:50 CEST 2016 +#Fri Aug 19 15:39:21 CEST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip diff --git a/samples/standalone/messaging/stream-source/pom.xml b/samples/standalone/messaging/stream-source/pom.xml index 39e600d3ec..0416e3cb19 100644 --- a/samples/standalone/messaging/stream-source/pom.xml +++ b/samples/standalone/messaging/stream-source/pom.xml @@ -93,12 +93,6 @@ target - - ${env.HOME}/.m2/repository/com/example/ - - **/* - - diff --git a/samples/standalone/messaging/stream-source/settings.gradle b/samples/standalone/messaging/stream-source/settings.gradle index f9a80faf09..a1970d8283 100644 --- a/samples/standalone/messaging/stream-source/settings.gradle +++ b/samples/standalone/messaging/stream-source/settings.gradle @@ -1 +1 @@ -rootProject.name = 'stream-source' +rootProject.name = 'stream-source-gradle' diff --git a/samples/standalone/restdocs/http-client/build.gradle b/samples/standalone/restdocs/http-client/build.gradle index 23424e685a..e07b075353 100644 --- a/samples/standalone/restdocs/http-client/build.gradle +++ b/samples/standalone/restdocs/http-client/build.gradle @@ -43,6 +43,7 @@ dependencies { } test { + systemProperty 'spring.profiles.active', 'gradle' testLogging { exceptionFormat = 'full' } diff --git a/samples/standalone/restdocs/http-client/gradle.properties b/samples/standalone/restdocs/http-client/gradle.properties index fc29ae128a..3a4bf021b7 100644 --- a/samples/standalone/restdocs/http-client/gradle.properties +++ b/samples/standalone/restdocs/http-client/gradle.properties @@ -1,2 +1,3 @@ +org.gradle.daemon=false verifierVersion=1.0.0.BUILD-SNAPSHOT BOM_VERSION=Brixton.SR4 \ No newline at end of file diff --git a/samples/standalone/restdocs/http-client/gradle/wrapper/gradle-wrapper.jar b/samples/standalone/restdocs/http-client/gradle/wrapper/gradle-wrapper.jar index d3b83982b9..3baa851b28 100644 Binary files a/samples/standalone/restdocs/http-client/gradle/wrapper/gradle-wrapper.jar and b/samples/standalone/restdocs/http-client/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/standalone/restdocs/http-client/gradle/wrapper/gradle-wrapper.properties b/samples/standalone/restdocs/http-client/gradle/wrapper/gradle-wrapper.properties index fe18faa66a..04160e9888 100644 --- a/samples/standalone/restdocs/http-client/gradle/wrapper/gradle-wrapper.properties +++ b/samples/standalone/restdocs/http-client/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jul 21 10:16:50 CEST 2016 +#Fri Aug 19 15:39:49 CEST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip diff --git a/samples/standalone/restdocs/http-client/settings.gradle b/samples/standalone/restdocs/http-client/settings.gradle index dce437c739..877b12b9ab 100644 --- a/samples/standalone/restdocs/http-client/settings.gradle +++ b/samples/standalone/restdocs/http-client/settings.gradle @@ -1 +1 @@ -rootProject.name = 'http-client-restdocs' +rootProject.name = 'http-client-restdocs-gradle' diff --git a/samples/standalone/restdocs/http-server/build.gradle b/samples/standalone/restdocs/http-server/build.gradle index 376e8fd835..1aec68a960 100644 --- a/samples/standalone/restdocs/http-server/build.gradle +++ b/samples/standalone/restdocs/http-server/build.gradle @@ -49,6 +49,7 @@ dependencies { } test { + systemProperty 'spring.profiles.active', 'gradle' testLogging { exceptionFormat = 'full' } @@ -87,7 +88,7 @@ task copyClasses(type: Copy) { clean.doFirst { delete 'target/snippets/stubs' - delete "~/.m2/repository/com/example/" + delete "~/.m2/repository/com/example/http-server-restdocs-gradle" } task resolveDependencies { diff --git a/samples/standalone/restdocs/http-server/gradle.properties b/samples/standalone/restdocs/http-server/gradle.properties index fc29ae128a..3a4bf021b7 100644 --- a/samples/standalone/restdocs/http-server/gradle.properties +++ b/samples/standalone/restdocs/http-server/gradle.properties @@ -1,2 +1,3 @@ +org.gradle.daemon=false verifierVersion=1.0.0.BUILD-SNAPSHOT BOM_VERSION=Brixton.SR4 \ No newline at end of file diff --git a/samples/standalone/restdocs/http-server/gradle/wrapper/gradle-wrapper.jar b/samples/standalone/restdocs/http-server/gradle/wrapper/gradle-wrapper.jar index d3b83982b9..3baa851b28 100644 Binary files a/samples/standalone/restdocs/http-server/gradle/wrapper/gradle-wrapper.jar and b/samples/standalone/restdocs/http-server/gradle/wrapper/gradle-wrapper.jar differ diff --git a/samples/standalone/restdocs/http-server/gradle/wrapper/gradle-wrapper.properties b/samples/standalone/restdocs/http-server/gradle/wrapper/gradle-wrapper.properties index fe18faa66a..8b8a75c0ac 100644 --- a/samples/standalone/restdocs/http-server/gradle/wrapper/gradle-wrapper.properties +++ b/samples/standalone/restdocs/http-server/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jul 21 10:16:50 CEST 2016 +#Fri Aug 19 15:39:42 CEST 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip diff --git a/samples/standalone/restdocs/http-server/pom.xml b/samples/standalone/restdocs/http-server/pom.xml index bff6997b6f..54d62a7429 100644 --- a/samples/standalone/restdocs/http-server/pom.xml +++ b/samples/standalone/restdocs/http-server/pom.xml @@ -80,6 +80,21 @@ true + + org.apache.maven.plugins + maven-clean-plugin + 3.0.0 + + + + build + + + target + + + + org.apache.maven.plugins maven-assembly-plugin diff --git a/samples/standalone/restdocs/http-server/settings.gradle b/samples/standalone/restdocs/http-server/settings.gradle index 06780ec1e9..a27eed8db1 100644 --- a/samples/standalone/restdocs/http-server/settings.gradle +++ b/samples/standalone/restdocs/http-server/settings.gradle @@ -1 +1 @@ -rootProject.name = 'http-server-restdocs' +rootProject.name = 'http-server-restdocs-gradle' diff --git a/scripts/generateDocs.sh b/scripts/generateDocs.sh index 07b3a38d85..c730dd17c3 100755 --- a/scripts/generateDocs.sh +++ b/scripts/generateDocs.sh @@ -4,7 +4,7 @@ source common.sh || source scripts/common.sh || echo "No common.sh script found. set -e -echo "Generating docs for Spring Cloud Contract version [$VERIFIER_VERSION]" +echo "Generating docs for Spring Cloud Contract" echo "Building main docs" ./mvnw clean install -P docs -DskipTests=true --pl docs