Upgrade to jakarta.validation-api and hibernate 8 as default validator (java 11)

hibernate-validator v.8 requires java 11 or higher. Because of this
we will from now on compile this library to java 11.

Change imports from javax.validation to jakarta.validation

Author: eivinhb

.github/workflows/build.yml

@@ -6,7 +6,7 @@ jobs:
   build:
     strategy:
       matrix:
-        java: [ '8', '11', '17' ]
+        java: [ '11', '17', '21' ]
     name: Build on Java ${{ matrix.java }}
     runs-on: ubuntu-latest
     steps:

.java-version

@@ -1 +1 @@
-1.8
+11.0

NOTICE

@@ -12,17 +12,17 @@ specific language governing permissions and limitations
 under the License.
 
 This project includes:
-  Bean Validation API under Apache License 2.0
-  ClassMate under The Apache Software License, Version 2.0
+  ClassMate under Apache License, Version 2.0
   Digipost Data Types under The Apache Software License, Version 2.0
   Digipost JAXB Resolver - com.sun.xml.bind under The Apache Software License, Version 2.0
-  Expression Language 3.0 API under CDDL + GPLv2 with classpath exception
+  Eclipse Expressly under Eclipse Public License v. 2.0 or GNU General Public License, version 2 with the GNU Classpath Exception
   Hibernate Validator Engine under Apache License 2.0
   Jackson datatype: JSR310 under The Apache Software License, Version 2.0
   Jackson-annotations under The Apache Software License, Version 2.0
   Jackson-core under The Apache Software License, Version 2.0
   jackson-databind under The Apache Software License, Version 2.0
-  Jakarta Expression Language 3.0 Implementation under EPL 2.0 or GPL2 w/ CPE
+  Jakarta Bean Validation API under Apache License 2.0
+  Jakarta Expression Language API under Eclipse Public License v. 2.0 or GNU General Public License, version 2 with the GNU Classpath Exception
   JavaBeans Activation Framework API jar under CDDL/GPLv2+CE
   jaxb-api under CDDL 1.1 or GPL2 w/ CPE
   JBoss Logging 3 under Apache License, version 2.0

pom.xml

@@ -14,8 +14,9 @@
     <description>Data types for Digipost messages</description>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <lombok.version>1.18.30</lombok.version>
     </properties>
 
     <dependencyManagement>
@@ -30,7 +31,7 @@
             <dependency>
                 <groupId>com.fasterxml.jackson</groupId>
                 <artifactId>jackson-bom</artifactId>
-                <version>2.14.2</version>
+                <version>2.16.0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
@@ -48,7 +49,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.20</version>
+            <version>${lombok.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -68,40 +69,28 @@
             <artifactId>jackson-core</artifactId>
         </dependency>
         <dependency>
-            <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>
         </dependency>
         <dependency>
             <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>6.1.5.Final</version>
+            <version>8.0.0.Final</version>
             <scope>runtime</scope>
             <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>jakarta.validation</groupId>
-                    <artifactId>jakarta.validation-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
-            <groupId>com.sun.el</groupId>
-            <artifactId>el-ri</artifactId>
-            <version>3.0.4</version>
+            <groupId>org.glassfish.expressly</groupId>
+            <artifactId>expressly</artifactId>
+            <version>5.0.0</version>
             <scope>runtime</scope>
             <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>jakarta.el</groupId>
-                    <artifactId>jakarta.el-api</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>javax.el-api</artifactId>
-            <version>3.0.0</version>
+            <groupId>jakarta.el</groupId>
+            <artifactId>jakarta.el-api</artifactId>
+            <version>5.0.1</version>
             <scope>runtime</scope>
             <optional>true</optional>
         </dependency>
@@ -133,7 +122,7 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
-            <version>2.2-rc1</version>
+            <version>2.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -259,6 +248,13 @@
                         </goals>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.projectlombok</groupId>
+                        <artifactId>lombok</artifactId>
+                        <version>${lombok.version}</version>
+                    </dependency>
+                </dependencies>
                 <configuration>
                     <sourceDirectory>${project.build.sourceDirectory}</sourceDirectory>
                     <outputDirectory>${project.build.directory}/schemagen-work/lombok</outputDirectory>

src/main/java/no/digipost/api/datatypes/DataTypeIdentifier.java

@@ -15,6 +15,8 @@
 import no.digipost.api.datatypes.types.proof.Proof;
 import no.digipost.api.datatypes.types.receipt.Receipt;
 import no.digipost.api.datatypes.types.share.ShareDocumentsRequest;
+import no.digipost.api.datatypes.types.share.ShareDocumentsRequestDocumentsShared;
+import no.digipost.api.datatypes.types.share.ShareDocumentsRequestSharingStopped;
 
 import java.util.Collections;
 import java.util.Map;
@@ -28,9 +30,6 @@
 import static java.util.stream.Collectors.toMap;
 import static java.util.stream.Collectors.toSet;
 
-import no.digipost.api.datatypes.types.share.ShareDocumentsRequestDocumentsShared;
-import no.digipost.api.datatypes.types.share.ShareDocumentsRequestSharingStopped;
-
 /**
  * HOWTO: Add new data type
  *

src/main/java/no/digipost/api/datatypes/documentation/DocumentationStructureBuilder.java

@@ -1,8 +1,8 @@
 package no.digipost.api.datatypes.documentation;
 
+import jakarta.validation.constraints.NotNull;
 import no.digipost.api.datatypes.ComplementedBy;
 
-import javax.validation.constraints.NotNull;
 import javax.xml.bind.annotation.XmlElement;
 import java.lang.reflect.AnnotatedElement;
 import java.lang.reflect.Field;

src/main/java/no/digipost/api/datatypes/types/Address.java

@@ -1,13 +1,13 @@
 package no.digipost.api.datatypes.types;
 
+import jakarta.validation.constraints.Size;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 import lombok.Value;
 import lombok.With;
 import no.digipost.api.datatypes.documentation.Description;
 
-import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 

src/main/java/no/digipost/api/datatypes/types/Appointment.java

@@ -1,5 +1,8 @@
 package no.digipost.api.datatypes.types;
 
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
@@ -8,9 +11,6 @@
 import no.digipost.api.datatypes.DataType;
 import no.digipost.api.datatypes.documentation.Description;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.time.ZoneId;

src/main/java/no/digipost/api/datatypes/types/Barcode.java

@@ -1,13 +1,13 @@
 package no.digipost.api.datatypes.types;
 
+import jakarta.validation.constraints.Size;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 import lombok.Value;
 import lombok.With;
 import no.digipost.api.datatypes.documentation.Description;
 
-import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 

src/main/java/no/digipost/api/datatypes/types/Boligdetaljer.java

@@ -1,5 +1,9 @@
 package no.digipost.api.datatypes.types;
 
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Min;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
@@ -9,10 +13,6 @@
 import no.digipost.api.datatypes.DataType;
 import no.digipost.api.datatypes.documentation.Description;
 
-import javax.validation.Valid;
-import javax.validation.constraints.Min;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.time.ZoneId;

src/main/java/no/digipost/api/datatypes/types/Event.java

@@ -1,5 +1,8 @@
 package no.digipost.api.datatypes.types;
 
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.Size;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
@@ -8,9 +11,6 @@
 import no.digipost.api.datatypes.DataType;
 import no.digipost.api.datatypes.documentation.Description;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.util.List;

src/main/java/no/digipost/api/datatypes/types/ExternalLink.java

@@ -1,5 +1,7 @@
 package no.digipost.api.datatypes.types;
 
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
@@ -9,8 +11,6 @@
 import no.digipost.api.datatypes.documentation.Description;
 import no.digipost.api.datatypes.validation.WebUrl;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlSchemaType;

src/main/java/no/digipost/api/datatypes/types/ForeignCurrencyPayment.java

@@ -1,13 +1,13 @@
 package no.digipost.api.datatypes.types;
 
+import jakarta.validation.constraints.Size;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 import lombok.Value;
 import lombok.With;
 import no.digipost.api.datatypes.documentation.Description;
 
-import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 import java.math.BigDecimal;

src/main/java/no/digipost/api/datatypes/types/Heftelse.java

@@ -1,13 +1,13 @@
 package no.digipost.api.datatypes.types;
 
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 import lombok.Value;
 import lombok.With;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 

src/main/java/no/digipost/api/datatypes/types/Hjemmelshaver.java

@@ -1,12 +1,12 @@
 package no.digipost.api.datatypes.types;
 
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 import lombok.Value;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 

src/main/java/no/digipost/api/datatypes/types/Info.java

@@ -1,12 +1,12 @@
 package no.digipost.api.datatypes.types;
 
+import jakarta.validation.constraints.Size;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 import lombok.Value;
 import no.digipost.api.datatypes.documentation.Description;
 
-import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 

src/main/java/no/digipost/api/datatypes/types/Inkasso.java

@@ -1,5 +1,6 @@
 package no.digipost.api.datatypes.types;
 
+import jakarta.validation.constraints.Size;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
@@ -10,7 +11,6 @@
 import no.digipost.api.datatypes.documentation.Description;
 import no.digipost.api.datatypes.types.invoice.InvoicePayment;
 
-import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import java.math.BigDecimal;

src/main/java/no/digipost/api/datatypes/types/Link.java

@@ -1,5 +1,7 @@
 package no.digipost.api.datatypes.types;
 
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
@@ -8,8 +10,6 @@
 import no.digipost.api.datatypes.documentation.Description;
 import no.digipost.api.datatypes.validation.WebUrl;
 
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;

src/main/java/no/digipost/api/datatypes/types/Matrikkel.java

@@ -1,15 +1,15 @@
 package no.digipost.api.datatypes.types;
 
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
+import jakarta.validation.constraints.Size;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 import lombok.Value;
 import lombok.With;
 
-import javax.validation.Valid;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;