Update dependabot config and update dependencies where possible

.github/dependabot.yml

@@ -8,8 +8,61 @@ updates:
   - package-ecosystem: "maven"
     directory: "/" # Location of package manifests
     schedule:
-      interval: "daily"
-    allow:
-      - dependency-name: jakarta.*:*
-      - dependency-name: org.glassfish.expressly:expressly
-      - dependency-name: org.jboss.weld:*
+      interval: "weekly"
+      day: "tuesday"
+    assignees: [ "marko-bekhta" ]
+    open-pull-requests-limit: 20
+    groups:
+      # This group combines all build-only dependencies. Published artifacts do not depend on them.
+      # Grouping such dependencies will make Dependabot create PRs with a branch name
+      # following the pattern (`dependabot/maven/build-dependencies-.*`)
+      # and with a title like `Bump the build-dependencies group with 8 updates` that we can easily
+      # use for Hibernate Bot rules.
+      build-dependencies:
+        patterns:
+          # Maven plugins:
+          - "*maven*plugin*"
+          - "org.apache.maven*:*"
+          - "*surefire*"
+          - "*forbiddenapis*"
+          - "com.puppycrawl.tools:*"
+          # Other test/build dependencies
+          - "org.apache.groovy:groovy-jsr223"
+          - "org.openjdk.jmh:*" # performance testing dependency
+          - "com.google.guava:guava" # Guava is used in our test utils
+          - "org.asciidoctor:*" # Asciidoctor is used for rendering the documentation
+          - "org.apache.logging.log4j:*"
+          - "org.slf4j:*"
+          - "org.ow2.asm:*" # for Surefire/Failsafe plugins to support builds on latest JDKs
+          - "junit:*"
+          - "org.testng:*"
+          - "org.easymock:*"
+          - "org.jboss.arquillian:*"
+          - "org.jboss.arquillian.container:*"
+          - "org.jboss.modules:*"
+          - "com.fasterxml.woodstox:*"
+          - "io.rest-assured:*"
+          - "net.bytebuddy:*"
+          - "com.fasterxml.jackson.core:*"
+          - "org.springframework:*"
+          # only used for perf tests based on javax:
+          - "org.glassfish:javax.el"
+    ignore:
+      - dependency-name: "javax.validation:*"
+      - dependency-name: "org.apache.bval:*"
+      # dependencies that we align on Wildfly version that is used:
+      - dependency-name: "org.jboss.weld:*"
+      - dependency-name: "org.wildfly.arquillian:*"
+      - dependency-name: "jakarta.enterprise:jakarta.enterprise.cdi-api"
+      - dependency-name: "jakarta.ejb:jakarta.ejb-api"
+      - dependency-name: "jakarta.interceptor:jakarta.interceptor-api"
+      - dependency-name: "jakarta.annotation:jakarta.annotation-api"
+      - dependency-name: "jakarta.inject:jakarta.inject-api"
+      - dependency-name: "jakarta.persistence:jakarta.persistence-api"
+      - dependency-name: "jakarta.ws.rs:jakarta.ws.rs-api"
+        # cannot upgrade wildfly dist and core to latest as patching modules is failing on them
+        # see https://github.com/jbossas/patch-gen/issues/34 the issue causing the problem.
+      - dependency-name: "org.wildfly:wildfly-dist"
+      - dependency-name: "org.wildfly.core:*"
+        # Bean Validation TCK requires a particular version of AssertJ and using others leads to errors:
+      - dependency-name: "org.assertj:*"

Jenkinsfile

@@ -91,7 +91,7 @@ import org.hibernate.jenkins.pipeline.helpers.alternative.AlternativeMultiMap
  */
 
 @Field final String DEFAULT_JDK_TOOL = 'OpenJDK 17 Latest'
-@Field final String MAVEN_TOOL = 'Apache Maven 3.6'
+@Field final String MAVEN_TOOL = 'Apache Maven 3.9'
 
 // Default node pattern, to be used for resource-intensive stages.
 // Should not include the controller node.

distribution/pom.xml

@@ -213,7 +213,7 @@
                 </property>
             </activation>
             <properties>
-                <javadoc.additional.options>-html5 -source 8</javadoc.additional.options>
+                <javadoc.additional.options>-html5</javadoc.additional.options>
             </properties>
         </profile>
     </profiles>

documentation/pom.xml

@@ -30,8 +30,6 @@
         <asciidoctor.engine-source-dir>${basedir}/../engine/src/main/java</asciidoctor.engine-source-dir>
         <asciidoctor.osgi-integrationtest-source-dir>${basedir}/../osgi/integrationtest/src/test/java</asciidoctor.osgi-integrationtest-source-dir>
 
-        <html.meta.description>Hibernate Validator, Annotation based constraints for your domain model - Reference Documentation</html.meta.description>
-        <html.meta.keywords>hibernate, validator, hibernate validator, validation, jakarta bean validation, bean validation</html.meta.keywords>
         <html.meta.project-key>validator</html.meta.project-key>
         <html.google-analytics.id>G-282CVRCQHZ</html.google-analytics.id>
         <html.outdated-content.project-key>${html.meta.project-key}</html.outdated-content.project-key>
@@ -72,7 +70,7 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-jsr223</artifactId>
             <scope>test</scope>
         </dependency>
@@ -170,7 +168,6 @@
                             <resources>
                                 <resource>
                                     <directory>${asciidoctor.theme-dir}</directory>
-                                    <filtering>true</filtering>
                                 </resource>
                             </resources>
                             <outputDirectory>${asciidoctor.aggregated-resources-dir}</outputDirectory>

documentation/src/main/asciidoc/index.asciidoc

@@ -11,6 +11,9 @@ Hardy Ferentschik; Gunnar Morling; Guillaume Smet
 :docinfodir: {docinfodir}
 :docinfo: shared,private
 :title-logo-image: image:hibernate_logo_a.png[align=left,pdfwidth=33%]
+:html-meta-description: Hibernate Validator, Annotation based constraints for your domain model - Reference Documentation
+:html-meta-keywords: hibernate, validator, hibernate validator, validation, jakarta bean validation, bean validation
+:html-meta-canonical-link: https://docs.jboss.org/hibernate/stable/validator/reference/en-US/html_single/
 
 include::pr01.asciidoc[]
 

documentation/src/test/java/org/hibernate/validator/referenceguide/chapter10/Vehicle.java

@@ -8,7 +8,7 @@
 //tag::include[]
 public interface Vehicle {
 
-	public interface Basic {
+	interface Basic {
 	}
 
 	@NotNull(groups = Vehicle.Basic.class)

engine/pom.xml

@@ -130,19 +130,13 @@
             <artifactId>log4j-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.logging.log4j</groupId>
-            <artifactId>log4j-core</artifactId>
-            <scope>test</scope>
-            <type>test-jar</type>
-        </dependency>
         <dependency>
             <groupId>org.easymock</groupId>
             <artifactId>easymock</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-jsr223</artifactId>
             <scope>test</scope>
         </dependency>

engine/src/main/java/org/hibernate/validator/internal/metadata/facets/Cascadable.java

@@ -54,7 +54,7 @@ public interface Cascadable {
 	 */
 	CascadingMetaData getCascadingMetaData();
 
-	public interface Builder {
+	interface Builder {
 
 		void mergeCascadingMetaData(CascadingMetaDataBuilder cascadingMetaDataBuilder);
 

engine/src/test/java/org/hibernate/validator/test/el/CustomViolationExpressionLanguageFeatureLevelTest.java

@@ -30,13 +30,13 @@
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.Logger;
 import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.test.appender.ListAppender;
 import org.hibernate.validator.HibernateValidator;
 import org.hibernate.validator.constraintvalidation.HibernateConstraintValidatorContext;
 import org.hibernate.validator.internal.engine.constraintvalidation.ConstraintValidatorContextImpl;
 import org.hibernate.validator.messageinterpolation.ExpressionLanguageFeatureLevel;
 import org.hibernate.validator.testutil.TestForIssue;
 import org.hibernate.validator.testutil.ValidationXmlTestHelper;
+import org.hibernate.validator.testutils.ListAppender;
 import org.hibernate.validator.testutils.ValidatorUtil;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeClass;
@@ -63,7 +63,8 @@ public static void setupValidationXmlTestHelper() {
 	public void setUp() {
 		LoggerContext context = LoggerContext.getContext( false );
 		Logger logger = context.getLogger( ConstraintValidatorContextImpl.class.getName() );
-		constraintValidatorContextImplLoglistAppender = (ListAppender) logger.getAppenders().get( "List" );
+		constraintValidatorContextImplLoglistAppender = new ListAppender( "list" );
+		logger.addAppender( constraintValidatorContextImplLoglistAppender );
 		constraintValidatorContextImplLoglistAppender.clear();
 	}
 

engine/src/test/java/org/hibernate/validator/test/internal/engine/constraintvalidation/LogValidatedValueConfigurationTest.java

@@ -19,15 +19,16 @@
 import java.util.Set;
 
 import org.hibernate.validator.testutil.TestForIssue;
+import org.hibernate.validator.testutils.ListAppender;
 
 import jakarta.validation.Constraint;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.Payload;
-import jakarta.validation.ReportAsSingleViolation;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.test.appender.ListAppender;
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
@@ -41,17 +42,15 @@ public class LogValidatedValueConfigurationTest {
 	@BeforeTest
 	public void setUp() {
 		LoggerContext context = LoggerContext.getContext( false );
-		simpleAppender = (ListAppender) context.getLogger(
-						"org.hibernate.validator.internal.engine.constraintvalidation.SimpleConstraintTree" )
-				.getAppenders().get( "List" );
+		simpleAppender = new ListAppender( "simple" );
+		context.getLogger( "org.hibernate.validator.internal.engine.constraintvalidation.SimpleConstraintTree" )
+				.addAppender( simpleAppender );
 		simpleAppender.clear();
 
-		composingAppender = (ListAppender) context.getLogger(
-						"org.hibernate.validator.internal.engine.constraintvalidation.ComposingConstraintTree" )
-				.getAppenders().get( "List" );
+		composingAppender = new ListAppender( "composing" );
+		context.getLogger( "org.hibernate.validator.internal.engine.constraintvalidation.ComposingConstraintTree" )
+				.addAppender( composingAppender );
 		composingAppender.clear();
-
-
 	}
 
 	@AfterTest
@@ -71,7 +70,8 @@ public void testValueLoggingIsEnabled() {
 
 		assertThat( constraintViolations ).containsOnlyViolations(
 				violationOf( Size.class ).withProperty( "value" ),
-				violationOf( ComposingConstraint.class ).withProperty( "value" )
+				violationOf( Size.class ).withProperty( "value2" ),
+				violationOf( ComposingConstraint.class ).withProperty( "value2" )
 		);
 
 		assertTrue(
@@ -96,7 +96,8 @@ public void testValueLoggingIsDisabledByDefault() {
 
 		assertThat( constraintViolations ).containsOnlyViolations(
 				violationOf( Size.class ).withProperty( "value" ),
-				violationOf( ComposingConstraint.class ).withProperty( "value" )
+				violationOf( Size.class ).withProperty( "value2" ),
+				violationOf( ComposingConstraint.class ).withProperty( "value2" )
 		);
 
 		assertTrue(
@@ -123,7 +124,8 @@ public void testValueLoggingIsEnabledUsingProperty() {
 
 		assertThat( constraintViolations ).containsOnlyViolations(
 				violationOf( Size.class ).withProperty( "value" ),
-				violationOf( ComposingConstraint.class ).withProperty( "value" )
+				violationOf( Size.class ).withProperty( "value2" ),
+				violationOf( ComposingConstraint.class ).withProperty( "value2" )
 		);
 
 		assertTrue(
@@ -140,22 +142,32 @@ public void testValueLoggingIsEnabledUsingProperty() {
 
 	public static class Foo {
 		@Size(max = 2)
-		@ComposingConstraint
 		private String value = "123";
+
+		@ComposingConstraint
+		private String value2 = "123";
 	}
 
 	@NotNull
 	@Size(max = 2)
-	@ReportAsSingleViolation
 	@Target({ FIELD })
 	@Retention(RUNTIME)
-	@Constraint(validatedBy = {})
+	@Constraint(validatedBy = ComposingConstraint.Validator.class)
 	@Documented
 	public @interface ComposingConstraint {
 		String message() default "";
 
 		Class<?>[] groups() default {};
 
 		Class<? extends Payload>[] payload() default {};
+
+		class Validator implements ConstraintValidator<ComposingConstraint, Object> {
+
+			@Override
+			public boolean isValid(Object value, ConstraintValidatorContext context) {
+				return false;
+			}
+		}
 	}
+
 }

engine/src/test/java/org/hibernate/validator/test/internal/engine/groups/sequence/SequenceOfSequencesTest.java

@@ -135,22 +135,22 @@ public static class PlushCrocodile {
 	public interface AllConstraints {
 
 		@GroupSequence({ OverlyBasicConstraints.class, SomewhatBasicConstraints.class })
-		public interface BasicConstraints {
+		interface BasicConstraints {
 
-			public interface OverlyBasicConstraints {
+			interface OverlyBasicConstraints {
 			}
 
-			public interface SomewhatBasicConstraints {
+			interface SomewhatBasicConstraints {
 			}
 		}
 
 		@GroupSequence({ SomewhatComplexConstraints.class, ImmenselyComplexConstraints.class })
-		public interface ComplexConstraints {
+		interface ComplexConstraints {
 
-			public interface SomewhatComplexConstraints {
+			interface SomewhatComplexConstraints {
 			}
 
-			public interface ImmenselyComplexConstraints {
+			interface ImmenselyComplexConstraints {
 			}
 		}
 	}

engine/src/test/java/org/hibernate/validator/test/internal/engine/messageinterpolation/ParameterMessageInterpolatorTest.java

@@ -16,9 +16,10 @@
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.Logger;
 import org.apache.logging.log4j.core.LoggerContext;
-import org.apache.logging.log4j.test.appender.ListAppender;
 import org.hibernate.validator.messageinterpolation.ParameterMessageInterpolator;
 import org.hibernate.validator.testutil.TestForIssue;
+import org.hibernate.validator.testutils.ListAppender;
+
 import org.testng.annotations.AfterTest;
 import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
@@ -43,7 +44,8 @@ public class ParameterMessageInterpolatorTest {
 	public void setUp() {
 		LoggerContext context = LoggerContext.getContext( false );
 		Logger logger = context.getLogger( ParameterMessageInterpolator.class.getName() );
-		listAppender = (ListAppender) logger.getAppenders().get( "List" );
+		listAppender = new ListAppender( "list" );
+		logger.addAppender( listAppender );
 		listAppender.clear();
 
 		validator = getConfiguration()

engine/src/test/java/org/hibernate/validator/test/internal/engine/messageinterpolation/ResourceBundleMessageInterpolatorTest.java

@@ -200,7 +200,7 @@ public void testUserResourceBundle() {
 		String actual = interpolator.interpolate(
 				notNullDescriptor.getAnnotation().message(),
 				messageInterpolatorContext,
-				new Locale( "es", "ES" )
+				Locale.forLanguageTag( "es-ES" )
 		);
 		assertEquals( actual, expected, "Wrong substitution" );
 	}

engine/src/test/java/org/hibernate/validator/test/internal/engine/methodvalidation/MethodInnerClassConstructorValidationTest.java

@@ -21,7 +21,6 @@
 import java.util.Set;
 
 import org.hibernate.validator.test.internal.engine.methodvalidation.model.Customer;
-import org.hibernate.validator.test.internal.engine.methodvalidation.service.CustomerRepositoryImpl;
 
 import jakarta.validation.Constraint;
 import jakarta.validation.ConstraintValidator;

engine/src/test/java/org/hibernate/validator/test/internal/engine/methodvalidation/service/CustomerRepository.java

@@ -78,6 +78,6 @@ public interface CustomerRepository extends RepositoryBase<Customer> {
 	@ConsistentDateParameters
 	void methodWithCrossParameterConstraint(@NotNull LocalDate start, @NotNull LocalDate end);
 
-	public interface ValidationGroup {
+	interface ValidationGroup {
 	}
 }

engine/src/test/java/org/hibernate/validator/test/internal/engine/methodvalidation/service/CustomerRepositoryWithRedefinedDefaultGroup.java

@@ -60,17 +60,17 @@ void constraintInLaterPartOfGroupSequenceAtDifferentParameters(@List({
 	int constraintsInAllPartsOfGroupSequence();
 
 
-	public interface ValidationGroup1 {
+	interface ValidationGroup1 {
 	}
 
-	public interface ValidationGroup2 {
+	interface ValidationGroup2 {
 	}
 
-	public interface ValidationGroup3 {
+	interface ValidationGroup3 {
 	}
 
 	@GroupSequence({ ValidationGroup2.class, ValidationGroup3.class })
-	public interface ValidationSequence {
+	interface ValidationSequence {
 	}
 
 }

engine/src/test/java/org/hibernate/validator/test/internal/metadata/Person.java

@@ -20,6 +20,6 @@ public interface Person {
 	@NotEmpty
 	String getLastName();
 
-	public interface PersonValidation {
+	interface PersonValidation {
 	}
 }