diff --git a/README.adoc b/README.adoc index ef4380ace4..bbaad202c1 100644 --- a/README.adoc +++ b/README.adoc @@ -154,8 +154,7 @@ video::130779882[vimeo] === Samples -Here you can find some https://github.com/spring-cloud/spring-cloud-contract[working samples]. Check the `spring-cloud-contract-verifier-standalone-test-samples` folder -and read readme of each project for more information. +Here you can find some https://github.com/spring-cloud/spring-cloud-contract/tree/master/samples/[samples]. === Why use Spring Cloud Contract Verifier and not X ? diff --git a/docs/src/main/asciidoc/introduction.adoc b/docs/src/main/asciidoc/introduction.adoc index 8cdcfb2292..c3955795ce 100644 --- a/docs/src/main/asciidoc/introduction.adoc +++ b/docs/src/main/asciidoc/introduction.adoc @@ -137,8 +137,7 @@ video::130779882[vimeo] === Samples -Here you can find some https://github.com/spring-cloud/spring-cloud-contract[working samples]. Check the `spring-cloud-contract-verifier-standalone-test-samples` folder -and read readme of each project for more information. +Here you can find some https://github.com/spring-cloud/spring-cloud-contract/tree/master/samples/[samples]. === Why use Spring Cloud Contract Verifier and not X ? diff --git a/spring-cloud-contract-verifier-standalone-test-samples/.mvn/maven.config b/samples/samples-standalone/.mvn/maven.config similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/.mvn/maven.config rename to samples/samples-standalone/.mvn/maven.config diff --git a/spring-cloud-contract-verifier-standalone-test-samples/.mvn/wrapper/maven-wrapper.jar b/samples/samples-standalone/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/.mvn/wrapper/maven-wrapper.jar rename to samples/samples-standalone/.mvn/wrapper/maven-wrapper.jar diff --git a/spring-cloud-contract-verifier-standalone-test-samples/.mvn/wrapper/maven-wrapper.properties b/samples/samples-standalone/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/.mvn/wrapper/maven-wrapper.properties rename to samples/samples-standalone/.mvn/wrapper/maven-wrapper.properties diff --git a/spring-cloud-contract-verifier-standalone-test-samples/README.adoc b/samples/samples-standalone/README.adoc similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/README.adoc rename to samples/samples-standalone/README.adoc diff --git a/spring-cloud-contract-verifier-standalone-test-samples/build.gradle b/samples/samples-standalone/build.gradle similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/build.gradle rename to samples/samples-standalone/build.gradle diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/.mvn/wrapper/maven-wrapper.jar b/samples/samples-standalone/contract-verifier-sample-stream-sink/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/.mvn/wrapper/maven-wrapper.jar rename to samples/samples-standalone/contract-verifier-sample-stream-sink/.mvn/wrapper/maven-wrapper.jar diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/.mvn/wrapper/maven-wrapper.properties b/samples/samples-standalone/contract-verifier-sample-stream-sink/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/.mvn/wrapper/maven-wrapper.properties rename to samples/samples-standalone/contract-verifier-sample-stream-sink/.mvn/wrapper/maven-wrapper.properties diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/README.adoc b/samples/samples-standalone/contract-verifier-sample-stream-sink/README.adoc similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/README.adoc rename to samples/samples-standalone/contract-verifier-sample-stream-sink/README.adoc diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/build.gradle b/samples/samples-standalone/contract-verifier-sample-stream-sink/build.gradle similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/build.gradle rename to samples/samples-standalone/contract-verifier-sample-stream-sink/build.gradle diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/gradle.properties b/samples/samples-standalone/contract-verifier-sample-stream-sink/gradle.properties similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/gradle.properties rename to samples/samples-standalone/contract-verifier-sample-stream-sink/gradle.properties diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/gradle/wrapper/gradle-wrapper.jar b/samples/samples-standalone/contract-verifier-sample-stream-sink/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/gradle/wrapper/gradle-wrapper.jar rename to samples/samples-standalone/contract-verifier-sample-stream-sink/gradle/wrapper/gradle-wrapper.jar diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/gradle/wrapper/gradle-wrapper.properties b/samples/samples-standalone/contract-verifier-sample-stream-sink/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/gradle/wrapper/gradle-wrapper.properties rename to samples/samples-standalone/contract-verifier-sample-stream-sink/gradle/wrapper/gradle-wrapper.properties diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/gradlew b/samples/samples-standalone/contract-verifier-sample-stream-sink/gradlew similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/gradlew rename to samples/samples-standalone/contract-verifier-sample-stream-sink/gradlew diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/gradlew.bat b/samples/samples-standalone/contract-verifier-sample-stream-sink/gradlew.bat similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/gradlew.bat rename to samples/samples-standalone/contract-verifier-sample-stream-sink/gradlew.bat diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/mvnw b/samples/samples-standalone/contract-verifier-sample-stream-sink/mvnw similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/mvnw rename to samples/samples-standalone/contract-verifier-sample-stream-sink/mvnw diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/mvnw.cmd b/samples/samples-standalone/contract-verifier-sample-stream-sink/mvnw.cmd similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/mvnw.cmd rename to samples/samples-standalone/contract-verifier-sample-stream-sink/mvnw.cmd diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/pom.xml b/samples/samples-standalone/contract-verifier-sample-stream-sink/pom.xml similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/pom.xml rename to samples/samples-standalone/contract-verifier-sample-stream-sink/pom.xml diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/settings.gradle b/samples/samples-standalone/contract-verifier-sample-stream-sink/settings.gradle similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/settings.gradle rename to samples/samples-standalone/contract-verifier-sample-stream-sink/settings.gradle diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java b/samples/samples-standalone/contract-verifier-sample-stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java rename to samples/samples-standalone/contract-verifier-sample-stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/main/java/com/example/sink/SensorData.java b/samples/samples-standalone/contract-verifier-sample-stream-sink/src/main/java/com/example/sink/SensorData.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/main/java/com/example/sink/SensorData.java rename to samples/samples-standalone/contract-verifier-sample-stream-sink/src/main/java/com/example/sink/SensorData.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java b/samples/samples-standalone/contract-verifier-sample-stream-sink/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java rename to samples/samples-standalone/contract-verifier-sample-stream-sink/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java b/samples/samples-standalone/contract-verifier-sample-stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java rename to samples/samples-standalone/contract-verifier-sample-stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/test/resources/application.yml b/samples/samples-standalone/contract-verifier-sample-stream-sink/src/test/resources/application.yml similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-sink/src/test/resources/application.yml rename to samples/samples-standalone/contract-verifier-sample-stream-sink/src/test/resources/application.yml diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/.mvn/wrapper/maven-wrapper.jar b/samples/samples-standalone/contract-verifier-sample-stream-source/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/.mvn/wrapper/maven-wrapper.jar rename to samples/samples-standalone/contract-verifier-sample-stream-source/.mvn/wrapper/maven-wrapper.jar diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/.mvn/wrapper/maven-wrapper.properties b/samples/samples-standalone/contract-verifier-sample-stream-source/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/.mvn/wrapper/maven-wrapper.properties rename to samples/samples-standalone/contract-verifier-sample-stream-source/.mvn/wrapper/maven-wrapper.properties diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/README.adoc b/samples/samples-standalone/contract-verifier-sample-stream-source/README.adoc similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/README.adoc rename to samples/samples-standalone/contract-verifier-sample-stream-source/README.adoc diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/build.gradle b/samples/samples-standalone/contract-verifier-sample-stream-source/build.gradle similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/build.gradle rename to samples/samples-standalone/contract-verifier-sample-stream-source/build.gradle diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/gradle.properties b/samples/samples-standalone/contract-verifier-sample-stream-source/gradle.properties similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/gradle.properties rename to samples/samples-standalone/contract-verifier-sample-stream-source/gradle.properties diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/gradle/wrapper/gradle-wrapper.jar b/samples/samples-standalone/contract-verifier-sample-stream-source/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/gradle/wrapper/gradle-wrapper.jar rename to samples/samples-standalone/contract-verifier-sample-stream-source/gradle/wrapper/gradle-wrapper.jar diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/gradle/wrapper/gradle-wrapper.properties b/samples/samples-standalone/contract-verifier-sample-stream-source/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/gradle/wrapper/gradle-wrapper.properties rename to samples/samples-standalone/contract-verifier-sample-stream-source/gradle/wrapper/gradle-wrapper.properties diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/gradlew b/samples/samples-standalone/contract-verifier-sample-stream-source/gradlew similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/gradlew rename to samples/samples-standalone/contract-verifier-sample-stream-source/gradlew diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/gradlew.bat b/samples/samples-standalone/contract-verifier-sample-stream-source/gradlew.bat similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/gradlew.bat rename to samples/samples-standalone/contract-verifier-sample-stream-source/gradlew.bat diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/mvnw b/samples/samples-standalone/contract-verifier-sample-stream-source/mvnw similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/mvnw rename to samples/samples-standalone/contract-verifier-sample-stream-source/mvnw diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/mvnw.cmd b/samples/samples-standalone/contract-verifier-sample-stream-source/mvnw.cmd similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/mvnw.cmd rename to samples/samples-standalone/contract-verifier-sample-stream-source/mvnw.cmd diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/pom.xml b/samples/samples-standalone/contract-verifier-sample-stream-source/pom.xml similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/pom.xml rename to samples/samples-standalone/contract-verifier-sample-stream-source/pom.xml diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/settings.gradle b/samples/samples-standalone/contract-verifier-sample-stream-source/settings.gradle similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/settings.gradle rename to samples/samples-standalone/contract-verifier-sample-stream-source/settings.gradle diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/main/java/com/example/source/ContractVerifierSampleStreamSourceApplication.java b/samples/samples-standalone/contract-verifier-sample-stream-source/src/main/java/com/example/source/ContractVerifierSampleStreamSourceApplication.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/main/java/com/example/source/ContractVerifierSampleStreamSourceApplication.java rename to samples/samples-standalone/contract-verifier-sample-stream-source/src/main/java/com/example/source/ContractVerifierSampleStreamSourceApplication.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/main/resources/application.properties b/samples/samples-standalone/contract-verifier-sample-stream-source/src/main/resources/application.properties similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/main/resources/application.properties rename to samples/samples-standalone/contract-verifier-sample-stream-source/src/main/resources/application.properties diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/test/java/com/example/source/ContractVerifierSampleStreamSourceApplicationTests.java b/samples/samples-standalone/contract-verifier-sample-stream-source/src/test/java/com/example/source/ContractVerifierSampleStreamSourceApplicationTests.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/test/java/com/example/source/ContractVerifierSampleStreamSourceApplicationTests.java rename to samples/samples-standalone/contract-verifier-sample-stream-source/src/test/java/com/example/source/ContractVerifierSampleStreamSourceApplicationTests.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/test/java/com/example/source/SensorSourceTestBase.java b/samples/samples-standalone/contract-verifier-sample-stream-source/src/test/java/com/example/source/SensorSourceTestBase.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/test/java/com/example/source/SensorSourceTestBase.java rename to samples/samples-standalone/contract-verifier-sample-stream-source/src/test/java/com/example/source/SensorSourceTestBase.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/test/resources/contracts/shouldProduceValidSensorData.groovy b/samples/samples-standalone/contract-verifier-sample-stream-source/src/test/resources/contracts/shouldProduceValidSensorData.groovy similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/contract-verifier-sample-stream-source/src/test/resources/contracts/shouldProduceValidSensorData.groovy rename to samples/samples-standalone/contract-verifier-sample-stream-source/src/test/resources/contracts/shouldProduceValidSensorData.groovy diff --git a/spring-cloud-contract-verifier-standalone-test-samples/downloadGradleDeps.sh b/samples/samples-standalone/downloadGradleDeps.sh similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/downloadGradleDeps.sh rename to samples/samples-standalone/downloadGradleDeps.sh diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/.gitignore b/samples/samples-standalone/http-client/.gitignore similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/.gitignore rename to samples/samples-standalone/http-client/.gitignore diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/.mvn/jvm.config b/samples/samples-standalone/http-client/.mvn/jvm.config similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/.mvn/jvm.config rename to samples/samples-standalone/http-client/.mvn/jvm.config diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/.mvn/maven.config b/samples/samples-standalone/http-client/.mvn/maven.config similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/.mvn/maven.config rename to samples/samples-standalone/http-client/.mvn/maven.config diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/.mvn/wrapper/maven-wrapper.jar b/samples/samples-standalone/http-client/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/.mvn/wrapper/maven-wrapper.jar rename to samples/samples-standalone/http-client/.mvn/wrapper/maven-wrapper.jar diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/.mvn/wrapper/maven-wrapper.properties b/samples/samples-standalone/http-client/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/.mvn/wrapper/maven-wrapper.properties rename to samples/samples-standalone/http-client/.mvn/wrapper/maven-wrapper.properties diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/README.adoc b/samples/samples-standalone/http-client/README.adoc similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/README.adoc rename to samples/samples-standalone/http-client/README.adoc diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/build.gradle b/samples/samples-standalone/http-client/build.gradle similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/build.gradle rename to samples/samples-standalone/http-client/build.gradle diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/gradle.properties b/samples/samples-standalone/http-client/gradle.properties similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/gradle.properties rename to samples/samples-standalone/http-client/gradle.properties diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/gradle/wrapper/gradle-wrapper.jar b/samples/samples-standalone/http-client/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/gradle/wrapper/gradle-wrapper.jar rename to samples/samples-standalone/http-client/gradle/wrapper/gradle-wrapper.jar diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/gradle/wrapper/gradle-wrapper.properties b/samples/samples-standalone/http-client/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/gradle/wrapper/gradle-wrapper.properties rename to samples/samples-standalone/http-client/gradle/wrapper/gradle-wrapper.properties diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/gradlew b/samples/samples-standalone/http-client/gradlew similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/gradlew rename to samples/samples-standalone/http-client/gradlew diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/gradlew.bat b/samples/samples-standalone/http-client/gradlew.bat similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/gradlew.bat rename to samples/samples-standalone/http-client/gradlew.bat diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/mvnw b/samples/samples-standalone/http-client/mvnw similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/mvnw rename to samples/samples-standalone/http-client/mvnw diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/mvnw.cmd b/samples/samples-standalone/http-client/mvnw.cmd similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/mvnw.cmd rename to samples/samples-standalone/http-client/mvnw.cmd diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/pom.xml b/samples/samples-standalone/http-client/pom.xml similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/pom.xml rename to samples/samples-standalone/http-client/pom.xml diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/settings.gradle b/samples/samples-standalone/http-client/settings.gradle similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/settings.gradle rename to samples/samples-standalone/http-client/settings.gradle diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/Application.java b/samples/samples-standalone/http-client/src/main/java/com/example/loan/Application.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/Application.java rename to samples/samples-standalone/http-client/src/main/java/com/example/loan/Application.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/LoanApplicationService.java b/samples/samples-standalone/http-client/src/main/java/com/example/loan/LoanApplicationService.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/LoanApplicationService.java rename to samples/samples-standalone/http-client/src/main/java/com/example/loan/LoanApplicationService.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/Client.java b/samples/samples-standalone/http-client/src/main/java/com/example/loan/model/Client.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/Client.java rename to samples/samples-standalone/http-client/src/main/java/com/example/loan/model/Client.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/FraudCheckStatus.java b/samples/samples-standalone/http-client/src/main/java/com/example/loan/model/FraudCheckStatus.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/FraudCheckStatus.java rename to samples/samples-standalone/http-client/src/main/java/com/example/loan/model/FraudCheckStatus.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/FraudServiceRequest.java b/samples/samples-standalone/http-client/src/main/java/com/example/loan/model/FraudServiceRequest.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/FraudServiceRequest.java rename to samples/samples-standalone/http-client/src/main/java/com/example/loan/model/FraudServiceRequest.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/FraudServiceResponse.java b/samples/samples-standalone/http-client/src/main/java/com/example/loan/model/FraudServiceResponse.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/FraudServiceResponse.java rename to samples/samples-standalone/http-client/src/main/java/com/example/loan/model/FraudServiceResponse.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/LoanApplication.java b/samples/samples-standalone/http-client/src/main/java/com/example/loan/model/LoanApplication.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/LoanApplication.java rename to samples/samples-standalone/http-client/src/main/java/com/example/loan/model/LoanApplication.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/LoanApplicationResult.java b/samples/samples-standalone/http-client/src/main/java/com/example/loan/model/LoanApplicationResult.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/LoanApplicationResult.java rename to samples/samples-standalone/http-client/src/main/java/com/example/loan/model/LoanApplicationResult.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/LoanApplicationStatus.java b/samples/samples-standalone/http-client/src/main/java/com/example/loan/model/LoanApplicationStatus.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/java/com/example/loan/model/LoanApplicationStatus.java rename to samples/samples-standalone/http-client/src/main/java/com/example/loan/model/LoanApplicationStatus.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/resources/application.yml b/samples/samples-standalone/http-client/src/main/resources/application.yml similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/main/resources/application.yml rename to samples/samples-standalone/http-client/src/main/resources/application.yml diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/test/groovy/com/example/loan/LoanApplicationServiceSpec.groovy b/samples/samples-standalone/http-client/src/test/groovy/com/example/loan/LoanApplicationServiceSpec.groovy similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/test/groovy/com/example/loan/LoanApplicationServiceSpec.groovy rename to samples/samples-standalone/http-client/src/test/groovy/com/example/loan/LoanApplicationServiceSpec.groovy diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-client/src/test/resources/application.yaml b/samples/samples-standalone/http-client/src/test/resources/application.yaml similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-client/src/test/resources/application.yaml rename to samples/samples-standalone/http-client/src/test/resources/application.yaml diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/.gitignore b/samples/samples-standalone/http-server/.gitignore similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/.gitignore rename to samples/samples-standalone/http-server/.gitignore diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/.mvn/jvm.config b/samples/samples-standalone/http-server/.mvn/jvm.config similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/.mvn/jvm.config rename to samples/samples-standalone/http-server/.mvn/jvm.config diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/.mvn/maven.config b/samples/samples-standalone/http-server/.mvn/maven.config similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/.mvn/maven.config rename to samples/samples-standalone/http-server/.mvn/maven.config diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/.mvn/wrapper/maven-wrapper.jar b/samples/samples-standalone/http-server/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/.mvn/wrapper/maven-wrapper.jar rename to samples/samples-standalone/http-server/.mvn/wrapper/maven-wrapper.jar diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/.mvn/wrapper/maven-wrapper.properties b/samples/samples-standalone/http-server/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/.mvn/wrapper/maven-wrapper.properties rename to samples/samples-standalone/http-server/.mvn/wrapper/maven-wrapper.properties diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/README.adoc b/samples/samples-standalone/http-server/README.adoc similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/README.adoc rename to samples/samples-standalone/http-server/README.adoc diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/build.gradle b/samples/samples-standalone/http-server/build.gradle similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/build.gradle rename to samples/samples-standalone/http-server/build.gradle diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/gradle.properties b/samples/samples-standalone/http-server/gradle.properties similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/gradle.properties rename to samples/samples-standalone/http-server/gradle.properties diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/gradle/wrapper/gradle-wrapper.jar b/samples/samples-standalone/http-server/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/gradle/wrapper/gradle-wrapper.jar rename to samples/samples-standalone/http-server/gradle/wrapper/gradle-wrapper.jar diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/gradle/wrapper/gradle-wrapper.properties b/samples/samples-standalone/http-server/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/gradle/wrapper/gradle-wrapper.properties rename to samples/samples-standalone/http-server/gradle/wrapper/gradle-wrapper.properties diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/gradlew b/samples/samples-standalone/http-server/gradlew similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/gradlew rename to samples/samples-standalone/http-server/gradlew diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/gradlew.bat b/samples/samples-standalone/http-server/gradlew.bat similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/gradlew.bat rename to samples/samples-standalone/http-server/gradlew.bat diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/mvnw b/samples/samples-standalone/http-server/mvnw similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/mvnw rename to samples/samples-standalone/http-server/mvnw diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/mvnw.cmd b/samples/samples-standalone/http-server/mvnw.cmd similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/mvnw.cmd rename to samples/samples-standalone/http-server/mvnw.cmd diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/pom.xml b/samples/samples-standalone/http-server/pom.xml similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/pom.xml rename to samples/samples-standalone/http-server/pom.xml diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/settings.gradle b/samples/samples-standalone/http-server/settings.gradle similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/settings.gradle rename to samples/samples-standalone/http-server/settings.gradle diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/Application.java b/samples/samples-standalone/http-server/src/main/java/com/example/fraud/Application.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/Application.java rename to samples/samples-standalone/http-server/src/main/java/com/example/fraud/Application.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/FraudDetectionController.java b/samples/samples-standalone/http-server/src/main/java/com/example/fraud/FraudDetectionController.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/FraudDetectionController.java rename to samples/samples-standalone/http-server/src/main/java/com/example/fraud/FraudDetectionController.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/model/FraudCheck.java b/samples/samples-standalone/http-server/src/main/java/com/example/fraud/model/FraudCheck.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/model/FraudCheck.java rename to samples/samples-standalone/http-server/src/main/java/com/example/fraud/model/FraudCheck.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/model/FraudCheckResult.java b/samples/samples-standalone/http-server/src/main/java/com/example/fraud/model/FraudCheckResult.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/model/FraudCheckResult.java rename to samples/samples-standalone/http-server/src/main/java/com/example/fraud/model/FraudCheckResult.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/model/FraudCheckStatus.java b/samples/samples-standalone/http-server/src/main/java/com/example/fraud/model/FraudCheckStatus.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/java/com/example/fraud/model/FraudCheckStatus.java rename to samples/samples-standalone/http-server/src/main/java/com/example/fraud/model/FraudCheckStatus.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/resources/application.yml b/samples/samples-standalone/http-server/src/main/resources/application.yml similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/src/main/resources/application.yml rename to samples/samples-standalone/http-server/src/main/resources/application.yml diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/java/com/example/fraud/MvcTest.java b/samples/samples-standalone/http-server/src/test/java/com/example/fraud/MvcTest.java similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/java/com/example/fraud/MvcTest.java rename to samples/samples-standalone/http-server/src/test/java/com/example/fraud/MvcTest.java diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/resources/contracts/shouldMarkClientAsFraud.groovy b/samples/samples-standalone/http-server/src/test/resources/contracts/shouldMarkClientAsFraud.groovy similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/resources/contracts/shouldMarkClientAsFraud.groovy rename to samples/samples-standalone/http-server/src/test/resources/contracts/shouldMarkClientAsFraud.groovy diff --git a/spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/resources/contracts/shouldMarkClientAsNotFraud.groovy b/samples/samples-standalone/http-server/src/test/resources/contracts/shouldMarkClientAsNotFraud.groovy similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/http-server/src/test/resources/contracts/shouldMarkClientAsNotFraud.groovy rename to samples/samples-standalone/http-server/src/test/resources/contracts/shouldMarkClientAsNotFraud.groovy diff --git a/spring-cloud-contract-verifier-standalone-test-samples/mvnw b/samples/samples-standalone/mvnw similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/mvnw rename to samples/samples-standalone/mvnw diff --git a/spring-cloud-contract-verifier-standalone-test-samples/mvnw.cmd b/samples/samples-standalone/mvnw.cmd similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/mvnw.cmd rename to samples/samples-standalone/mvnw.cmd diff --git a/spring-cloud-contract-verifier-standalone-test-samples/pom.xml b/samples/samples-standalone/pom.xml similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/pom.xml rename to samples/samples-standalone/pom.xml diff --git a/spring-cloud-contract-verifier-standalone-test-samples/runMavenTests.sh b/samples/samples-standalone/runMavenTests.sh similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/runMavenTests.sh rename to samples/samples-standalone/runMavenTests.sh diff --git a/spring-cloud-contract-verifier-standalone-test-samples/runTests.sh b/samples/samples-standalone/runTests.sh similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/runTests.sh rename to samples/samples-standalone/runTests.sh diff --git a/spring-cloud-contract-verifier-standalone-test-samples/settings.gradle b/samples/samples-standalone/settings.gradle similarity index 100% rename from spring-cloud-contract-verifier-standalone-test-samples/settings.gradle rename to samples/samples-standalone/settings.gradle diff --git a/scripts/downloadDependencies.sh b/scripts/downloadDependencies.sh index 2c395d469e..b3d2d9c62e 100755 --- a/scripts/downloadDependencies.sh +++ b/scripts/downloadDependencies.sh @@ -12,5 +12,5 @@ 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 +cd $ROOT_FOLDER/samples/samples-standalone && ./mvnw --fail-never dependency:go-offline || true +cd $ROOT_FOLDER/samples/samples-standalone && ./downloadGradleDeps.sh diff --git a/scripts/runTests.sh b/scripts/runTests.sh index f494c6be8a..4a9ca04454 100755 --- a/scripts/runTests.sh +++ b/scripts/runTests.sh @@ -10,12 +10,11 @@ if [[ ! -e "${ROOT_FOLDER}/.git" ]]; then ROOT_FOLDER=`pwd` fi -CONTRACT_VERIFIER_VERSION=1.0.0.BUILD-SNAPSHOT -export CONTRACT_VERIFIER_VERSION=${CONTRACT_VERIFIER_VERSION} +export CONTRACT_VERIFIER_VERSION=${CONTRACT_VERIFIER_VERSION:-1.0.0.BUILD-SNAPSHOT} echo "Current Spring Cloud Contract Verifier version is ${CONTRACT_VERIFIER_VERSION}" -cd spring-cloud-contract-verifier-standalone-test-samples +cd samples/samples-standalone echo "Running Gradle tests" . ./runTests.sh