diff --git a/samples/samples-standalone/.mvn/wrapper/maven-wrapper.jar b/samples/standalone/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from samples/samples-standalone/.mvn/wrapper/maven-wrapper.jar rename to samples/standalone/.mvn/wrapper/maven-wrapper.jar diff --git a/samples/samples-standalone/.mvn/wrapper/maven-wrapper.properties b/samples/standalone/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from samples/samples-standalone/.mvn/wrapper/maven-wrapper.properties rename to samples/standalone/.mvn/wrapper/maven-wrapper.properties diff --git a/samples/samples-standalone/README.adoc b/samples/standalone/README.adoc similarity index 100% rename from samples/samples-standalone/README.adoc rename to samples/standalone/README.adoc diff --git a/samples/samples-standalone/downloadGradleDeps.sh b/samples/standalone/downloadGradleDeps.sh similarity index 100% rename from samples/samples-standalone/downloadGradleDeps.sh rename to samples/standalone/downloadGradleDeps.sh diff --git a/samples/samples-standalone/http-client/.gitignore b/samples/standalone/http-client/.gitignore similarity index 100% rename from samples/samples-standalone/http-client/.gitignore rename to samples/standalone/http-client/.gitignore diff --git a/samples/samples-standalone/http-client/.mvn/jvm.config b/samples/standalone/http-client/.mvn/jvm.config similarity index 100% rename from samples/samples-standalone/http-client/.mvn/jvm.config rename to samples/standalone/http-client/.mvn/jvm.config diff --git a/samples/samples-standalone/http-client/.mvn/maven.config b/samples/standalone/http-client/.mvn/maven.config similarity index 100% rename from samples/samples-standalone/http-client/.mvn/maven.config rename to samples/standalone/http-client/.mvn/maven.config diff --git a/samples/samples-standalone/http-client/.mvn/wrapper/maven-wrapper.jar b/samples/standalone/http-client/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from samples/samples-standalone/http-client/.mvn/wrapper/maven-wrapper.jar rename to samples/standalone/http-client/.mvn/wrapper/maven-wrapper.jar diff --git a/samples/samples-standalone/http-client/.mvn/wrapper/maven-wrapper.properties b/samples/standalone/http-client/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from samples/samples-standalone/http-client/.mvn/wrapper/maven-wrapper.properties rename to samples/standalone/http-client/.mvn/wrapper/maven-wrapper.properties diff --git a/samples/samples-standalone/http-client/README.adoc b/samples/standalone/http-client/README.adoc similarity index 100% rename from samples/samples-standalone/http-client/README.adoc rename to samples/standalone/http-client/README.adoc diff --git a/samples/samples-standalone/http-client/build.gradle b/samples/standalone/http-client/build.gradle similarity index 100% rename from samples/samples-standalone/http-client/build.gradle rename to samples/standalone/http-client/build.gradle diff --git a/samples/samples-standalone/contract-verifier-sample-stream-sink/gradle.properties b/samples/standalone/http-client/gradle.properties similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-sink/gradle.properties rename to samples/standalone/http-client/gradle.properties diff --git a/samples/samples-standalone/http-client/gradle/wrapper/gradle-wrapper.jar b/samples/standalone/http-client/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from samples/samples-standalone/http-client/gradle/wrapper/gradle-wrapper.jar rename to samples/standalone/http-client/gradle/wrapper/gradle-wrapper.jar diff --git a/samples/samples-standalone/http-client/gradle/wrapper/gradle-wrapper.properties b/samples/standalone/http-client/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from samples/samples-standalone/http-client/gradle/wrapper/gradle-wrapper.properties rename to samples/standalone/http-client/gradle/wrapper/gradle-wrapper.properties diff --git a/samples/samples-standalone/http-client/gradlew b/samples/standalone/http-client/gradlew similarity index 100% rename from samples/samples-standalone/http-client/gradlew rename to samples/standalone/http-client/gradlew diff --git a/samples/samples-standalone/http-client/gradlew.bat b/samples/standalone/http-client/gradlew.bat similarity index 100% rename from samples/samples-standalone/http-client/gradlew.bat rename to samples/standalone/http-client/gradlew.bat diff --git a/samples/samples-standalone/http-client/mvnw b/samples/standalone/http-client/mvnw similarity index 100% rename from samples/samples-standalone/http-client/mvnw rename to samples/standalone/http-client/mvnw diff --git a/samples/samples-standalone/http-client/mvnw.cmd b/samples/standalone/http-client/mvnw.cmd similarity index 100% rename from samples/samples-standalone/http-client/mvnw.cmd rename to samples/standalone/http-client/mvnw.cmd diff --git a/samples/samples-standalone/http-client/pom.xml b/samples/standalone/http-client/pom.xml similarity index 100% rename from samples/samples-standalone/http-client/pom.xml rename to samples/standalone/http-client/pom.xml diff --git a/samples/samples-standalone/http-client/settings.gradle b/samples/standalone/http-client/settings.gradle similarity index 100% rename from samples/samples-standalone/http-client/settings.gradle rename to samples/standalone/http-client/settings.gradle diff --git a/samples/samples-standalone/http-client/src/main/java/com/example/loan/Application.java b/samples/standalone/http-client/src/main/java/com/example/loan/Application.java similarity index 100% rename from samples/samples-standalone/http-client/src/main/java/com/example/loan/Application.java rename to samples/standalone/http-client/src/main/java/com/example/loan/Application.java diff --git a/samples/samples-standalone/http-client/src/main/java/com/example/loan/LoanApplicationService.java b/samples/standalone/http-client/src/main/java/com/example/loan/LoanApplicationService.java similarity index 100% rename from samples/samples-standalone/http-client/src/main/java/com/example/loan/LoanApplicationService.java rename to samples/standalone/http-client/src/main/java/com/example/loan/LoanApplicationService.java diff --git a/samples/samples-standalone/http-client/src/main/java/com/example/loan/model/Client.java b/samples/standalone/http-client/src/main/java/com/example/loan/model/Client.java similarity index 100% rename from samples/samples-standalone/http-client/src/main/java/com/example/loan/model/Client.java rename to samples/standalone/http-client/src/main/java/com/example/loan/model/Client.java diff --git a/samples/samples-standalone/http-client/src/main/java/com/example/loan/model/FraudCheckStatus.java b/samples/standalone/http-client/src/main/java/com/example/loan/model/FraudCheckStatus.java similarity index 100% rename from samples/samples-standalone/http-client/src/main/java/com/example/loan/model/FraudCheckStatus.java rename to samples/standalone/http-client/src/main/java/com/example/loan/model/FraudCheckStatus.java diff --git a/samples/samples-standalone/http-client/src/main/java/com/example/loan/model/FraudServiceRequest.java b/samples/standalone/http-client/src/main/java/com/example/loan/model/FraudServiceRequest.java similarity index 100% rename from samples/samples-standalone/http-client/src/main/java/com/example/loan/model/FraudServiceRequest.java rename to samples/standalone/http-client/src/main/java/com/example/loan/model/FraudServiceRequest.java diff --git a/samples/samples-standalone/http-client/src/main/java/com/example/loan/model/FraudServiceResponse.java b/samples/standalone/http-client/src/main/java/com/example/loan/model/FraudServiceResponse.java similarity index 100% rename from samples/samples-standalone/http-client/src/main/java/com/example/loan/model/FraudServiceResponse.java rename to samples/standalone/http-client/src/main/java/com/example/loan/model/FraudServiceResponse.java diff --git a/samples/samples-standalone/http-client/src/main/java/com/example/loan/model/LoanApplication.java b/samples/standalone/http-client/src/main/java/com/example/loan/model/LoanApplication.java similarity index 100% rename from samples/samples-standalone/http-client/src/main/java/com/example/loan/model/LoanApplication.java rename to samples/standalone/http-client/src/main/java/com/example/loan/model/LoanApplication.java diff --git a/samples/samples-standalone/http-client/src/main/java/com/example/loan/model/LoanApplicationResult.java b/samples/standalone/http-client/src/main/java/com/example/loan/model/LoanApplicationResult.java similarity index 100% rename from samples/samples-standalone/http-client/src/main/java/com/example/loan/model/LoanApplicationResult.java rename to samples/standalone/http-client/src/main/java/com/example/loan/model/LoanApplicationResult.java diff --git a/samples/samples-standalone/http-client/src/main/java/com/example/loan/model/LoanApplicationStatus.java b/samples/standalone/http-client/src/main/java/com/example/loan/model/LoanApplicationStatus.java similarity index 100% rename from samples/samples-standalone/http-client/src/main/java/com/example/loan/model/LoanApplicationStatus.java rename to samples/standalone/http-client/src/main/java/com/example/loan/model/LoanApplicationStatus.java diff --git a/samples/samples-standalone/http-client/src/main/resources/application.yml b/samples/standalone/http-client/src/main/resources/application.yml similarity index 100% rename from samples/samples-standalone/http-client/src/main/resources/application.yml rename to samples/standalone/http-client/src/main/resources/application.yml diff --git a/samples/samples-standalone/http-client/src/test/groovy/com/example/loan/LoanApplicationServiceSpec.groovy b/samples/standalone/http-client/src/test/groovy/com/example/loan/LoanApplicationServiceSpec.groovy similarity index 100% rename from samples/samples-standalone/http-client/src/test/groovy/com/example/loan/LoanApplicationServiceSpec.groovy rename to samples/standalone/http-client/src/test/groovy/com/example/loan/LoanApplicationServiceSpec.groovy diff --git a/samples/samples-standalone/http-client/src/test/resources/application.yaml b/samples/standalone/http-client/src/test/resources/application.yaml similarity index 100% rename from samples/samples-standalone/http-client/src/test/resources/application.yaml rename to samples/standalone/http-client/src/test/resources/application.yaml diff --git a/samples/samples-standalone/http-server/.gitignore b/samples/standalone/http-server/.gitignore similarity index 100% rename from samples/samples-standalone/http-server/.gitignore rename to samples/standalone/http-server/.gitignore diff --git a/samples/samples-standalone/http-server/.mvn/jvm.config b/samples/standalone/http-server/.mvn/jvm.config similarity index 100% rename from samples/samples-standalone/http-server/.mvn/jvm.config rename to samples/standalone/http-server/.mvn/jvm.config diff --git a/samples/samples-standalone/http-server/.mvn/maven.config b/samples/standalone/http-server/.mvn/maven.config similarity index 100% rename from samples/samples-standalone/http-server/.mvn/maven.config rename to samples/standalone/http-server/.mvn/maven.config diff --git a/samples/samples-standalone/http-server/.mvn/wrapper/maven-wrapper.jar b/samples/standalone/http-server/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from samples/samples-standalone/http-server/.mvn/wrapper/maven-wrapper.jar rename to samples/standalone/http-server/.mvn/wrapper/maven-wrapper.jar diff --git a/samples/samples-standalone/http-server/.mvn/wrapper/maven-wrapper.properties b/samples/standalone/http-server/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from samples/samples-standalone/http-server/.mvn/wrapper/maven-wrapper.properties rename to samples/standalone/http-server/.mvn/wrapper/maven-wrapper.properties diff --git a/samples/samples-standalone/http-server/README.adoc b/samples/standalone/http-server/README.adoc similarity index 100% rename from samples/samples-standalone/http-server/README.adoc rename to samples/standalone/http-server/README.adoc diff --git a/samples/samples-standalone/http-server/build.gradle b/samples/standalone/http-server/build.gradle similarity index 100% rename from samples/samples-standalone/http-server/build.gradle rename to samples/standalone/http-server/build.gradle diff --git a/samples/samples-standalone/contract-verifier-sample-stream-source/gradle.properties b/samples/standalone/http-server/gradle.properties similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-source/gradle.properties rename to samples/standalone/http-server/gradle.properties diff --git a/samples/samples-standalone/contract-verifier-sample-stream-sink/gradle/wrapper/gradle-wrapper.jar b/samples/standalone/http-server/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-sink/gradle/wrapper/gradle-wrapper.jar rename to samples/standalone/http-server/gradle/wrapper/gradle-wrapper.jar diff --git a/samples/samples-standalone/http-server/gradle/wrapper/gradle-wrapper.properties b/samples/standalone/http-server/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from samples/samples-standalone/http-server/gradle/wrapper/gradle-wrapper.properties rename to samples/standalone/http-server/gradle/wrapper/gradle-wrapper.properties diff --git a/samples/samples-standalone/contract-verifier-sample-stream-sink/gradlew b/samples/standalone/http-server/gradlew similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-sink/gradlew rename to samples/standalone/http-server/gradlew diff --git a/samples/samples-standalone/contract-verifier-sample-stream-sink/gradlew.bat b/samples/standalone/http-server/gradlew.bat similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-sink/gradlew.bat rename to samples/standalone/http-server/gradlew.bat diff --git a/samples/samples-standalone/http-server/mvnw b/samples/standalone/http-server/mvnw similarity index 100% rename from samples/samples-standalone/http-server/mvnw rename to samples/standalone/http-server/mvnw diff --git a/samples/samples-standalone/http-server/mvnw.cmd b/samples/standalone/http-server/mvnw.cmd similarity index 100% rename from samples/samples-standalone/http-server/mvnw.cmd rename to samples/standalone/http-server/mvnw.cmd diff --git a/samples/samples-standalone/http-server/pom.xml b/samples/standalone/http-server/pom.xml similarity index 100% rename from samples/samples-standalone/http-server/pom.xml rename to samples/standalone/http-server/pom.xml diff --git a/samples/samples-standalone/http-server/settings.gradle b/samples/standalone/http-server/settings.gradle similarity index 100% rename from samples/samples-standalone/http-server/settings.gradle rename to samples/standalone/http-server/settings.gradle diff --git a/samples/samples-standalone/http-server/src/main/java/com/example/fraud/Application.java b/samples/standalone/http-server/src/main/java/com/example/fraud/Application.java similarity index 100% rename from samples/samples-standalone/http-server/src/main/java/com/example/fraud/Application.java rename to samples/standalone/http-server/src/main/java/com/example/fraud/Application.java diff --git a/samples/samples-standalone/http-server/src/main/java/com/example/fraud/FraudDetectionController.java b/samples/standalone/http-server/src/main/java/com/example/fraud/FraudDetectionController.java similarity index 100% rename from samples/samples-standalone/http-server/src/main/java/com/example/fraud/FraudDetectionController.java rename to samples/standalone/http-server/src/main/java/com/example/fraud/FraudDetectionController.java diff --git a/samples/samples-standalone/http-server/src/main/java/com/example/fraud/model/FraudCheck.java b/samples/standalone/http-server/src/main/java/com/example/fraud/model/FraudCheck.java similarity index 100% rename from samples/samples-standalone/http-server/src/main/java/com/example/fraud/model/FraudCheck.java rename to samples/standalone/http-server/src/main/java/com/example/fraud/model/FraudCheck.java diff --git a/samples/samples-standalone/http-server/src/main/java/com/example/fraud/model/FraudCheckResult.java b/samples/standalone/http-server/src/main/java/com/example/fraud/model/FraudCheckResult.java similarity index 100% rename from samples/samples-standalone/http-server/src/main/java/com/example/fraud/model/FraudCheckResult.java rename to samples/standalone/http-server/src/main/java/com/example/fraud/model/FraudCheckResult.java diff --git a/samples/samples-standalone/http-server/src/main/java/com/example/fraud/model/FraudCheckStatus.java b/samples/standalone/http-server/src/main/java/com/example/fraud/model/FraudCheckStatus.java similarity index 100% rename from samples/samples-standalone/http-server/src/main/java/com/example/fraud/model/FraudCheckStatus.java rename to samples/standalone/http-server/src/main/java/com/example/fraud/model/FraudCheckStatus.java diff --git a/samples/samples-standalone/http-server/src/main/resources/application.yml b/samples/standalone/http-server/src/main/resources/application.yml similarity index 100% rename from samples/samples-standalone/http-server/src/main/resources/application.yml rename to samples/standalone/http-server/src/main/resources/application.yml diff --git a/samples/samples-standalone/http-server/src/test/java/com/example/fraud/MvcTest.java b/samples/standalone/http-server/src/test/java/com/example/fraud/MvcTest.java similarity index 100% rename from samples/samples-standalone/http-server/src/test/java/com/example/fraud/MvcTest.java rename to samples/standalone/http-server/src/test/java/com/example/fraud/MvcTest.java diff --git a/samples/samples-standalone/http-server/src/test/resources/contracts/shouldMarkClientAsFraud.groovy b/samples/standalone/http-server/src/test/resources/contracts/shouldMarkClientAsFraud.groovy similarity index 100% rename from samples/samples-standalone/http-server/src/test/resources/contracts/shouldMarkClientAsFraud.groovy rename to samples/standalone/http-server/src/test/resources/contracts/shouldMarkClientAsFraud.groovy diff --git a/samples/samples-standalone/http-server/src/test/resources/contracts/shouldMarkClientAsNotFraud.groovy b/samples/standalone/http-server/src/test/resources/contracts/shouldMarkClientAsNotFraud.groovy similarity index 100% rename from samples/samples-standalone/http-server/src/test/resources/contracts/shouldMarkClientAsNotFraud.groovy rename to samples/standalone/http-server/src/test/resources/contracts/shouldMarkClientAsNotFraud.groovy diff --git a/samples/samples-standalone/mvnw b/samples/standalone/mvnw similarity index 100% rename from samples/samples-standalone/mvnw rename to samples/standalone/mvnw diff --git a/samples/samples-standalone/mvnw.cmd b/samples/standalone/mvnw.cmd similarity index 100% rename from samples/samples-standalone/mvnw.cmd rename to samples/standalone/mvnw.cmd diff --git a/samples/samples-standalone/pom.xml b/samples/standalone/pom.xml similarity index 92% rename from samples/samples-standalone/pom.xml rename to samples/standalone/pom.xml index 3f823a7f4c..b04d786afc 100644 --- a/samples/samples-standalone/pom.xml +++ b/samples/standalone/pom.xml @@ -19,8 +19,8 @@ http-server http-client - contract-verifier-sample-stream-source - contract-verifier-sample-stream-sink + stream-source + stream-sink diff --git a/samples/samples-standalone/runMavenTests.sh b/samples/standalone/runMavenTests.sh similarity index 100% rename from samples/samples-standalone/runMavenTests.sh rename to samples/standalone/runMavenTests.sh diff --git a/samples/samples-standalone/runTests.sh b/samples/standalone/runTests.sh similarity index 94% rename from samples/samples-standalone/runTests.sh rename to samples/standalone/runTests.sh index 11fa5dc976..1fe1c52082 100755 --- a/samples/samples-standalone/runTests.sh +++ b/samples/standalone/runTests.sh @@ -30,10 +30,10 @@ rm -rf $LOCAL_MAVEN_REPO/repository/org/springframework/cloud/contract/testproje echo -e "\n\nRunning tests for Gradle (communication via messaging)\n\n" echo -e "Building producer (uses Spring Cloud Contract Verifier Gradle Plugin)" -cd contract-verifier-sample-stream-source +cd stream-source ./gradlew clean build publishToMavenLocal -PverifierVersion=${VERIFIER_VERSION} --stacktrace cd $ROOT echo -e "\n\nBuilding consumer (uses Spring Cloud Contract Stub Runner Messaging)" -cd contract-verifier-sample-stream-sink +cd stream-sink ./gradlew clean build -PverifierVersion=${VERIFIER_VERSION} --stacktrace cd $ROOT diff --git a/samples/samples-standalone/settings.gradle b/samples/standalone/settings.gradle similarity index 100% rename from samples/samples-standalone/settings.gradle rename to samples/standalone/settings.gradle diff --git a/samples/samples-standalone/contract-verifier-sample-stream-sink/.mvn/wrapper/maven-wrapper.jar b/samples/standalone/stream-sink/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-sink/.mvn/wrapper/maven-wrapper.jar rename to samples/standalone/stream-sink/.mvn/wrapper/maven-wrapper.jar diff --git a/samples/samples-standalone/contract-verifier-sample-stream-sink/.mvn/wrapper/maven-wrapper.properties b/samples/standalone/stream-sink/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-sink/.mvn/wrapper/maven-wrapper.properties rename to samples/standalone/stream-sink/.mvn/wrapper/maven-wrapper.properties diff --git a/samples/samples-standalone/contract-verifier-sample-stream-sink/README.adoc b/samples/standalone/stream-sink/README.adoc similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-sink/README.adoc rename to samples/standalone/stream-sink/README.adoc diff --git a/samples/samples-standalone/contract-verifier-sample-stream-sink/build.gradle b/samples/standalone/stream-sink/build.gradle similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-sink/build.gradle rename to samples/standalone/stream-sink/build.gradle diff --git a/samples/samples-standalone/http-client/gradle.properties b/samples/standalone/stream-sink/gradle.properties similarity index 100% rename from samples/samples-standalone/http-client/gradle.properties rename to samples/standalone/stream-sink/gradle.properties diff --git a/samples/samples-standalone/http-server/gradle/wrapper/gradle-wrapper.jar b/samples/standalone/stream-sink/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from samples/samples-standalone/http-server/gradle/wrapper/gradle-wrapper.jar rename to samples/standalone/stream-sink/gradle/wrapper/gradle-wrapper.jar diff --git a/samples/samples-standalone/contract-verifier-sample-stream-sink/gradle/wrapper/gradle-wrapper.properties b/samples/standalone/stream-sink/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-sink/gradle/wrapper/gradle-wrapper.properties rename to samples/standalone/stream-sink/gradle/wrapper/gradle-wrapper.properties diff --git a/samples/samples-standalone/contract-verifier-sample-stream-source/gradlew b/samples/standalone/stream-sink/gradlew similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-source/gradlew rename to samples/standalone/stream-sink/gradlew diff --git a/samples/samples-standalone/contract-verifier-sample-stream-source/gradlew.bat b/samples/standalone/stream-sink/gradlew.bat similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-source/gradlew.bat rename to samples/standalone/stream-sink/gradlew.bat diff --git a/samples/samples-standalone/contract-verifier-sample-stream-sink/mvnw b/samples/standalone/stream-sink/mvnw similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-sink/mvnw rename to samples/standalone/stream-sink/mvnw diff --git a/samples/samples-standalone/contract-verifier-sample-stream-sink/mvnw.cmd b/samples/standalone/stream-sink/mvnw.cmd similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-sink/mvnw.cmd rename to samples/standalone/stream-sink/mvnw.cmd diff --git a/samples/samples-standalone/contract-verifier-sample-stream-sink/pom.xml b/samples/standalone/stream-sink/pom.xml similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-sink/pom.xml rename to samples/standalone/stream-sink/pom.xml diff --git a/samples/samples-standalone/contract-verifier-sample-stream-sink/settings.gradle b/samples/standalone/stream-sink/settings.gradle similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-sink/settings.gradle rename to samples/standalone/stream-sink/settings.gradle diff --git a/samples/samples-standalone/contract-verifier-sample-stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java b/samples/standalone/stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java rename to samples/standalone/stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java diff --git a/samples/samples-standalone/contract-verifier-sample-stream-sink/src/main/java/com/example/sink/SensorData.java b/samples/standalone/stream-sink/src/main/java/com/example/sink/SensorData.java similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-sink/src/main/java/com/example/sink/SensorData.java rename to samples/standalone/stream-sink/src/main/java/com/example/sink/SensorData.java diff --git a/samples/samples-standalone/contract-verifier-sample-stream-sink/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java b/samples/standalone/stream-sink/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-sink/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java rename to samples/standalone/stream-sink/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java diff --git a/samples/samples-standalone/contract-verifier-sample-stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java b/samples/standalone/stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java rename to samples/standalone/stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java diff --git a/samples/samples-standalone/contract-verifier-sample-stream-sink/src/test/resources/application.yml b/samples/standalone/stream-sink/src/test/resources/application.yml similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-sink/src/test/resources/application.yml rename to samples/standalone/stream-sink/src/test/resources/application.yml diff --git a/samples/samples-standalone/contract-verifier-sample-stream-source/.mvn/wrapper/maven-wrapper.jar b/samples/standalone/stream-source/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-source/.mvn/wrapper/maven-wrapper.jar rename to samples/standalone/stream-source/.mvn/wrapper/maven-wrapper.jar diff --git a/samples/samples-standalone/contract-verifier-sample-stream-source/.mvn/wrapper/maven-wrapper.properties b/samples/standalone/stream-source/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-source/.mvn/wrapper/maven-wrapper.properties rename to samples/standalone/stream-source/.mvn/wrapper/maven-wrapper.properties diff --git a/samples/samples-standalone/contract-verifier-sample-stream-source/README.adoc b/samples/standalone/stream-source/README.adoc similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-source/README.adoc rename to samples/standalone/stream-source/README.adoc diff --git a/samples/samples-standalone/contract-verifier-sample-stream-source/build.gradle b/samples/standalone/stream-source/build.gradle similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-source/build.gradle rename to samples/standalone/stream-source/build.gradle diff --git a/samples/samples-standalone/http-server/gradle.properties b/samples/standalone/stream-source/gradle.properties similarity index 100% rename from samples/samples-standalone/http-server/gradle.properties rename to samples/standalone/stream-source/gradle.properties diff --git a/samples/samples-standalone/contract-verifier-sample-stream-source/gradle/wrapper/gradle-wrapper.jar b/samples/standalone/stream-source/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-source/gradle/wrapper/gradle-wrapper.jar rename to samples/standalone/stream-source/gradle/wrapper/gradle-wrapper.jar diff --git a/samples/samples-standalone/contract-verifier-sample-stream-source/gradle/wrapper/gradle-wrapper.properties b/samples/standalone/stream-source/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-source/gradle/wrapper/gradle-wrapper.properties rename to samples/standalone/stream-source/gradle/wrapper/gradle-wrapper.properties diff --git a/samples/samples-standalone/http-server/gradlew b/samples/standalone/stream-source/gradlew similarity index 100% rename from samples/samples-standalone/http-server/gradlew rename to samples/standalone/stream-source/gradlew diff --git a/samples/samples-standalone/http-server/gradlew.bat b/samples/standalone/stream-source/gradlew.bat similarity index 100% rename from samples/samples-standalone/http-server/gradlew.bat rename to samples/standalone/stream-source/gradlew.bat diff --git a/samples/samples-standalone/contract-verifier-sample-stream-source/mvnw b/samples/standalone/stream-source/mvnw similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-source/mvnw rename to samples/standalone/stream-source/mvnw diff --git a/samples/samples-standalone/contract-verifier-sample-stream-source/mvnw.cmd b/samples/standalone/stream-source/mvnw.cmd similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-source/mvnw.cmd rename to samples/standalone/stream-source/mvnw.cmd diff --git a/samples/samples-standalone/contract-verifier-sample-stream-source/pom.xml b/samples/standalone/stream-source/pom.xml similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-source/pom.xml rename to samples/standalone/stream-source/pom.xml diff --git a/samples/samples-standalone/contract-verifier-sample-stream-source/settings.gradle b/samples/standalone/stream-source/settings.gradle similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-source/settings.gradle rename to samples/standalone/stream-source/settings.gradle diff --git a/samples/samples-standalone/contract-verifier-sample-stream-source/src/main/java/com/example/source/ContractVerifierSampleStreamSourceApplication.java b/samples/standalone/stream-source/src/main/java/com/example/source/ContractVerifierSampleStreamSourceApplication.java similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-source/src/main/java/com/example/source/ContractVerifierSampleStreamSourceApplication.java rename to samples/standalone/stream-source/src/main/java/com/example/source/ContractVerifierSampleStreamSourceApplication.java diff --git a/samples/samples-standalone/contract-verifier-sample-stream-source/src/main/resources/application.properties b/samples/standalone/stream-source/src/main/resources/application.properties similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-source/src/main/resources/application.properties rename to samples/standalone/stream-source/src/main/resources/application.properties diff --git a/samples/samples-standalone/contract-verifier-sample-stream-source/src/test/java/com/example/source/ContractVerifierSampleStreamSourceApplicationTests.java b/samples/standalone/stream-source/src/test/java/com/example/source/ContractVerifierSampleStreamSourceApplicationTests.java similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-source/src/test/java/com/example/source/ContractVerifierSampleStreamSourceApplicationTests.java rename to samples/standalone/stream-source/src/test/java/com/example/source/ContractVerifierSampleStreamSourceApplicationTests.java diff --git a/samples/samples-standalone/contract-verifier-sample-stream-source/src/test/java/com/example/source/SensorSourceTestBase.java b/samples/standalone/stream-source/src/test/java/com/example/source/SensorSourceTestBase.java similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-source/src/test/java/com/example/source/SensorSourceTestBase.java rename to samples/standalone/stream-source/src/test/java/com/example/source/SensorSourceTestBase.java diff --git a/samples/samples-standalone/contract-verifier-sample-stream-source/src/test/resources/contracts/shouldProduceValidSensorData.groovy b/samples/standalone/stream-source/src/test/resources/contracts/shouldProduceValidSensorData.groovy similarity index 100% rename from samples/samples-standalone/contract-verifier-sample-stream-source/src/test/resources/contracts/shouldProduceValidSensorData.groovy rename to samples/standalone/stream-source/src/test/resources/contracts/shouldProduceValidSensorData.groovy diff --git a/scripts/runTests.sh b/scripts/runTests.sh index 4a9ca04454..c0dc9011cf 100755 --- a/scripts/runTests.sh +++ b/scripts/runTests.sh @@ -14,7 +14,7 @@ export CONTRACT_VERIFIER_VERSION=${CONTRACT_VERIFIER_VERSION:-1.0.0.BUILD-SNAPSH echo "Current Spring Cloud Contract Verifier version is ${CONTRACT_VERIFIER_VERSION}" -cd samples/samples-standalone +cd samples/standalone echo "Running Gradle tests" . ./runTests.sh @@ -22,4 +22,4 @@ echo "Running Gradle tests" echo "Running Maven tests" . ./runMavenTests.sh -cd $ROOT_FOLDER \ No newline at end of file +cd $ROOT_FOLDER