diff --git a/dependencies-lock.json b/dependencies-lock.json index 1d0a65c33f0..59972dd110b 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", @@ -1000,14 +904,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", @@ -1019,11 +915,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", @@ -1051,11 +947,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", @@ -1064,14 +960,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", @@ -1088,14 +976,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", @@ -1112,14 +992,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", @@ -1128,14 +1000,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", @@ -1144,14 +1008,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", @@ -1265,14 +1121,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", @@ -1361,14 +1209,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", @@ -1388,11 +1228,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", @@ -1404,11 +1252,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", @@ -2041,14 +1889,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", @@ -2105,14 +1945,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", @@ -2162,21 +1994,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", @@ -2204,11 +2036,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", @@ -2220,11 +2052,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", @@ -2292,51 +2124,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", @@ -2523,12 +2315,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", @@ -2881,14 +2673,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", @@ -3065,14 +2849,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", @@ -3172,11 +2948,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", @@ -3297,14 +3073,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", @@ -3545,30 +3313,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", @@ -3612,35 +3356,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 2522d352c84..abc54a7b799 100644 --- a/pom.xml +++ b/pom.xml @@ -46,19 +46,16 @@ oscar_repo https://oscarmcmaster.sourceforge.net/m2 - jitpack.io https://jitpack.io - central https://repo.maven.apache.org/maven2 - @@ -66,12 +63,12 @@ local_repo file://${basedir}/local_repo - oscar_repo https://oscarmcmaster.sourceforge.net/m2 + @@ -83,17 +80,18 @@ - + + com.lowagie itext 4.2.2 - + net.bull.javamelody javamelody-core @@ -120,7 +118,6 @@ commons-logging 1.2 - org.apache.commons commons-text @@ -129,18 +126,17 @@ + org.apache.logging.log4j log4j-core ${log4j2.version} - org.apache.logging.log4j log4j-api ${log4j2.version} - org.apache.logging.log4j @@ -148,18 +144,14 @@ ${log4j2.version} + org.slf4j slf4j-api ${slf4j.version} - - org.slf4j - slf4j-jdk14 - ${slf4j.version} - - + commons-lang commons-lang @@ -173,13 +165,46 @@ commons-io commons-io - 2.13.0 + 2.18.0 commons-fileupload commons-fileupload 1.5 + + commons-collections + commons-collections + 3.2.2 + + + + commons-digester + commons-digester + 1.8 + + + + commons-codec + commons-codec + 1.7 + + + + commons-betwixt + commons-betwixt + 0.7 + + + org.apache.commons + commons-compress + 1.26.0 + + + org.apache.commons + commons-lang3 + 3.17.0 + @@ -188,29 +213,19 @@ 2.10.1 - - - commons-collections - commons-collections - 3.2.2 - junit junit 4.13.2 test + javax.servlet javax.servlet-api 4.0.1 provided - - org.apache.jcs - jcs - 1.3 - @@ -265,6 +280,7 @@ spring-webmvc 5.3.39 + org.springframework.integration spring-integration-ftp @@ -275,6 +291,7 @@ spring-integration-sftp 5.3.10.RELEASE + org.springframework spring-aspects @@ -290,6 +307,7 @@ spring-aop 5.3.39 + com.onelogin java-saml @@ -324,10 +342,11 @@ commons-dbcp 1.4 + mysql mysql-connector-java - 8.0.25 + 8.0.33 @@ -335,11 +354,6 @@ hibernate-core 5.6.15.Final - - cglib - cglib-nodep - 3.2.5 - @@ -354,11 +368,7 @@ pdfbox 2.0.27 - - org.apache.pdfbox - jbig2-imageio - 3.0.4 - + com.twelvemonkeys.imageio imageio-jpeg @@ -392,21 +402,23 @@ + taglibs standard 1.1.2 + com.itextpdf itextpdf - 5.5.13.1 + 5.5.13.4 com.itextpdf.tool xmlworker - 5.5.13.1 + 5.5.13.4 @@ -496,32 +508,13 @@ com.fasterxml.jackson.core jackson-annotations - - com.lowagie - itext - - - jasperreports - htmlcomponent - 6.8.0 - - - com.fasterxml.jackson.core - jackson-core - 2.12.7 - com.fasterxml.jackson.core jackson-databind 2.12.7.2 - - com.fasterxml.jackson.core - jackson-annotations - 2.12.7 - net.sourceforge.barbecue barbecue @@ -536,26 +529,13 @@ + ca.mcmaster.plus macplus_client_stubs SNAPSHOT - - - org.apache.xmlgraphics - batik-dom - 1.7 - - - - - commons-codec - commons-codec - 1.7 - - org.indivo @@ -579,32 +559,7 @@ krysalis-jCharts 0.7.5 - - batik - batik-awt-util - 1.6-1 - - - batik - batik-dom - 1.6-1 - - - batik - batik-svggen - 1.6-1 - - - batik - batik-util - 1.6-1 - - - batik - batik-xml - 1.6-1 - - + cds @@ -618,21 +573,18 @@ cds_cihi_phcvrs 1.0 - cds cds_cihi 1.0 - cds cds_rourke 1.0 - cds @@ -646,7 +598,6 @@ hrm-jaxb 4.1a - omd @@ -660,7 +611,6 @@ hsfo 2007-02-12 - hsfo2 hsfo2 @@ -671,7 +621,7 @@ org.apache.xmlbeans xmlbeans - 2.5.0 + 3.1.0 @@ -690,19 +640,7 @@ org.quartz-scheduler quartz - 1.8.5 - - - org.slf4j - slf4j-api - - - - - - commons-betwixt - commons-betwixt - 0.7 + 2.5.0 @@ -757,13 +695,6 @@ 1.0 - - - jspellchecker - jazzy-core - unknown - - patientSiteVisit @@ -806,13 +737,7 @@ 1.4.3 - - - com.sun - xacml - 1.2 - - + com.sun @@ -855,6 +780,7 @@ + org.chip.ping oscar-ping @@ -865,11 +791,13 @@ ping-client UNKNOWN + org.chip.ping ping-core UNKNOWN + org.chip.ping ping-server @@ -898,40 +826,33 @@ xerces xercesImpl - 2.9.1 + 2.12.2 + janino janino 2.3.2 - + ocan ocan-iar 3.0 - ocan ocan-iar-consent UNKNOWN - - ocan - ocan-iar-phr - UNKNOWN - - - com.jcraft jsch - 0.1.49 + 0.1.54 @@ -940,6 +861,7 @@ olis-service 20111111 + org.bouncycastle @@ -948,12 +870,12 @@ - org.apache.axis2 axis2 1.5.4 + org.apache.axis2 axis2-transport-http @@ -963,40 +885,29 @@ org.apache.ws.commons.schema XmlSchema - org.apache.neethi neethi - - org.apache.axis2 - axis2-transport-local - 1.5.4 - - - org.apache.ws.commons.axiom - axiom-api - 1.2.11 - - - org.apache.ws.commons.axiom - axiom-impl - 1.2.11 - org.apache.velocity - velocity - 1.7 - compile + velocity-engine-core + 2.4.1 + + + org.apache.commons + commons-lang3 + + - org.apache.velocity - velocity-tools - 2.0 + org.apache.velocity.tools + velocity-tools-generic + 3.1 compile @@ -1014,7 +925,6 @@ - com.sun.xml.messaging.saaj saaj-impl @@ -1022,6 +932,7 @@ + org.apache.cxf apache-cxf @@ -1066,7 +977,6 @@ - org.apache.cxf cxf-rt-frontend-jaxws @@ -1078,7 +988,6 @@ - org.apache.cxf cxf-rt-transports-http @@ -1166,11 +1075,6 @@ - - org.marc.shic - shic-atna - 1.0.8 - org.marc.shic shic-pix @@ -1182,11 +1086,6 @@ - - org.marc.shic - shic-svs - 1.0.8 - org.marc.shic shic-cda @@ -1219,27 +1118,7 @@ 1.1 - - rome - rome - 1.0 - - - - org.oscarehr.integration.ebs - ebs-client - 0.0.6 - - - org.bouncycastle - bcprov-jdk16 - - - log4j - log4j - - - + org.oscarehr.integration.ebs edt-stubs @@ -1251,12 +1130,15 @@ 0.0.1-SNAPSHOT + org.codehaus.jackson jackson-jaxrs 1.9.13 + + org.owasp.encoder encoder-jsp @@ -1267,11 +1149,13 @@ encoder 1.2.1 + org.owasp csrfguard 3.1.0 + com.medseek.clinical.service SSOClinicalConnect @@ -1289,35 +1173,34 @@ 1.9.3 - - - - org.seleniumhq.selenium - selenium-java - 3.141.59 - - - - - io.github.bonigarcia - webdrivermanager - 3.8.1 - - - - - org.testng - testng - 7.5.1 - test - - - - - com.google.guava - guava - 25.1-jre - + + + + + org.seleniumhq.selenium + selenium-java + 3.141.59 + + + + + io.github.bonigarcia + webdrivermanager + 3.8.1 + + + + org.testng + testng + 7.5.1 + test + + + + com.google.guava + guava + 25.1-jre + @@ -1341,27 +1224,18 @@ + org.apache.openjpa openjpa 3.0.0 - - org.apache.commons - commons-compress - 1.14 - - - org.apache.commons - commons-lang3 - 3.9 - + ca.uhn.hapi.fhir hapi-fhir-base ${hapifhir.version} - org.slf4j @@ -1378,6 +1252,7 @@ hapi-fhir-structures-dstu2 ${hapifhir.version} + ca.uhn.hapi.fhir hapi-fhir-structures-dstu3 @@ -1389,39 +1264,14 @@ flowsheets 1.0 - - org.codehaus.woodstox - woodstox-core-asl - 4.4.1 - - + + com.sun.xml.ws jaxws-ri 2.3.3 pom - - javax.xml.bind - jaxb-api - 2.3.1 - - - javax.annotation - javax.annotation-api - 1.3.2 - - - - com.sun.xml.bind - jaxb-impl - 2.3.3 - - - javax.servlet - jstl - 1.2 - org.apache.struts struts2-core @@ -1445,13 +1295,9 @@ - - + org.jacoco jacoco-maven-plugin @@ -1503,6 +1349,7 @@ + org.apache.maven.plugins maven-site-plugin @@ -1519,6 +1366,7 @@ UTF-8 + org.apache.maven.plugins maven-compiler-plugin @@ -1544,12 +1392,9 @@ - - - - - - - jspc - verify - - run - - - - - - - - - - org.apache.maven.plugins maven-war-plugin @@ -1657,8 +1483,7 @@ org.apache.maven.plugins maven-pmd-plugin 3.21.2 - + --> 1.8 @@ -1683,8 +1507,6 @@ 3.2.5 false - - **/*EDTTest.java **/HinValidatorTest.java @@ -1699,55 +1521,47 @@ ${project.build.directory} - - + - + org.codehaus.mojo build-helper-maven-plugin @@ -1797,193 +1611,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 8ef23ac2392..d21f3b15376 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,13 @@ import org.apache.logging.log4j.Logger; import org.oscarehr.util.MiscUtils; +import org.quartz.JobBuilder; import org.quartz.JobDetail; +import org.quartz.JobKey; import org.quartz.Scheduler; -import org.quartz.SimpleTrigger; +import org.quartz.SimpleScheduleBuilder; import org.quartz.Trigger; +import org.quartz.TriggerBuilder; import org.quartz.impl.StdSchedulerFactory; import oscar.OscarProperties; @@ -72,19 +75,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, RecommitHSFO2Action.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 8dd5398b7b9..42b86251a9f 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,9 @@ 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; import javax.servlet.Servlet; import javax.servlet.ServletConfig; @@ -42,6 +42,14 @@ import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; +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 { @@ -78,21 +86,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, RecommitHSFO2Action.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); }