This is an automated email from the ASF dual-hosted git repository. rhoughton pushed a commit to branch support/1.15 in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.15 by this push: new f4c05ad2c1 GEODE-10388: create better output filter for srcDist task (#7806) f4c05ad2c1 is described below commit f4c05ad2c15534bede369699f778d92c1a5a833d Author: Robert Houghton <rhough...@pivotal.io> AuthorDate: Thu Jun 16 13:33:47 2022 -0700 GEODE-10388: create better output filter for srcDist task (#7806) Replace the brittle exclude list for `build` and `out` directories with a closure containing comparison logic for file-type and name. Makes sure that regular files named `out` are still archived. (cherry picked from commit bbf51e74fccf59cbdf6a7ca283342a09ec9bffb3) --- geode-assembly/build.gradle | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/geode-assembly/build.gradle b/geode-assembly/build.gradle index 78f1f5e377..8e62fabea9 100755 --- a/geode-assembly/build.gradle +++ b/geode-assembly/build.gradle @@ -442,14 +442,8 @@ distributions { exclude 'wrapper' // These exclude the 'build' and 'out' artifact directories from Gradle and IntelliJ for each project - exclude 'buildSrc/build' - exclude 'buildSrc/out' - rootProject.allprojects.each { - def relPath = Paths.get(rootDir.getPath()).relativize(Paths.get(it.projectDir.getPath())) - def relOut = relPath.resolve("out").toString() - def relBuild = relPath.resolve("build").toString() - exclude relOut - exclude relBuild + exclude { FileTreeElement details -> + details.directory && (details.name == "build" || details.name == "out") } } }