Merge branch '5.8.x'

marcusdacoregio · marcusdacoregio · commit f9f41047cf27 · 2022-10-10T11:02:22.000-03:00
Closes gh-11981
diff --git a/build.gradle b/build.gradle
@@ -179,12 +179,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
`@@ -179,12 +179,9 @@ nohttp {`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`tasks.register('cloneSamples', IncludeRepoTask) {`
`182`		`- if (!project.hasProperty("cloneOutputDirectory")) {`
`183`		`- throw new GradleException("Required parameter 'cloneOutputDirectory' not found")`
`184`		`- }`
`185`	`182`	`repository = 'spring-projects/spring-security-samples'`
`186`	`183`	`ref = samplesBranch`
`187`		`- outputDirectory = project.file("$cloneOutputDirectory")`
	`184`	`+ outputDirectory = project.hasProperty("cloneOutputDirectory") ? project.file("$cloneOutputDirectory") : project.file("build/samples")`
`188`	`185`	`}`
`189`	`186`
`190`	`187`	`s101 {`