From b178895440186baad9bc1d491bb3ac150a68dd58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eivind=20Bergst=C3=B8l?= Date: Wed, 11 Jan 2023 16:08:36 +0100 Subject: [PATCH] =?UTF-8?q?Oppgrader=20til=20=C3=A5=20bruke=20jakarta-vali?= =?UTF-8?q?dation=20i=20stedet=20for=20javax-validation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Vi holder oss på java 8 med denne endringen. --- .java-version | 1 + pom.xml | 37 ++++++++++--------- .../bekkopen/banking/KidnummerValidator.java | 4 +- .../banking/KontonummerValidator.java | 4 +- .../banking/annotation/Kidnummer.java | 4 +- .../banking/annotation/Kontonummer.java | 4 +- .../mail/annotation/Kommunenummer.java | 4 +- .../bekkopen/mail/annotation/Postnummer.java | 4 +- .../validator/KommunenummerValidator.java | 6 +-- .../mail/validator/PostnummerValidator.java | 5 +-- .../org/OrganisasjonsnummerValidator.java | 4 +- .../org/annotation/Organisasjonsnummer.java | 4 +- .../person/FodselsnummerValidator.java | 4 +- .../person/annotation/Fodselsnummer.java | 4 +- .../FodselsnummerAnnotationTest.java | 8 ++-- 15 files changed, 48 insertions(+), 49 deletions(-) create mode 100644 .java-version diff --git a/.java-version b/.java-version new file mode 100644 index 0000000..6259340 --- /dev/null +++ b/.java-version @@ -0,0 +1 @@ +1.8 diff --git a/pom.xml b/pom.xml index 64a011d..7a8c227 100644 --- a/pom.xml +++ b/pom.xml @@ -107,16 +107,16 @@ - javax.validation - validation-api - 2.0.1.Final - - + jakarta.validation + jakarta.validation-api + 3.0.2 + + org.junit.jupiter junit-jupiter-api - 5.8.2 + 5.9.0 test @@ -128,21 +128,21 @@ org.hibernate.validator hibernate-validator - 6.2.2.Final + 7.0.5.Final test + + jakarta.el + jakarta.el-api + 4.0.0 + test + - javax.el - javax.el-api - 3.0.0 - test - - - org.glassfish.web - javax.el - 2.2.6 - test - + org.glassfish + jakarta.el + 4.0.2 + test + @@ -245,6 +245,7 @@ 1.8 1.8 + 1.8 UTF-8 diff --git a/src/main/java/no/bekk/bekkopen/banking/KidnummerValidator.java b/src/main/java/no/bekk/bekkopen/banking/KidnummerValidator.java index 59efc2a..630f57d 100644 --- a/src/main/java/no/bekk/bekkopen/banking/KidnummerValidator.java +++ b/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; diff --git a/src/main/java/no/bekk/bekkopen/banking/KontonummerValidator.java b/src/main/java/no/bekk/bekkopen/banking/KontonummerValidator.java index 6ccc95d..b7898c0 100644 --- a/src/main/java/no/bekk/bekkopen/banking/KontonummerValidator.java +++ b/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; diff --git a/src/main/java/no/bekk/bekkopen/banking/annotation/Kidnummer.java b/src/main/java/no/bekk/bekkopen/banking/annotation/Kidnummer.java index 509b411..ede8fe4 100644 --- a/src/main/java/no/bekk/bekkopen/banking/annotation/Kidnummer.java +++ b/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; diff --git a/src/main/java/no/bekk/bekkopen/banking/annotation/Kontonummer.java b/src/main/java/no/bekk/bekkopen/banking/annotation/Kontonummer.java index de7a872..940785d 100644 --- a/src/main/java/no/bekk/bekkopen/banking/annotation/Kontonummer.java +++ b/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; diff --git a/src/main/java/no/bekk/bekkopen/mail/annotation/Kommunenummer.java b/src/main/java/no/bekk/bekkopen/mail/annotation/Kommunenummer.java index c8bcd75..7494ae5 100644 --- a/src/main/java/no/bekk/bekkopen/mail/annotation/Kommunenummer.java +++ b/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; diff --git a/src/main/java/no/bekk/bekkopen/mail/annotation/Postnummer.java b/src/main/java/no/bekk/bekkopen/mail/annotation/Postnummer.java index c811198..ce0ea5c 100644 --- a/src/main/java/no/bekk/bekkopen/mail/annotation/Postnummer.java +++ b/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; diff --git a/src/main/java/no/bekk/bekkopen/mail/validator/KommunenummerValidator.java b/src/main/java/no/bekk/bekkopen/mail/validator/KommunenummerValidator.java index 6dc2b86..e92ce31 100644 --- a/src/main/java/no/bekk/bekkopen/mail/validator/KommunenummerValidator.java +++ b/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 */ diff --git a/src/main/java/no/bekk/bekkopen/mail/validator/PostnummerValidator.java b/src/main/java/no/bekk/bekkopen/mail/validator/PostnummerValidator.java index e469968..a60f4a8 100644 --- a/src/main/java/no/bekk/bekkopen/mail/validator/PostnummerValidator.java +++ b/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 */ diff --git a/src/main/java/no/bekk/bekkopen/org/OrganisasjonsnummerValidator.java b/src/main/java/no/bekk/bekkopen/org/OrganisasjonsnummerValidator.java index 1c729d0..e128b3c 100644 --- a/src/main/java/no/bekk/bekkopen/org/OrganisasjonsnummerValidator.java +++ b/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; diff --git a/src/main/java/no/bekk/bekkopen/org/annotation/Organisasjonsnummer.java b/src/main/java/no/bekk/bekkopen/org/annotation/Organisasjonsnummer.java index 800ed74..c49f6b1 100644 --- a/src/main/java/no/bekk/bekkopen/org/annotation/Organisasjonsnummer.java +++ b/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; diff --git a/src/main/java/no/bekk/bekkopen/person/FodselsnummerValidator.java b/src/main/java/no/bekk/bekkopen/person/FodselsnummerValidator.java index da1de0b..60926f0 100644 --- a/src/main/java/no/bekk/bekkopen/person/FodselsnummerValidator.java +++ b/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; diff --git a/src/main/java/no/bekk/bekkopen/person/annotation/Fodselsnummer.java b/src/main/java/no/bekk/bekkopen/person/annotation/Fodselsnummer.java index 37f53d7..209b2dd 100644 --- a/src/main/java/no/bekk/bekkopen/person/annotation/Fodselsnummer.java +++ b/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; diff --git a/src/test/java/no/bekk/bekkopen/person/annotation/FodselsnummerAnnotationTest.java b/src/test/java/no/bekk/bekkopen/person/annotation/FodselsnummerAnnotationTest.java index 3be2e79..4b3ac8e 100644 --- a/src/test/java/no/bekk/bekkopen/person/annotation/FodselsnummerAnnotationTest.java +++ b/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;