Merge branch '5.7.x' into 5.8.x

Steve Riesenberg · Steve Riesenberg · commit a6918f9e0c3f · 2023-03-01T11:50:17.000-06:00
diff --git a/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaDeployPlugin.groovy b/buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaDeployPlugin.groovy
@@ -86,7 +86,7 @@ public class SchemaDeployPlugin implements Plugin<Project> {
 						 */
 						if (name == "spring-security") {
 							def springSecurityOauthPath = "/var/www/domains/spring.io/docs/htdocs/autorepo/schema/spring-security-oauth/current/security"
-							execute "cp $springSecurityOauthPath/* $extractPath"
+							execute "cp $springSecurityOauthPath/* ${extractPath}security"
 						}
 
 						execute "chmod -R g+w $extractPath"

Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@ public class SchemaDeployPlugin implements Plugin<Project> {`
`86`	`86`	`*/`
`87`	`87`	`if (name == "spring-security") {`
`88`	`88`	`def springSecurityOauthPath = "/var/www/domains/spring.io/docs/htdocs/autorepo/schema/spring-security-oauth/current/security"`
`89`		`- execute "cp $springSecurityOauthPath/* $extractPath"`
	`89`	`+ execute "cp $springSecurityOauthPath/* ${extractPath}security"`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`execute "chmod -R g+w $extractPath"`