From db8b946aaa2770fe64599e67cf00e00786105eed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Eivind=20Bergst=C3=B8l?= <eivind@bergstol.no>
Date: Wed, 4 Dec 2019 20:09:36 +0100
Subject: [PATCH] =?UTF-8?q?Bygg=20p=C3=A5=20java=2011?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Oppgraderer lombok og legger til dependencies fra jakarta for
å få digipost-data-types til å bygge på java 11.
---
 NOTICE  |  7 +++++++
 pom.xml | 41 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 46 insertions(+), 2 deletions(-)

diff --git a/NOTICE b/NOTICE
index 42b79f0a..50b85d2d 100644
--- a/NOTICE
+++ b/NOTICE
@@ -14,13 +14,20 @@ under the License.
 This project includes:
   ClassMate under The Apache Software License, Version 2.0
   Digipost Data Types under The Apache Software License, Version 2.0
+  Extended StAX API under Eclipse Distribution License - v 1.0
+  fastinfoset under Apache License, Version 2.0 or Eclipse Distribution License - v 1.0
   Hibernate Validator Engine under Apache License 2.0
+  istack common utility code runtime under Eclipse Distribution License - v 1.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 Bean Validation API under Apache License 2.0
   Jakarta Expression Language 3.0 under EPL 2.0 or GPL2 w/ CPE
+  jakarta.xml.bind-api under Eclipse Distribution License - v 1.0
+  JavaBeans Activation Framework API jar under EDL 1.0
+  JAXB Runtime under Eclipse Distribution License - v 1.0
   JBoss Logging 3 under Apache License, version 2.0
   Project Lombok under The MIT License
+  TXW2 Runtime under Eclipse Distribution License - v 1.0
 
diff --git a/pom.xml b/pom.xml
index c8d15a1d..85377be6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,7 +41,7 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.8</version>
+            <version>1.18.10</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -83,6 +83,17 @@
             <version>3.0.3</version>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>2.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.jaxb</groupId>
+            <artifactId>jaxb-runtime</artifactId>
+            <version>2.3.2</version>
+            <scope>runtime</scope>
+        </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter-api</artifactId>
@@ -217,7 +228,7 @@
             <plugin>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok-maven-plugin</artifactId>
-                <version>1.16.16.0</version>
+                <version>1.18.10.0</version>
                 <executions>
                     <execution>
                         <phase>generate-sources</phase>
@@ -244,6 +255,19 @@
                         </goals>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>jakarta.xml.bind</groupId>
+                        <artifactId>jakarta.xml.bind-api</artifactId>
+                        <version>2.3.2</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.glassfish.jaxb</groupId>
+                        <artifactId>jaxb-runtime</artifactId>
+                        <version>2.3.2</version>
+                        <scope>runtime</scope>
+                    </dependency>
+                </dependencies>
                 <configuration>
                     <sources>
                         <source>${project.build.directory}/schemagen-work/lombok</source>
@@ -335,6 +359,19 @@
                         <phase>generate-resources</phase>
                     </execution>
                 </executions>
+                <dependencies>
+                    <dependency>
+                        <groupId>jakarta.xml.bind</groupId>
+                        <artifactId>jakarta.xml.bind-api</artifactId>
+                        <version>2.3.2</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.glassfish.jaxb</groupId>
+                        <artifactId>jaxb-runtime</artifactId>
+                        <version>2.3.2</version>
+                        <scope>runtime</scope>
+                    </dependency>
+                </dependencies>
             </plugin>
         </plugins>
     </build>