Merge pull request #64 from bekkopen/jakarta.validation

Oppgrader til å bruke jakarta-validation i stedet for javax-validation

.java-version

@@ -0,0 +1 @@
+1.8

pom.xml

@@ -107,16 +107,16 @@
 
   <dependencies>
     <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
-      <version>2.0.1.Final</version>
-    </dependency>
-
+		<groupId>jakarta.validation</groupId>
+		<artifactId>jakarta.validation-api</artifactId>
+		<version>3.0.2</version>
+	</dependency>
+	  
     <!-- Test -->
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.8.2</version>
+      <version>5.9.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -128,21 +128,21 @@
     <dependency>
       <groupId>org.hibernate.validator</groupId>
       <artifactId>hibernate-validator</artifactId>
-      <version>6.2.2.Final</version>
+      <version>7.0.5.Final</version>
       <scope>test</scope>
     </dependency>
+	  <dependency>
+		<groupId>jakarta.el</groupId>
+		<artifactId>jakarta.el-api</artifactId>
+		<version>4.0.0</version>
+		<scope>test</scope>
+	</dependency>
     <dependency>
-      <groupId>javax.el</groupId>
-      <artifactId>javax.el-api</artifactId>
-      <version>3.0.0</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.glassfish.web</groupId>
-      <artifactId>javax.el</artifactId>
-      <version>2.2.6</version>
-      <scope>test</scope>
-    </dependency>
+		<groupId>org.glassfish</groupId>
+		<artifactId>jakarta.el</artifactId>
+		<version>4.0.2</version>
+		<scope>test</scope>
+	</dependency>
   </dependencies>
 
   <build>
@@ -245,6 +245,7 @@
     <!-- Dependency version -->
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.release>1.8</maven.compiler.release>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 

src/main/java/no/bekk/bekkopen/banking/KidnummerValidator.java

@@ -29,8 +29,8 @@
 import no.bekk.bekkopen.common.StringNumber;
 import no.bekk.bekkopen.common.StringNumberValidator;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 import static no.bekk.bekkopen.common.Checksums.ERROR_INVALID_CHECKSUM;
 import static no.bekk.bekkopen.common.Checksums.calculateMod10CheckSum;

src/main/java/no/bekk/bekkopen/banking/KontonummerValidator.java

@@ -28,8 +28,8 @@
 
 import no.bekk.bekkopen.common.StringNumberValidator;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 import static no.bekk.bekkopen.common.Checksums.ERROR_INVALID_CHECKSUM;
 import static no.bekk.bekkopen.common.Checksums.calculateMod11CheckSum;

src/main/java/no/bekk/bekkopen/banking/annotation/Kidnummer.java

@@ -28,8 +28,8 @@
 
 import no.bekk.bekkopen.banking.KidnummerValidator;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;

src/main/java/no/bekk/bekkopen/banking/annotation/Kontonummer.java

@@ -28,8 +28,8 @@
 
 import no.bekk.bekkopen.banking.KontonummerValidator;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;

src/main/java/no/bekk/bekkopen/mail/annotation/Kommunenummer.java

@@ -37,8 +37,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 no.bekk.bekkopen.mail.validator.KommunenummerValidator;
 

src/main/java/no/bekk/bekkopen/mail/annotation/Postnummer.java

@@ -37,8 +37,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 no.bekk.bekkopen.mail.validator.PostnummerValidator;
 

src/main/java/no/bekk/bekkopen/mail/validator/KommunenummerValidator.java

@@ -26,13 +26,11 @@
  * #L%
  */
 
-
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 import no.bekk.bekkopen.mail.MailValidator;
 import no.bekk.bekkopen.mail.annotation.Kommunenummer;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
 /**
  * Validering av kommunenummer
  */

src/main/java/no/bekk/bekkopen/mail/validator/PostnummerValidator.java

@@ -26,12 +26,11 @@
  * #L%
  */
 
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 import no.bekk.bekkopen.mail.MailValidator;
 import no.bekk.bekkopen.mail.annotation.Postnummer;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
-
 /**
  * Validator av postnummer
  */

src/main/java/no/bekk/bekkopen/org/OrganisasjonsnummerValidator.java

@@ -28,8 +28,8 @@
 
 import no.bekk.bekkopen.common.StringNumberValidator;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 
 import static no.bekk.bekkopen.common.Checksums.ERROR_INVALID_CHECKSUM;
 import static no.bekk.bekkopen.common.Checksums.calculateMod11CheckSum;

src/main/java/no/bekk/bekkopen/org/annotation/Organisasjonsnummer.java

@@ -28,8 +28,8 @@
 
 import no.bekk.bekkopen.org.OrganisasjonsnummerValidator;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;

src/main/java/no/bekk/bekkopen/person/FodselsnummerValidator.java

@@ -28,8 +28,8 @@
 
 import no.bekk.bekkopen.common.StringNumberValidator;
 
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
 import java.net.URL;
 import java.text.DateFormat;
 import java.text.ParseException;

src/main/java/no/bekk/bekkopen/person/annotation/Fodselsnummer.java

@@ -28,8 +28,8 @@
 
 import no.bekk.bekkopen.person.FodselsnummerValidator;
 
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.Target;

src/test/java/no/bekk/bekkopen/person/annotation/FodselsnummerAnnotationTest.java

@@ -30,10 +30,10 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
-import javax.validation.ConstraintViolation;
-import javax.validation.Validation;
-import javax.validation.Validator;
-import javax.validation.ValidatorFactory;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Validation;
+import jakarta.validation.Validator;
+import jakarta.validation.ValidatorFactory;
 import java.util.Date;
 import java.util.Set;