Merge branch '5.6.x' into 5.7.x

Closes gh-11979
3 years ago · b17ba7cdcc
1 changed files with 1 additions and 4 deletions
--- a/build.gradle
+++ b/build.gradle
@ -202,12 +202,9 @@ nohttp {
				@@ -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 {