SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1.0.x'

Browse Source
This commit is contained in:
Marcin Grzejszczak
2017-02-28 14:27:30 +01:00
parent 9c96d3de3d a4007cc3cb
commit 7340f2893d
7 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/build.gradle
View File

@@ -77,7 +77,11 @@ dependencies {
}
task libtest << { configurations.testCompile.files.each { println it } }
task libtest() {
doLast{
configurations.testCompile.files.each { println it }
}
}
test {
testLogging {
@@ -126,4 +130,8 @@ task resolveDependencies {
}
}
}
}
task wrapper(type: Wrapper) {
gradleVersion = '3.4'
}

3
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle.properties
View File

@@ -16,4 +16,5 @@
nexusUsername =
nexusPassword =
verifierVersion=1.1.0.BUILD-SNAPSHOT
verifierVersion=1.1.0.BUILD-SNAPSHOT
org.gradle.daemon=false

BIN
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Mon Aug 29 14:43:30 CEST 2016
#Tue Feb 28 14:19:34 CET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip

5
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradlew vendored
View File

@@ -161,4 +161,9 @@ function splitJvmOpts() {
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
cd "$(dirname "$0")"
fi
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

6
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/gradlew.bat vendored
View File

@@ -49,7 +49,6 @@ goto fail
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
goto execute
:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line

2
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/test/groovy/org/springframework/cloud/contract/verifier/plugin/ContractVerifierIntegrationSpec.groovy
View File

@@ -76,7 +76,7 @@ abstract class ContractVerifierIntegrationSpec extends Specification {
protected void runTasksSuccessfully(String... tasks) {
BuildResult result = run(tasks)
result.tasks.each {
assert it.outcome == TaskOutcome.SUCCESS || it.outcome == TaskOutcome.UP_TO_DATE
assert it.outcome == TaskOutcome.SUCCESS || it.outcome == TaskOutcome.UP_TO_DATE || it.outcome == TaskOutcome.NO_SOURCE
}
}