From 45bbabd48547610e3ff5bd3992d4e1fcdc25dfc4 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@gopivotal.com>
Date: Mon, 26 Oct 2015 14:04:17 -0500
Subject: [PATCH] SEC-3057: Include all *.txt & *.jar in dist zip

---
 build.gradle | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 92bff1454e..c307096884 100644
--- a/build.gradle
+++ b/build.gradle
@@ -135,7 +135,7 @@ task coreBuild {
 // Task for creating the distro zip
 
 task dist(type: Zip) {
-	dependsOn subprojects*.tasks*.matching { task -> task.name == 'assemble' || task.name.endsWith('Zip') || task.name.endsWith('generatePom') }
+	dependsOn { subprojects*.tasks*.matching { task -> task.name.endsWith('generatePom') } }
 	classifier = 'dist'
 
 	evaluationDependsOn(':docs')
@@ -145,14 +145,19 @@ task dist(type: Zip) {
 	into(zipRootDir) {
 		from(rootDir) {
 			include '*.adoc'
+			include '*.txt'
 		}
 		into('docs') {
 			with(project(':docs').apiSpec)
 			with(project(':docs:manual').spec)
 			with(project(':docs:guides').spec)
 		}
-		into('dist') {
-			from coreModuleProjects.collect {project -> project.libsDir }
+		project.coreModuleProjects*.tasks*.withType(AbstractArchiveTask).flatten().each{ archiveTask ->
+			if(archiveTask!=dist){
+				into("$zipRootDir/dist") {
+					from archiveTask.outputs.files
+				}
+			}
 		}
 		sampleProjects.each { project->
 			into("$zipRootDir/samples/$project.name") {