Skip to content

Commit 1eefd43

Browse files
committed
Add spring-security.xsd symlink
Closes gh-13131
1 parent b6f3cb7 commit 1eefd43

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

buildSrc/src/main/groovy/io/spring/gradle/convention/SchemaZipPlugin.groovy

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package io.spring.gradle.convention
22

3-
import org.gradle.api.plugins.JavaPlugin
4-
import org.gradle.api.tasks.bundling.Zip
53
import org.gradle.api.Plugin
64
import org.gradle.api.Project
5+
import org.gradle.api.plugins.JavaPlugin
6+
import org.gradle.api.tasks.bundling.Zip
77

88
public class SchemaZipPlugin implements Plugin<Project> {
99

@@ -37,6 +37,15 @@ public class SchemaZipPlugin implements Plugin<Project> {
3737
from xsdFile.path
3838
}
3939
}
40+
File symlink = module.sourceSets.main.resources.find {
41+
it.path.endsWith('org/springframework/security/config/spring-security.xsd')
42+
}
43+
if (symlink != null) {
44+
schemaZip.into('security') {
45+
duplicatesStrategy 'exclude'
46+
from symlink.path
47+
}
48+
}
4049
}
4150
}
4251
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
spring-security-5.7.xsd

config/src/test/java/org/springframework/security/config/doc/XsdDocumentedTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,8 @@ public void sizeWhenReadingFilesystemThenIsCorrectNumberOfSchemaFiles() throws I
150150
.getParentFile()
151151
.list((dir, name) -> name.endsWith(".xsd"));
152152
// @formatter:on
153-
assertThat(schemas.length).isEqualTo(19)
154-
.withFailMessage("the count is equal to 19, if not then schemaDocument needs updating");
153+
assertThat(schemas.length).isEqualTo(20)
154+
.withFailMessage("the count is equal to 20, if not then schemaDocument needs updating");
155155
}
156156

157157
/**

0 commit comments

Comments
 (0)