Skip to content

Commit 59eadda

Browse files
gsmetgsmet
committed
fixup! HV-1759 Add the new XML schemas and rely of them for the tests
1 parent 090608b commit 59eadda

File tree

16 files changed

+56
-51
lines changed

16 files changed

+56
-51
lines changed

‎cdi/src/test/resources/org/hibernate/validator/test/cdi/internal/injection/validation.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
~ License: Apache License, Version 2.0
66
~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
77
-->
8-
<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
9-
xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration validation-configuration-1.1.xsd"
10-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
8+
<validation-config xmlns="https://xmlns.jakarta.ee/xml/ns/validation/configuration"
9+
xsi:schemaLocation="https://xmlns.jakarta.ee/xml/ns/validation/configuration validation-configuration-3.0.xsd"
10+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11+
version="3.0">
1112
<default-provider>org.hibernate.validator.test.cdi.internal.injection.MyValidationProvider</default-provider>
1213
</validation-config>

‎cdi/src/test/resources/org/hibernate/validator/test/cdi/internal/methodvalidation/getter/validation-validate-executable-getter.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
77
-->
88
<validation-config
9-
xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
9+
xmlns="https://xmlns.jakarta.ee/xml/ns/validation/configuration"
1010
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11-
xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration validation-configuration-1.1.xsd"
12-
version="1.1">
11+
xsi:schemaLocation="https://xmlns.jakarta.ee/xml/ns/validation/configuration validation-configuration-3.0.xsd"
12+
version="3.0">
1313
<executable-validation>
1414
<default-validated-executable-types>
1515
<executable-type>GETTER_METHODS</executable-type>

‎cdi/src/test/resources/org/hibernate/validator/test/cdi/internal/methodvalidation/validation-disable-executable-validation.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
77
-->
88
<validation-config
9-
xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
9+
xmlns="https://xmlns.jakarta.ee/xml/ns/validation/configuration"
1010
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11-
xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration validation-configuration-1.1.xsd"
12-
version="1.1">
11+
xsi:schemaLocation="https://xmlns.jakarta.ee/xml/ns/validation/configuration validation-configuration-3.0.xsd"
12+
version="3.0">
1313
<executable-validation enabled="false"/>
1414
</validation-config>

‎documentation/src/test/java/org/hibernate/validator/referenceguide/chapter09/validation-DisableTraversableResolverResultCache.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<validation-config
3-
xmlns="http://xmlns.jcp.org/xml/ns/validation/configuration"
3+
xmlns="https://xmlns.jakarta.ee/xml/ns/validation/configuration"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5-
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/validation/configuration validation-configuration-2.0.xsd"
6-
version="2.0">
5+
xsi:schemaLocation="https://xmlns.jakarta.ee/xml/ns/validation/configuration validation-configuration-3.0.xsd"
6+
version="3.0">
77
<default-provider>org.hibernate.validator.HibernateValidator</default-provider>
88

99
<property name="hibernate.validator.enable_traversable_resolver_result_cache">false</property>

‎documentation/src/test/resources/org/hibernate/validator/referenceguide/chapter08/rental-car-mapping.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<constraint-mappings
2-
xmlns="http://xmlns.jcp.org/xml/ns/validation/mapping"
2+
xmlns="https://xmlns.jakarta.ee/xml/ns/validation/mapping"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/validation/mapping
5-
http://xmlns.jcp.org/xml/ns/validation/mapping/validation-mapping-2.0.xsd"
6-
version="2.0">
4+
xsi:schemaLocation="https://xmlns.jakarta.ee/xml/ns/validation/mapping
5+
https://xmlns.jakarta.ee/xml/ns/validation/mapping/validation-mapping-3.0.xsd"
6+
version="3.0">
77

88
<default-package>org.hibernate.validator.referenceguide.chapter05</default-package>
99
<bean class="Car" ignore-annotations="true">

‎documentation/src/test/resources/org/hibernate/validator/referenceguide/chapter08/rental-station-mapping.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<constraint-mappings
2-
xmlns="http://xmlns.jcp.org/xml/ns/validation/mapping"
2+
xmlns="https://xmlns.jakarta.ee/xml/ns/validation/mapping"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/validation/mapping
5-
http://xmlns.jcp.org/xml/ns/validation/mapping/validation-mapping-2.0.xsd"
6-
version="2.0">
4+
xsi:schemaLocation="https://xmlns.jakarta.ee/xml/ns/validation/mapping
5+
https://xmlns.jakarta.ee/xml/ns/validation/mapping/validation-mapping-3.0.xsd"
6+
version="3.0">
77

88
<default-package>org.hibernate.validator.referenceguide.chapter08</default-package>
99

‎documentation/src/test/resources/org/hibernate/validator/referenceguide/chapter08/validation.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<validation-config
2-
xmlns="http://xmlns.jcp.org/xml/ns/validation/configuration"
2+
xmlns="https://xmlns.jakarta.ee/xml/ns/validation/configuration"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/validation/configuration
5-
http://xmlns.jcp.org/xml/ns/validation/configuration/validation-configuration-2.0.xsd"
6-
version="2.0">
4+
xsi:schemaLocation="https://xmlns.jakarta.ee/xml/ns/validation/configuration
5+
https://xmlns.jakarta.ee/xml/ns/validation/configuration/validation-configuration-3.0.xsd"
6+
version="3.0">
77

88
<default-provider>com.acme.ValidationProvider</default-provider>
99

‎documentation/src/test/resources/org/hibernate/validator/referenceguide/chapter09/script-evaluator-factory-validation.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<validation-config
2-
xmlns="http://xmlns.jcp.org/xml/ns/validation/configuration"
2+
xmlns="https://xmlns.jakarta.ee/xml/ns/validation/configuration"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/validation/configuration
5-
http://xmlns.jcp.org/xml/ns/validation/configuration/validation-configuration-2.0.xsd"
6-
version="2.0">
4+
xsi:schemaLocation="https://xmlns.jakarta.ee/xml/ns/validation/configuration
5+
https://xmlns.jakarta.ee/xml/ns/validation/configuration/validation-configuration-3.0.xsd"
6+
version="3.0">
77

88
<property name="hibernate.validator.script_evaluator_factory">
99
org.hibernate.validator.referenceguide.chapter09.CustomScriptEvaluatorFactory

‎documentation/src/test/resources/org/hibernate/validator/referenceguide/chapter12/getter-property-selection-strategy-validation.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<validation-config
2-
xmlns="http://xmlns.jcp.org/xml/ns/validation/configuration"
2+
xmlns="https://xmlns.jakarta.ee/xml/ns/validation/configuration"
33
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
4-
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/validation/configuration
5-
http://xmlns.jcp.org/xml/ns/validation/configuration/validation-configuration-2.0.xsd"
6-
version="2.0">
4+
xsi:schemaLocation="https://xmlns.jakarta.ee/xml/ns/validation/configuration
5+
https://xmlns.jakarta.ee/xml/ns/validation/configuration/validation-configuration-3.0.xsd"
6+
version="3.0">
77

88
<property name="hibernate.validator.getter_property_selection_strategy">
99
org.hibernate.validator.referenceguide.chapter12.getterselectionstrategy.NoPrefixGetterPropertySelectionStrategy

‎integration/src/test/resources/constraint-mapping-contributor-validation.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
77
-->
88
<validation-config
9-
xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
9+
xmlns="https://xmlns.jakarta.ee/xml/ns/validation/configuration"
1010
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11-
xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration validation-configuration-1.1.xsd"
12-
version="1.1">
11+
xsi:schemaLocation="https://xmlns.jakarta.ee/xml/ns/validation/configuration validation-configuration-3.0.xsd"
12+
version="3.0">
1313

1414
<property name="hibernate.validator.constraint_mapping_contributors">org.hibernate.validator.integration.wildfly.MyConstraintMappingContributor</property>
1515
</validation-config>

‎integration/src/test/resources/constraints-magician.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
-->
88
<constraint-mappings
99
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.1.xsd"
11-
xmlns="http://jboss.org/xml/ns/javax/validation/mapping" version="1.1">
10+
xsi:schemaLocation="https://xmlns.jakarta.ee/xml/ns/validation/mapping validation-mapping-3.0.xsd"
11+
xmlns="https://xmlns.jakarta.ee/xml/ns/validation/mapping" version="3.0">
1212

1313
<constraint-definition annotation="org.hibernate.validator.integration.wildfly.jpa.ValidMagicianName">
1414
<validated-by include-existing-validators="false">

‎integration/src/test/resources/validation-custom-config.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
77
-->
88
<validation-config
9-
xmlns="http://xmlns.jcp.org/xml/ns/validation/configuration"
9+
xmlns="https://xmlns.jakarta.ee/xml/ns/validation/configuration"
1010
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11-
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/validation/configuration validation-configuration-2.0.xsd"
12-
version="2.0">
11+
xsi:schemaLocation="https://xmlns.jakarta.ee/xml/ns/validation/configuration validation-configuration-3.0.xsd"
12+
version="3.0">
1313

1414
<message-interpolator>
1515
org.hibernate.validator.integration.cdi.configuration.MessageInterpolatorWithInjection

‎integration/src/test/resources/validation-custom-provider.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
~ License: Apache License, Version 2.0
66
~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
77
-->
8-
<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
9-
xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration validation-configuration-1.0.xsd"
10-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
8+
<validation-config xmlns="https://xmlns.jakarta.ee/xml/ns/validation/configuration"
9+
xsi:schemaLocation="https://xmlns.jakarta.ee/xml/ns/validation/configuration validation-configuration-3.0.xsd"
10+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11+
version="3.0">
1112

1213
<default-provider>org.hibernate.validator.integration.util.MyValidationProvider</default-provider>
1314
</validation-config>

‎integration/src/test/resources/validation.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
~ License: Apache License, Version 2.0
66
~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
77
-->
8-
<validation-config xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
9-
xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration validation-configuration-1.0.xsd"
10-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
8+
<validation-config xmlns="https://xmlns.jakarta.ee/xml/ns/validation/configuration"
9+
xsi:schemaLocation="https://xmlns.jakarta.ee/xml/ns/validation/configuration validation-configuration-3.0.xsd"
10+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11+
version="3.0">
1112

1213
<!--
1314
CustomValidatorFactoryInPersistenceUnitIT requires this config for passing; So if it passes we know

‎osgi/integrationtest/src/test/resources/META-INF/constraint-mappings.xml

+4-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77
-->
88
<constraint-mappings
99
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10-
xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/mapping validation-mapping-1.0.xsd"
11-
xmlns="http://jboss.org/xml/ns/javax/validation/mapping">
10+
xsi:schemaLocation="https://xmlns.jakarta.ee/xml/ns/validation/mapping validation-mapping-3.0.xsd"
11+
xmlns="https://xmlns.jakarta.ee/xml/ns/validation/mapping"
12+
version="3.0">
1213

1314
<default-package>com.example</default-package>
1415

1516
<bean class="Customer" ignore-annotations="true">
1617
<field name="status">
17-
<constraint annotation="javax.validation.constraints.Min">
18+
<constraint annotation="jakarta.validation.constraints.Min">
1819
<element name="value">2</element>
1920
</constraint>
2021
</field>

‎osgi/integrationtest/src/test/resources/META-INF/validation.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@
66
~ See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
77
-->
88
<validation-config
9-
xmlns="http://jboss.org/xml/ns/javax/validation/configuration"
9+
xmlns="https://xmlns.jakarta.ee/xml/ns/validation/configuration"
1010
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
11-
xsi:schemaLocation="http://jboss.org/xml/ns/javax/validation/configuration validation-configuration-1.1.xsd">
11+
xsi:schemaLocation="https://xmlns.jakarta.ee/xml/ns/validation/configuration validation-configuration-3.0.xsd"
12+
version="3.0">
1213

1314
<constraint-validator-factory>
1415
com.example.ExampleConstraintValidatorFactory

0 commit comments

Comments
 (0)