Merge branch 'release/2.0.0' into main

.tool-versions

@@ -1 +1,2 @@
-java adoptopenjdk-11.0.7+10.1
+java temurin-11.0.19+7
+maven 3.9.0

pom.xml

@@ -20,12 +20,12 @@
 	<parent>
 		<groupId>ch.dvbern.oss.maven</groupId>
 		<artifactId>parent</artifactId>
-		<version>3.0.5</version>
+		<version>5.0.0</version>
 	</parent>
 
 	<groupId>ch.dvbern.oss.junit-beanvalidation-extension</groupId>
 	<artifactId>junit-beanvalidation-extension</artifactId>
-	<version>1.0.3</version>
+	<version>2.0.0</version>
 
 	<name>DV Bern JUnit BeanValidation Extension</name>
 	<description>Allow for easy injection and customization of a Java BeanValidation Validator into your tests</description>
@@ -62,70 +62,78 @@
 	</scm>
 
 	<properties>
-
+		<maven-compiler-plugin.source>11</maven-compiler-plugin.source>
+		<maven-compiler-plugin.target>11</maven-compiler-plugin.target>
 	</properties>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.checkerframework</groupId>
 			<artifactId>checker-qual</artifactId>
-			<version>3.11.0</version>
+			<version>3.36.0</version>
 		</dependency>
 
 		<dependency>
 			<groupId>org.junit.jupiter</groupId>
 			<artifactId>junit-jupiter-api</artifactId>
-			<version>5.7.1</version>
+			<version>5.9.3</version>
 			<scope>provided</scope>
 		</dependency>
 
 		<!-- START: minimal dependencies to make this work -->
 		<dependency>
 			<!-- validation API spec -->
-			<groupId>javax.validation</groupId>
-			<artifactId>validation-api</artifactId>
-			<version>2.0.1.Final</version>
+			<groupId>jakarta.validation</groupId>
+			<artifactId>jakarta.validation-api</artifactId>
+			<version>3.0.2</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<!-- transitive requirement of the validtion API -->
+			<groupId>jakarta.el</groupId>
+			<artifactId>jakarta.el-api</artifactId>
+			<version>5.0.1</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<!-- we need an implementation for el-api -->
 			<groupId>org.glassfish</groupId>
-			<artifactId>javax.el</artifactId>
-			<version>3.0.0</version>
+			<artifactId>jakarta.el</artifactId>
+			<version>4.0.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<!-- validation API implementation (hibernate-validaor is just used as an example) -->
 			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
-			<version>6.2.0.Final</version>
+			<version>8.0.0.Final</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- END: minimal dependencies to make this work -->
 
 		<dependency>
-			<groupId>javax.enterprise</groupId>
-			<artifactId>cdi-api</artifactId>
-			<version>2.0</version>
+			<groupId>jakarta.enterprise</groupId>
+			<artifactId>jakarta.enterprise.cdi-api</artifactId>
+			<version>4.0.1</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>org.assertj</groupId>
-			<artifactId>assertj-core</artifactId>
-			<version>3.19.0</version>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>5.4.0</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<version>3.8.0</version>
+			<groupId>org.assertj</groupId>
+			<artifactId>assertj-core</artifactId>
+			<version>3.24.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.mockito</groupId>
 			<artifactId>mockito-junit-jupiter</artifactId>
-			<version>3.8.0</version>
+			<version>5.4.0</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
@@ -145,16 +153,10 @@
 				<plugin>
 					<groupId>ch.dvbern.oss.maven.jgitflow</groupId>
 					<artifactId>jgitflow-maven-plugin</artifactId>
-					<version>${jgitflow-maven-plugin.version}</version>
 					<configuration>
 						<flowInitContext>
 							<!-- github changed default names -->
 							<masterBranchName>main</masterBranchName>
-							<developBranchName>develop</developBranchName>
-							<featureBranchPrefix>feature/</featureBranchPrefix>
-							<releaseBranchPrefix>release/</releaseBranchPrefix>
-							<hotfixBranchPrefix>hotfix/</hotfixBranchPrefix>
-							<versionTagPrefix />
 						</flowInitContext>
 					</configuration>
 				</plugin>

src/main/java/ch/dvbern/oss/junitbeanvalidationextension/ContextCustomizer.java

@@ -2,8 +2,8 @@
 
 import java.util.function.BiFunction;
 
-import javax.validation.ConstraintValidatorFactory;
-import javax.validation.ValidatorContext;
+import jakarta.validation.ConstraintValidatorFactory;
+import jakarta.validation.ValidatorContext;
 
 @FunctionalInterface
 public interface ContextCustomizer extends BiFunction<ValidatorContext, ConstraintValidatorFactory, ValidatorContext> {

src/main/java/ch/dvbern/oss/junitbeanvalidationextension/CustomConstraintValidatorFactory.java

@@ -3,8 +3,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorFactory;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorFactory;
 
 import static java.util.Objects.requireNonNull;
 

src/main/java/ch/dvbern/oss/junitbeanvalidationextension/Customizations.java

@@ -4,7 +4,7 @@
 import java.util.Map;
 import java.util.function.Function;
 
-import javax.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidator;
 
 import static java.util.stream.Collectors.toMap;
 

src/main/java/ch/dvbern/oss/junitbeanvalidationextension/ValidatorCustomizerImpl.java

@@ -1,7 +1,7 @@
 package ch.dvbern.oss.junitbeanvalidationextension;
 
-import javax.validation.ValidatorContext;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ValidatorContext;
+import jakarta.validation.ValidatorFactory;
 
 class ValidatorCustomizerImpl implements ValidatorCustomizer {
 	private ContextCustomizer customizer = null;

src/main/java/ch/dvbern/oss/junitbeanvalidationextension/ValidatorExtension.java

@@ -1,10 +1,9 @@
 package ch.dvbern.oss.junitbeanvalidationextension;
 
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorContext;
-import javax.validation.ValidatorFactory;
-
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorContext;
+import jakarta.validation.ValidatorFactory;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
@@ -109,7 +108,8 @@ private void rejectTestMethod(InvocationOn invocationOn) {
 			throw new IllegalArgumentException(
 					String.format(
 							"Injecting the %s into test methods is not supported",
-							ValidatorCustomizer.class.getSimpleName()));
+							ValidatorCustomizer.class.getSimpleName()
+					));
 		}
 	}
 
@@ -165,7 +165,8 @@ private Validator createValidator(ExtensionContext context) {
 
 		ValidatorFactory factory = requireNonNull(
 				(ValidatorFactory) store.get(DEFAULT_FACTORY),
-				"ValidatorFactory instance not found in Test context store???");
+				"ValidatorFactory instance not found in Test context store???"
+		);
 
 		ValidatorContext ctx = applyCustomizers(factory, store);
 

src/test/java/ch/dvbern/oss/junitbeanvalidationextension/demo/CustomValidatorTest.java

@@ -2,14 +2,13 @@
 
 import java.util.Set;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validator;
-
 import ch.dvbern.oss.junitbeanvalidationextension.Customizations;
 import ch.dvbern.oss.junitbeanvalidationextension.ValidatorCustomizer;
 import ch.dvbern.oss.junitbeanvalidationextension.ValidatorExtension;
 import ch.dvbern.oss.junitbeanvalidationextension.demo.fixtures.CustomConstraintValidator;
 import ch.dvbern.oss.junitbeanvalidationextension.demo.fixtures.SomeFixture;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validator;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;

src/test/java/ch/dvbern/oss/junitbeanvalidationextension/demo/fixtures/CustomConstraint.java

@@ -5,8 +5,8 @@
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 

src/test/java/ch/dvbern/oss/junitbeanvalidationextension/demo/fixtures/CustomConstraintValidator.java

@@ -1,8 +1,8 @@
 package ch.dvbern.oss.junitbeanvalidationextension.demo.fixtures;
 
-import javax.inject.Inject;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.inject.Inject;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 public class CustomConstraintValidator implements ConstraintValidator<CustomConstraint, Object> {
 

src/test/java/ch/dvbern/oss/junitbeanvalidationextension/demo/fixtures/SomeFixture.java

@@ -1,6 +1,6 @@
 package ch.dvbern.oss.junitbeanvalidationextension.demo.fixtures;
 
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
 
 @CustomConstraint
 public class SomeFixture {