From 67b537ae0a14239bcc5f3e315d118cf4d7fc68e3 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Sun, 28 Oct 2018 15:09:52 +0100 Subject: [PATCH] Added .mvn and .gradle to excluded build folders; fixes gh-772 --- .../cloud/contract/verifier/plugin/ContractsCopyTask.groovy | 2 +- .../cloud/contract/maven/verifier/CopyContracts.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/ContractsCopyTask.groovy b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/ContractsCopyTask.groovy index 7404ffd7ac..f2ab11a6c3 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/ContractsCopyTask.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/groovy/org/springframework/cloud/contract/verifier/plugin/ContractsCopyTask.groovy @@ -57,7 +57,7 @@ class ContractsCopyTask extends ConventionTask { // ...we also want to allow dot separation include(slashSeparatedAntPattern) if (props.isExcludeBuildFolders()) { - exclude "**/target/**", "**/build/**" + exclude "**/target/**", "**/build/**", "**/.mvn/**", "**/.gradle/**" } into(outputContractsFolder) } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/CopyContracts.java b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/CopyContracts.java index fd1ecc2540..f089d3a66a 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/CopyContracts.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-maven-plugin/src/main/java/org/springframework/cloud/contract/maven/verifier/CopyContracts.java @@ -75,7 +75,9 @@ class CopyContracts { } if (this.config.isExcludeBuildFolders()) { resource.addExclude("**/target/**"); + resource.addExclude("**/.mvn/**"); resource.addExclude("**/build/**"); + resource.addExclude("**/.gradle/**"); } resource.setDirectory(contractsDirectory.getAbsolutePath()); MavenResourcesExecution execution = new MavenResourcesExecution();