From df9a0d3cb649e89e3b8b935fc797607d89cf190d Mon Sep 17 00:00:00 2001
From: radhay <radhay.anand@cred.club>
Date: Sat, 18 Mar 2023 21:47:18 +0530
Subject: [PATCH] Migrated to Java17, SpringBoot3 and Graal

---
 .DS_Store                                     | Bin 6148 -> 6148 bytes
 dependency-reduced-pom.xml                    |  44 ++++++++++++++----
 pom.xml                                       |  18 +++++--
 .../java/messagerosa/core/model/XMessage.java |   9 ++--
 .../java/messagerosa/xml/XMessageParser.java  |  15 ++----
 .../messagerosa/xml/ElementParserTest.java    |   8 +---
 .../messagerosa/xml/XMessageParserTest.java   |   2 +-
 7 files changed, 60 insertions(+), 36 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 33cc3ecf6494cdccee44bc2542090c0c52a258f2..0387394593eb6a564c8dbd9de88228aceaa7c799 100644
GIT binary patch
delta 107
zcmZoMXfc=|&Zs)EP}rD}fq{XUp_rkFAvrCjI5{alKL;oR0ZdRDqy~ru7$EW+54y2W
pypX(^okM_wQFY_N@640=MHD$fsuDmtCY$gmZ%z<d!aT8o1ptbf7PSBX

delta 148
zcmZoMXfc=|&e%3FQH+&?fq{WzVxou)6OaJ{AexbZL4ct+IVnFs2PDKcF;PPoB+krG
z%uvLToR)$l$56tM2oy|bNM$I2Nic3q^k<)JAi}bln}dggv2A1Gcjn3bB8s9QLll5G
S0f>Q?FdP74hRu#5`<VeRDje1T

diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml
index 577b428..a34f733 100644
--- a/dependency-reduced-pom.xml
+++ b/dependency-reduced-pom.xml
@@ -3,14 +3,14 @@
   <parent>
     <artifactId>spring-boot-starter-parent</artifactId>
     <groupId>org.springframework.boot</groupId>
-    <version>2.5.7</version>
+    <version>3.0.0</version>
     <relativePath>pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.uci</groupId>
   <artifactId>message-rosa</artifactId>
   <name>message-rosa</name>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>5.1.0</version>
   <description>message-rosa for messages</description>
   <build>
     <plugins>
@@ -28,17 +28,29 @@
       </plugin>
     </plugins>
   </build>
+  <profiles>
+    <profile>
+      <id>github</id>
+      <distributionManagement>
+        <repository>
+          <id>github</id>
+          <name>GitHub Packages</name>
+          <url>https://maven.pkg.github.com/samagra-comms/message-rosa</url>
+        </repository>
+      </distributionManagement>
+    </profile>
+  </profiles>
   <dependencies>
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-validation</artifactId>
-      <version>2.5.7</version>
+      <version>3.0.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.projectlombok</groupId>
       <artifactId>lombok</artifactId>
-      <version>1.18.12</version>
+      <version>1.18.22</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -80,13 +92,9 @@
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>
-      <version>5.6.2</version>
+      <version>5.9.1</version>
       <scope>test</scope>
       <exclusions>
-        <exclusion>
-          <artifactId>apiguardian-api</artifactId>
-          <groupId>org.apiguardian</groupId>
-        </exclusion>
         <exclusion>
           <artifactId>opentest4j</artifactId>
           <groupId>org.opentest4j</groupId>
@@ -95,6 +103,10 @@
           <artifactId>junit-platform-commons</artifactId>
           <groupId>org.junit.platform</groupId>
         </exclusion>
+        <exclusion>
+          <artifactId>apiguardian-api</artifactId>
+          <groupId>org.apiguardian</groupId>
+        </exclusion>
       </exclusions>
     </dependency>
     <dependency>
@@ -121,8 +133,20 @@
       <version>RELEASE</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.springframework.boot</groupId>
+      <artifactId>spring-boot-properties-migrator</artifactId>
+      <version>3.0.3</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>jakarta.validation</groupId>
+      <artifactId>jakarta.validation-api</artifactId>
+      <version>3.0.2</version>
+      <scope>provided</scope>
+    </dependency>
   </dependencies>
   <properties>
-    <java.version>11</java.version>
+    <java.version>17</java.version>
   </properties>
 </project>
diff --git a/pom.xml b/pom.xml
index 3584e76..6121c36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.5.7</version>
+		<version>3.0.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
 	<groupId>com.uci</groupId>
@@ -15,7 +15,7 @@
 	<name>message-rosa</name>
 	<description>message-rosa for messages</description>
 	<properties>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 	</properties>
 	<profiles>
 		<profile>
@@ -43,7 +43,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.18.12</version>
+			<version>1.18.22</version>
 		</dependency>
 		<dependency>
 			<groupId>javax.xml.bind</groupId>
@@ -90,6 +90,18 @@
             <version>RELEASE</version>
             <scope>compile</scope>
         </dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-properties-migrator</artifactId>
+			<version>3.0.3</version>
+			<scope>runtime</scope>
+		</dependency>
+		<!-- https://mvnrepository.com/artifact/jakarta.validation/jakarta.validation-api -->
+		<dependency>
+			<groupId>jakarta.validation</groupId>
+			<artifactId>jakarta.validation-api</artifactId>
+			<version>3.0.2</version>
+		</dependency>
     </dependencies>
 
 	<build>
diff --git a/src/main/java/messagerosa/core/model/XMessage.java b/src/main/java/messagerosa/core/model/XMessage.java
index af83d9a..9d92ceb 100644
--- a/src/main/java/messagerosa/core/model/XMessage.java
+++ b/src/main/java/messagerosa/core/model/XMessage.java
@@ -4,13 +4,12 @@
 import java.io.StringWriter;
 import java.time.Instant;
 import java.util.ArrayList;
-import java.util.Map;
 import java.util.UUID;
 
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.annotation.XmlRootElement;
 
 import com.sun.istack.NotNull;
 
diff --git a/src/main/java/messagerosa/xml/XMessageParser.java b/src/main/java/messagerosa/xml/XMessageParser.java
index 20bbf01..8610154 100644
--- a/src/main/java/messagerosa/xml/XMessageParser.java
+++ b/src/main/java/messagerosa/xml/XMessageParser.java
@@ -1,17 +1,12 @@
 package messagerosa.xml;
 
 import messagerosa.core.model.XMessage;
-import messagerosa.xml.exception.InvalidStructureException;
-import org.kxml2.io.KXmlParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-import java.io.IOException;
+
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Unmarshaller;
+
 import java.io.InputStream;
-import java.util.HashMap;
-import java.util.Map;
 
 /**
  * @author chakshu
diff --git a/src/test/java/messagerosa/xml/ElementParserTest.java b/src/test/java/messagerosa/xml/ElementParserTest.java
index 617ac76..ba7ff2a 100644
--- a/src/test/java/messagerosa/xml/ElementParserTest.java
+++ b/src/test/java/messagerosa/xml/ElementParserTest.java
@@ -1,24 +1,18 @@
 package messagerosa.xml;
 
 import messagerosa.core.model.XMessage;
-import messagerosa.xml.exception.InvalidStructureException;
 import org.junit.Before;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
-import org.kxml2.io.KXmlParser;
-import org.xmlpull.v1.XmlPullParserException;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.net.URL;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 
 import static junit.framework.TestCase.assertEquals;
 import static messagerosa.utils.ResourcePathHelper.r;
-import static org.junit.jupiter.api.Assertions.*;
 
 class ElementParserTest {
 
diff --git a/src/test/java/messagerosa/xml/XMessageParserTest.java b/src/test/java/messagerosa/xml/XMessageParserTest.java
index 7133273..4935221 100644
--- a/src/test/java/messagerosa/xml/XMessageParserTest.java
+++ b/src/test/java/messagerosa/xml/XMessageParserTest.java
@@ -3,7 +3,7 @@
 import messagerosa.core.model.XMessage;
 import org.junit.jupiter.api.Test;
 
-import javax.xml.bind.JAXBException;
+import jakarta.xml.bind.JAXBException;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.InputStream;