From 488419eb68f6326245b64a833cb29b5d660e0d0b Mon Sep 17 00:00:00 2001
From: Kate Yang <150059882+kateyang1998@users.noreply.github.com>
Date: Fri, 6 Dec 2024 11:25:12 -0500
Subject: [PATCH 1/2] update: removed unused dependencies and upgraded some
 dependencies in the pom.xml

- Upgraded some dependencies
- Cleaned up some dependencies
- Fixed compilation errors caused by dependency upgrade
---
 dependencies-lock.json                        | 408 ++--------
 pom.xml                                       | 703 ++++--------------
 .../HSFO/pageUtil/HsfoQuartzServlet.java      |  25 +-
 .../hsfo2/pageUtil/HsfoQuartzServlet.java     |  28 +-
 4 files changed, 256 insertions(+), 908 deletions(-)

diff --git a/dependencies-lock.json b/dependencies-lock.json
index ed4abe3e9f3..a4f758a2245 100644
--- a/dependencies-lock.json
+++ b/dependencies-lock.json
@@ -7,94 +7,6 @@
     "type" : "jar",
     "optional" : false,
     "integrity" : "sha512:MRwxFfn2ZR0XEcUtFzniWnDyVFbKy5os3edidJjDCxPXIRM8x1s5RirRiBKoJHLvGzudZPq1q7A3fBK/ggQ6dA=="
-  }, {
-    "groupId" : "batik",
-    "artifactId" : "batik-awt-util",
-    "version" : "1.6-1",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:Pe6dU1dEmaV/ACC0o8z5CwnrwRiKiLsn+gC4KIgN95TOF4Vs6FVRE1TuAd8GpDYmmC/TtIU5OTNS7WNhfrfF/w=="
-  }, {
-    "groupId" : "batik",
-    "artifactId" : "batik-css",
-    "version" : "1.6-1",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:rUk0WEuUn/eGDoEPlad4FOH/XJvfkL3RMhu6BLPk7UA9820VlUeRhD2HC5k2h0EGH2h56EQFAQ3sUJeVuTLZNQ=="
-  }, {
-    "groupId" : "batik",
-    "artifactId" : "batik-dom",
-    "version" : "1.6-1",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:5LTa5CR31r4cZ2R5p3ewJSmPkVdXg2sNqmBmmC6siG0k2ZkSx7UaMkUnpQ0RHB+4DqbdeJ6hiTHGywsH01ZJMA=="
-  }, {
-    "groupId" : "batik",
-    "artifactId" : "batik-ext",
-    "version" : "1.6-1",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:CbquYoHZHNDXS7WiFqMoD7JzA7KnuoXtVHcKnSVDvu/5VSyRSokeARMt0wVdTC4EHIf66ON9abCPyVaiXdbnBw=="
-  }, {
-    "groupId" : "batik",
-    "artifactId" : "batik-gui-util",
-    "version" : "1.6-1",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:KbabBEYVcY30JNxorfwsKcd3sRHi3FxYWMEs+ThPlRydIrSsD+i37ZoI6FqugYmsNnMPQ5Fa05fdpuLGL/GuGQ=="
-  }, {
-    "groupId" : "batik",
-    "artifactId" : "batik-gvt",
-    "version" : "1.6-1",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:s4AUeT3xC1ew+dqPgPx3+v39SoS7pPzBws9mxt0cLbw9RSYY3n0d0Wl7tuZoTh32bvBoax9NNyBi3IU4gRXRgA=="
-  }, {
-    "groupId" : "batik",
-    "artifactId" : "batik-parser",
-    "version" : "1.6-1",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:7LoNx8S5GJtnpiWsHwb76+uaaHhXOjiJVBjwPK05uDb8MWTnukgX9aEeKUGCVn6Gdsre3xMPLHXD7dF1vVL6fQ=="
-  }, {
-    "groupId" : "batik",
-    "artifactId" : "batik-svg-dom",
-    "version" : "1.6-1",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:0cOedc5pSfqhxu8FMUe8dhcD0CtIwXGvxhOh1p876q2tj5T7qr2M4egGz9qguFmP55FxmHr52N68+gHigXycGw=="
-  }, {
-    "groupId" : "batik",
-    "artifactId" : "batik-svggen",
-    "version" : "1.6-1",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:pOc0m+YA6nVZY9N5OIYG2Sbhbmbb+8iq/Ii+uj62ptLTQY+MHqMKfGdhsmuhGF1vAneR70PThKjk7NAo044mSA=="
-  }, {
-    "groupId" : "batik",
-    "artifactId" : "batik-util",
-    "version" : "1.6-1",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:A6Z6CWWTXWAu+aV8aOGxFJOj6Hem57MsYSQ6zbO3kMeIIBCMXJsKmjKNfohj3kJopudlmFu+LEvlUmnJzXIqgw=="
-  }, {
-    "groupId" : "batik",
-    "artifactId" : "batik-xml",
-    "version" : "1.6-1",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:vbficz/xE/RpKxh8V/BqzjgFcUIDO5TcVH2X7ku5Ojh36HMVpN01UitZ3zvCa2LNzA3+ZoUyo3u2QF7InG4bOA=="
   }, {
     "groupId" : "ca.bornontario",
     "artifactId" : "BORNWB",
@@ -303,14 +215,6 @@
     "type" : "jar",
     "optional" : false,
     "integrity" : "sha512:kGAn8E5VII/duD6uY/Elj64QAQfijpy9Z2qNS99znBh9P5v6nLNyEc5KC3LzZQHeMAzYgG4fSwO8O9mDA7laOw=="
-  }, {
-    "groupId" : "cglib",
-    "artifactId" : "cglib-nodep",
-    "version" : "3.2.5",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:feAS1i5hK5V+lyduXlasUZTswnB2fuLlYIYr/jo6l2uIG7wNNYMKKXjHKywhSy/fiYBhIoj6OjafgYi8h2uotg=="
   }, {
     "groupId" : "com.atlassian.commonmark",
     "artifactId" : "commonmark",
@@ -375,6 +279,14 @@
     "type" : "jar",
     "optional" : false,
     "integrity" : "sha512:f8R2TrZSJ/W6YUaYpc8vlDATP0LsbirlO0xyTuU/JYVBoBCf4GWeC55FcptGyVwAIn5pa40a3c13LIX4d2WMmg=="
+  }, {
+    "groupId" : "com.github.cliftonlabs",
+    "artifactId" : "json-simple",
+    "version" : "3.0.2",
+    "scope" : "compile",
+    "type" : "jar",
+    "optional" : false,
+    "integrity" : "sha512:x390I/2WtbYVkjZTbk5LUJAyzqlDaBhrhsmfTscs9A7PsmghzHEkB3NjkCziuRZE4y5T+n3j/OmIW0ALBCTs0A=="
   }, {
     "groupId" : "com.github.jtidy",
     "artifactId" : "jtidy",
@@ -474,35 +386,35 @@
   }, {
     "groupId" : "com.google.protobuf",
     "artifactId" : "protobuf-java",
-    "version" : "3.11.4",
+    "version" : "3.21.9",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:CwPTdTfAd58Ii3fAH4K93Mli4OZCgwM4KnOV3y68NS/3ejh0fGidS6lAWHer2pjYQKUnq6pQAZESjxBlEYaRmg=="
+    "integrity" : "sha512:F1lmQcSp0QibGG9G+SW/lJKfgVC7amqYVqnGDzXwr6KNBWcuChP0imIWRzOlthYiehXnVVUwYJ4VFXymQdxidw=="
   }, {
     "groupId" : "com.itextpdf.tool",
     "artifactId" : "xmlworker",
-    "version" : "5.5.13.1",
+    "version" : "5.5.13.4",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:DzwUDY7lOvCZDOghN4WBudvyU3t4w+fpT/ShHOHyxGwspTH23FVzPQSkEX8bJiWxVaIFCO8SvmA0dc/BXCeBiA=="
+    "integrity" : "sha512:Tj69vcCRv0r0mr78sY5gHPfpojQ2WCg7J6+/K1Jhbta/vUhRwmitDPUFrda8DQShTb3uGRkCbF0Rkw03+0zU2A=="
   }, {
     "groupId" : "com.itextpdf",
     "artifactId" : "itextpdf",
-    "version" : "5.5.13.1",
+    "version" : "5.5.13.4",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:XnLwz95ipxbq/9tFZJKn+UKGpuyL8x9vV85EhoQUhXWZ0n0/BuHcAih9oTgetnlgz5xHL22D9G1r51cHGESXHA=="
+    "integrity" : "sha512:HCHFwerQk+96YOD6L8Xbe65mrOsBWdffo4Ynwu7htpmUtv3IjNT5ZXOT87noUhYzO7ZVbkQjYAFOB388gGWWmw=="
   }, {
     "groupId" : "com.jcraft",
     "artifactId" : "jsch",
-    "version" : "0.1.49",
+    "version" : "0.1.54",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:YgsBfXB0hLJheTswegFUBsgnomUB749+E/IkX+aX8wQkYdnLKeJsKQ7byLKrRp4CrJa6pCk9tOUNR3ExDz3XPA=="
+    "integrity" : "sha512:l+xt5k9IcO48hPiDvTZkViv9YAyp8zZJZufb7n5OhSBkfAP5+B1oCOMwBSyhMz439JfWJSzSb+chqQ9XPL4gNg=="
   }, {
     "groupId" : "com.lowagie",
     "artifactId" : "itext-rtf",
@@ -527,6 +439,14 @@
     "type" : "jar",
     "optional" : false,
     "integrity" : "sha512:HLfbp3yV8KzFFEqazKmkfg7/oz/N7MRg2/PRuhXrgB6yJ8VZUzczVaI09CbuizXqdJEQH4rQMyYoQ0wS1WcEWA=="
+  }, {
+    "groupId" : "com.mysql",
+    "artifactId" : "mysql-connector-j",
+    "version" : "8.0.33",
+    "scope" : "compile",
+    "type" : "jar",
+    "optional" : false,
+    "integrity" : "sha512:38Vqp2p0GajtLA0FHtJ53tjJr/NUAYqsL4yXtooiB4Sr56i6T8R+kyxBv/YcuWNwJKfhnPqjfv14zYoyJ/e6qg=="
   }, {
     "groupId" : "com.onelogin",
     "artifactId" : "java-saml-core",
@@ -602,11 +522,11 @@
   }, {
     "groupId" : "com.sun.xml.bind",
     "artifactId" : "jaxb-impl",
-    "version" : "2.3.3",
+    "version" : "2.2.11",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:gkCQxFbuEgVxmb/Zj9rlNaMIBbFsgleUHsj+bsq7p7WHmhgz7QBNtAHH3ZKOXxAhb1BBVYSqSPw3smMkBf5jJQ=="
+    "integrity" : "sha512:SHj1ch5QB7Vhyh3O6nT9555KaP5WlsOO0RhYqrRlDqACqOZDYZpUUulLrNQ1typHgYgxwWe80F5zoqNyzivh4Q=="
   }, {
     "groupId" : "com.sun.xml.bind",
     "artifactId" : "jaxb-jxc",
@@ -720,14 +640,6 @@
     "type" : "jar",
     "optional" : false,
     "integrity" : "sha512:Uv1ngALqQlg+Kr+ALnIGk9krwGsvrkjgDwSvnatRRAmLzmGEo0eOafgHNuhjD39W8Gi9Z1/jhR4ZXpwoZABTfQ=="
-  }, {
-    "groupId" : "com.sun",
-    "artifactId" : "xacml",
-    "version" : "1.2",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:pHV0DUOIDFV1DQ9UWzl/A/7S58jLKOOekddqulNIipMFl8053bNR71p2o7SlpGNYFq2KV53HYdvGo46rn9OJkQ=="
   }, {
     "groupId" : "com.twelvemonkeys.common",
     "artifactId" : "common-image",
@@ -875,11 +787,11 @@
   }, {
     "groupId" : "commons-io",
     "artifactId" : "commons-io",
-    "version" : "2.13.0",
+    "version" : "2.18.0",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:OlaY0MmVw5XPRBgAc2FfCHr0L9eOcfIk6ziQjYI9pB8NBPGOahTfZ7OwKDD79ULzW59Dqv45Q38X/hhlX7ysBw=="
+    "integrity" : "sha512:eGd4UpQ12KFKts4hds3yue5lhacYk7eF8mJXEiFm3O/HxK8/YS7aOXSwbBbQb8NXF4vyi5t0AQ6bwEwzIhrcLw=="
   }, {
     "groupId" : "commons-lang",
     "artifactId" : "commons-lang",
@@ -920,14 +832,6 @@
     "type" : "jar",
     "optional" : false,
     "integrity" : "sha512:rKQ0an19rrbbVjips4ZGZIwhYo0YFUPJJy+6r7qhIYUp6mRjKnAptYEPZFYrPxYUl02bGuRtPVqmnyHjomP5EA=="
-  }, {
-    "groupId" : "concurrent",
-    "artifactId" : "concurrent",
-    "version" : "1.0",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:YHXAJKd0jZsXk8GiFodkkuRaEtHZaI1S/BSxUc8JIesXwDnQE2u26t6VgyWJPpYzQHuQRcjbic74GHToesK+9g=="
   }, {
     "groupId" : "displaytag",
     "artifactId" : "displaytag",
@@ -939,11 +843,11 @@
   }, {
     "groupId" : "dom4j",
     "artifactId" : "dom4j",
-    "version" : "1.1",
+    "version" : "1.6.1",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:JuaXHlAVFZZxoLyBuNQCNrEW1BcZjX0CgvdSfk0llG4KhZrwygkeQel79Xr2xTt+t31uLrZtJPgSY2QjE+ERvw=="
+    "integrity" : "sha512:43N+9KFVHkZBCRb82imKYpsmgddGnOqv/9Zo5gVdnA55W8nRLqMwDSGJgdWqWy84uy5kEhGZfJYuYIYGj2KtZw=="
   }, {
     "groupId" : "drools",
     "artifactId" : "drools-all",
@@ -1088,14 +992,6 @@
     "type" : "jar",
     "optional" : false,
     "integrity" : "sha512:gEOmdC/YDUuEwvfVY9tLPQBu1RI11j9c48BlHaLEq87++T0pZx96zZGP/kZI8zuk+OHq4FgTvUKEywsnptpxwA=="
-  }, {
-    "groupId" : "jasperreports",
-    "artifactId" : "htmlcomponent",
-    "version" : "6.8.0",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:Nbz5vwfz78HQTeyzjFriFafFXZkGDhKud54STVyjhPijxFJrcWKxE9+Edvy9pDQLbwTb3DkdlSr6O3jlN9NdeQ=="
   }, {
     "groupId" : "javax.activation",
     "artifactId" : "javax.activation-api",
@@ -1107,11 +1003,11 @@
   }, {
     "groupId" : "javax.annotation",
     "artifactId" : "javax.annotation-api",
-    "version" : "1.3.2",
+    "version" : "1.3",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:Z5z0TDudY1tD7RIqVV1XApLD8JN8M4ccQEOKGlPiBYyAV4aU7JRm6snigOGb+3qVsmFZTMTBFhyF3JffYjXlUw=="
+    "integrity" : "sha512:/pM3CZYQFY9RhmUCME/XIhPkrGU1jKDl7eHAl3HMY22jBu8jqezwlq6PmUzb4reX50Z0gXe28te6BzzkOhc3uQ=="
   }, {
     "groupId" : "javax.inject",
     "artifactId" : "javax.inject",
@@ -1139,11 +1035,11 @@
   }, {
     "groupId" : "javax.servlet",
     "artifactId" : "jstl",
-    "version" : "1.2",
+    "version" : "1.0.2",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:+2/jOSJjG7ohtgbLXVPERXBx5pXsVjIgUYUoHn2z4tY9lSSLQ7nH+yy1BC0Uome4fSxdp0LJiRdMNSbczyOu7A=="
+    "integrity" : "sha512:k+9oTi5vy0FV6G/VHg6+fCTjsqNihsGuHCrHPd3UL3MgR3/C4OYis2vKZWTA16byl81HHG/G6i5TxTWP+P90nw=="
   }, {
     "groupId" : "javax.servlet",
     "artifactId" : "servlet-api",
@@ -1152,14 +1048,6 @@
     "type" : "jar",
     "optional" : false,
     "integrity" : "sha512:4HxZjUaKniaNyAO/0v36fK+zXScUB7hSl7NfwXAXuFuvsLFlJDTc/7Z3e045l50M2SBLsVDvpeSJFGtRcirx/g=="
-  }, {
-    "groupId" : "javax.transaction",
-    "artifactId" : "jta",
-    "version" : "1.1",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:+ppatR+X4s1jtcHLF3W2Ox7cAZeu28wOirMRbf4n1HNlhl0k7vrxm2SFVLYPGh7OE+MZLRV8MZNEqXrVUcYoxA=="
   }, {
     "groupId" : "javax.ws.rs",
     "artifactId" : "javax.ws.rs-api",
@@ -1176,14 +1064,6 @@
     "type" : "jar",
     "optional" : false,
     "integrity" : "sha512:k6R7JFq4MNZkpIydFOhhmKOICc6U9yymaz1odGrh17kC9v7y0awaksAXAVSa6AoH22m9gi/9gxqV2Nv/rUNXkA=="
-  }, {
-    "groupId" : "javax.xml.stream",
-    "artifactId" : "stax-api",
-    "version" : "1.0-2",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:p/M3c1EANW9yY5BTc0UGmCMpAVaTZ3+v1NLKdMTkEsquB3mZy0Le4kAsxkGoDI+wJ9650txsThQdlMkYS6qdxQ=="
   }, {
     "groupId" : "javax.xml",
     "artifactId" : "jaxm-api",
@@ -1200,14 +1080,6 @@
     "type" : "jar",
     "optional" : false,
     "integrity" : "sha512:znENcJspok1Xv2MlUhljl1uX0WCKrzCYwq55APPBMm+4MQ06wKi/egA/3zdfpMN7oOfcULuQJp8ld27oBiSbBg=="
-  }, {
-    "groupId" : "jdom",
-    "artifactId" : "jdom",
-    "version" : "1.0",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:JnvP9H/UKER+6ypLCIhhM7QdANG72q2SgjToiRdJn30GqNd4NwLvpnFJ0SV317WSZcH/QtzCz3W6cf+QJuDirA=="
   }, {
     "groupId" : "joda-time",
     "artifactId" : "joda-time",
@@ -1216,14 +1088,6 @@
     "type" : "jar",
     "optional" : false,
     "integrity" : "sha512:Xd5dVNou6uIB8/XAVi8WOa5mSfezqD0nbih3LOLl2GsmvTUz/c7a+EHMd5gtaDWYwY+OxcW2y6TrR3SPC9QROA=="
-  }, {
-    "groupId" : "jspellchecker",
-    "artifactId" : "jazzy-core",
-    "version" : "unknown",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:++8UobJOIqjol/7wrBaZ4ThHV2Zx8cwYGfbnLq2xCGPKzb561pJKi8XTXWPr54NCrySrHzk2dOdMNMSHrmQNnQ=="
   }, {
     "groupId" : "junit",
     "artifactId" : "junit",
@@ -1232,14 +1096,6 @@
     "type" : "jar",
     "optional" : false,
     "integrity" : "sha512:oxuZUPkpp+WmANiXh+9A5CqKjiOS4hDQwPRbNXKTdnChilJPGBVQjNEVLNHqpydct0MLpFwFO+NlyDwjG8zT8A=="
-  }, {
-    "groupId" : "mysql",
-    "artifactId" : "mysql-connector-java",
-    "version" : "8.0.25",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:PlIU94TG1TWx3pqHPuTSGJIlSU0CNOCmwd42uU+DY2tgL7WG+eFonxtb3bncEYaQ5qfXgbACHHqRqCEnPZTnJw=="
   }, {
     "groupId" : "net.bull.javamelody",
     "artifactId" : "javamelody-core",
@@ -1353,14 +1209,6 @@
     "type" : "jar",
     "optional" : false,
     "integrity" : "sha512:fkHddlaDsoboFxGAVzpe75AN6tEEBMWjyyZQ2BhZmnoGCjbB8IVjbcJHxEVAomRGv1evSFtqm76TFuCAYNDZoA=="
-  }, {
-    "groupId" : "ocan",
-    "artifactId" : "ocan-iar-phr",
-    "version" : "UNKNOWN",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:JdlFy+zhqu8tXiv1jP+UGIn3Bicgk8Uu5VZGEwQIjTTL51yDbMUMc3fuQfqO6F1vUR6wvP3MAQHs+5nyb6kCTA=="
   }, {
     "groupId" : "ocan",
     "artifactId" : "ocan-iar",
@@ -1441,14 +1289,6 @@
     "type" : "jar",
     "optional" : false,
     "integrity" : "sha512:DqH79QMBSKSUVMia+HA9qyXr88iM4xq92/ZsYLvLSWeNoqk3IihwjTvl8WpkimW9rLVGf9qvUUz38LAt4gF7dA=="
-  }, {
-    "groupId" : "org.apache.axis2",
-    "artifactId" : "axis2-transport-local",
-    "version" : "1.5.4",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:OEX747KJZC6sl+qzO//tgkYSDSRn/O1vU/rAsEmDHYqCgVrAB22fj9gbuwYihiPHOWULLxQ+D+DYecXoyfq75A=="
   }, {
     "groupId" : "org.apache.axis2",
     "artifactId" : "axis2",
@@ -1468,11 +1308,19 @@
   }, {
     "groupId" : "org.apache.commons",
     "artifactId" : "commons-compress",
-    "version" : "1.14",
+    "version" : "1.26.0",
+    "scope" : "compile",
+    "type" : "jar",
+    "optional" : false,
+    "integrity" : "sha512:rL6qKQm4Cc1WHnFW3xg0DZarrLF5MlYi1zvda4LLmzh9b8saRNgZWq1OeG2imSieF1mKHTN7fH0cC8YQzBKHFA=="
+  }, {
+    "groupId" : "org.apache.commons",
+    "artifactId" : "commons-digester3",
+    "version" : "3.2",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:SSbT77MsJ7VlUTB7+M+PKF51PJ2AaHdzwQHoYTO/jbNErphJ1lOGBoST50irMSAGGdkfd+kqe37gOw7E5BkSHA=="
+    "integrity" : "sha512:ogY/Af1Q+Wz9h2XEmTUkmnffR5Zf8K43W7Hx5H483rXoLq8LDjIYPlgcAYIUmfnUxXQZ6QNSp6qWuXhQlQ6GUg=="
   }, {
     "groupId" : "org.apache.commons",
     "artifactId" : "commons-exec",
@@ -1484,11 +1332,11 @@
   }, {
     "groupId" : "org.apache.commons",
     "artifactId" : "commons-lang3",
-    "version" : "3.9",
+    "version" : "3.17.0",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:xlFuuqDYPT38QhBhpX0PfrMNDPnqBaDV+hyUtNQryiEUROqQI94agSUzuIESvpXNXZY44WCvyzHDHWVw+VqWEA=="
+    "integrity" : "sha512:39X/f+f4UrnKq8geWgDiBhb5hAUIXwWbZNwhIf61+myzJ+EaPS+VTAeYEcMfb9SE6Q+TLUUHh5b7+n2/Hx61qg=="
   }, {
     "groupId" : "org.apache.commons",
     "artifactId" : "commons-math3",
@@ -2121,14 +1969,6 @@
     "type" : "jar",
     "optional" : false,
     "integrity" : "sha512:mEHbd3m2R95GaN7Zt56MUQplMHY4T8MFnvGG6l2Cgo4UneSMAWtcuJob6r5gmBQpJlqDJL4xCEc8V693piq9ag=="
-  }, {
-    "groupId" : "org.apache.jcs",
-    "artifactId" : "jcs",
-    "version" : "1.3",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:UjRPAph9edK20Uodx/vH2XxfDLLPj5m9KiKoLSji30RNvDwyKJP9qQ9/PmuLk8aGvxz54MA01Nmt1CpEUK8OCQ=="
   }, {
     "groupId" : "org.apache.logging.log4j",
     "artifactId" : "log4j-1.2-api",
@@ -2185,14 +2025,6 @@
     "type" : "jar",
     "optional" : false,
     "integrity" : "sha512:OMih7bjBySpZjIL8fdKDxQ/urJde91UTyNBI6MS0Gz7CyUFoi1/FS43uRh7f0RdK6EV/SPXjw2UGWBCzYj6Q6A=="
-  }, {
-    "groupId" : "org.apache.pdfbox",
-    "artifactId" : "jbig2-imageio",
-    "version" : "3.0.4",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:H7iIigkam5TsOaK99QaL21TsrcvoT4zBT06zEIjUbBpuksTMGDZm1lGS0V0wsdv2tvNd1gk34qhKVTpZd3wTPw=="
   }, {
     "groupId" : "org.apache.pdfbox",
     "artifactId" : "pdfbox",
@@ -2226,21 +2058,21 @@
     "optional" : false,
     "integrity" : "sha512:XOr3rZ5itO/1EsAFQcd/gH13oHN6EdUlAdCyUCS4xXjnt+ivekad5vblSr8c4Co10zVozzXUhSwALBBXYve7nQ=="
   }, {
-    "groupId" : "org.apache.velocity",
-    "artifactId" : "velocity-engine-core",
-    "version" : "2.0",
+    "groupId" : "org.apache.velocity.tools",
+    "artifactId" : "velocity-tools-generic",
+    "version" : "3.1",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:fd+U9aqaERia0fznbboSOulhpx2DKzhHgKg7SJl4iVMT0CJ+YkG8NE9MIEPfecmM+5/BihcHBXfaxNVk7filEQ=="
+    "integrity" : "sha512:UecknpLVFvnoqSoQaIVtkg7e5RJWMTHMot7eRe1t4Ohmff4PVM1ZcS8lX5AZ2S6lIbgYJiK6MDrzpFuXQKbVSw=="
   }, {
     "groupId" : "org.apache.velocity",
-    "artifactId" : "velocity-tools",
-    "version" : "2.0",
+    "artifactId" : "velocity-engine-core",
+    "version" : "2.4.1",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:wQSG8RK7cRmlV/6aE4h46umA61cCelvd+iSeFx6yWJ+o09Nst36CXMM2JF1/hFXhBtqgTFTG6ul0GHWjMq8Vug=="
+    "integrity" : "sha512:dxUO13XmRL5E2fHq0ZqIDIoCy6GNrpeuxOqPFNsE7nlbzjW9LlMU8uldQMAUQdqVQyc0j5Gt3Ju40MyffAD1YQ=="
   }, {
     "groupId" : "org.apache.velocity",
     "artifactId" : "velocity",
@@ -2268,11 +2100,11 @@
   }, {
     "groupId" : "org.apache.ws.commons.axiom",
     "artifactId" : "axiom-api",
-    "version" : "1.2.11",
+    "version" : "1.2.10",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:vjbG7sZEBPzWK3yO/ccyDpcga00tGOs/Fu2iUJWVcAw15EggEZAkKFZFaWGUGnKDaGQEM3njbg3dy+cGiAuObg=="
+    "integrity" : "sha512:R7ODpB3RE1DZ9DKOOjkC2Tz/U7d9TQdknAhQt0W3xUzXCVxmfksfOTeFeNiCfaGw/DAKPAyIF+lOVguIC4WoEw=="
   }, {
     "groupId" : "org.apache.ws.commons.axiom",
     "artifactId" : "axiom-dom",
@@ -2284,11 +2116,11 @@
   }, {
     "groupId" : "org.apache.ws.commons.axiom",
     "artifactId" : "axiom-impl",
-    "version" : "1.2.11",
+    "version" : "1.2.10",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:a8Hep2cqXsKkLGlK9MYlA6VqG6zPSpvuGBNlHfeUj1h2uNrLtYeETa5UCtGqJ8/NoZwKAnL+zxhhlVTsziFZnQ=="
+    "integrity" : "sha512:Bq1uk2cXrJiZhvbCK5D9rihPF69n8RVvhVc9phETaviiT0jfLgKt4r5SYdkmrB5Dx3oLWpwXJ9IiWfaxK7+DsA=="
   }, {
     "groupId" : "org.apache.ws.xmlschema",
     "artifactId" : "xmlschema-core",
@@ -2356,51 +2188,11 @@
   }, {
     "groupId" : "org.apache.xmlbeans",
     "artifactId" : "xmlbeans",
-    "version" : "2.5.0",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:zzNKrlDoEqu+Djt4Rpm2NJG92XjemIzMzXqOmeHPK2l7DFuJ5CJuNr1LAgXr9X13Gn2XE/LBsM0KQOabOKXLYw=="
-  }, {
-    "groupId" : "org.apache.xmlgraphics",
-    "artifactId" : "batik-css",
-    "version" : "1.7",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:HN7O1RR+Vt9woTpJ5hTvZQcmfYDgfQWtZ9lJRs25WEivavQ4FqiLUA3xtEtdEc0IuekMFLQG8UVbzWNgECdeXA=="
-  }, {
-    "groupId" : "org.apache.xmlgraphics",
-    "artifactId" : "batik-dom",
-    "version" : "1.7",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:PFvHzOlFBiQTFM8fgByy3LWs0k08h7xRIIHKayiL6SMmDicfY7AtdiHUoD50rL83zeLWPaj0JeXbQ02qtL4o4w=="
-  }, {
-    "groupId" : "org.apache.xmlgraphics",
-    "artifactId" : "batik-ext",
-    "version" : "1.7",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:fev30+t3XUVurlSsywZTwnlo5xvYQgv+cZ7il25uNxW2esqOIS9COuxKVVVXHcR7O690EP05TQLkcpsnEXB/8g=="
-  }, {
-    "groupId" : "org.apache.xmlgraphics",
-    "artifactId" : "batik-util",
-    "version" : "1.7",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:5VoF3OV/7Y5kQkTxz0SP5FMlnr3YzUeAnf4cXTc56ugXnHCGoow3kxM9kb4FJJS3ozod5re9Fepi3zp4FI54hg=="
-  }, {
-    "groupId" : "org.apache.xmlgraphics",
-    "artifactId" : "batik-xml",
-    "version" : "1.7",
+    "version" : "3.1.0",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:bV5SxloaGH1k6lHQKPi17I1oz2DY6nve5V7uC+0DlCQ3i2Qs1Jj6lJ5T53GxeZMOavwRDsC4lvra7S0WkvUQxQ=="
+    "integrity" : "sha512:IbheUyQR7bv0kp4gxEkdP+DXtLsVcztYxkVckB1KBfkY5ztlIeccYqiaZXbUFs3ct5sMUggs2BMvwwxA5Qa01w=="
   }, {
     "groupId" : "org.aspectj",
     "artifactId" : "aspectjweaver",
@@ -2587,12 +2379,12 @@
     "integrity" : "sha512:kR4+JQyayQmImfEttYS4PzbZHozKGv7vOMGZUqFoZH27yIyxy91ZGXaTQu0JJnJjoUKxLnHKtGWyXa7t8iVctw=="
   }, {
     "groupId" : "org.codehaus.woodstox",
-    "artifactId" : "woodstox-core-asl",
-    "version" : "4.4.1",
+    "artifactId" : "wstx-asl",
+    "version" : "3.2.9",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:MxZctYeQHokI+iWJ8WptHuuHQpk2c06EC2B+CoDGpmgFNuuARFNrhx882UtUrHNPUf3akSC84NL1h1TGgiIW0A=="
+    "integrity" : "sha512:ctYwG2wMHiZjSIbVXuBWPpWcw6vfk84FEnn0FhzgPF0Jl0TW5FLlFjYIgjH7espZKezzGagUTzGKS27lmz/71Q=="
   }, {
     "groupId" : "org.cryptacular",
     "artifactId" : "cryptacular",
@@ -3017,14 +2809,6 @@
     "type" : "jar",
     "optional" : false,
     "integrity" : "sha512:lGnLzIA5MOshMMvCQtU7Zv1XCHcUM+lwhsDGXTUpFOzDC8iTNi2QtVqhr8VmEpe5/M+r72PzIMgsE05a0q5+Pw=="
-  }, {
-    "groupId" : "org.marc.shic",
-    "artifactId" : "shic-svs",
-    "version" : "1.0.8",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:xBjgzv6MQrYHCNpF9ZKWKrcQzBk22uBcbQ4h1TF5IG672Z1ip162JQummLXhE48jPzqnZj1lnOxfadwuWTzSug=="
   }, {
     "groupId" : "org.marc.shic",
     "artifactId" : "shic-xds",
@@ -3201,14 +2985,6 @@
     "type" : "jar",
     "optional" : false,
     "integrity" : "sha512:LxeBfAPgMYEJEBPdut8FKDWaq87nihpYJxFizkhG6h75yuwApVjRuvtqexLMf9Z2V1w2+d6+VyC2ciR1WDiirw=="
-  }, {
-    "groupId" : "org.oscarehr.integration.ebs",
-    "artifactId" : "ebs-client",
-    "version" : "0.0.6",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:ZJECLuT7yyuqFYiU3vjci4/Y9zNs97ilHDIOfGmQp6Fltr5NkNhZGfxfyXyTT6loZBEDlYljBN1eSS2yyuhXLw=="
   }, {
     "groupId" : "org.oscarehr.integration.ebs",
     "artifactId" : "edt-stubs",
@@ -3308,11 +3084,11 @@
   }, {
     "groupId" : "org.quartz-scheduler",
     "artifactId" : "quartz",
-    "version" : "1.8.5",
+    "version" : "2.5.0",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:E5L7Ktczeq/CRP00N0GKdeXTDEqmOWB4IE/le2CUYgeOfCAjw8FBfN2XhIZg8oiV/xgo1ZMutvnYd4xTmku5bA=="
+    "integrity" : "sha512:Y3qy7skuO33oH1KSVdvyA8/beWqkUjdWZn4it+5zlL+TRxcaTtnw6fh+Ui/1bMUg+Ar5ub863QIugPdunM03wA=="
   }, {
     "groupId" : "org.rauschig",
     "artifactId" : "jarchivelib",
@@ -3433,14 +3209,6 @@
     "type" : "jar",
     "optional" : false,
     "integrity" : "sha512:TKQEV3WoecPOMCGQjbe0d4I1oyL9jiVn2pYBVvJLnahuaBKklWyNwZkgzYPkxhFBFoxYCCn0PxC7rJJdRlw/0Q=="
-  }, {
-    "groupId" : "org.slf4j",
-    "artifactId" : "slf4j-jdk14",
-    "version" : "1.7.32",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:RH1TkOlzLdUfSk/lsSfqooQyAHZmVaMrqEsWPF8RPqn++CtngfPtQz4urMETpEk8IDxACHqJNpymcuYKyfyudQ=="
   }, {
     "groupId" : "org.springframework.integration",
     "artifactId" : "spring-integration-core",
@@ -3681,30 +3449,6 @@
     "type" : "jar",
     "optional" : false,
     "integrity" : "sha512:6q9Up89IKZuel5/PQUhHos/nCmnRnrrqc6cn+/P+NONxBNrYmF0Y/B+ZnMSvLWhQpx46o0MSIvEpsvQvXwyKGg=="
-  }, {
-    "groupId" : "rome",
-    "artifactId" : "rome",
-    "version" : "1.0",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:7vmqOXJReBTaoAW18kRze5xiz0Mb7LZht9FhMlQWecOwFZW4Ra5deCkNeqwhH6kDkGYOXs4WAFoqztyZyXSsrA=="
-  }, {
-    "groupId" : "sslext",
-    "artifactId" : "sslext",
-    "version" : "1.2-0",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:YhbsCm3ny9Vgx8Jowhfzzt4OaZA3R7/+IP8J9wyOnztFOpQ8EUDA6YmfgcR44p/c1cY2F1Inm9CcU1jm6wtNUw=="
-  }, {
-    "groupId" : "stax",
-    "artifactId" : "stax-api",
-    "version" : "1.0.1",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:Q8JOjb/6m5MkksjM8rkZJrK6PR00talnHGib0k1MIguZZwipZnUhZB0au/KUBLZTdVtvbz3ArQZx9cCdszLqBg=="
   }, {
     "groupId" : "surveyModel",
     "artifactId" : "surveyModel",
@@ -3748,35 +3492,19 @@
   }, {
     "groupId" : "xerces",
     "artifactId" : "xercesImpl",
-    "version" : "2.9.1",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:7CIA5aWnD1xkdE9kE6VG9eSXmz+xZJsCdW/wNdNt3jEXDqrccIQiMClrYIlvBIdycMJrQEFXNima70SsFsWBHA=="
-  }, {
-    "groupId" : "xml-apis",
-    "artifactId" : "xml-apis-ext",
-    "version" : "1.3.04",
+    "version" : "2.12.2",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:rAiWuaP+pxZEMw2u9OzLMwBbW3rB4dHXPu0rKh9LIoIFfzwPNpi4meHHaxnAnGm/TNDuVIQnubzGdreR21w2vA=="
+    "integrity" : "sha512:v9IfI1C/C7VGpo0zA/KMahXO4eYwE4wWk0TD9l/jmhXmHG/05SOfOPLx+eSI7/TVVlpKB3QmMGSrajCqn8qu0w=="
   }, {
     "groupId" : "xml-apis",
     "artifactId" : "xml-apis",
-    "version" : "1.3.04",
-    "scope" : "compile",
-    "type" : "jar",
-    "optional" : false,
-    "integrity" : "sha512:EIalKSSt0kBuC07HIZqHg6wg4Coyp6JGHvvwkvAHBQH3yt6cBYiQfEAzUvGkj4C5UObUCy5OPp64hufbTpe97A=="
-  }, {
-    "groupId" : "xml-apis",
-    "artifactId" : "xmlParserAPIs",
-    "version" : "2.0.2",
+    "version" : "1.0.b2",
     "scope" : "compile",
     "type" : "jar",
     "optional" : false,
-    "integrity" : "sha512:w78FEhA0WuXMjGyjjeJPr4FO2jpPCzk8iieQAlBW08lsIT3G5VN+3jduCLSsu1/PXxNS+eKCQyENp6gVydWy1A=="
+    "integrity" : "sha512:2u5R8PVkl5yUG0HienEpYXzp15Gk4cS2GKKa4z7Jx4IBrFFmhcrf0HP9olDVDrLA1lFHQQPnxFd+S/p9XyBSoQ=="
   }, {
     "groupId" : "xml-resolver",
     "artifactId" : "xml-resolver",
diff --git a/pom.xml b/pom.xml
index bb29c8e00f2..4b805449d8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,19 +46,16 @@
             <id>oscar_repo</id>
             <url>https://oscarmcmaster.sourceforge.net/m2</url>
         </repository>
-
         <!-- for the com.github.openosp htmltopdf dependency only. Upgrades
         from this dependency are welcome -->
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
-
         <repository>
             <id>central</id>
             <url>https://repo.maven.apache.org/maven2</url>
         </repository>
-
     </repositories>
 
     <pluginRepositories>
@@ -66,12 +63,12 @@
             <id>local_repo</id>
             <url>file://${basedir}/local_repo</url>
         </pluginRepository>
-
         <pluginRepository>
             <id>oscar_repo</id>
             <url>https://oscarmcmaster.sourceforge.net/m2</url>
         </pluginRepository>
     </pluginRepositories>
+
     <dependencyManagement>
         <dependencies>
             <dependency>
@@ -83,17 +80,18 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-    <dependencies>
 
+    <dependencies>
         <!-- For Jasper Reports and backwards compatibility -->
+        <!-- throws an compilation error when removed/commented -->
         <dependency>
             <groupId>com.lowagie</groupId>
             <artifactId>itext</artifactId>
             <version>4.2.2</version>
         </dependency>
 
-
         <!-- https://mvnrepository.com/artifact/net.bull.javamelody/javamelody-core -->
+        <!-- throws a 404 error when removed/uncommented -->
         <dependency>
             <groupId>net.bull.javamelody</groupId>
             <artifactId>javamelody-core</artifactId>
@@ -120,7 +118,6 @@
             <artifactId>commons-logging</artifactId>
             <version>1.2</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
@@ -129,18 +126,17 @@
 
         <!--Log4j-2 libraries-->
         <!-- https://mvnrepository.com/artifact/org.apache.logging.log4j/log4j-core -->
+        <!-- throws a 404 error when removed/uncommented -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
             <version>${log4j2.version}</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
             <version>${log4j2.version}</version>
         </dependency>
-
         <!--Enables log4j-2 binding from libraries that still use older Log4j-1 -->
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
@@ -148,18 +144,14 @@
             <version>${log4j2.version}</version>
         </dependency>
 
+        <!-- SLF4J -->
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
             <version>${slf4j.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-jdk14</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-
+        <!-- commons -->
         <dependency>
             <groupId>commons-lang</groupId>
             <artifactId>commons-lang</artifactId>
@@ -173,13 +165,46 @@
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <version>2.13.0</version>
+            <version>2.18.0</version>
         </dependency>
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
             <version>1.5</version>
         </dependency>
+        <dependency>
+            <groupId>commons-collections</groupId>
+            <artifactId>commons-collections</artifactId>
+            <version>3.2.2</version>
+        </dependency>
+        <!-- Commons Digester Library -->
+        <dependency>
+            <groupId>commons-digester</groupId>
+            <artifactId>commons-digester</artifactId>
+            <version>1.8</version>
+        </dependency>
+        <!-- apache commons codec -->
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+            <version>1.7</version>
+        </dependency>
+        <!-- commons-betwixt ... what is this for? -->
+        <dependency>
+            <groupId>commons-betwixt</groupId>
+            <artifactId>commons-betwixt</artifactId>
+            <version>0.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.26.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>3.17.0</version>
+        </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.google.code.gson/gson -->
         <dependency>
@@ -188,29 +213,19 @@
             <version>2.10.1</version>
         </dependency>
 
-
-        <dependency>
-            <groupId>commons-collections</groupId>
-            <artifactId>commons-collections</artifactId>
-            <version>3.2.2</version>
-        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>4.13.2</version>
             <scope>test</scope>
         </dependency>
+
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
             <version>4.0.1</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.jcs</groupId>
-            <artifactId>jcs</artifactId>
-            <version>1.3</version>
-        </dependency>
 
         <!-- hapi/HL7 -->
         <dependency>
@@ -265,6 +280,7 @@
             <artifactId>spring-webmvc</artifactId>
             <version>5.3.39</version>
         </dependency>
+        <!-- throws an compilation error when removed/commented -->
         <dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-ftp</artifactId>
@@ -275,6 +291,7 @@
             <artifactId>spring-integration-sftp</artifactId>
             <version>5.3.10.RELEASE</version>
         </dependency>
+        <!-- throws 10 compilation errors when removed/commented -->
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-aspects</artifactId>
@@ -290,6 +307,7 @@
             <artifactId>spring-aop</artifactId>
             <version>5.3.39</version>
         </dependency>
+
         <dependency>
             <groupId>com.onelogin</groupId>
             <artifactId>java-saml</artifactId>
@@ -324,10 +342,11 @@
             <artifactId>commons-dbcp</artifactId>
             <version>1.4</version>
         </dependency>
+        <!-- throws a 404 error when removed/uncommented -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>8.0.25</version>
+            <version>8.0.33</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.hibernate/hibernate-core -->
         <dependency>
@@ -335,11 +354,6 @@
             <artifactId>hibernate-core</artifactId>
             <version>5.6.15.Final</version>
         </dependency>
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib-nodep</artifactId>
-            <version>3.2.5</version>
-        </dependency>
 
         <!-- pdf / jpedal -->
         <dependency>
@@ -354,11 +368,7 @@
             <artifactId>pdfbox</artifactId>
             <version>2.0.27</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.pdfbox</groupId>
-            <artifactId>jbig2-imageio</artifactId>
-            <version>3.0.4</version>
-        </dependency>
+        <!-- throws an compilation error when removed/commented -->
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-jpeg</artifactId>
@@ -372,21 +382,18 @@
             <artifactId>struts-core</artifactId>
             <version>${struts.version}</version>
         </dependency>
-
         <!-- Struts Taglib Library -->
         <dependency>
             <groupId>io.github.weblegacy</groupId>
             <artifactId>struts-taglib</artifactId>
             <version>${struts.version}</version>
         </dependency>
-
         <!-- Struts Extras Library -->
         <dependency>
             <groupId>io.github.weblegacy</groupId>
             <artifactId>struts-extras</artifactId>
             <version>${struts.version}</version>
         </dependency>
-
         <!-- Struts El Library -->
         <dependency>
             <groupId>io.github.weblegacy</groupId>
@@ -394,13 +401,6 @@
             <version>${struts.version}</version>
         </dependency>
 
-        <!-- Commons Digester Library -->
-        <dependency>
-            <groupId>commons-digester</groupId>
-            <artifactId>commons-digester</artifactId>
-            <version>1.8</version>
-        </dependency>
-
         <!-- struts2 coming soon...-->
         <!--        <dependency>-->
         <!--            <groupId>org.apache.struts</groupId>-->
@@ -428,21 +428,23 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <dependency>
             <groupId>taglibs</groupId>
             <artifactId>standard</artifactId>
             <version>1.1.2</version>
         </dependency>
 
+        <!-- itext -->
         <dependency>
             <groupId>com.itextpdf</groupId>
             <artifactId>itextpdf</artifactId>
-            <version>5.5.13.1</version>
+            <version>5.5.13.4</version>
         </dependency>
         <dependency>
             <groupId>com.itextpdf.tool</groupId>
             <artifactId>xmlworker</artifactId>
-            <version>5.5.13.1</version>
+            <version>5.5.13.4</version>
         </dependency>
 
         <dependency>
@@ -532,32 +534,13 @@
                     <groupId>com.fasterxml.jackson.core</groupId>
                     <artifactId>jackson-annotations</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>com.lowagie</groupId>
-                    <artifactId>itext</artifactId>
-                </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>jasperreports</groupId>
-            <artifactId>htmlcomponent</artifactId>
-            <version>6.8.0</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>2.12.7</version>
-        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
             <version>2.12.7.2</version>
         </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>2.12.7</version>
-        </dependency>
         <dependency>
             <groupId>net.sourceforge.barbecue</groupId>
             <artifactId>barbecue</artifactId>
@@ -572,26 +555,13 @@
         </dependency>
 
         <!-- macplus -->
+        <!-- Detected as "Unused dependency" but don't remove it, it's using in jsp -->
         <dependency>
             <groupId>ca.mcmaster.plus</groupId>
             <artifactId>macplus_client_stubs</artifactId>
             <version>SNAPSHOT</version>
         </dependency>
 
-        <!-- apache xmlgraphics batik -->
-        <dependency>
-            <groupId>org.apache.xmlgraphics</groupId>
-            <artifactId>batik-dom</artifactId>
-            <version>1.7</version>
-        </dependency>
-
-        <!-- apache commons codec -->
-        <dependency>
-            <groupId>commons-codec</groupId>
-            <artifactId>commons-codec</artifactId>
-            <version>1.7</version>
-        </dependency>
-
         <!-- indivo -->
         <dependency>
             <groupId>org.indivo</groupId>
@@ -615,32 +585,7 @@
             <artifactId>krysalis-jCharts</artifactId>
             <version>0.7.5</version>
         </dependency>
-        <dependency>
-            <groupId>batik</groupId>
-            <artifactId>batik-awt-util</artifactId>
-            <version>1.6-1</version>
-        </dependency>
-        <dependency>
-            <groupId>batik</groupId>
-            <artifactId>batik-dom</artifactId>
-            <version>1.6-1</version>
-        </dependency>
-        <dependency>
-            <groupId>batik</groupId>
-            <artifactId>batik-svggen</artifactId>
-            <version>1.6-1</version>
-        </dependency>
-        <dependency>
-            <groupId>batik</groupId>
-            <artifactId>batik-util</artifactId>
-            <version>1.6-1</version>
-        </dependency>
-        <dependency>
-            <groupId>batik</groupId>
-            <artifactId>batik-xml</artifactId>
-            <version>1.6-1</version>
-        </dependency>
-
+        
         <!-- cds -->
         <dependency>
             <groupId>cds</groupId>
@@ -654,21 +599,18 @@
             <artifactId>cds_cihi_phcvrs</artifactId>
             <version>1.0</version>
         </dependency>
-
         <!-- cds cihi -->
         <dependency>
             <groupId>cds</groupId>
             <artifactId>cds_cihi</artifactId>
             <version>1.0</version>
         </dependency>
-
         <!-- cds rourke -->
         <dependency>
             <groupId>cds</groupId>
             <artifactId>cds_rourke</artifactId>
             <version>1.0</version>
         </dependency>
-
         <!-- cds hrm -->
         <dependency>
             <groupId>cds</groupId>
@@ -682,7 +624,6 @@
             <artifactId>hrm-jaxb</artifactId>
             <version>4.1a</version>
         </dependency>
-
         <!-- HRM module 4.3 -->
         <dependency>
             <groupId>omd</groupId>
@@ -696,7 +637,6 @@
             <artifactId>hsfo</artifactId>
             <version>2007-02-12</version>
         </dependency>
-
         <dependency>
             <groupId>hsfo2</groupId>
             <artifactId>hsfo2</artifactId>
@@ -707,7 +647,7 @@
         <dependency>
             <groupId>org.apache.xmlbeans</groupId>
             <artifactId>xmlbeans</artifactId>
-            <version>2.5.0</version>
+            <version>3.1.0</version>
         </dependency>
 
         <!-- HttpClient -->
@@ -726,19 +666,7 @@
         <dependency>
             <groupId>org.quartz-scheduler</groupId>
             <artifactId>quartz</artifactId>
-            <version>1.8.5</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-api</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- commons-betwixt ... what is this for? -->
-        <dependency>
-            <groupId>commons-betwixt</groupId>
-            <artifactId>commons-betwixt</artifactId>
-            <version>0.7</version>
+            <version>2.5.0</version>
         </dependency>
 
         <!-- email -->
@@ -793,13 +721,6 @@
             <version>1.0</version>
         </dependency>
 
-
-        <dependency>
-            <groupId>jspellchecker</groupId>
-            <artifactId>jazzy-core</artifactId>
-            <version>unknown</version>
-        </dependency>
-
         <!-- patientSiteVisit.jar , suspect this is generated classes and should be removed as a jar in the future -->
         <dependency>
             <groupId>patientSiteVisit</groupId>
@@ -842,13 +763,7 @@
             <version>1.4.3</version>
         </dependency>
 
-        <!-- sun xacml -->
-        <dependency>
-            <groupId>com.sun</groupId>
-            <artifactId>xacml</artifactId>
-            <version>1.2</version>
-        </dependency>
-
+        <!-- com.sun -->
         <!-- sun pdfview -->
         <dependency>
             <groupId>com.sun</groupId>
@@ -891,6 +806,7 @@
         </dependency>
 
         <!-- chip / ping libararies -->
+        <!-- Detected as "Unused dependency" but don't remove it, it's using in jsp -->
         <dependency>
             <groupId>org.chip.ping</groupId>
             <artifactId>oscar-ping</artifactId>
@@ -901,11 +817,13 @@
             <artifactId>ping-client</artifactId>
             <version>UNKNOWN</version>
         </dependency>
+        <!-- Detected as "Unused dependency" but don't remove it, caused 404 error after removing -->
         <dependency>
             <groupId>org.chip.ping</groupId>
             <artifactId>ping-core</artifactId>
             <version>UNKNOWN</version>
         </dependency>
+        <!-- Detected as "Unused dependency" but don't remove it, it's using in jsp -->
         <dependency>
             <groupId>org.chip.ping</groupId>
             <artifactId>ping-server</artifactId>
@@ -934,40 +852,33 @@
         <dependency>
             <groupId>xerces</groupId>
             <artifactId>xercesImpl</artifactId>
-            <version>2.9.1</version>
+            <version>2.12.2</version>
         </dependency>
 
         <!-- janino -->
+        <!-- Detected as "Unused dependency" but don't remove it, caused 404 error after removing -->
         <dependency>
             <groupId>janino</groupId>
             <artifactId>janino</artifactId>
             <version>2.3.2</version>
         </dependency>
 
-        <!-- something something ocan something -->
+        <!-- ocan -->
         <dependency>
             <groupId>ocan</groupId>
             <artifactId>ocan-iar</artifactId>
             <version>3.0</version>
         </dependency>
-
         <dependency>
             <groupId>ocan</groupId>
             <artifactId>ocan-iar-consent</artifactId>
             <version>UNKNOWN</version>
         </dependency>
 
-        <dependency>
-            <groupId>ocan</groupId>
-            <artifactId>ocan-iar-phr</artifactId>
-            <version>UNKNOWN</version>
-        </dependency>
-
-
         <dependency>
             <groupId>com.jcraft</groupId>
             <artifactId>jsch</artifactId>
-            <version>0.1.49</version>
+            <version>0.1.54</version>
         </dependency>
 
         <!-- OLIS -->
@@ -976,6 +887,7 @@
             <artifactId>olis-service</artifactId>
             <version>20111111</version>
         </dependency>
+
         <!-- https://mvnrepository.com/artifact/org.bouncycastle/bcpkix-jdk18on-->
         <dependency>
             <groupId>org.bouncycastle</groupId>
@@ -984,12 +896,12 @@
         </dependency>
 
         <!-- AXIS2 (for OLIS) -->
-
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2</artifactId>
             <version>1.5.4</version>
         </dependency>
+        <!-- Detected as "Unused dependency" but don't remove it, caused 404 error after removing -->
         <dependency>
             <groupId>org.apache.axis2</groupId>
             <artifactId>axis2-transport-http</artifactId>
@@ -999,40 +911,29 @@
                     <groupId>org.apache.ws.commons.schema</groupId>
                     <artifactId>XmlSchema</artifactId>
                 </exclusion>
-
                 <exclusion>
                     <groupId>org.apache.neethi</groupId>
                     <artifactId>neethi</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.apache.axis2</groupId>
-            <artifactId>axis2-transport-local</artifactId>
-            <version>1.5.4</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-api</artifactId>
-            <version>1.2.11</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.ws.commons.axiom</groupId>
-            <artifactId>axiom-impl</artifactId>
-            <version>1.2.11</version>
-        </dependency>
 
         <!-- velocity -->
         <dependency>
             <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity</artifactId>
-            <version>1.7</version>
-            <scope>compile</scope>
+            <artifactId>velocity-engine-core</artifactId>
+            <version>2.4.1</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.commons</groupId>
+                    <artifactId>commons-lang3</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
-            <groupId>org.apache.velocity</groupId>
-            <artifactId>velocity-tools</artifactId>
-            <version>2.0</version>
+            <groupId>org.apache.velocity.tools</groupId>
+            <artifactId>velocity-tools-generic</artifactId>
+            <version>3.1</version>
             <scope>compile</scope>
             <exclusions>
                 <exclusion>
@@ -1050,7 +951,6 @@
             </exclusions>
         </dependency>
 
-        <!-- CXF -->
         <dependency>
             <groupId>com.sun.xml.messaging.saaj</groupId>
             <artifactId>saaj-impl</artifactId>
@@ -1058,6 +958,7 @@
         </dependency>
 
         <!-- CXF -->
+        <!-- Detected as "Unused dependency" but don't remove it, it's using actually -->
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>apache-cxf</artifactId>
@@ -1102,7 +1003,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-frontend-jaxws</artifactId>
@@ -1114,7 +1014,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-
         <dependency>
             <groupId>org.apache.cxf</groupId>
             <artifactId>cxf-rt-transports-http</artifactId>
@@ -1202,11 +1101,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.marc.shic</groupId>
-            <artifactId>shic-atna</artifactId>
-            <version>1.0.8</version>
-        </dependency>
         <dependency>
             <groupId>org.marc.shic</groupId>
             <artifactId>shic-pix</artifactId>
@@ -1218,11 +1112,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.marc.shic</groupId>
-            <artifactId>shic-svs</artifactId>
-            <version>1.0.8</version>
-        </dependency>
         <dependency>
             <groupId>org.marc.shic</groupId>
             <artifactId>shic-cda</artifactId>
@@ -1255,27 +1144,7 @@
             <version>1.1</version>
         </dependency>
 
-        <dependency>
-            <groupId>rome</groupId>
-            <artifactId>rome</artifactId>
-            <version>1.0</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.oscarehr.integration.ebs</groupId>
-            <artifactId>ebs-client</artifactId>
-            <version>0.0.6</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.bouncycastle</groupId>
-                    <artifactId>bcprov-jdk16</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
+        <!-- EBS and HCV Stubs -->
         <dependency>
             <groupId>org.oscarehr.integration.ebs</groupId>
             <artifactId>edt-stubs</artifactId>
@@ -1287,12 +1156,15 @@
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
 
+        <!-- Detected as "Unused dependency" but don't remove it, it's using actually -->
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-jaxrs</artifactId>
             <version>1.9.13</version>
         </dependency>
 
+        <!-- OWASP Encoder -->
+        <!-- Detected as "Unused dependency" but don't remove it, it's using in jsp -->
         <dependency>
             <groupId>org.owasp.encoder</groupId>
             <artifactId>encoder-jsp</artifactId>
@@ -1303,11 +1175,13 @@
             <artifactId>encoder</artifactId>
             <version>1.2.1</version>
         </dependency>
+
         <dependency>
             <groupId>org.owasp</groupId>
             <artifactId>csrfguard</artifactId>
             <version>3.1.0</version>
         </dependency>
+
         <dependency>
             <groupId>com.medseek.clinical.service</groupId>
             <artifactId>SSOClinicalConnect</artifactId>
@@ -1325,35 +1199,34 @@
             <version>1.9.3</version>
         </dependency>
 
-<!-- Selenium test dependencies -->
-<!-- https://mvnrepository.com/artifact/org.seleniumhq.selenium/selenium-java -->
-<dependency>
-    <groupId>org.seleniumhq.selenium</groupId>
-    <artifactId>selenium-java</artifactId>
-    <version>3.141.59</version>
-</dependency>
-
-<!-- https://mvnrepository.com/artifact/io.github.bonigarcia/webdrivermanager -->
-<dependency>
-    <groupId>io.github.bonigarcia</groupId>
-    <artifactId>webdrivermanager</artifactId>
-    <version>3.8.1</version>
-</dependency>
-
-<!-- https://mvnrepository.com/artifact/org.testng/testng -->
-<dependency>
-    <groupId>org.testng</groupId>
-    <artifactId>testng</artifactId>
-    <version>7.5.1</version>
-    <scope>test</scope>
-</dependency>
-
-<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
-<dependency>
-    <groupId>com.google.guava</groupId>
-    <artifactId>guava</artifactId>
-    <version>25.1-jre</version>
-</dependency>
+        <!-- Selenium test dependencies -->
+        <!-- Detected as "Unused dependency" but don't remove it, it's using actually -->
+        <!-- https://mvnrepository.com/artifact/org.seleniumhq.selenium/selenium-java -->
+        <dependency>
+            <groupId>org.seleniumhq.selenium</groupId>
+            <artifactId>selenium-java</artifactId>
+            <version>3.141.59</version>
+        </dependency>
+        <!-- Detected as "Unused dependency" but don't remove it, it's using actually -->
+        <!-- https://mvnrepository.com/artifact/io.github.bonigarcia/webdrivermanager -->
+        <dependency>
+            <groupId>io.github.bonigarcia</groupId>
+            <artifactId>webdrivermanager</artifactId>
+            <version>3.8.1</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/org.testng/testng -->
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>7.5.1</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>25.1-jre</version>
+        </dependency>
 
         <!-- https://mvnrepository.com/artifact/org.xhtmlrenderer/flying-saucer-pdf -->
         <dependency>
@@ -1377,27 +1250,18 @@
 
         <!-- This is a dependency for the Caisi Integrator Objects. Only required until
         OpenJPA is no longer needed in Integrator. -->
+        <!-- Detected as "Unused dependency" but don't remove it, it's using actually -->
         <dependency>
             <groupId>org.apache.openjpa</groupId>
             <artifactId>openjpa</artifactId>
             <version>3.0.0</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-compress</artifactId>
-            <version>1.14</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>3.9</version>
-        </dependency>
+        <!-- HAPI FHIR -->
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>hapi-fhir-base</artifactId>
             <version>${hapifhir.version}</version>
-
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>
@@ -1414,6 +1278,7 @@
             <artifactId>hapi-fhir-structures-dstu2</artifactId>
             <version>${hapifhir.version}</version>
         </dependency>
+        <!-- Detected as "Unused dependency" but don't remove it, it's using actually -->
         <dependency>
             <groupId>ca.uhn.hapi.fhir</groupId>
             <artifactId>hapi-fhir-structures-dstu3</artifactId>
@@ -1425,39 +1290,14 @@
             <artifactId>flowsheets</artifactId>
             <version>1.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.codehaus.woodstox</groupId>
-            <artifactId>woodstox-core-asl</artifactId>
-            <version>4.4.1</version>
-        </dependency>
-        <!-- Coming soon: JAVA 11 -->
+        
+        <!-- Detected as "Unused dependency" but don't remove it, it's using actually -->
         <dependency>
            <groupId>com.sun.xml.ws</groupId>
            <artifactId>jaxws-ri</artifactId>
            <version>2.3.3</version>
            <type>pom</type>
         </dependency>
-        <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
-        </dependency>
-         <!-- Added for Tomcat9.0.97 -->
-        <dependency>
-            <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>2.3.3</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <version>1.2</version>
-        </dependency>
     </dependencies>
 
     <build>
@@ -1471,13 +1311,9 @@
                     </exclude>
                 </excludes>
             </resource>
-            <!-- <resource>
-              <directory>${basedir}/src/test/resources</directory>
-              <filtering>true</filtering>
-            </resource> -->
         </resources>
-        <plugins>
 
+        <plugins>
             <plugin>
                 <groupId>org.jacoco</groupId>
                 <artifactId>jacoco-maven-plugin</artifactId>
@@ -1529,6 +1365,7 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-site-plugin</artifactId>
@@ -1545,6 +1382,7 @@
                     <outputEncoding>UTF-8</outputEncoding>
                 </configuration>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
@@ -1570,12 +1408,9 @@
                                 <tstamp>
                                     <format property="build.dateTime.value" pattern="yyyy-MM-dd hh:mm aa"/>
                                 </tstamp>
-
                                 <echo message="build time : ${build.dateTime.value}"/>
-
                                 <replace file="target/classes/oscar_mcmaster.properties" token="${build.dateTime}"
                                          value="${build.dateTime.value}"/>
-
                                 <property environment="env"/>
                                 <echo message="JOB_NAME - BUILD_NUMBER : ${env.JOB_NAME}-${env.BUILD_NUMBER}"/>
                                 <replace file="target/classes/oscar_mcmaster.properties" token="${build.JOB_NAME}"
@@ -1585,28 +1420,9 @@
                             </target>
                         </configuration>
                     </execution>
-
-                    <execution>
-                        <!-- We're doing jspc this way because the codehaus jspc seems to be abandonded,
-                        it doesn't go beyond jdk 1.5 and the documentation is sparse, and the source
-                        code links to a broken page and I can't find the goals it supports. -->
-                        <id>jspc</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <target>
-                                <property name="build.compiler" value="extJavac"/>
-                                <property name='jspc_target' value="${project.artifactId}-${project.version}"/>
-                                <ant antfile="jspc.xml" target="jspc"/>
-                            </target>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
             
-            <!-- https://mvnrepository.com/artifact/org.apache.maven.plugins/maven-war-plugin -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
@@ -1683,8 +1499,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-pmd-plugin</artifactId>
                 <version>3.21.2</version>
-                <!--
-                DO NOT execute until these tests actually pass
+                <!-- DO NOT execute until these tests actually pass
                 <executions>
                     <execution>
                         <phase>process-sources</phase>
@@ -1693,8 +1508,7 @@
                             <goal>check</goal>
                         </goals>
                     </execution>
-                </executions>
-                 -->
+                </executions> -->
                 <configuration>
                     <targetJdk>1.8</targetJdk>
                     <rulesets>
@@ -1709,8 +1523,6 @@
                 <version>3.2.5</version>
                 <configuration>
                     <skipTests>false</skipTests>
-                    <!--Required to comment out the following line to run Jacoco reporting-->
-                    <!--                  <argLine>${surefireArgLine} -Xms4096m -Xmx4096m -Xss2048k -XX:MaxNewSize=256m -XX:MaxPermSize=512m</argLine>-->
                     <excludes>
                         <exclude>**/*EDTTest.java</exclude>
                         <exclude>**/HinValidatorTest.java</exclude>
@@ -1725,55 +1537,47 @@
                         <buildDirectory>${project.build.directory}</buildDirectory>
                     </systemPropertyVariables>
                 </configuration>
-
             </plugin>
 
-            <!-- https://mvnrepository.com/artifact/org.eclipse.jetty/jetty-maven-plugin -->
+            <!-- Comming soon. After spring and java upgrades -->
             <!-- <plugin>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>11.0.24</version>
+                <groupId>org.apache.axis2</groupId>
+                <artifactId>axis2-wsdl2code-maven-plugin</artifactId>
+                <version>1.5.4</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>wsdl2code</goal>
+                        </goals>
+                        <configuration>
+                            <packageName>test</packageName>
+                            <wsdlFile>src/main/resources/olis.wsdl</wsdlFile>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <plugin>
+                <groupId>com.sun.tools.xjc.maven2</groupId>
+                <artifactId>maven-jaxb-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <generatePackage>ca.ssha._2005.hial</generatePackage>
+                    <schemaDirectory>${basedir}/src/main/webapp/olis</schemaDirectory>
+                    <includeSchemas>
+                        <includeSchema>response.xsd</includeSchema>
+                    </includeSchemas>
+                    <strict>true</strict>
+                    <verbose>true</verbose>
+                </configuration>
             </plugin> -->
-            <!--
-            Comming soon. After spring and java upgrades
-                        <plugin>
-                            <groupId>org.apache.axis2</groupId>
-                            <artifactId>axis2-wsdl2code-maven-plugin</artifactId>
-                            <version>1.5.4</version>
-                            <executions>
-                                <execution>
-                                    <goals>
-                                        <goal>wsdl2code</goal>
-                                    </goals>
-                                    <configuration>
-                                        <packageName>test</packageName>
-                                        <wsdlFile>src/main/resources/olis.wsdl</wsdlFile>
-                                    </configuration>
-                                </execution>
-                            </executions>
-                        </plugin>
-
-                <plugin>
-                    <groupId>com.sun.tools.xjc.maven2</groupId>
-                    <artifactId>maven-jaxb-plugin</artifactId>
-                    <executions>
-                        <execution>
-                            <goals>
-                                <goal>generate</goal>
-                            </goals>
-                        </execution>
-                    </executions>
-                    <configuration>
-                        <generatePackage>ca.ssha._2005.hial</generatePackage>
-                        <schemaDirectory>${basedir}/src/main/webapp/olis</schemaDirectory>
-                        <includeSchemas>
-                            <includeSchema>response.xsd</includeSchema>
-                        </includeSchemas>
-                        <strict>true</strict>
-                        <verbose>true</verbose>
-                    </configuration>
-                </plugin>
-            -->
+
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>build-helper-maven-plugin</artifactId>
@@ -1823,195 +1627,6 @@
                 </executions>
             </plugin>
         </plugins>
-
-        <!--     Maybe one day when the header licences are used again.
-        <plugin>-->
-        <!--            <groupId>com.mycila.maven-license-plugin</groupId>-->
-        <!--            <artifactId>maven-license-plugin</artifactId>-->
-        <!--        <version>1.10.b1</version>-->
-        <!--            <configuration>-->
-        <!--                <header>utils/headers/mcmaster.txt</header>-->
-        <!--        <validHeaders>-->
-        <!--                        <validHeader>utils/headers/os.txt</validHeader>-->
-        <!--                        <validHeader>utils/headers/quatro.txt</validHeader>-->
-        <!--                        <validHeader>utils/headers/quatro2.txt</validHeader>-->
-        <!--                        <validHeader>utils/headers/md.txt</validHeader>-->
-        <!--                        <validHeader>utils/headers/caisi.txt</validHeader>-->
-        <!--                        <validHeader>utils/headers/hs.txt</validHeader>-->
-        <!--                        <validHeader>utils/headers/pc.txt</validHeader>-->
-        <!--                        <validHeader>utils/headers/andromedia.txt</validHeader>-->
-        <!--                        <validHeader>utils/headers/lgpl.txt</validHeader>-->
-        <!--                        <validHeader>utils/headers/asl.txt</validHeader>-->
-        <!--                        <validHeader>utils/headers/cmi.txt</validHeader>-->
-        <!--                        <validHeader>utils/headers/indivica.txt</validHeader>-->
-        <!--                        <validHeader>utils/headers/peaceworks.txt</validHeader>-->
-        <!--                        <validHeader>utils/headers/ubc.txt</validHeader>-->
-        <!--                        <validHeader>utils/headers/uvic.txt</validHeader>-->
-        <!--                        <validHeader>utils/headers/kai.txt</validHeader>-->
-        <!--                        <validHeader>utils/headers/ubcfps.txt</validHeader>-->
-        <!--                        <validHeader>utils/headers/well_emr.txt</validHeader>-->
-        <!--                </validHeaders>-->
-        <!--                <includes>-->
-        <!--                    <include>src/main/java/**/*.java</include>-->
-        <!--                    <include>src/test/java/**/*.java</include>-->
-        <!--                    <include>src/main/webapp/**/*.jsp</include>-->
-        <!--        </includes>-->
-        <!--                <excludes>-->
-        <!--            <exclude>src/main/webapp/billing/CA/BC/billingAccountReports.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/billing/CA/BC/billingPreferences.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/billing/CA/BC/billingSVCTrayAssoc.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/billing/CA/BC/billTransactions.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/billing/CA/BC/billType_frag.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/billing/CA/BC/deletePrivateCode.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/billing/CA/BC/dxcode_svccode_assoc.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/billing/CA/BC/manageSVCDXAssoc.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/billing/CA/BC/receivePayment.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/billing/CA/BC/saveAssocs.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/billing/CA/BC/settleBG.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/tabulardaysheetreport.jsp</exclude>-->
-
-        <!--            <exclude>src/main/webapp/form/formadf.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formadfv2.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formbcar.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formbcarpg1.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formbcarpg1namepopup.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formbcarpg2.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formbcarpg3.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formbcbirthsummo.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formbcclientchartchecklist.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formbcinr.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formbcnewborn.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formbcnewbornpg1.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formbcnewbornpg2.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formbcnewbornpg3.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formGrowth0_36.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formGrowth0_36Print.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formGrowthChart.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formGrowthChartPrint.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formimmunallergy.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formInvoice.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formonar.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formonarpg1.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formonarpg2.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formonarpg3.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formonarpg4.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/formovulation.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/study/ar2ping.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/study/dm2ping.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/study/dmdata.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/study/formar2ping.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/study/formarpg1.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/study/formarpg2.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/study/formarpg3.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/form/study/formdiabete2ping.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/onbillingtotal.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/reportBCARDemo2.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/reportBCARDemo.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/reportbcedblist.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/reportbilledvisit1.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/reportbilledvisit2.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/reportbilledvisit3.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/reportbilledvisit.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/reportdxvisit.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/reportFilter.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/reportFormCaption.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/reportFormConfig.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/reportFormDemoConfig.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/reportFormOrder.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/reportFormRecord.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/reportonbilledphcp.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/reportonbilledvisit.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/reportonbilledvisitprovider.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/reportonedblist.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/report/reportResult.jsp</exclude>-->
-
-        <!--            <exclude>src/main/webapp/billing/billingBrazil.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/billing/billingBrazilSuccess.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/billing/billingConsFatMedBrazil.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/billing/billingConsFatPatBrazil.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/popup/atividade.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/popup/cid.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/popup/procedimento.jsp</exclude>-->
-        <!--            <exclude>src/main/java/oscar/entities/S21.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/entities/S22.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/entities/S23.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/oscarBilling/ca/bc/MSP/CDMReminderHlp.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/oscarBilling/ca/bc/MSP/CreateBillingReportActionForm.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/oscarBilling/ca/bc/MSP/CreateBillingReportAction.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/oscarBilling/ca/bc/MSP/ServiceCodeValidationLogic.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/oscarBilling/ca/bc/MSP/ServiceCodeValidator.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/oscarBilling/ca/bc/MSP/SexValidator.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/oscarDemographic/PrintDemoAddressLabelAction.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/oscarDemographic/PrintDemoChartLabelAction.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/oscarDemographic/PrintDemoLabelAction.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/OscarDocumentCreator.java</exclude>-->
-        <!--            <exclude>src/main/webapp/oscarReport/patientlist.jsp</exclude>-->
-        <!--            <exclude>src/main/java/oscar/oscarReport/data/DoctorList.java</exclude>-->
-        <!--            <exclude>src/main/webapp/jspspellcheck/*.jsp</exclude>-->
-        <!--            <exclude>src/main/java/net/sf/jasperreports/renderers/BarbecueRenderer.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/oscarDB/ResultSetBuilder.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/login/UAgentInfo.java</exclude>-->
-        <!--            <exclude>src/main/webapp/lab/CA/ON/uploadComplete.jsp</exclude>-->
-        <!--            <exclude>src/main/webapp/lab/CA/ALL/uploadComplete.jsp</exclude>-->
-        <!--                        <exclude>src/**/*.txt</exclude>-->
-        <!--                        <exclude>src/**/*.js</exclude>-->
-        <!--                        <exclude>database/**</exclude>-->
-        <!--                        <exclude>docs/**</exclude>-->
-        <!--                        <exclude>local_repo/**</exclude>-->
-        <!--                        <exclude>**/.gitignore</exclude>-->
-        <!--            <exclude>src/main/java/oscar/form/FrmAdfRecord.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/form/FrmAdfV2Record.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/form/FrmBCARRecord.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/form/FrmBCBrithSumMoRecord.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/form/FrmBCClientChartChecklistRecord.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/form/FrmBCINRRecord.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/form/FrmBCNewBornRecord.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/form/FrmGrowth0_36Record.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/form/FrmGrowthChartRecord.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/form/FrmInvoiceRecord.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/form/FrmONARRecord.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/form/FrmOvulationRecord.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/form/graphic/FrmPdfGraphicAR.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/form/graphic/FrmPdfGraphicGrowthChart.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/form/pdfservlet/FrmPDFServlet.java</exclude>-->
-        <!--            <exclude>src/main/java/oscar/form/study/FrmStudyPING_DiabetesRecord.java</exclude>-->
-
-        <!--            <exclude>src/main/java/org/apache/xml/security/encryption/XMLCipher.java</exclude>-->
-        <!--            <exclude>src/main/java/org/apache/xml/security/encryption/DocumentSerializer.java</exclude>-->
-        <!--            <exclude>src/main/webapp/library/bootstrap2-datepicker/**</exclude>-->
-        <!--            <exclude>src/main/webapp/library/ng-table/**</exclude>-->
-        <!--                </excludes>-->
-        <!--        <strictCheck>true</strictCheck>-->
-        <!--            </configuration>-->
-        <!--            <executions>-->
-        <!--                <execution>-->
-        <!--                    <goals>-->
-        <!--                        <goal>check</goal>-->
-        <!--                    </goals>-->
-        <!--                </execution>-->
-        <!--            </executions>-->
-        <!--                </plugin>-->
-
-        <!--            <plugin>-->
-        <!--                <artifactId>maven-war-plugin</artifactId>-->
-        <!--                <version>3.4.0</version>-->
-        <!--                <configuration>-->
-        <!--                    <failOnMissingWebXml>false</failOnMissingWebXml>-->
-        <!--                    <archive>-->
-        <!--                        <manifest>-->
-        <!--                            <addDefaultImplementationEntries>true</addDefaultImplementationEntries>-->
-        <!--                        </manifest>-->
-        <!--                        <manifestEntries>-->
-        <!--                            <git-SHA-1>${buildNumber}</git-SHA-1>-->
-        <!--                        </manifestEntries>-->
-        <!--                    </archive>-->
-
-        <!--&lt;!&ndash;                    <webappDirectory>${basedir}/src/main/webapp/admin</webappDirectory>&ndash;&gt;-->
-
-        <!--                </configuration>-->
-        <!--            </plugin>-->
-        <!--            </plugins>-->
-        <!--        </pluginManagement>-->
     </build>
 
     <profiles>
diff --git a/src/main/java/oscar/form/study/HSFO/pageUtil/HsfoQuartzServlet.java b/src/main/java/oscar/form/study/HSFO/pageUtil/HsfoQuartzServlet.java
index efc5d34b705..01e297efdfa 100644
--- a/src/main/java/oscar/form/study/HSFO/pageUtil/HsfoQuartzServlet.java
+++ b/src/main/java/oscar/form/study/HSFO/pageUtil/HsfoQuartzServlet.java
@@ -37,10 +37,7 @@
 
 import org.apache.logging.log4j.Logger;
 import org.oscarehr.util.MiscUtils;
-import org.quartz.JobDetail;
-import org.quartz.Scheduler;
-import org.quartz.SimpleTrigger;
-import org.quartz.Trigger;
+import org.quartz.*;
 import org.quartz.impl.StdSchedulerFactory;
 
 import oscar.OscarProperties;
@@ -72,19 +69,23 @@ public static void schedule() throws Exception {
 
         scheduler.start();
 
-        JobDetail job = scheduler.getJobDetail(RESUBMIT_JOB,
-                Scheduler.DEFAULT_GROUP);
+        JobKey jobKey = JobKey.jobKey(RESUBMIT_JOB, Scheduler.DEFAULT_GROUP);
+        JobDetail job = scheduler.getJobDetail(jobKey); 
         if (job != null) {
             logger.info("Delete old job.");
-            scheduler.deleteJob(RESUBMIT_JOB, Scheduler.DEFAULT_GROUP);
+            scheduler.deleteJob(jobKey);
         }
         logger.info("new schedule job at " + startTime);
-        Trigger trigger = new SimpleTrigger(RESUBMIT_TRIGGER,
-                Scheduler.DEFAULT_GROUP, startTime);
-        JobDetail jobDetail = new JobDetail(RESUBMIT_JOB,
-                Scheduler.DEFAULT_GROUP, ResubmitJob.class);
-        scheduler.scheduleJob(jobDetail, trigger);
+        Trigger trigger = TriggerBuilder.newTrigger()
+            .withIdentity(RESUBMIT_TRIGGER, Scheduler.DEFAULT_GROUP)
+            .startAt(startTime)
+            .withSchedule(SimpleScheduleBuilder.simpleSchedule())
+            .build();
+        JobDetail jobDetail = JobBuilder.newJob(ResubmitJob.class)
+            .withIdentity(RESUBMIT_JOB, Scheduler.DEFAULT_GROUP)
+            .build();
 
+        scheduler.scheduleJob(jobDetail, trigger);
     }
 
     public ServletConfig getServletConfig() {
diff --git a/src/main/java/oscar/form/study/hsfo2/pageUtil/HsfoQuartzServlet.java b/src/main/java/oscar/form/study/hsfo2/pageUtil/HsfoQuartzServlet.java
index 08168af30c5..d2997366e74 100644
--- a/src/main/java/oscar/form/study/hsfo2/pageUtil/HsfoQuartzServlet.java
+++ b/src/main/java/oscar/form/study/hsfo2/pageUtil/HsfoQuartzServlet.java
@@ -32,9 +32,6 @@
 import org.oscarehr.common.dao.Hsfo2RecommitScheduleDao;
 import org.oscarehr.common.model.Hsfo2RecommitSchedule;
 import org.oscarehr.util.SpringUtils;
-import org.quartz.CronTrigger;
-import org.quartz.JobDetail;
-import org.quartz.Scheduler;
 import oscar.OscarProperties;
 
 import oscar.form.study.hsfo2.pageUtil.RecommitHSFOAction.ResubmitJob;
@@ -45,6 +42,7 @@
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
+import org.quartz.*;
 import org.quartz.impl.StdSchedulerFactory;
 
 public class HsfoQuartzServlet implements Servlet {
@@ -81,21 +79,27 @@ public static void schedule() throws Exception {
 
         logger.info("quartz schedule cron expression:" + cronExpression);
 
-        CronTrigger trigger = new CronTrigger(RESUBMIT_TRIGGER, Scheduler.DEFAULT_GROUP, cronExpression);
-
+        JobKey jobKey = JobKey.jobKey(RESUBMIT_JOB, Scheduler.DEFAULT_GROUP);
+        TriggerKey triggerKey = TriggerKey.triggerKey(RESUBMIT_TRIGGER, Scheduler.DEFAULT_GROUP);
+ 
         //trigger.setCronExpression("0 42 10 * * ?"); //Build a trigger that will fire daily at 10:42 am
 
-        JobDetail jobDetail = new JobDetail(RESUBMIT_JOB, Scheduler.DEFAULT_GROUP, ResubmitJob.class);
+        JobDetail jobDetail = JobBuilder.newJob(ResubmitJob.class)
+                .withIdentity(jobKey)
+                .build();
+
+        Trigger trigger = TriggerBuilder.newTrigger()
+                .withIdentity(triggerKey)
+                .withSchedule(CronScheduleBuilder.cronSchedule(cronExpression))
+                .build();
 
         //Delete old job.
-        JobDetail job = scheduler.getJobDetail(RESUBMIT_JOB, Scheduler.DEFAULT_GROUP);
-        if (job != null) {
-            logger.info("Reschedule quartz cron trigger.......");
-            //scheduler.rescheduleJob(trigger.getName(), trigger.getGroup(), trigger);
-            scheduler.deleteJob(RESUBMIT_JOB, Scheduler.DEFAULT_GROUP);
-            scheduler.scheduleJob(jobDetail, trigger);
+        if (scheduler.checkExists(jobKey)) {
+            logger.info("Deleting old job...");
+            scheduler.deleteJob(jobKey);
         } else {
             //Start new job.
+            logger.info("Scheduling new job...");
             scheduler.scheduleJob(jobDetail, trigger);
         }
 

From 79e75411334e351d0b8d892eaf44e35779751580 Mon Sep 17 00:00:00 2001
From: Kate Yang <150059882+kateyang1998@users.noreply.github.com>
Date: Wed, 11 Dec 2024 10:39:15 -0500
Subject: [PATCH 2/2] fix: added needed Quartz imports into HsfoQuartzServlet
 classes

Added Quartz imports to enable job scheduling functionality, including defining jobs (JobBuilder, JobDetail, JobKey), setting triggers (TriggerBuilder, TriggerKey, CronScheduleBuilder, SimpleScheduleBuilder), and managing the scheduler (Scheduler) for efficient task execution and timing.
---
 .../form/study/HSFO/pageUtil/HsfoQuartzServlet.java      | 8 +++++++-
 .../form/study/hsfo2/pageUtil/HsfoQuartzServlet.java     | 9 ++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/oscar/form/study/HSFO/pageUtil/HsfoQuartzServlet.java b/src/main/java/oscar/form/study/HSFO/pageUtil/HsfoQuartzServlet.java
index 01e297efdfa..4811b174edb 100644
--- a/src/main/java/oscar/form/study/HSFO/pageUtil/HsfoQuartzServlet.java
+++ b/src/main/java/oscar/form/study/HSFO/pageUtil/HsfoQuartzServlet.java
@@ -37,7 +37,13 @@
 
 import org.apache.logging.log4j.Logger;
 import org.oscarehr.util.MiscUtils;
-import org.quartz.*;
+import org.quartz.JobBuilder;
+import org.quartz.JobDetail;
+import org.quartz.JobKey;
+import org.quartz.Scheduler;
+import org.quartz.SimpleScheduleBuilder;
+import org.quartz.Trigger;
+import org.quartz.TriggerBuilder;
 import org.quartz.impl.StdSchedulerFactory;
 
 import oscar.OscarProperties;
diff --git a/src/main/java/oscar/form/study/hsfo2/pageUtil/HsfoQuartzServlet.java b/src/main/java/oscar/form/study/hsfo2/pageUtil/HsfoQuartzServlet.java
index d2997366e74..42b86251a9f 100644
--- a/src/main/java/oscar/form/study/hsfo2/pageUtil/HsfoQuartzServlet.java
+++ b/src/main/java/oscar/form/study/hsfo2/pageUtil/HsfoQuartzServlet.java
@@ -42,7 +42,14 @@
 import javax.servlet.ServletRequest;
 import javax.servlet.ServletResponse;
 
-import org.quartz.*;
+import org.quartz.CronScheduleBuilder;
+import org.quartz.JobBuilder;
+import org.quartz.JobDetail;
+import org.quartz.JobKey;
+import org.quartz.Scheduler;
+import org.quartz.Trigger;
+import org.quartz.TriggerBuilder;
+import org.quartz.TriggerKey;
 import org.quartz.impl.StdSchedulerFactory;
 
 public class HsfoQuartzServlet implements Servlet {