Merge branch '5.6.x' into 5.7.x

marcusdacoregio · marcusdacoregio · commit b17ba7cdccc9 · 2022-10-10T11:01:27.000-03:00
Closes gh-11979
diff --git a/build.gradle b/build.gradle
@@ -202,12 +202,9 @@ nohttp {
 }
 
 tasks.register('cloneSamples', IncludeRepoTask) {
-	if (!project.hasProperty("cloneOutputDirectory")) {
-		throw new GradleException("Required parameter 'cloneOutputDirectory' not found")
-	}
 	repository = 'spring-projects/spring-security-samples'
 	ref = samplesBranch
-	outputDirectory = project.file("$cloneOutputDirectory")
+	outputDirectory = project.hasProperty("cloneOutputDirectory") ? project.file("$cloneOutputDirectory") : project.file("build/samples")
 }
 
 s101 {

Original file line number	Diff line number	Diff line change
`@@ -202,12 +202,9 @@ nohttp {`
`202`	`202`	`}`
`203`	`203`
`204`	`204`	`tasks.register('cloneSamples', IncludeRepoTask) {`
`205`		`- if (!project.hasProperty("cloneOutputDirectory")) {`
`206`		`- throw new GradleException("Required parameter 'cloneOutputDirectory' not found")`
`207`		`- }`
`208`	`205`	`repository = 'spring-projects/spring-security-samples'`
`209`	`206`	`ref = samplesBranch`
`210`		`- outputDirectory = project.file("$cloneOutputDirectory")`
	`207`	`+ outputDirectory = project.hasProperty("cloneOutputDirectory") ? project.file("$cloneOutputDirectory") : project.file("build/samples")`
`211`	`208`	`}`
`212`	`209`
`213`	`210`	`s101 {`