Merge branch '5.7.x' into 5.8.x

marcusdacoregio · marcusdacoregio · commit 6e2e76978f84 · 2022-10-10T11:01:56.000-03:00
Closes gh-11980
diff --git a/build.gradle b/build.gradle
@@ -187,12 +187,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
`@@ -187,12 +187,9 @@ nohttp {`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`tasks.register('cloneSamples', IncludeRepoTask) {`
`190`		`- if (!project.hasProperty("cloneOutputDirectory")) {`
`191`		`- throw new GradleException("Required parameter 'cloneOutputDirectory' not found")`
`192`		`- }`
`193`	`190`	`repository = 'spring-projects/spring-security-samples'`
`194`	`191`	`ref = samplesBranch`
`195`		`- outputDirectory = project.file("$cloneOutputDirectory")`
	`192`	`+ outputDirectory = project.hasProperty("cloneOutputDirectory") ? project.file("$cloneOutputDirectory") : project.file("build/samples")`
`196`	`193`	`}`
`197`	`194`
`198`	`195`	`s101 {`