Skip to content

Commit 79b65e7

Browse files
committed
[#288] Move XSDs in jar from the root to META-INF
# Conflicts: # pom.xml
1 parent 75a5452 commit 79b65e7

File tree

2 files changed

+14
-13
lines changed

2 files changed

+14
-13
lines changed

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
<resources>
123123
<resource>
124124
<directory>${project.basedir}/src/main/xsd</directory>
125+
<targetPath>META-INF</targetPath>
125126
</resource>
126127
<resource>
127128
<directory>${project.basedir}</directory>

src/test/java/jakarta/validation/XsdValidationTest.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class XsdValidationTest {
4343
public void beforeClass() throws Exception {
4444
Pattern pattern = Pattern.compile( ".+(\\d+\\.\\d+)\\.xsd" );
4545

46-
try ( Stream<Path> stream = Files.list( Paths.get( XsdValidationTest.this.getClass().getResource( "/validation-configuration-1.0.xsd" ).toURI() ).getParent() ) ) {
46+
try ( Stream<Path> stream = Files.list( Paths.get( XsdValidationTest.this.getClass().getResource( "/META-INF/validation-configuration-1.0.xsd" ).toURI() ).getParent() ) ) {
4747
stream.forEach( path -> {
4848
String filename = path.getFileName().toString();
4949
if ( filename.endsWith( ".xsd" ) ) {
@@ -102,41 +102,41 @@ public void fatalError(SAXParseException exception) throws SAXException {
102102
@DataProvider(name = "xsd")
103103
public static Object[][] xsd() {
104104
return new Object[][] {
105-
{ "1.0", "/validation-configuration-1.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
105+
{ "1.0", "/META-INF/validation-configuration-1.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
106106
"<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>"
107107
},
108-
{ "1.1", "/validation-configuration-1.1.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
108+
{ "1.1", "/META-INF/validation-configuration-1.1.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
109109
"<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>"
110110
},
111-
{ "2.0", "/validation-configuration-2.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
111+
{ "2.0", "/META-INF/validation-configuration-2.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
112112
"<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>"
113113
},
114-
{ "3.0", "/validation-configuration-3.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
114+
{ "3.0", "/META-INF/validation-configuration-3.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
115115
"<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>"
116116
},
117-
{ "3.1", "/validation-configuration-3.1.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
117+
{ "3.1", "/META-INF/validation-configuration-3.1.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
118118
"<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>"
119119
},
120-
{ "4.0", "/validation-configuration-4.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
120+
{ "4.0", "/META-INF/validation-configuration-4.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
121121
"<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>"
122122
},
123123

124-
{ "1.0", "/validation-mapping-1.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
124+
{ "1.0", "/META-INF/validation-mapping-1.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
125125
"<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>"
126126
},
127-
{ "1.1", "/validation-mapping-1.1.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
127+
{ "1.1", "/META-INF/validation-mapping-1.1.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
128128
"<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>"
129129
},
130-
{ "2.0", "/validation-mapping-2.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
130+
{ "2.0", "/META-INF/validation-mapping-2.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
131131
"<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>"
132132
},
133-
{ "3.0", "/validation-mapping-3.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
133+
{ "3.0", "/META-INF/validation-mapping-3.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
134134
"<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>"
135135
},
136-
{ "3.1", "/validation-mapping-3.1.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
136+
{ "3.1", "/META-INF/validation-mapping-3.1.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
137137
"<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>"
138138
},
139-
{ "4.0", "/validation-mapping-4.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
139+
{ "4.0", "/META-INF/validation-mapping-4.0.xsd", "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
140140
"<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>"
141141
},
142142
};

0 commit comments

Comments
 (0)