Include ALL source artifacts in published sources jars

sbrannen · sbrannen · commit 3b64db18f769 · 2014-08-26T17:06:42.000+02:00
This commit updates the Gradle build to ensure that *all* source artifacts are including in published 'sources' jars. To achieve this, we are now assembling 'sources' jars from 'sourceSets.main.allSource' and not explicitly including or excluding anything by default. Issue: SPR-12085 (cherry picked from commit 07629a3)
diff --git a/build.gradle b/build.gradle
@@ -144,10 +144,10 @@ configure(subprojects - project(":spring-build-src")) { subproject ->
 		logging.captureStandardOutput LogLevel.INFO // suppress "## warnings" message
 	}
 
-	task sourcesJar(type: Jar, dependsOn:classes) {
-		classifier = "sources"
-		from sourceSets.main.allJava.srcDirs
-		include "**/*.java", "**/*.aj"
+	task sourcesJar(type: Jar, dependsOn: classes) {
+		classifier = 'sources'
+		from sourceSets.main.allSource
+		// don't include or exclude anything explicitly by default. See SPR-12085.
 	}
 
 	task javadocJar(type: Jar) {

Original file line number	Diff line number	Diff line change
`@@ -144,10 +144,10 @@ configure(subprojects - project(":spring-build-src")) { subproject ->`
`144`	`144`	`logging.captureStandardOutput LogLevel.INFO // suppress "## warnings" message`
`145`	`145`	`}`
`146`	`146`
`147`		`- task sourcesJar(type: Jar, dependsOn:classes) {`
`148`		`- classifier = "sources"`
`149`		`- from sourceSets.main.allJava.srcDirs`
`150`		`- include "*/.java", "*/.aj"`
	`147`	`+ task sourcesJar(type: Jar, dependsOn: classes) {`
	`148`	`+ classifier = 'sources'`
	`149`	`+ from sourceSets.main.allSource`
	`150`	`+ // don't include or exclude anything explicitly by default. See SPR-12085.`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`task javadocJar(type: Jar) {`