Skip to content

[#288] Move XSDs in jar from the root to META-INF #289

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marko-bekhta merged 1 commit into from
Oct 22, 2025
Merged

[#288] Move XSDs in jar from the root to META-INF #289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@
<resources>
<resource>
<directory>${project.basedir}/src/main/xsd</directory>
<targetPath>META-INF</targetPath>
</resource>
<resource>
<directory>${project.basedir}</directory>
Expand Down
26 changes: 13 additions & 13 deletions src/test/java/jakarta/validation/XsdValidationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class XsdValidationTest {
public void beforeClass() throws Exception {
Pattern pattern = Pattern.compile( ".+(\\d+\\.\\d+)\\.xsd" );

try ( Stream<Path> stream = Files.list( Paths.get( XsdValidationTest.this.getClass().getResource( "/validation-configuration-1.0.xsd" ).toURI() ).getParent() ) ) {
try ( Stream<Path> stream = Files.list( Paths.get( XsdValidationTest.this.getClass().getResource( "/META-INF/validation-configuration-1.0.xsd" ).toURI() ).getParent() ) ) {
stream.forEach( path -> {
String filename = path.getFileName().toString();
if ( filename.endsWith( ".xsd" ) ) {
Expand Down Expand Up @@ -102,41 +102,41 @@ public void fatalError(SAXParseException exception) throws SAXException {
@DataProvider(name = "xsd")
public static Object[][] xsd() {
return new Object[][] {
{ "1.0", "/validation-configuration-1.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
{ "1.0", "/META-INF/validation-configuration-1.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<validation-config xmlns=\"http://jboss.org/xml/ns/javax/validation/configuration\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://jboss.org/xml/ns/javax/validation/configuration validation-configuration-1.0.xsd\"><property name=\"com.acme.validation.safetyChecking\">failOnError</property></validation-config>"
},
{ "1.1", "/validation-configuration-1.1.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
{ "1.1", "/META-INF/validation-configuration-1.1.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<validation-config xmlns=\"http://jboss.org/xml/ns/javax/validation/configuration\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://jboss.org/xml/ns/javax/validation/configuration validation-configuration-1.1.xsd\" version=\"1.1\"><property name=\"com.acme.validation.safetyChecking\">failOnError</property></validation-config>"
},
{ "2.0", "/validation-configuration-2.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
{ "2.0", "/META-INF/validation-configuration-2.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<validation-config xmlns=\"http://xmlns.jcp.org/xml/ns/validation/configuration\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://xmlns.jcp.org/xml/ns/validation/configuration http://xmlns.jcp.org/xml/ns/validation/configuration/validation-configuration-2.0.xsd\" version=\"2.0\"><property name=\"com.acme.validation.safetyChecking\">failOnError</property></validation-config>"
},
{ "3.0", "/validation-configuration-3.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
{ "3.0", "/META-INF/validation-configuration-3.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<validation-config xmlns=\"https://jakarta.ee/xml/ns/validation/configuration\" xsi:schemaLocation=\"https://jakarta.ee/xml/ns/validation/configuration https://jakarta.ee/xml/ns/validation/validation-configuration-3.0.xsd\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" version=\"3.0\"><property name=\"com.acme.validation.safetyChecking\">failOnError</property></validation-config>"
},
{ "3.1", "/validation-configuration-3.1.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
{ "3.1", "/META-INF/validation-configuration-3.1.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<validation-config xmlns=\"https://jakarta.ee/xml/ns/validation/configuration\" xsi:schemaLocation=\"https://jakarta.ee/xml/ns/validation/configuration https://jakarta.ee/xml/ns/validation/validation-configuration-3.1.xsd\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" version=\"3.1\"><property name=\"com.acme.validation.safetyChecking\">failOnError</property></validation-config>"
},
{ "4.0", "/validation-configuration-4.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
{ "4.0", "/META-INF/validation-configuration-4.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<validation-config xmlns=\"https://jakarta.ee/xml/ns/validation/configuration\" xsi:schemaLocation=\"https://jakarta.ee/xml/ns/validation/configuration https://jakarta.ee/xml/ns/validation/validation-configuration-4.0.xsd\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" version=\"4.0\"><property name=\"com.acme.validation.safetyChecking\">failOnError</property></validation-config>"
},

{ "1.0", "/validation-mapping-1.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
{ "1.0", "/META-INF/validation-mapping-1.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<constraint-mappings xmlns=\"http://jboss.org/xml/ns/javax/validation/mapping\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.0.xsd\"><constraint-definition annotation=\"jakarta.validation.constraints.NotNull\"><validated-by><value>com.acme.SomeValidator</value></validated-by></constraint-definition></constraint-mappings>"
},
{ "1.1", "/validation-mapping-1.1.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
{ "1.1", "/META-INF/validation-mapping-1.1.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<constraint-mappings xmlns=\"http://jboss.org/xml/ns/javax/validation/mapping\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.1.xsd\" version=\"1.1\"><constraint-definition annotation=\"jakarta.validation.constraints.NotNull\"><validated-by><value>com.acme.SomeValidator</value></validated-by></constraint-definition></constraint-mappings>"
},
{ "2.0", "/validation-mapping-2.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
{ "2.0", "/META-INF/validation-mapping-2.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<constraint-mappings xmlns=\"http://xmlns.jcp.org/xml/ns/validation/mapping\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://xmlns.jcp.org/xml/ns/validation/mapping http://xmlns.jcp.org/xml/ns/validation/mapping/validation-mapping-2.0.xsd\" version=\"2.0\"><constraint-definition annotation=\"jakarta.validation.constraints.NotNull\"><validated-by><value>com.acme.SomeValidator</value></validated-by></constraint-definition></constraint-mappings>"
},
{ "3.0", "/validation-mapping-3.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
{ "3.0", "/META-INF/validation-mapping-3.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<constraint-mappings xmlns=\"https://jakarta.ee/xml/ns/validation/mapping\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"https://jakarta.ee/xml/ns/validation/mapping https://jakarta.ee/xml/ns/validation/validation-mapping-3.0.xsd\" version=\"3.0\"><constraint-definition annotation=\"jakarta.validation.constraints.NotNull\"><validated-by><value>com.acme.SomeValidator</value></validated-by></constraint-definition></constraint-mappings>"
},
{ "3.1", "/validation-mapping-3.1.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
{ "3.1", "/META-INF/validation-mapping-3.1.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<constraint-mappings xmlns=\"https://jakarta.ee/xml/ns/validation/mapping\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"https://jakarta.ee/xml/ns/validation/mapping https://jakarta.ee/xml/ns/validation/validation-mapping-3.1.xsd\" version=\"3.1\"><constraint-definition annotation=\"jakarta.validation.constraints.NotNull\"><validated-by><value>com.acme.SomeValidator</value></validated-by></constraint-definition></constraint-mappings>"
},
{ "4.0", "/validation-mapping-4.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
{ "4.0", "/META-INF/validation-mapping-4.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
"<constraint-mappings xmlns=\"https://jakarta.ee/xml/ns/validation/mapping\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"https://jakarta.ee/xml/ns/validation/mapping https://jakarta.ee/xml/ns/validation/validation-mapping-4.0.xsd\" version=\"4.0\"><constraint-definition annotation=\"jakarta.validation.constraints.NotNull\"><validated-by><value>com.acme.SomeValidator</value></validated-by></constraint-definition></constraint-mappings>"
},
};
Expand Down