diff --git a/circle.yml b/circle.yml index 1332bc45ff..0eb2f7f39e 100644 --- a/circle.yml +++ b/circle.yml @@ -25,11 +25,10 @@ dependencies: sudo service postgresql stop || echo "Service not running" - touch ~/.gradle/gradle.properties && echo "org.gradle.daemon=false" >> ~/.gradle/gradle.properties override: - - ./mvnw dependency:resolve || true + - ./scripts/downloadDependencies.sh test: override: - # docs take 15 minutes to run - - rm -rf ~/.m2/repository/com/example && ./mvnw clean install -P docs,integration -U $MVN_LOCAL_OPTS + - ./mvnw clean org.jacoco:jacoco-maven-plugin:prepare-agent install -P docs,integration -U $MVN_LOCAL_OPTS post: - mkdir -p $CIRCLE_TEST_REPORTS/junit/ - find . -type f -regex ".*/target/.*-reports/.*" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \; diff --git a/docs/src/main/asciidoc/building.adoc b/docs/src/main/asciidoc/building.adoc index 72e5dc03a2..3165106df7 100644 --- a/docs/src/main/asciidoc/building.adoc +++ b/docs/src/main/asciidoc/building.adoc @@ -7,64 +7,43 @@ Here you can find the Spring Cloud Contract folder structure ``` ├── samples ├── scripts +├── spring-cloud-contract-dependencies ├── spring-cloud-contract-spec +├── spring-cloud-contract-starters ├── spring-cloud-contract-stub-runner ├── spring-cloud-contract-tools -└── spring-cloud-contract-verifier +├── spring-cloud-contract-verifier +├── spring-cloud-contract-wiremock +└── tests ``` - `samples` - folder contains test samples together with standalone ones used also to build documentation - `scripts` - contains scripts to build and test `Spring Cloud Contract` with Maven, Gradle and standalone projects + - `spring-cloud-contract-dependencies` - contains Spring Cloud Contract BOM + - `spring-cloud-contract-starters` - contains Spring Cloud Contract Starters - `spring-cloud-contract-spec` - contains specification modules (contains concept of a Contract) - `spring-cloud-contract-stub-runner` - contains Stub Runner related modules - `spring-cloud-contract-tools` - Gradle and Maven plugin for `Spring Cloud Contract Verifier` - `spring-cloud-contract-verifier` - core of the `Spring Cloud Contract Verifier` functionality + - `spring-cloud-contract-wiremock` - all WireMock related functionality + - `tests` - integration tests for different messaging technologies === Commands To build the core functionality together with Maven Plugin you can run ``` -./mvnw clean install +./mvnw clean install -P integration ``` -To build the Gradle Plugin +Calling that function will build core, Maven plugin, Gradle plugin and run end to end tests on the +standalone samples in proper order (both for Maven and Gradle). + +To build the Gradle Plugin only ``` cd spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin ./gradlew clean build ``` -=== Scripts -For your convenience we have created a bunch of scripts to build and test the whole functionality. - -Build both Maven and Gradle project - -``` -./scripts/build.sh -``` - -Run tests on the standalone projects - -``` -./scripts/runTests.sh -``` - -Build both Maven and Gradle projects and run tests on standalone projects - -``` -./scripts/buildAndTest.sh -``` - -Generate documentation - -``` -./scripts/generateDocs.sh -``` - -Publish documentation to `gh-pages` - -``` -./docs/src/main/asciidoc/ghpages.sh -``` diff --git a/docs/src/main/asciidoc/verifier/messaging.adoc b/docs/src/main/asciidoc/verifier/messaging.adoc index 863680b319..e51b4a1d18 100644 --- a/docs/src/main/asciidoc/verifier/messaging.adoc +++ b/docs/src/main/asciidoc/verifier/messaging.adoc @@ -142,4 +142,4 @@ include::{plugins_path}/spring-cloud-contract-gradle-plugin/src/test/resources/f ===== Maven Setup -Example of Maven can be found in the https://github.com/spring-cloud/spring-cloud-contract/tree/master/samples/standalone/02-stream-sink/pom.xml[Stream Sink sample] +Example of Maven can be found in the https://github.com/spring-cloud/spring-cloud-contract/tree/master/samples/standalone/messaging/stream-sink/pom.xml[Stream Sink sample] diff --git a/samples/standalone/dsl/http-client/pom.xml b/samples/standalone/dsl/http-client/pom.xml index d8dde4584d..ea8a2d96b1 100644 --- a/samples/standalone/dsl/http-client/pom.xml +++ b/samples/standalone/dsl/http-client/pom.xml @@ -91,65 +91,60 @@ + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/milestone + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/milestone + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + - - spring - - true - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - http://repo.spring.io/milestone - - false - - - - spring-releases - Spring Releases - http://repo.spring.io/release - - false - - - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - http://repo.spring.io/milestone - - false - - - - spring-releases - Spring Releases - http://repo.spring.io/release - - false - - - - integration diff --git a/samples/standalone/dsl/http-server/pom.xml b/samples/standalone/dsl/http-server/pom.xml index d7ff6ded9b..955bcc88dc 100644 --- a/samples/standalone/dsl/http-server/pom.xml +++ b/samples/standalone/dsl/http-server/pom.xml @@ -139,67 +139,62 @@ + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/milestone + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/milestone + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + + - - spring - - true - - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - http://repo.spring.io/milestone - - false - - - - spring-releases - Spring Releases - http://repo.spring.io/release - - false - - - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - http://repo.spring.io/milestone - - false - - - - spring-releases - Spring Releases - http://repo.spring.io/release - - false - - - - - integration diff --git a/samples/standalone/dsl/pom.xml b/samples/standalone/dsl/pom.xml index a953d39434..44323034cf 100644 --- a/samples/standalone/dsl/pom.xml +++ b/samples/standalone/dsl/pom.xml @@ -16,10 +16,9 @@ Spring Cloud Contract Standalone Dsl Test Samples Spring Cloud Contract Standalone Test Samples used for end to end tests - - http-server - http-client - + + 1.0.0.BUILD-SNAPSHOT + @@ -32,4 +31,91 @@ + + + spring + + true + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/milestone + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/milestone + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + + + integration + + + + org.codehaus.mojo + exec-maven-plugin + + + runTests + test + + ./runTests.sh + + ${spring-cloud-contract.version} + + + + exec + + + + + + + + + diff --git a/samples/standalone/dsl/runTests.sh b/samples/standalone/dsl/runTests.sh new file mode 100755 index 0000000000..638292068d --- /dev/null +++ b/samples/standalone/dsl/runTests.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +set -o errexit + +VERIFIER_VERSION=$1 +ROOT=`pwd` + +cat < + + 4.0.0 + + + org.springframework.cloud + spring-cloud-contract-samples-standalone + 1.0.0.BUILD-SNAPSHOT + .. + + + spring-cloud-contract-samples-messaging + pom + + Spring Cloud Contract Standalone Dsl Test Samples With Messaging + Spring Cloud Contract Standalone Test Samples used for end to end tests + + + 1.0.0.BUILD-SNAPSHOT + + + + + + maven-deploy-plugin + + true + + + + + + + + spring + + true + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/milestone + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/milestone + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + + + integration + + + + org.codehaus.mojo + exec-maven-plugin + + + runTests + test + + ./runTests.sh + + ${spring-cloud-contract.version} + + + + exec + + + + + + + + + + diff --git a/samples/standalone/messaging/runTests.sh b/samples/standalone/messaging/runTests.sh new file mode 100755 index 0000000000..5750b55560 --- /dev/null +++ b/samples/standalone/messaging/runTests.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +set -o errexit + +VERIFIER_VERSION=$1 +ROOT=`pwd` + +cat < + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/milestone + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/milestone + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + - - spring - - true - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - http://repo.spring.io/milestone - - false - - - - spring-releases - Spring Releases - http://repo.spring.io/release - - false - - - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - http://repo.spring.io/milestone - - false - - - - spring-releases - Spring Releases - http://repo.spring.io/release - - false - - - - integration diff --git a/samples/standalone/02-stream-sink/settings.gradle b/samples/standalone/messaging/stream-sink/settings.gradle similarity index 100% rename from samples/standalone/02-stream-sink/settings.gradle rename to samples/standalone/messaging/stream-sink/settings.gradle diff --git a/samples/standalone/02-stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java b/samples/standalone/messaging/stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java similarity index 100% rename from samples/standalone/02-stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java rename to samples/standalone/messaging/stream-sink/src/main/java/com/example/sink/ContractVerifierSampleStreamSinkApplication.java diff --git a/samples/standalone/02-stream-sink/src/main/java/com/example/sink/SensorData.java b/samples/standalone/messaging/stream-sink/src/main/java/com/example/sink/SensorData.java similarity index 100% rename from samples/standalone/02-stream-sink/src/main/java/com/example/sink/SensorData.java rename to samples/standalone/messaging/stream-sink/src/main/java/com/example/sink/SensorData.java diff --git a/samples/standalone/02-stream-sink/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java b/samples/standalone/messaging/stream-sink/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java similarity index 100% rename from samples/standalone/02-stream-sink/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java rename to samples/standalone/messaging/stream-sink/src/test/java/com/example/sink/ContractVerifierSampleStreamSinkApplicationTests.java diff --git a/samples/standalone/02-stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java b/samples/standalone/messaging/stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java similarity index 100% rename from samples/standalone/02-stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java rename to samples/standalone/messaging/stream-sink/src/test/java/com/example/sink/MessageConsumedTests.java diff --git a/samples/standalone/02-stream-sink/src/test/resources/application.yml b/samples/standalone/messaging/stream-sink/src/test/resources/application.yml similarity index 100% rename from samples/standalone/02-stream-sink/src/test/resources/application.yml rename to samples/standalone/messaging/stream-sink/src/test/resources/application.yml diff --git a/samples/standalone/02-stream-sink/.mvn/wrapper/maven-wrapper.jar b/samples/standalone/messaging/stream-source/.mvn/wrapper/maven-wrapper.jar similarity index 100% rename from samples/standalone/02-stream-sink/.mvn/wrapper/maven-wrapper.jar rename to samples/standalone/messaging/stream-source/.mvn/wrapper/maven-wrapper.jar diff --git a/samples/standalone/02-stream-sink/.mvn/wrapper/maven-wrapper.properties b/samples/standalone/messaging/stream-source/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from samples/standalone/02-stream-sink/.mvn/wrapper/maven-wrapper.properties rename to samples/standalone/messaging/stream-source/.mvn/wrapper/maven-wrapper.properties diff --git a/samples/standalone/01-stream-source/README.adoc b/samples/standalone/messaging/stream-source/README.adoc similarity index 100% rename from samples/standalone/01-stream-source/README.adoc rename to samples/standalone/messaging/stream-source/README.adoc diff --git a/samples/standalone/01-stream-source/build.gradle b/samples/standalone/messaging/stream-source/build.gradle similarity index 100% rename from samples/standalone/01-stream-source/build.gradle rename to samples/standalone/messaging/stream-source/build.gradle diff --git a/samples/standalone/02-stream-sink/gradle.properties b/samples/standalone/messaging/stream-source/gradle.properties similarity index 100% rename from samples/standalone/02-stream-sink/gradle.properties rename to samples/standalone/messaging/stream-source/gradle.properties diff --git a/samples/standalone/02-stream-sink/gradle/wrapper/gradle-wrapper.jar b/samples/standalone/messaging/stream-source/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from samples/standalone/02-stream-sink/gradle/wrapper/gradle-wrapper.jar rename to samples/standalone/messaging/stream-source/gradle/wrapper/gradle-wrapper.jar diff --git a/samples/standalone/02-stream-sink/gradle/wrapper/gradle-wrapper.properties b/samples/standalone/messaging/stream-source/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from samples/standalone/02-stream-sink/gradle/wrapper/gradle-wrapper.properties rename to samples/standalone/messaging/stream-source/gradle/wrapper/gradle-wrapper.properties diff --git a/samples/standalone/02-stream-sink/gradlew b/samples/standalone/messaging/stream-source/gradlew similarity index 100% rename from samples/standalone/02-stream-sink/gradlew rename to samples/standalone/messaging/stream-source/gradlew diff --git a/samples/standalone/02-stream-sink/gradlew.bat b/samples/standalone/messaging/stream-source/gradlew.bat similarity index 100% rename from samples/standalone/02-stream-sink/gradlew.bat rename to samples/standalone/messaging/stream-source/gradlew.bat diff --git a/samples/standalone/02-stream-sink/mvnw b/samples/standalone/messaging/stream-source/mvnw similarity index 100% rename from samples/standalone/02-stream-sink/mvnw rename to samples/standalone/messaging/stream-source/mvnw diff --git a/samples/standalone/02-stream-sink/mvnw.cmd b/samples/standalone/messaging/stream-source/mvnw.cmd similarity index 100% rename from samples/standalone/02-stream-sink/mvnw.cmd rename to samples/standalone/messaging/stream-source/mvnw.cmd diff --git a/samples/standalone/01-stream-source/pom.xml b/samples/standalone/messaging/stream-source/pom.xml similarity index 77% rename from samples/standalone/01-stream-source/pom.xml rename to samples/standalone/messaging/stream-source/pom.xml index e2a0b9244b..5c08d26fb6 100644 --- a/samples/standalone/01-stream-source/pom.xml +++ b/samples/standalone/messaging/stream-source/pom.xml @@ -141,65 +141,60 @@ + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/milestone + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/milestone + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + - - spring - - true - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - http://repo.spring.io/milestone - - false - - - - spring-releases - Spring Releases - http://repo.spring.io/release - - false - - - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - http://repo.spring.io/milestone - - false - - - - spring-releases - Spring Releases - http://repo.spring.io/release - - false - - - - integration diff --git a/samples/standalone/01-stream-source/settings.gradle b/samples/standalone/messaging/stream-source/settings.gradle similarity index 100% rename from samples/standalone/01-stream-source/settings.gradle rename to samples/standalone/messaging/stream-source/settings.gradle diff --git a/samples/standalone/01-stream-source/src/main/java/com/example/source/ContractVerifierSampleStreamSourceApplication.java b/samples/standalone/messaging/stream-source/src/main/java/com/example/source/ContractVerifierSampleStreamSourceApplication.java similarity index 100% rename from samples/standalone/01-stream-source/src/main/java/com/example/source/ContractVerifierSampleStreamSourceApplication.java rename to samples/standalone/messaging/stream-source/src/main/java/com/example/source/ContractVerifierSampleStreamSourceApplication.java diff --git a/samples/standalone/01-stream-source/src/main/resources/application.properties b/samples/standalone/messaging/stream-source/src/main/resources/application.properties similarity index 100% rename from samples/standalone/01-stream-source/src/main/resources/application.properties rename to samples/standalone/messaging/stream-source/src/main/resources/application.properties diff --git a/samples/standalone/01-stream-source/src/test/java/com/example/source/ContractVerifierSampleStreamSourceApplicationTests.java b/samples/standalone/messaging/stream-source/src/test/java/com/example/source/ContractVerifierSampleStreamSourceApplicationTests.java similarity index 100% rename from samples/standalone/01-stream-source/src/test/java/com/example/source/ContractVerifierSampleStreamSourceApplicationTests.java rename to samples/standalone/messaging/stream-source/src/test/java/com/example/source/ContractVerifierSampleStreamSourceApplicationTests.java diff --git a/samples/standalone/01-stream-source/src/test/java/com/example/source/SensorSourceTestBase.java b/samples/standalone/messaging/stream-source/src/test/java/com/example/source/SensorSourceTestBase.java similarity index 100% rename from samples/standalone/01-stream-source/src/test/java/com/example/source/SensorSourceTestBase.java rename to samples/standalone/messaging/stream-source/src/test/java/com/example/source/SensorSourceTestBase.java diff --git a/samples/standalone/01-stream-source/src/test/resources/contracts/shouldProduceValidSensorData.groovy b/samples/standalone/messaging/stream-source/src/test/resources/contracts/shouldProduceValidSensorData.groovy similarity index 100% rename from samples/standalone/01-stream-source/src/test/resources/contracts/shouldProduceValidSensorData.groovy rename to samples/standalone/messaging/stream-source/src/test/resources/contracts/shouldProduceValidSensorData.groovy diff --git a/samples/standalone/pom.xml b/samples/standalone/pom.xml index 5fe20bef3a..22b1311359 100644 --- a/samples/standalone/pom.xml +++ b/samples/standalone/pom.xml @@ -21,10 +21,7 @@ - dsl restdocs - 01-stream-source - 02-stream-sink diff --git a/samples/standalone/restdocs/http-client/pom.xml b/samples/standalone/restdocs/http-client/pom.xml index 786ea98a90..6a92d81ab4 100644 --- a/samples/standalone/restdocs/http-client/pom.xml +++ b/samples/standalone/restdocs/http-client/pom.xml @@ -92,57 +92,60 @@ + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/milestone + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/milestone + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + - - spring - - true - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/libs-snapshot-local - - true - - - - spring-milestones - Spring Milestones - http://repo.spring.io/libs-milestone-local - - false - - - - spring-releases - Spring Releases - http://repo.spring.io/release - - false - - - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/libs-snapshot-local - - true - - - - spring-milestones - Spring Milestones - http://repo.spring.io/libs-milestone-local - - false - - - - integration @@ -157,6 +160,7 @@ ./gradlew + clean build publishToMavenLocal -PverifierVersion=${spring-cloud-contract.version} diff --git a/samples/standalone/restdocs/http-server/pom.xml b/samples/standalone/restdocs/http-server/pom.xml index 3144b601e4..ac9e3501d8 100644 --- a/samples/standalone/restdocs/http-server/pom.xml +++ b/samples/standalone/restdocs/http-server/pom.xml @@ -101,73 +101,60 @@ + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/milestone + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/milestone + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + - - spring - - true - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/libs-snapshot-local - - true - - - - spring-milestones - Spring Milestones - http://repo.spring.io/libs-milestone-local - - false - - - - spring-releases - Spring Releases - http://repo.spring.io/release - - false - - - - - - spring-snapshots - Spring Snapshots - http://repo.spring.io/libs-snapshot-local - - true - - - - spring-milestones - Spring Milestones - http://repo.spring.io/libs-milestone-local - - false - - - - spring-plugin-snapshots - Spring Snapshots - http://repo.spring.io/plugins-snapshot-local - - true - - - - spring-plugin-milestones - Spring Milestones - http://repo.spring.io/plugins-milestone-local - - false - - - - integration diff --git a/samples/standalone/restdocs/pom.xml b/samples/standalone/restdocs/pom.xml index 4b7f372b47..77bee619cf 100644 --- a/samples/standalone/restdocs/pom.xml +++ b/samples/standalone/restdocs/pom.xml @@ -16,10 +16,9 @@ Spring Cloud Contract Standalone Restdocs Test Samples Spring Cloud Contract Standalone Test Samples used for end to end tests - - http-server - http-client - + + 1.0.0.BUILD-SNAPSHOT + @@ -32,4 +31,91 @@ + + + spring + + true + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/milestone + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + + + spring-snapshots + Spring Snapshots + http://repo.spring.io/snapshot + + true + + + + spring-milestones + Spring Milestones + http://repo.spring.io/milestone + + false + + + + spring-releases + Spring Releases + http://repo.spring.io/release + + false + + + + + + integration + + + + org.codehaus.mojo + exec-maven-plugin + + + runTests + test + + ./runTests.sh + + ${spring-cloud-contract.version} + + + + exec + + + + + + + + + diff --git a/samples/standalone/restdocs/runTests.sh b/samples/standalone/restdocs/runTests.sh new file mode 100755 index 0000000000..638292068d --- /dev/null +++ b/samples/standalone/restdocs/runTests.sh @@ -0,0 +1,36 @@ +#!/bin/bash + +set -o errexit + +VERIFIER_VERSION=$1 +ROOT=`pwd` + +cat < 0 ]] -do -key="$1" -case $key in - -v|--version) - VERIFIER_VERSION="$2" - shift # past argument - ;; - --help) - print_usage - exit 0 - ;; - *) - echo "Invalid option: [$1]" - print_usage - exit 1 - ;; -esac -shift # past argument or value -done - -# Code grepping for the 3rd presence of "version" in pom.xml. -# The 3rd one is where we define the SC-Contract version -VERSION_NODE=`awk '/version/{i++}i==3{print; exit}' $ROOT_FOLDER/pom.xml` -# Extract the contents of the version node -VERSION_VALUE=$(sed -ne '/version/{s/.*\(.*\)<\/version>.*/\1/p;q;}' <<< "$VERSION_NODE") - -[[ -z "${VERIFIER_VERSION}" ]] && VERIFIER_VERSION="$VERSION_VALUE" -export VERIFIER_VERSION - -echo -e "\n\nBUILDING AND RUNNING TESTS FOR VERIFIER IN VERSION [$VERIFIER_VERSION]\n\n" - -echo "Building all libraries" -$ROOT_FOLDER/scripts/build.sh - -echo "Running tests" -$ROOT_FOLDER/scripts/runTests.sh diff --git a/scripts/deploy.sh b/scripts/deploy.sh deleted file mode 100755 index bc3562d929..0000000000 --- a/scripts/deploy.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -source common.sh || source scripts/common.sh || echo "No common.sh script found..." - -set -e - -./mvnw clean install && ./scripts/runTests.sh && ./mvnw deploy diff --git a/scripts/downloadDependencies.sh b/scripts/downloadDependencies.sh index 7ed335d2df..ee869c74d6 100755 --- a/scripts/downloadDependencies.sh +++ b/scripts/downloadDependencies.sh @@ -6,5 +6,15 @@ set -e ./mvnw -s .settings.xml --fail-never dependency:go-offline || true cd $ROOT_FOLDER/spring-cloud-contact-gradle-plugin && ./gradlew resolveDependencies || true -cd $ROOT_FOLDER/samples/samples-standalone && ./mvnw --fail-never dependency:go-offline || true -cd $ROOT_FOLDER/samples/samples-standalone && ./downloadGradleDeps.sh +cd $ROOT_FOLDER/samples/standalone/dsl/http-client && ./mvnw --fail-never dependency:go-offline || true +cd $ROOT_FOLDER/samples/standalone/dsl/http-client && ./downloadGradleDeps.sh +cd $ROOT_FOLDER/samples/standalone/dsl/http-server && ./mvnw --fail-never dependency:go-offline || true +cd $ROOT_FOLDER/samples/standalone/dsl/http-server && ./downloadGradleDeps.sh +cd $ROOT_FOLDER/samples/standalone/restdocs/http-client && ./mvnw --fail-never dependency:go-offline || true +cd $ROOT_FOLDER/samples/standalone/restdocs/http-client && ./downloadGradleDeps.sh +cd $ROOT_FOLDER/samples/standalone/restdocs/http-server && ./mvnw --fail-never dependency:go-offline || true +cd $ROOT_FOLDER/samples/standalone/restdocs/http-server && ./downloadGradleDeps.sh +cd $ROOT_FOLDER/samples/standalone/messaging/stream-sink && ./mvnw --fail-never dependency:go-offline || true +cd $ROOT_FOLDER/samples/standalone/messaging/stream-sink && ./downloadGradleDeps.sh +cd $ROOT_FOLDER/samples/standalone/messaging/sream-source && ./mvnw --fail-never dependency:go-offline || true +cd $ROOT_FOLDER/samples/standalone/messaging/sream-source && ./downloadGradleDeps.sh