More updates to match Jakarta Validation 4.0 api

Signed-off-by: marko-bekhta <[email protected]>

Author: marko-bekhta

engine/src/main/java/org/hibernate/validator/internal/engine/constraintvalidation/ConstraintValidatorContextImpl.java

@@ -235,8 +235,9 @@ public HibernateConstraintViolationBuilder enableExpressionLanguage(ExpressionLa
 			return this;
 		}
 
+		@SuppressWarnings("removal")
+		@Deprecated(forRemoval = true, since = "10.0")
 		@Override
-		@Deprecated
 		public NodeBuilderDefinedContext addNode(String name) {
 			dropLeafNodeIfRequired();
 			propertyPath.addPropertyNode( name );
@@ -290,8 +291,9 @@ protected NodeBuilder(String template, ExpressionLanguageFeatureLevel expression
 			super( template, expressionLanguageFeatureLevel, path );
 		}
 
+		@SuppressWarnings("removal")
+		@Deprecated(forRemoval = true, since = "10.0")
 		@Override
-		@Deprecated
 		public ConstraintViolationBuilder.NodeBuilderCustomizableContext addNode(String name) {
 			return addPropertyNode( name );
 		}
@@ -375,8 +377,9 @@ public NodeBuilder atIndex(Integer index) {
 			return new NodeBuilder( messageTemplate, expressionLanguageFeatureLevel, propertyPath );
 		}
 
+		@SuppressWarnings("removal")
+		@Deprecated(forRemoval = true, since = "10.0")
 		@Override
-		@Deprecated
 		public NodeBuilderCustomizableContext addNode(String name) {
 			return addPropertyNode( name );
 		}

engine/src/test/java/org/hibernate/validator/test/constraints/ConstraintValidatorContextTest.java

@@ -308,7 +308,7 @@ private static class MyObjectWithELInjectionRiskCausedByRecklessConcatenation {
 
 		class Validator implements ConstraintValidator<MyClassLevelValidation, MyObject> {
 
-			@SuppressWarnings("deprecation")
+			@SuppressWarnings({ "deprecation", "removal" })
 			@Override
 			public boolean isValid(MyObject value, ConstraintValidatorContext context) {
 				context.disableDefaultConstraintViolation();

pom.xml

@@ -472,6 +472,12 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <!-- Override the version of Jakarta Validation: -->
+            <dependency>
+                <groupId>jakarta.validation</groupId>
+                <artifactId>jakarta.validation-api</artifactId>
+                <version>${version.jakarta.validation-api}</version>
+            </dependency>
             <dependency>
                 <groupId>org.jboss.logging</groupId>
                 <artifactId>jboss-logging</artifactId>

tck-runner/pom.xml

@@ -334,6 +334,7 @@
             <properties>
                 <sigtest.java-version>${java-version.main.release}</sigtest.java-version>
                 <sigtest.signature-file>${project.build.directory}/validation-tck/validation-tck-dist-${version.jakarta.validation-api}/artifacts/validation-tck-tests-${version.jakarta.validation-api}-sigtest-jdk${sigtest.java-version}.sig</sigtest.signature-file>
+                <sigtest.signature-file-21>${project.build.directory}/validation-tck/validation-tck-dist-${version.jakarta.validation-api}/artifacts/validation-tck-tests-${version.jakarta.validation-api}-sigtest-jdk21.sig</sigtest.signature-file-21>
             </properties>
             <build>
                 <plugins>
@@ -373,11 +374,24 @@
                                     <goal>check</goal>
                                 </goals>
                                 <configuration>
-                                    <action>strictcheck</action>
+                                    <release>17</release>
+                                    <sigfile>${sigtest.signature-file}</sigfile>
+                                </configuration>
+                            </execution>
+                            <execution>
+                                <id>sigtest-check-21</id>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                                <configuration>
+                                    <release>21</release>
+                                    <sigfile>${sigtest.signature-file-21}</sigfile>
                                 </configuration>
                             </execution>
                         </executions>
                         <configuration>
+                            <action>strictcheck</action>
+                            <ignoreJDKClasses/>
                             <packages>
                                 jakarta.validation,
                                 jakarta.validation.bootstrap,
@@ -389,7 +403,6 @@
                                 jakarta.validation.spi,
                                 jakarta.validation.valueextraction
                             </packages>
-                            <sigfile>${sigtest.signature-file}</sigfile>
                             <report>${project.build.directory}/surefire-reports/sigtest/report.xml</report>
                         </configuration>
                     </plugin>