Merge branch '1.1.x'

This commit is contained in:
Marcin Grzejszczak
2017-11-20 11:48:57 +01:00
3 changed files with 5 additions and 5 deletions

View File

@@ -1,3 +1,3 @@
releaser.maven.buildCommand: ./scripts/noIntegration.sh
releaser.maven.buildCommand: ./scripts/noIntegration.sh {{systemProps}}
releaser.gradle.gradlePropsSubstitution:
verifierVersion: spring-cloud-contract

View File

@@ -7,10 +7,10 @@ set -e
echo "Generating docs for Spring Cloud Contract"
echo "Building main docs"
./mvnw clean install -P docs -DskipTests=true --pl docs
./mvnw clean install -P docs -DskipTests=true --pl docs ${@}
echo "Building maven plugin docs"
./mvnw site -DskipTests=true --pl spring-cloud-contract-tools/spring-cloud-contract-maven-plugin
./mvnw site -DskipTests=true --pl spring-cloud-contract-tools/spring-cloud-contract-maven-plugin ${@}
echo "Copying generated maven plugin docs to main docs"
cp -r spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/target/site docs/target/generated-docs/spring-cloud-contract-maven-plugin

View File

@@ -6,5 +6,5 @@ FOLDER=`pwd`
set -e
./mvnw clean install
${FOLDER}/scripts/generateDocs.sh
./mvnw clean install ${@}
${FOLDER}/scripts/generateDocs.sh ${@}