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

Skip tasks when input directory is empty (#1530)

Browse Source
This commit is contained in:
Shannon Pamperl
2020-10-17 00:36:20 -05:00
committed by GitHub
parent 1bfa966550
commit 9df4da4ef5
4 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
samples/standalone/webclient/http-server/build.gradle
View File

@@ -4,6 +4,13 @@ plugins {
id "io.spring.dependency-management"
id "maven-publish"
id "maven"
/**
* While the SCC Gradle plugin is not strictly necessary for this project.
* It is included to ensure that if the contractDslDir does not exist, then
* the plugin reports "NO-SOURCE" for associated tasks, rather than resulting
* in an error for the end user.
*/
id "org.springframework.cloud.contract"
}
group = 'com.example'
@@ -35,6 +42,10 @@ dependencies {
testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
}
contracts {
failOnNoContracts = false
}
test {
useJUnitPlatform()
systemProperty 'spring.profiles.active', 'gradle'

2
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/ContractsCopyTask.java
View File

@@ -42,6 +42,7 @@ import org.gradle.api.tasks.Optional;
import org.gradle.api.tasks.OutputDirectory;
import org.gradle.api.tasks.PathSensitive;
import org.gradle.api.tasks.PathSensitivity;
import org.gradle.api.tasks.SkipWhenEmpty;
import org.gradle.api.tasks.TaskAction;
import org.springframework.cloud.contract.stubrunner.ContractDownloader;
import org.springframework.cloud.contract.stubrunner.ScmStubDownloaderBuilder;
@@ -281,6 +282,7 @@ class ContractsCopyTask extends DefaultTask {
}
@InputDirectory
@SkipWhenEmpty
@PathSensitive(PathSensitivity.RELATIVE)
DirectoryProperty getContractsDirectory() {
return contractsDirectory;

2
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/GenerateClientStubsFromDslTask.java
View File

@@ -33,6 +33,7 @@ import org.gradle.api.tasks.InputDirectory;
import org.gradle.api.tasks.OutputDirectory;
import org.gradle.api.tasks.PathSensitive;
import org.gradle.api.tasks.PathSensitivity;
import org.gradle.api.tasks.SkipWhenEmpty;
import org.gradle.api.tasks.TaskAction;
import org.springframework.cloud.contract.verifier.converter.RecursiveFilesConverter;
@@ -81,6 +82,7 @@ class GenerateClientStubsFromDslTask extends DefaultTask {
}
@InputDirectory
@SkipWhenEmpty
@PathSensitive(PathSensitivity.RELATIVE)
public Property<Directory> getContractsDslDir() {
return contractsDslDir;

2
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/GenerateServerTestsTask.java
View File

@@ -30,6 +30,7 @@ import org.gradle.api.tasks.Optional;
import org.gradle.api.tasks.OutputDirectory;
import org.gradle.api.tasks.PathSensitive;
import org.gradle.api.tasks.PathSensitivity;
import org.gradle.api.tasks.SkipWhenEmpty;
import org.gradle.api.tasks.TaskAction;
import org.springframework.cloud.contract.spec.ContractVerifierException;
import org.springframework.cloud.contract.verifier.TestGenerator;
@@ -132,6 +133,7 @@ class GenerateServerTestsTask extends DefaultTask {
}
@InputDirectory
@SkipWhenEmpty
@PathSensitive(PathSensitivity.RELATIVE)
DirectoryProperty getContractsDslDir() {
return contractsDslDir;