diff --git a/dependencies-lock.json b/dependencies-lock.json
index 1f02de4d41f..47be5d30250 100644
--- a/dependencies-lock.json
+++ b/dependencies-lock.json
@@ -18,43 +18,51 @@
}, {
"groupId" : "ca.uhn.hapi.fhir",
"artifactId" : "hapi-fhir-base",
- "version" : "5.4.0",
+ "version" : "6.4.0",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:gESUebwyLOPlLGtOw5yAsb0cb7spwyrE5GgAxzCfMyO6UfCwigRjM6MeIMzXkZ+XHlargRN9QpmT1/B86gWI+g=="
+ "integrity" : "sha512:2oz1V5Kn8WNKXvm8A2eY6F/B+cz9/XfNejYKoaPIF1a298R7OqpMaXBudIA52jxWveES7E7BLAoBAiP/fwC4hw=="
+ }, {
+ "groupId" : "ca.uhn.hapi.fhir",
+ "artifactId" : "hapi-fhir-caching-api",
+ "version" : "6.4.0",
+ "scope" : "compile",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:ItuEAtdoCmu6iKtO9KxNCT2pwq8u3IIzoAkSmmpaIoJoXfPHUzIp3hagNf1Nh/QR/2/29CYbsPXH+GhgDHwoMg=="
}, {
"groupId" : "ca.uhn.hapi.fhir",
"artifactId" : "hapi-fhir-structures-dstu2",
- "version" : "5.4.0",
+ "version" : "6.4.0",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:TeJmDgh1OhuE4Mg6BejGFnJS1KK8fp/6jlAJnAZsmkGaJ0hRPX3W+D8isM9v3HEpGHiH9wsyfmoRd/Oa+7TCaw=="
+ "integrity" : "sha512:1bxFD3Qa1axzg8dd0jWud0F8kxQbtdcodEMNKHx/SnJLI9GU/H5Qv/5c/deTQaaO3YY8wcip3IGVL4uaVUd0Qw=="
}, {
"groupId" : "ca.uhn.hapi.fhir",
"artifactId" : "hapi-fhir-structures-dstu3",
- "version" : "5.4.0",
+ "version" : "6.4.0",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:t1WSgJYKlIpCPlYv09AVumNQQzJJhc+r6q4NopFGg+FQXhHl4fP1ss0fxtJzu8pX9tsKX6jU4vxo0j7gTUTJbg=="
+ "integrity" : "sha512:5yZoCN6xvQGnLu1j6aky7jF9Exrjc2HgQo4+oMuF5+cE3+Lcx1N+jsUc2YQ0mMbog23Sq2iXpLmLG9GTE3pDjA=="
}, {
"groupId" : "ca.uhn.hapi.fhir",
"artifactId" : "org.hl7.fhir.dstu3",
- "version" : "5.4.0",
+ "version" : "5.6.881",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:DUX6NpnGOav094EJJoXUXBy4wsXw9wBjq8Z6eM8s/aFxHO6dAMTpVdtJaz+pg6n8nL3Idt2WNM8D/WfASZCP1Q=="
+ "integrity" : "sha512:HFvhYUucEcYMFddx5KvZEcQPkDrQkJLR+MpZ9za8oDeJ6boQYpgip2CebgS9WJZEdG2ZaqVpoa6ErtMDI10C4w=="
}, {
"groupId" : "ca.uhn.hapi.fhir",
"artifactId" : "org.hl7.fhir.utilities",
- "version" : "5.4.0",
+ "version" : "5.6.881",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:BHvDr7P/smhanO2lWe3LEIogj4lOMWTgaGlAe79ggdfUoPu+1l+bK09UQrEg1+5b//i9ZhiD7CT98CoRAHlWXg=="
+ "integrity" : "sha512:IONZ+tgMGxP9M1ZODhlPremqpT6nnVZRzswNMbxLzEVlvRAJq0koGPixM2I29ZX0SkF2CATU2m79vgRXt5+JSw=="
}, {
"groupId" : "ca.uhn.hapi",
"artifactId" : "hapi-base",
@@ -199,6 +207,14 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:BTP+qaNaLnuSZ6YqOSUtOsXPirD/MAVyQoMaHhfCMiW5NffC7WTedYXqg+VsMuJrtgeNmDRlTgR/HKew7gDdcg=="
+ }, {
+ "groupId" : "com.fasterxml.jackson.datatype",
+ "artifactId" : "jackson-datatype-jsr310",
+ "version" : "2.14.1",
+ "scope" : "compile",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:6qSvSdIuD+VJDjki/0vDiMt6tyNe2jtzzL+7OpmYmYmJtoaXfRSgan9Q4Tcu/DQuE5EIBV21UpVtFgFmhV1Pew=="
}, {
"groupId" : "com.fasterxml.jackson.jaxrs",
"artifactId" : "jackson-jaxrs-base",
@@ -247,6 +263,126 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:x390I/2WtbYVkjZTbk5LUJAyzqlDaBhrhsmfTscs9A7PsmghzHEkB3NjkCziuRZE4y5T+n3j/OmIW0ALBCTs0A=="
+ }, {
+ "groupId" : "com.github.docker-java.docker-java",
+ "artifactId" : "docker-java-api",
+ "version" : "3.5.0",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:peR3qbanhvSzWOOPTB7t4ezXbs0fvRSmgUM8MuVaxqX7EWYtPnodneq83b3wrekf0pGkP2b5V1sbjIQ0YD0UHg=="
+ }, {
+ "groupId" : "com.github.docker-java.docker-java",
+ "artifactId" : "docker-java-core",
+ "version" : "3.5.0",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:u8QpaOlueaYoCtK1Ne/YKPfxEfFSanT7PhMbOBeYX4TyQGdP3pOWw5lX2bODMudt/W9fqCrbq8BlSF8DAnI3eA=="
+ }, {
+ "groupId" : "com.github.docker-java.docker-java",
+ "artifactId" : "docker-java-transport-httpclient5",
+ "version" : "3.5.0",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:gPJFa7ey8stLu+FTqytcRlCXb+L/4YLZ4DhVpQ1UivpmpqCqz/XAL8Y0ZC2u96wnbfyzVXZOGLv2GFEGckOhuQ=="
+ }, {
+ "groupId" : "com.github.docker-java.docker-java",
+ "artifactId" : "docker-java-transport-jersey",
+ "version" : "3.5.0",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:wiSt8bnvY2Zfe5Hs7k7wKXrB8fwFECaqytfVTIUrsz6L0ZGRNfgDxSPnzQmymLb10QaYCjiMl7p4ABMa11PvLQ=="
+ }, {
+ "groupId" : "com.github.docker-java.docker-java",
+ "artifactId" : "docker-java-transport-netty",
+ "version" : "3.5.0",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:zXokfJ44d/armf1yVbhznIIFzTM39v5ygGkCnBVJ1NTlVch7qhGFKQ0v4KFOwDyVApXi7w6UX2D/ELsKgMmu7g=="
+ }, {
+ "groupId" : "com.github.docker-java.docker-java",
+ "artifactId" : "docker-java-transport-okhttp",
+ "version" : "3.5.0",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:3B3MiEe8fecbq4Hzk7ikOWlpUmSHIuhaNPCiy2x+aG+OYLUBLRgVHhEjwpe1YJQf1nyfWQN6XPm9NnyhGROL1Q=="
+ }, {
+ "groupId" : "com.github.docker-java.docker-java",
+ "artifactId" : "docker-java-transport-tck",
+ "version" : "3.5.0",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:QYm7Cwyn72frC13bqevUIhey5JwITYucOJYII+uUbaXWdZ4BsVlIDrBp2JAblK/r22lM3Bmsjfbca36PygngBg=="
+ }, {
+ "groupId" : "com.github.docker-java.docker-java",
+ "artifactId" : "docker-java-transport-zerodep",
+ "version" : "3.5.0",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:ZZxtdwBieksCdzgDibCvYQnZl1IYcPPQYUaXmJz9Vh5LX+Tlh5T4MmPHs4lKOGL8KanI7P7KoQ5fMHYX1CCj3g=="
+ }, {
+ "groupId" : "com.github.docker-java.docker-java",
+ "artifactId" : "docker-java-transport",
+ "version" : "3.5.0",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:oKflCFLndOlu+tghIdqrjY7dF2/LFmFj7jkRTkPVNw7XIXVVkA4fnwRyR+8mjSYGzfVY11TWClFKBpW60aiyNA=="
+ }, {
+ "groupId" : "com.github.docker-java.docker-java",
+ "artifactId" : "docker-java",
+ "version" : "3.5.0",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:1AcoIzMgAOx9ZnABBgRpVp3pDiRtUi0dKZVma3Q/22Agg0kvjgqw7Vaxz/bfkjFdfnNcADzOiM6QBi/tVIzGGA=="
+ }, {
+ "groupId" : "com.github.docker-java",
+ "artifactId" : "docker-java-api",
+ "version" : "3.3.3",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:p/hg45FBOSnUa+DSp/M6Tviixm/RMezEHiswBiaOVwAb8UmCIlkp/loGN3Z0VLp4inKi+2g+nEl6A+yN05eOKQ=="
+ }, {
+ "groupId" : "com.github.docker-java",
+ "artifactId" : "docker-java-transport-httpclient5",
+ "version" : "3.5.0",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:JsjL731H992hg/HEhSWXYppl9dCE2qMZExWA8E6tc8ML5GRQOBxQY4yw4kY0/lZbuXtquwQlBweTWdEGEsg4Cg=="
+ }, {
+ "groupId" : "com.github.docker-java",
+ "artifactId" : "docker-java-transport-zerodep",
+ "version" : "3.3.3",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:MVGkmS3KanGkv+3I4PP9v8Iiu2DYnei/wTDJpo3fdy+m+gFyBLm+5bo2mN1XN6kQuBfMDRso0CSFNZGNZopA9Q=="
+ }, {
+ "groupId" : "com.github.docker-java",
+ "artifactId" : "docker-java-transport",
+ "version" : "3.5.0",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:2HrYpdZlkrjWS/ks6FFH4b4sYD97DWkpgeKDHQgTtzmE5p4cGMk1BvIW+PEDkNFZY2zV7wYYnB60vApSAby2kQ=="
+ }, {
+ "groupId" : "com.github.docker-java",
+ "artifactId" : "docker-java",
+ "version" : "3.5.0",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:YOFlogT8PaiMZF+l4g1nQVw5RRxXegegKUB3xbCYBWcrFvn6hqq8h+hrN38cI9xSsIwHkxljLjVYGomrpFEv/w=="
}, {
"groupId" : "com.github.jtidy",
"artifactId" : "jtidy",
@@ -391,6 +527,14 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:7ZquT6pWwE3Ahq8HB42zc09nXrQYi7K+mMlMxZqOTne3QZXEfXDHtpe8O5OOEG/cE3/9pTWLMCl5Xyjn2SFtaA=="
+ }, {
+ "groupId" : "com.ibm.icu",
+ "artifactId" : "icu4j",
+ "version" : "72.1",
+ "scope" : "compile",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:SBMOs0alu1va/4Z+UjGAijzQPRh22Oa3xQEzbfaZLpEvfFNFbccrZzrTJy87VLQUND7qihEY0B0OUXQDyrPjJA=="
}, {
"groupId" : "com.itextpdf.tool",
"artifactId" : "xmlworker",
@@ -415,6 +559,22 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:l+xt5k9IcO48hPiDvTZkViv9YAyp8zZJZufb7n5OhSBkfAP5+B1oCOMwBSyhMz439JfWJSzSb+chqQ9XPL4gNg=="
+ }, {
+ "groupId" : "com.kohlschutter.junixsocket",
+ "artifactId" : "junixsocket-common",
+ "version" : "2.10.1",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:VXhwRNHNOt4RNk0cDqEGYOFSFWHNz3sSZhaOvibWM0A2SpZ5BYEAr6CW7wk3j11kfvu+v8t4AE98WjjXx3qreA=="
+ }, {
+ "groupId" : "com.kohlschutter.junixsocket",
+ "artifactId" : "junixsocket-native-common",
+ "version" : "2.10.1",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:sXIDC0TFQB6WcoCJMct5WDDV0d1azfWtRBgt73w6s5EA5W5YMljGsXf0Y93XG5wXSGaMSgZOwuQMsZq9WFO/Dg=="
}, {
"groupId" : "com.lowagie",
"artifactId" : "itext-rtf",
@@ -473,20 +633,20 @@
"integrity" : "sha512:uh0OM4Iv8QHKJg3hH1om3U10ie0Ke+ZVRlG8qS7ne/UkPERLpHJMP1Y62IYIHYidXq1s3PjTQaHrOwodV3B0cA=="
}, {
"groupId" : "com.squareup.okhttp3",
- "artifactId" : "okhttp",
- "version" : "3.11.0",
+ "artifactId" : "mockwebserver",
+ "version" : "3.14.9",
"scope" : "test",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:99iBggx9a5ygv23I2BKOF2kVYtw5IC03Y1Oxc1SqgDEbbOD/WETlekrBNOC7OgOTEe3xysM0/TrnjqXzMRbTiA=="
+ "integrity" : "sha512:MoJ9MAmEhIf26SxscGXv0N3C4eSUXmHPueNlfwf/NwR+EYkIPSWAs35XGxR/1W9gtRAPJTFmWvlRupzgFfDOlg=="
}, {
- "groupId" : "com.squareup.okio",
- "artifactId" : "okio",
- "version" : "1.14.0",
+ "groupId" : "com.squareup.okhttp3",
+ "artifactId" : "okhttp",
+ "version" : "3.11.0",
"scope" : "test",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:4czbwYwNDOot3ziKPvScQ7aGHMYx53YIxuEeFj8IhFT2O3BStYB8AznDIltrydaKqoPozAYfmKOf8do/NvdZZQ=="
+ "integrity" : "sha512:99iBggx9a5ygv23I2BKOF2kVYtw5IC03Y1Oxc1SqgDEbbOD/WETlekrBNOC7OgOTEe3xysM0/TrnjqXzMRbTiA=="
}, {
"groupId" : "com.sun.activation",
"artifactId" : "jakarta.activation",
@@ -675,11 +835,11 @@
}, {
"groupId" : "commons-beanutils",
"artifactId" : "commons-beanutils",
- "version" : "1.9.4",
+ "version" : "1.11.0",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:d2KzSMrs6tSQOKOKiXVP99m+YZkyQxVJW6R88k9SwG+q35MG2SXI/kfFh1iak5yC5JHhxzAmf981QkOmjA+W/w=="
+ "integrity" : "sha512:Q0hnBXlgG8EVHeLydBRjXE6gtLUwYdEWwJujGeLE+OkdDLBxOpZGaL1RiRBaweK2WQiBhQiAv1/yPMZAnycEIA=="
}, {
"groupId" : "commons-cli",
"artifactId" : "commons-cli",
@@ -731,19 +891,11 @@
}, {
"groupId" : "commons-fileupload",
"artifactId" : "commons-fileupload",
- "version" : "1.5",
+ "version" : "1.6.0",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:q5F3iyYB6gsABiSPQ2q1eojfMQKzVFtF7sZ1+trz0kBZDQhVnLeBOfAa5jCHr9yz3SOvBgqO0nRG6aJfezCDGA=="
- }, {
- "groupId" : "commons-httpclient",
- "artifactId" : "commons-httpclient",
- "version" : "3.1",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:heedT9smaGGRDvlbzW6Cp/CRyb+8Y9viESOD6k1TpbejeLVOfEcvvf3pI/MMctnK1ib4+rsLnHDR37CVrdczWQ=="
+ "integrity" : "sha512:806Q0ZhawtpSlbwjs8m5Z08VfSaXtjfcu7KOHekWirgvfktasWnvxVWaQn8osslAEWomuPGcK31SNGgh4yOk1g=="
}, {
"groupId" : "commons-io",
"artifactId" : "commons-io",
@@ -755,11 +907,11 @@
}, {
"groupId" : "commons-lang",
"artifactId" : "commons-lang",
- "version" : "2.5",
+ "version" : "2.4",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:7/OI7M4G3y1Ve2NVnbKmuJMvNGbhAVsVZTx/eIx3uLuOQt99xP6TB3yWzECUI4fTi4EQ4AQAp1lNk5XPDsczTQ=="
+ "integrity" : "sha512:rjW3YdFvQyfNtv2hZ4kWb8ZwIO/XH9LMM5W5dET0Od/Mfu6Uij79OwJEBBbK64c0F9ldtqKxb07xmN6dGvvARQ=="
}, {
"groupId" : "commons-logging",
"artifactId" : "commons-logging",
@@ -771,11 +923,11 @@
}, {
"groupId" : "commons-net",
"artifactId" : "commons-net",
- "version" : "3.6",
+ "version" : "3.11.1",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:26QUzqn7S0ff5tIMNHvZEFIYXdlYmWv90ecJ9mtfp4Euuw2tgMR+crzAB1s7VSbHBSFu/nccrBzFOy95IxJPrw=="
+ "integrity" : "sha512:f9hVMOAiBKjK9GJ/JpNiA7H7rMu50LCcPGT1i2O3OOmqrimqC4ReCe+5pw2d0VQuu8eQJbPrCcH7YupPepydgQ=="
}, {
"groupId" : "commons-pool",
"artifactId" : "commons-pool",
@@ -819,75 +971,125 @@
}, {
"groupId" : "io.github.bonigarcia",
"artifactId" : "webdrivermanager",
- "version" : "3.8.1",
+ "version" : "6.1.0",
"scope" : "test",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:Nlxb25dHhsMkjKbPe2Cv69osOWnrfK9Gs2JbQznJ1jy0BHecDFCeoFgjHF+Wne4yvJHwORc1mKrcE4IofMqFFQ=="
+ "integrity" : "sha512:9IFmcBdnemg/eGG349+t9NXXP5C+ZDAqKLL3FgQFBKVjnj0aM4VImU5yGtcODl4bOt7fydczzsPwhsFWQ4hQ3A=="
}, {
"groupId" : "io.netty",
"artifactId" : "netty-buffer",
- "version" : "4.1.115.Final",
+ "version" : "4.1.119.Final",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:HurugEKKIYpUuUeBag6O1vOwOPOyrBGlLYXzoHsgcDeGbOT8zW97i+Qb53XLw5InEhNc6couD19IXr+B0hBpzw=="
+ "integrity" : "sha512:HMXqJdDNXBGUwl6/rTTB3rSuwlBCUTAUy38OslLqjHbkh8wkEzb/5m7ZRPvOEdvm+UAw9UVraSHc+WOiWjjsJw=="
}, {
"groupId" : "io.netty",
"artifactId" : "netty-codec-http2",
- "version" : "4.1.115.Final",
+ "version" : "4.1.119.Final",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:rgjw018uEcyqR6i7i1ntHo0fVjnNAAtBXCgvFcb/6zW13mveRn7Ne/MRftWwrnBh5FVCkMwF8ETddmZzOcz5dg=="
+ "integrity" : "sha512:iYjWadmaKZolqHrV3a4THVfKjltSEF7uqWbOHDUmt7Iwv4EyPVFYQk4cifI8yNHZNcmH7D8yStcHHheOML2PbA=="
+ }, {
+ "groupId" : "io.netty",
+ "artifactId" : "netty-codec-http",
+ "version" : "4.1.119.Final",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:AxlOlh2IHmolHOWPXYsSIXFNNgQzDbe/EtCPVaqX72s+NUS9MaMiqOSYxB3rHjuglVT1lCRc1xyHv/r+QTH3EQ=="
+ }, {
+ "groupId" : "io.netty",
+ "artifactId" : "netty-codec-socks",
+ "version" : "4.1.119.Final",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:qELVAKundBks0LAq/PnjsEL4+g1CxoI/jgR4zbklvmZI+l0viOG7ELwPndMXO6TeqkylWcTQuTevmV7BNM7uPw=="
}, {
"groupId" : "io.netty",
"artifactId" : "netty-codec",
- "version" : "4.1.115.Final",
+ "version" : "4.1.119.Final",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:5L1z4g3/P1pWeeQyaUglp2H9nEuWazcZ6eb6n5oy1rqsnSin+sTWwfp5T4FqsW15HoDEnm8ruWaL8jgz3L2oyA=="
+ "integrity" : "sha512:smCgGx3YNElSDg2/g84jKHJa9HaRJTSjvPK3DWaoJaLqL6FRA/STz1SeH/m7meiPZoXsDSyUxTzC92Tmt5uMjg=="
}, {
"groupId" : "io.netty",
- "artifactId" : "netty-common",
- "version" : "4.1.115.Final",
- "scope" : "compile",
+ "artifactId" : "netty-handler-proxy",
+ "version" : "4.1.119.Final",
+ "scope" : "test",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:hKPHAvwpCnRcjnlxfgCNSBIMlsCNDL939eHyEm6iQ8tnqbo/4DXbl3OTLrLk/wdynhrm5mHLP7ncmVTyTg4xkg=="
+ "integrity" : "sha512:tGOJ0RTZyNPiH3cdIK4b5vvHKgIvTVgQUfIhTlpzSuT+VmrgHpLhli6dD9C7yXJLRbi2tILc9nD6HgRkVvyYbg=="
}, {
"groupId" : "io.netty",
"artifactId" : "netty-handler",
- "version" : "4.1.115.Final",
- "scope" : "compile",
+ "version" : "4.1.119.Final",
+ "scope" : "test",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:65fyr0MKWBQYCzHcj2PBwUw5oirqb6iW3E38XZRN/DBJa76Ku5bcDVjxvlp+DRwncizOEkD5Qjym3CKD/JTlZg=="
+ "integrity" : "sha512:lCjdVI/tv6RWKLzp5BbJIQSWSEl6BvO/pvYvImIou5eHqAxXE11vVwdFIF3kr/4ZkHaIGSx1WjNomzKQTROeQg=="
}, {
"groupId" : "io.netty",
"artifactId" : "netty-resolver",
- "version" : "4.1.115.Final",
+ "version" : "4.1.119.Final",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:/7vjdszrtK+idEVaklO89CU+rFPGZzwKwYl8tKKXQ19xdVCfcLUHBGsK6Ghub4fOIp50+kE4pGjZZgITZ0M5QA=="
+ "integrity" : "sha512:eMUz585JYi86VLu/Ytu8CAJq9xXb/k6QkkcO6C2H2Qk+rQaWnJP0tQjeXIrll6jzK3ucWKNO+FueLDBhn7ceeQ=="
+ }, {
+ "groupId" : "io.netty",
+ "artifactId" : "netty-transport-classes-epoll",
+ "version" : "4.1.119.Final",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:bFepuNF8XbgGAzUA/alfjfRiqYQQ9l7STc9xmZHNFDiBB/fgnjD9RsyJcVBNXxwcWW4/WL2AHxcy16yNEY/lng=="
+ }, {
+ "groupId" : "io.netty",
+ "artifactId" : "netty-transport-classes-kqueue",
+ "version" : "4.1.119.Final",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:toVbGeh8DctG1Cr6EhPkTTpJLjQtYpS2BNd7lhNx8DMmwRFiSVrpL2mstSnWx86P+2RNGMT4ESgUz7L2A4S2wg=="
+ }, {
+ "groupId" : "io.netty",
+ "artifactId" : "netty-transport-native-epoll",
+ "version" : "4.1.119.Final",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:agvkZPCFgT8TQVZnF3YqQR4Ny4sodN5NU3IR3K1Hw0qa/OFYvisa69s4zQC0sOKv+kdxHo418Ko6hzMd1JwNAw==",
+ "classifier" : "linux-x86_64"
+ }, {
+ "groupId" : "io.netty",
+ "artifactId" : "netty-transport-native-kqueue",
+ "version" : "4.1.119.Final",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:Lw6dFmkjO/em3m5Al5+4lQHoSQKrTWiX0TzeZRF0wzwOgn8gY66rRI3agreoFbjKGfXEyWJY8eeIokooZRZ0IQ==",
+ "classifier" : "osx-x86_64"
}, {
"groupId" : "io.netty",
"artifactId" : "netty-transport-native-unix-common",
- "version" : "4.1.115.Final",
- "scope" : "compile",
+ "version" : "4.1.119.Final",
+ "scope" : "test",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:gsSccGSnjSJi2BqkQ4RCmn/5y6LsenZ5+YktTjz6Er0SrrsvewkOEIfglMy6IQeEcRZUxBNLgDw16A4A+ZDmuA=="
+ "integrity" : "sha512:ewE+RJNB/Xwa+nxYKIdxdKuSb2Nh98W8ci3y50vAs7gxNus+YpShFZwaFldAiZs4uympfY/XPTjqYoPuMyry3A=="
}, {
"groupId" : "io.netty",
"artifactId" : "netty-transport",
- "version" : "4.1.115.Final",
+ "version" : "4.1.119.Final",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:s3aiDEnDgiXEKjNNsL3QvS/DFjqoaFzdQunwinCUuBTA/Lr5Wj29MDxS9jel86bY/YJIcbyL01Z2rM/I1iCBMg=="
+ "integrity" : "sha512:bg+TSYsz28O+a/6SWtXw8Ap5cn5SAUQpmK6M0TEdFIArqo5ahPuq2Pm34BErtqT1R83hBF1Uw9mZCHdYHkwsvQ=="
}, {
"groupId" : "io.projectreactor",
"artifactId" : "reactor-core",
@@ -896,14 +1098,6 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:oio3IAodBcf4uXftxExiWEUSTu+IEfNpnrChGsUWUSjmA6mfbP1SPv24UrrLmLcorhsyoHgzwOs0JIOh/+fptQ=="
- }, {
- "groupId" : "io.undertow",
- "artifactId" : "undertow-core",
- "version" : "2.2.33.Final",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:7/HokZ5CbCRmvoU7xSLD6zwGIJCmarFmc5jLeZxUKTKbdAthvQo8JEoW13U1+Skdzm7rNb0Bbd3sY42wF/b+Nw=="
}, {
"groupId" : "io.undertow",
"artifactId" : "undertow-servlet",
@@ -1032,6 +1226,14 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:AT5ODv5ksc9nRNzkTtcWtNhROyrVtqATGvZjt5GOtlcFvQnU33Y/9KgQgp9Pa2wZjKdnDOQ5lAvleu0JFLUT+A=="
+ }, {
+ "groupId" : "javax.servlet.jsp",
+ "artifactId" : "javax.servlet.jsp-api",
+ "version" : "2.3.3",
+ "scope" : "provided",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:msaevADQDl7bKDAv3VFcjmeMrRwsusutSHs9hMdIJ1Y/yjeDgwYc4DuNnuUPmc7ZQYzJ2NZOSe7zInAjLWYMig=="
}, {
"groupId" : "javax.servlet",
"artifactId" : "javax.servlet-api",
@@ -1049,13 +1251,13 @@
"optional" : false,
"integrity" : "sha512:+2/jOSJjG7ohtgbLXVPERXBx5pXsVjIgUYUoHn2z4tY9lSSLQ7nH+yy1BC0Uome4fSxdp0LJiRdMNSbczyOu7A=="
}, {
- "groupId" : "javax.servlet",
- "artifactId" : "servlet-api",
- "version" : "2.3",
+ "groupId" : "javax.transaction",
+ "artifactId" : "javax.transaction-api",
+ "version" : "1.3",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:4HxZjUaKniaNyAO/0v36fK+zXScUB7hSl7NfwXAXuFuvsLFlJDTc/7Z3e045l50M2SBLsVDvpeSJFGtRcirx/g=="
+ "integrity" : "sha512:NJfPdzUqoTF8cK0dKOjn2lEzfYRMgiejVwcgnHULpvXWRKT/29sQ5fveIEADqkP/gOni/zFkWEp6NNgpImayvA=="
}, {
"groupId" : "javax.transaction",
"artifactId" : "jta",
@@ -1064,6 +1266,14 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:+ppatR+X4s1jtcHLF3W2Ox7cAZeu28wOirMRbf4n1HNlhl0k7vrxm2SFVLYPGh7OE+MZLRV8MZNEqXrVUcYoxA=="
+ }, {
+ "groupId" : "javax.ws.rs",
+ "artifactId" : "jsr311-api",
+ "version" : "1.1.1",
+ "scope" : "compile",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:7t5Iykww/iUWBjbK0n/FcyExVD1nxZZ2KC5P0GjlbC4nIXHJBI3WtbwLDIiL28Oqj5wRfJfkLZMJzwSdC/iUuw=="
}, {
"groupId" : "javax.xml.bind",
"artifactId" : "jaxb-api",
@@ -1083,11 +1293,11 @@
}, {
"groupId" : "jaxen",
"artifactId" : "jaxen",
- "version" : "1.1.1",
+ "version" : "1.2.0",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:znENcJspok1Xv2MlUhljl1uX0WCKrzCYwq55APPBMm+4MQ06wKi/egA/3zdfpMN7oOfcULuQJp8ld27oBiSbBg=="
+ "integrity" : "sha512:ytWC/BLQdB6eb9fgz4ClD+sE9e9CBD35b4pbeEdsd2ldi0ODbSJB92s1Z26nWZIe3SXq6ywE7JFusTiqKQHOXw=="
}, {
"groupId" : "joda-time",
"artifactId" : "joda-time",
@@ -1120,6 +1330,14 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:VcR19CgIPWVt2e1aCHK7802j7wPlZ9xd/6kAqDUw0WPC4FnNYwQIxz90B3Ag59/mLVeKD1gmPu7wHJwwfgRDCQ=="
+ }, {
+ "groupId" : "net.java.dev.jna",
+ "artifactId" : "jna-platform",
+ "version" : "5.13.0",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:3fzoBgmDs79zrpOff3fxMwUqrb5NPp0ZkvHYv5xyEGEb85MepyE3BZvRNBqNTRN5EOhDw6UvpQUm4hFDMZ8Hjg=="
}, {
"groupId" : "net.java.dev.jna",
"artifactId" : "jna",
@@ -1210,61 +1428,53 @@
"optional" : false,
"integrity" : "sha512:XJQIbhRlcep6ispfp+o6RkCk7CPeixlO/toHfX5QCjU//GegmSKV/kJJJUG6bf2PapbIK1ALFD31hLU8dgbQ1Q=="
}, {
- "groupId" : "org.apache.activemq",
- "artifactId" : "activemq-client",
- "version" : "5.16.7",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:3aRzB7j7CKL3zwWxid1jwm/GfSfkFLxGI9g7x6FY7bHeseUV7xNuVCpzfRjFl0Tt8jUMEi5zkdfz1WqP7EtTzA=="
- }, {
- "groupId" : "org.apache.activemq",
- "artifactId" : "activemq-openwire-legacy",
- "version" : "5.16.7",
+ "groupId" : "org.apache.ant",
+ "artifactId" : "ant-launcher",
+ "version" : "1.10.15",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:JSznDGqUNF2FTsgCBB5CfFf7N/9n/qLgKIsooVUIzy2isVhnewuDh3vV2bj7fozwtzD/fjJuAOgSqOA2qPxGtQ=="
+ "integrity" : "sha512:b8KzPN4HSTcEwgG3WeaBO6X2D/05JaUrsJen//7byVC8xPvJP+CobsKkGHKxa5KGi2vodjLT6ODciaW0FDzLng=="
}, {
"groupId" : "org.apache.ant",
- "artifactId" : "ant-launcher",
- "version" : "1.7.0",
+ "artifactId" : "ant",
+ "version" : "1.10.15",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:xg+5jD5a+M3l2qKP/B9s6N9rF7e5R5hMbDGKwgkvyjnVDls8FOxq9iR1MxjXD3n8aNmxTKEDwBmO7hxZPkqZcQ=="
+ "integrity" : "sha512:1RCYOAkKRGMJjEqCwXHQe5LUJjMBDgRTiPuKaHRP3N0rB6dan7Vng+g+y8yAZkEZzMRFN5kxJdZySVbhFFCDFg=="
}, {
- "groupId" : "org.apache.ant",
- "artifactId" : "ant",
- "version" : "1.7.0",
+ "groupId" : "org.apache.axis2",
+ "artifactId" : "axis2-adb",
+ "version" : "1.8.0",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:JK0NW8axooOz56gJH2dISCZvwO9tKyMWe66Me38v2mh3WMZzAWGgRmSkkSLBUIheJJnXvCrA5DXOI0JexZziCA=="
+ "integrity" : "sha512:U8IH9zC/Qh961guGUFrVcmlTisrOHA5Y5ssJgARrCbgSExbGdXJi/o/tUqs51voUrKqdjRojzmQF61mpTWHERA=="
}, {
"groupId" : "org.apache.axis2",
"artifactId" : "axis2-kernel",
- "version" : "1.5.4",
+ "version" : "1.8.0",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:GrCFwp83qpYodO1P0ZxGAgQqDwfPhZxHVHU0WjLV6Jv5F4gyuCRCZKp3vgT4lTQfp3Bdlw11zcdy8DcK2uQeEw=="
+ "integrity" : "sha512:9qf+CEGmZGxWAf8X7HCIh0KIRhWdBXVOLXpxteIj2CXB+npLv+uKSlIMaVmV52VFGd0OzfMY2EfKNR70NQ2p8g=="
}, {
"groupId" : "org.apache.axis2",
"artifactId" : "axis2-transport-http",
- "version" : "1.5.4",
+ "version" : "1.8.0",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:DqH79QMBSKSUVMia+HA9qyXr88iM4xq92/ZsYLvLSWeNoqk3IihwjTvl8WpkimW9rLVGf9qvUUz38LAt4gF7dA=="
+ "integrity" : "sha512:qVlOGwGscBnDUOq/ZhxoNAV8Z/b139IA/Thbvc52GpRNcmnX/lO6lDGn2gFIawVN4yzalRrSySYafT3V/jLMRQ=="
}, {
"groupId" : "org.apache.axis2",
"artifactId" : "axis2",
- "version" : "1.5.4",
+ "version" : "1.8.0",
"scope" : "compile",
- "type" : "jar",
+ "type" : "pom",
"optional" : false,
- "integrity" : "sha512:BBYTPoLvg1TlIOmF7bMUgX5P46w6ECFADtrveXlC3QvIKZkOUvb0566pFaXeSh/+GE/di3zDD+K+45Mqf/lHcg=="
+ "integrity" : "sha512:CqrjyRj1x+i9q7WnsSCREkEZAw02htv+HcxBGGHY5B4FaDljfCZQ2GiWJMs78Gab7o4a1FPGCcRBgND2Xh/upg=="
}, {
"groupId" : "org.apache.commons",
"artifactId" : "commons-collections4",
@@ -1300,11 +1510,11 @@
}, {
"groupId" : "org.apache.commons",
"artifactId" : "commons-lang3",
- "version" : "3.17.0",
+ "version" : "3.18.0",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:39X/f+f4UrnKq8geWgDiBhb5hAUIXwWbZNwhIf61+myzJ+EaPS+VTAeYEcMfb9SE6Q+TLUUHh5b7+n2/Hx61qg=="
+ "integrity" : "sha512:wsnUl/wb5BEFD0ARskB3ZLeKoJjrQpJa+KGX6r28JbUH8J+4mIBem+1IFfNSNqUI7lsJbjbzY99NQHIy1Q/IMg=="
}, {
"groupId" : "org.apache.commons",
"artifactId" : "commons-math3",
@@ -1324,27 +1534,27 @@
}, {
"groupId" : "org.apache.cxf.services.sts",
"artifactId" : "cxf-services-sts-core",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:paqC4Z3N7wauqCVmkWFdnap85dvP6MdADhVs1z43bqss8ABpWJNEzieHY7Wg81zeZ1n3q0FpikxkBzBI2SVu0Q=="
+ "integrity" : "sha512:mTovJV4hNqyQTp7m5vahjeY6apV7UKsf5L///s8+ZMS3+WzXQouSMkIS0h98q/TgfsX93OusY9DrQ2u5Lv9Gug=="
}, {
"groupId" : "org.apache.cxf.services.wsn",
"artifactId" : "cxf-services-wsn-api",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:EpPe2E4/Lo+b4cbFW3HqEr1irxbff7aW6hVbfnxfQvkczQSvSk2GgjR7rT9lseJWfH0ULvUin3jMIcOLqQVeog=="
+ "integrity" : "sha512:a8jB3yRJy0Hb63ZOjiCIov+wRhRS3wTloPfZvT7VjQRTsz9xJzuNRpsP/UfZL6JLfMdzGYOy7tIcDzL4Jwbgrw=="
}, {
"groupId" : "org.apache.cxf.services.wsn",
"artifactId" : "cxf-services-wsn-core",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:tOV8mnB5QBUEQ1L5PsX5NZE0EhZpl0qTwP1BG3FtVSHZG7KoDtNPMQNYzBmhZ8/yuETKv+9Y6ztfOCTjdZlepQ=="
+ "integrity" : "sha512:Dht9VkXdglUVRuJAshh+d39hevl68WrGWXU/9RAg22z8N8S3HsFVJg4ufoBzvy0UemJ4sY8NxsDoCFkTCXCGVg=="
}, {
"groupId" : "org.apache.cxf.xjc-utils",
"artifactId" : "cxf-xjc-runtime",
@@ -1396,515 +1606,491 @@
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "apache-cxf",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "pom",
"optional" : false,
- "integrity" : "sha512:LhCGzQgNlZOllph9fl4HLt6Q153NBdO81aMrGN/jq0byQa6um6fnl2pICtOU1mEQTvkiBZoSlkA32o9Wst0j+Q=="
+ "integrity" : "sha512:Cs2+VGhgCyHQM5Hv463d0Y4YJfii1Q8SKuf7LHYtO6pRpKspyL6qW6Z7dgZLdgBd9zhAosV5yk3o2iA82IMctA=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-core",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:y9YSGKHiVI2drooRU46C75XgJTL2cCCR/U+SXklhwmY0wrmKpdX8NZ5QsqfD6yrXSx/kgc+XENUXz6RssRG15g=="
+ "integrity" : "sha512:tSCh0GlVguuVaPdvxPW/Llc1vzN6iPlSse8vcGH8G1YyJG5tegtTZvtEKhnySmwh8gvUck/wD6V7uPMhSMpOsQ=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-bindings-coloc",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:KOuBSMzB5X3xqdmEKa2+h8ToXr/LQduOOwzE/ucDnFtmau31VQqugJF2DZNlE0ujG8JjINgj4PNZ/kZ6o6A0Nw=="
+ "integrity" : "sha512:jlhWIvume8+Q0+7Stc0SLZCSsrLwfMGYW4+ZOGyvyZ1hN3IvnrlWknoX9VSV2QRHtMLJVV4Nvb8B6h0Z/CT1fA=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-bindings-corba",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:KFAEDB0O0ohLR5VnAzDwHGaPKKMtsh5+gy6BTGkiwlTHMnqDzBne77JondLy/gqcC8ZqW5yYO0ieFlwKHY+yvw=="
+ "integrity" : "sha512:hHVi9OociyMr9HHyvCu+svYL6cVQLmvsPIGTnwATkIPAuUPrVqPsXgXnqTF7b8xFVj2mFn9BvHZkcYRd9aTHgw=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-bindings-soap",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:0HZZWYlGstcWe22yiA5RSzEI3GmYx9U1qIvuhHJLLw9j9msfyTVojyG+y1BX0pHjKWeWeexxStkW91AFO7bhTQ=="
+ "integrity" : "sha512:1/P5Lq4ummYukpNUxy7F9j3hWRwss3sKNfGKrSHDjHrr3E/xeK0Gp+pPPqeH7RnWnYmdoLCMt+CDfkCsryn20w=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-bindings-xml",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:fhASwConJv0np1p6QsPMZebvUJRZb5yHsaV4JbmByk5A5lOwRorafNgARrG638b1xd9/pTtHTPC0erL5oOr2sQ=="
+ "integrity" : "sha512:b0xoTalEAerQtNvgKZ6yYIjRSKlEMDSjUvzcZ2bHechfQLutF9rnlxT1jloh15v5DmVOh13bbFOuPEYD9BDixQ=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-databinding-aegis",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:Cf2tHokFNfVa6ANCGg4mJiPwXUNghtmYhxkxIW5UFMDmwHHZE0fcR30xs215waM0dVWJswocfexqnvgnxjTLqg=="
+ "integrity" : "sha512:0IVOKqQN2oUwAbCm8B9o7sNl3YVqkOJuZmq1oRw6FbBXN7PXVr+DzOJ6Qnc527DhfGwJKI+zOWfMFaXcaP3ciw=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-databinding-jaxb",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:s79HnmTCafNMGmpsVBqGyXOoIEYmtSr1egyV6fKw49i99TfO3KbdMvc3zwr8eyZzdp7JyMjsijqHnnisMvAIIg=="
+ "integrity" : "sha512:LV/EgGt4H39iO4rs2lWt8YVVnluLUTc6ZSbZD1nNDvO5TqrQc69mkXzpZDq0NV8O/m5B9XA45BvGptLIgwClYA=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-features-clustering",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:hrgT+C83i/PvsUYWnYAkCKj24i/Aa40WagQ2UvLhRljSVrYLSrarlQtx9qEYSCzNVCxT4O4NieLqAUthht8A0A=="
+ "integrity" : "sha512:J5341+psZgDj0yRmwKF9GXYeZMIRA06raIUN5PRNZMq3R1AuIedV+mm8zDwDI9MyVn+kde/mbQtPO9mhdpRRGA=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-features-logging",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:M96MLBDZQgMAhvHt8I3Vst2kBdfRbs6b/aDzF6axDl3GA0va9/YGA6Q872SCZktdegxiMAQs70VfUgheO1TxzQ=="
+ "integrity" : "sha512:8vGbk8Wk+1b/cBtx9kZyPKxYvMIR7PKwsyMZXRPS5hHBavUUrXwLD9YeICzmq+7AyEcawM4NQdISzqSRhPdOLg=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-features-metrics",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:uoWTHCQrr5f+P2dwNPwTsitWlOh4xfhbBVdvwXJUNW5lzHkLZhm7C+IUcm1U2koSxWQpMjAOCZrG5y1ZWn0scw=="
+ "integrity" : "sha512:kFlGCRjTstIWFQ1IoF17GgsZEJ+bct3jOGuQKcA+wmDhU7W4JW3LBcp7VIo0HL5N4ESnUaXmoCSMZn4jeX47zg=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-features-throttling",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:7IYTiPuUGkjZYlLizgOWPt2Sk6Eld/hCVr8Z5eqF5pFBYIYDq1SBdW2e1Tg5AyTbOgFWB85uVxifHppUYjYzLw=="
+ "integrity" : "sha512:07oat6gWJUQX4f0468z+W5KQIZ/Wcoi5g2VnkktyG94brKsVRdTG76kOnnyd/AdFerCcFCA/BIxs13oCPboEBQ=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-frontend-jaxrs",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:6a21rvqdPILsOXwvGVl5NwjrkuXKp2tj1L8ZZNIlEnfZBoyAahkGMmr9h+X7XQqnAw23t+q/ygDgbUIPX3576g=="
+ "integrity" : "sha512:0TKATNmiYX4HrpyvySPHPKsg234rSUgOnaZ7kwRAA5rBnZi5W7ToAJjhX23egvmABn1SzyhWDRKjiv3xjclQCQ=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-frontend-jaxws",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:A5FUSZyTT8J473BfPHlpo3rzDy0ni1+pCYXVjbjXyiUs1r16OEthrlnhg++wHnT+IBLNu6ceNzUUw9bUZTMzlg=="
+ "integrity" : "sha512:ppHjzG0MGRAtR5Un6onFsdX0aTcEBFq+hMRPg7CfpNyfvGW/zZXrPTkpzBI/VgETm5dOLnlfW3P2B0PwiaAnFQ=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-frontend-js",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:GCHA/xQJpvnUP53wg/BaTwAn/XFW9XnCCsrbx3W7uBO6SZsl8GY3gabG1kuoOE8uSUq14hvKmySEapSD24WHFg=="
+ "integrity" : "sha512:UFGYhfJUZ4KncYS0YU4ZFU/cwBdVMjP7DtFMkaMbBfLPN54an1AP09dGJ+8q0D+gN4rYRYr6qm9F11LbCBVwSA=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-frontend-simple",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:QGdsCM8Td0Q51jK075esKIeLoa+F6nodhM0Qcqx8XvG0NQvKhOjyZ1dSOFDpEUfm77qUU0D+YcoAoZD0h22fmA=="
+ "integrity" : "sha512:Kpc3Y19zBBBK/OdSqbcAyTN9ZKo46wOKhFfgoO5ZPgFD3ewhkvAhhL9qin0n/pTHZ5UxZa/+pWQcLIWxEJ+LlQ=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-javascript",
- "version" : "3.5.10",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:w6zJpNw8pycYTJKJ48qzVs2X8B1DzuwnRMAgf7890KB7ukWXdnBzwLBJlSPhwijG43rQH3ve3TnVX3di/nkTlA=="
- }, {
- "groupId" : "org.apache.cxf",
- "artifactId" : "cxf-rt-management",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:nNWzJdD2cGbmKIXeeJMvBGdkS2q282TnM0zXvK52ZSYwtQdXIIB8QpfTU+OvMOXdmJsxSHVR4Z+Bg10z6rTfKw=="
+ "integrity" : "sha512:MugD+6ZxgyHuy4Vwqp9tGYiGkzlVPI10SwlKqlDFsOIj3I5ZEWnd5/utiZHMHYuioqdvjYw9i66tFZ24S0qBvQ=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-rs-client",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:tBoaWYP8L310feDftgMrW6ldY8+OJ0PIJiUVew+mSYc4cQyaHWeSsTYkaLUozPVivM2WZrYfmGDo9QhISLeEuA=="
+ "integrity" : "sha512:fH0FmigPwjl60ALVvW21s4sFAepXDXDUjhkiaXbvLVsE3n7NjEt1X8fUd1oGOv4wU3JZXnbXnEpIakr5OKCTPw=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-rs-extension-providers",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:Yt3qqh2a9VgX/zHw4gN/P/IK/Id7Unr1jNh1gk8D81Q3fpTYQPntMGCqYhuzQOA+vNyVnepUoAUGKUJGoVRVcQ=="
+ "integrity" : "sha512:+hoh9DdnNvtSWjmNTKq1eRJ18xgZyy6uGr8ZHbc9WyPdwOudhGM4NPpNC4+cDk2jQVw5qAXq+l7BGOH+S54dPg=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-rs-extension-search",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:PRAj7JyeKaIj1oftMFXOI3Xje6BE+xsLdSMzKQWxltGJYzDQPEG/tWKI9x82QmM8Tw/AT/+Fu+67MOXW/ekGPw=="
+ "integrity" : "sha512:KBxlmsTXQTZ9ooAjmyIxeoxmXEdZ+LKic7Ktnv0iTsIqDLJYoBL5bpu2TCr2Z7HZ+RNS1+IW0YLYdVQW75IiXg=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-rs-http-sci",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:To13ErvLQ/Ufk0dr3C4mVHjAQgAGKxU4EbMdqKzNEpICd4MYNmO9AVdPzQtBl+FWqTPB8lnfV6YAIqlpOGX1Jg=="
- }, {
- "groupId" : "org.apache.cxf",
- "artifactId" : "cxf-rt-rs-json-basic",
- "version" : "3.5.10",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:C9FAf6NHhSJ88c27/0wSMq1HzFVbTidcPftIte7Vg+ZlUgWmUwHp/MlkZiFutc/kUG9HJirmzx8V5gAzjv3yag=="
+ "integrity" : "sha512:UGte5+/bwQm3yVPz2tMMHMTUlCNlTeE0l9aWOE9YlI33xSiiRXP9RqgXwsdeefpkwvdp1B0nAZJVGUn5/x7xMA=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-rs-mp-client",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:zEKXPhBvmoEOQNBx5wjW0or4mixm6BePTaFCWBQUevJmAtbqi5MBWAlWzk/6KTg0hyQOusOU6decCrXfuohPHQ=="
+ "integrity" : "sha512:ChxjrcHgwYCvkDB7eJtaC/VISOYoRtIo5UHvArT+ZlMw4Gd3rXuQWkfHHZwnGft7yxfQv5TDZwqj0i0nKdzSsg=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-rs-security-cors",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:zvpLDoSP00S0vzw76BgOmv4Wz77q0tk3mcSw0uUWlDwPRjlY9r+QtjrpqKmZBXMWvPQL5UtOBLN2/SQQpD93bQ=="
+ "integrity" : "sha512:H+PX89S64nybLZ2QKMza8PXLh1Gt+HYx0rVYHFUPuKIGX8W0GOn60BWXE4jMioQ5R2aa8xbUcSJbABpgpkNHlQ=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-rs-security-http-signature",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:bdYWDlrvNEVaFHL8MNQBUyW0HdaT6LzPLq2OksqBLOPIqOp+a8KOLFzTpPhZ7c0m/+pCMIc1QRQ4cfmRVsvGmA=="
+ "integrity" : "sha512:S2GJ7SHnh1KgCt/wF0wadCVruZlB+jAtGROS3BQg3Ujnw8fsFLSoKo8bG0eFLDQYYFOXVpiVxS1w1Lh0sRHU4A=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-rs-security-jose-jaxrs",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:pRGMvSXCH9Ua74TbuKr3OaJoN+78qW0YULCAKlS3ctmGFriDBrlDHlWtH5Jvx9CiBzR60N4K2wZ0PruXinA/9A=="
- }, {
- "groupId" : "org.apache.cxf",
- "artifactId" : "cxf-rt-rs-security-jose",
- "version" : "3.5.10",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:nDcn1tjGOqVBwQdL+N4TyX48UaOuoGM+4RidcRhbL8MYlg6UQn9qRIth9IDxXXBKIbHQ1z8l/stkcYc0BlW/bg=="
+ "integrity" : "sha512:1SeMxttuBh97szIQVdceHw+zYzupJURYiidUz8uhbW/kogD3q6Oj6U4HA+QEB+VggCMwakY+IEHio5zxjvJLiQ=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-rs-security-oauth2-saml",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:HRoVAiRBAvDg2BGkSFolj21LwoDjo56g8wnOPaCLAsG9opCLTAidXFcyo2pjlJlis0/7Dvcq1pjnNOol4P5cGA=="
+ "integrity" : "sha512:4XuBPZJiMx5ODF/0D8yc6yChSjMmvZB52XSy8wpss7Nm2SgzJjYzQwpD8oerqHipcJrIuv3zfdpu+wvJ4hUipA=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-rs-security-oauth2",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:YStMZ+BcGCKmtFwkz3vI4BKO7iLpYuOv4ik6qfT4ebG8XHTcNQmO38gue5WP3kBgrZZnkMHx+AQ0kzKdWQiN4w=="
+ "integrity" : "sha512:m0E2bqt1xEbvUahRa2yXLSUM6FbchBXG0f+in6P35Mhy4REGKKLsRfMJ4uNPkHKX3rzdrrddGNs4Q5HBAlvsuQ=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-rs-security-sso-oidc",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:L4Da4rAcKWQ0obAw0HSbZgnzBu492pwiCgdUvSjBeN10+ho4WUaBS7VLvKHkq5U7GMM8MhXSoaIxckyYaYwC1A=="
+ "integrity" : "sha512:vO3JC6RVSYiuSDQAp62Vz+vU5fixsPA+qrZRdHsarpFAT7e6SlzUovUDceDl1Du+l/hPqJSUoJfhCTPzvuemKw=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-rs-security-sso-saml",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:BmoulLxX8/Lh88h4u9c6Tya11Zf96CaNdBO9B6kfPYshbaWjza+ZGi3/w50a/K5gm314o7XSKcvpIwB0lSNlig=="
+ "integrity" : "sha512:SL8B8me02hAdVHebbVXgQd0q9hcNVxifCzGi43F0o8/CiMbndazaJ1ZJ3Sbs6TZsoeh3dvxRV4FPC/aVwCNyUA=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-rs-security-xml",
- "version" : "3.5.10",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:cerWCBz6qPxcXlNb2ngVZY7ztlJVHQxBIQ+cS9iQAIeFKNLvGNV2aKZybhXLZWBgbiOiAZXV+MBR2SeSVjhH1g=="
- }, {
- "groupId" : "org.apache.cxf",
- "artifactId" : "cxf-rt-rs-service-description",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:gII7g7D+Wg/wmFMExQOoVRKAgv07i8WzKpMBT2N0VUkYEmKpyaZQSac/wMr5Loy207uGf/82/i6NFFIvGwTUyg=="
+ "integrity" : "sha512:q6sUHsoHc2iBv1whe4WiQA9bPzYngn3XKPDb4eQdNGODa11NWaziF/iwQD1SyED1Dx7pKOFBUtwvb545/YSTDQ=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-rs-sse",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:2X82QICuAKhDok1z2yIvocBpxL39MEFsGoBuZ9Hc8Gyk/saeR4/nAnPKURxfqEywPCgQw2SKQ1csCrM9VB6sRg=="
+ "integrity" : "sha512:cZspDg+//WvPNp4wawfh0ykGOpL1LBx1p7FjFe1TFmKla9BfB8uc8Ij0Oqcl/UF+qjoggELLH/ID/3TRgy1w+A=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-security-saml",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:PXaLtGQXTXSb22+6uWDom0vTlzKEzkbi86zlEF+AgOz9sYMGhXzuEEJFL1fqOiQRn1nu0nmv8yDkAPgQdhiSJg=="
+ "integrity" : "sha512:2XC27GT+HNCazfw/84uALu+aAU3kGPNanPsRJDJJxAQY6KOgUypwKCCj6ZsmYizaBzOIUMJM1f4Xd2ulI3Gwsg=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-security",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:UH2Ob7jZs7aIXKWAiWazR3tCDC27Yhb60xz68gub9ZrVMUbK8xaUMFV7z7RirJIi7LToBJ9wNzZZdfVxeAlmOw=="
+ "integrity" : "sha512:eFDjI9L9VTwH1xVGmZ4VRzdWu9NwN1qd77RDfB4rKpYqF78TbVKBd56n29FTZCLLxx6599UxMlqlQDGQD5iLrw=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-transports-http-hc",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:ntnc1Y6FFpArJANY12wJu2OBYn8wSZIpNFd/mayvuED2L3f9JO3H4J5p2rx7TpYlcp2rSSDxqEa/R6htfYMa9w=="
+ "integrity" : "sha512:G69zhbQzX6VBftfSy4fvHrM1BsRwlmCqXtiDTSsFF89yS5wg2bzTeAd8v8AhH6H5yMwupNdh/eKkI3pcu0cYtA=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-transports-http-jetty",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:zHs9b7AhHUiZufefeS6tCeQF6k/51pFRLEPnNEVJatj1BtpUcxz5z05fEe+QrmaxlYzHttEmv4kv/9Stovze1Q=="
+ "integrity" : "sha512:DuOjpPRKjNl4iyW1+0qXDuHfVo8RGZPundRWrj+M00A7cfQBdnOqyYtDr7O6V8vBbDFGicC6ZbHbmshfl0rDtw=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-transports-http-netty-client",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:O1etyd1vRPfwGrZx92B72Dros+4rxpnWNYxNY8BSxiH7IBTej/Qm1iX90mb7jKktTP8fR4M+JbxMCy4PKx/ceg=="
+ "integrity" : "sha512:hvDR7j66HNu5NS411h1MtwhPMYdSljokCRb0B7qRsFhAHmrDlPBScnrtKmRdZYy0rAr+b1g7pAA8y55i6v9StQ=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-transports-http-netty-server",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:qgHkbPIFlmtx0sLGe8qKoG2fwZLnIwiZfXKsRILru6hQ31kPPZ3C0tz4uQ3DOiIHtP+Nvim151/SVc93qBhBhA=="
+ "integrity" : "sha512:oc1o+XdNKYC8IdcLLAcjXqYyraia8qP8jxJVugMRWUoJnQRKSVsI/9k48fyeSTZ6qDckxgoBDPtaiwu2bmUeyw=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-transports-http-undertow",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:lRAps1/v/54rk1rRBb3VvBySHwtiLKCprnhBM9E29qcRLZMVwvbTSX7E6Z3lzudTw72zacHGGGW/giW/oIP3hw=="
+ "integrity" : "sha512:4Txz8YbZ/0QzK/NnanKt8dwfxpNW02rNyhZrTLjVoi4r0ydccz6sbSELNP1dM+IaBJdHXVa1hMaO7Bdr8g30DQ=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-transports-http",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:KsRHv1qSD+/OkPBgjvBdYiviCuAroXwYogSqejyHd7DTrrvLHKGSD+V4a3y+dXre2Si92QEK8qq0N4qzqlRhWA=="
+ "integrity" : "sha512:yfTvaR5ePcMF8ptjgmmc5QI5P/BWHp/eE2HnMxnVGfdm/aHYuF10aCrU/ECmg3r38SSbzsAgtQ/dx7odTp8pkQ=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-transports-jms",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:3zu8Z+hV/WVICbQ8H6u6GTatHc+uHsN3ZVJuCiEe4sEpVGHWj2tj+oOVc5Y3HqKZxidSI6tfsclpgAxXi6+HUA=="
+ "integrity" : "sha512:1S+ZN6MaQxgLxhCIw0PEXmCGqIzkQCAY35e9Kl8NNvc6sXyYQY4XHhp4GfTCnI++akaeKJueOvwy7aGK4qbmGA=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-transports-local",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:jOlBYl9t4y4SitfQe0yMdPRF4XlEWiWtVDiWnTskSwO2ILFsqYI/bq/yxMy7+cd78B13nVDEXwDgli3E1hHjrw=="
+ "integrity" : "sha512:pVtTNCvOT7YkEMIpTQUe4Z7ThoL2Oxjup5mmdUz1AKl/GxP5N4dFlxFNVxJEj/XN3jTr3FP41amTNxWuzIZMZw=="
+ }, {
+ "groupId" : "org.apache.cxf",
+ "artifactId" : "cxf-rt-transports-udp",
+ "version" : "3.5.11",
+ "scope" : "compile",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:+k/kPxlqkRl4QSXRjBK948rO3LfDr3+lgZ+/G0xb2X4SiJWP+qZzNoOGNNcspAB92nTn5FlQStQiySnMo0HTDw=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-transports-websocket",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:I7sP4cgnOdhP6dcRHAE9DgV4T0X3b0eMF3ldVfHTtqT30QGgKtKxIeSbItXKWo3PvrMjI10xD8+rzUPYR+VHLA=="
+ "integrity" : "sha512:e/ro2vgqJiENLc/+9H82m4kO+v02uKJJQ7kFzG56L0ZY3OT4avlqhhnkDExyv00ZIWsb1H5l32HaoRpuemf8ew=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-ws-addr",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:nr7E+5FZm1DEbz1bNQvzRB8rywcCekdf5cnTj///yiWjuqKYL2bf0Wg7lEtt6PbDmxNYoJv8FI7s9Ofl1JguPg=="
+ "integrity" : "sha512:XufO99R+5z2XBOYyZAmlwEy/MpbmjiXNwBKMYmnTuQz2sNHAt8bv57jx6o1IgHqGXGjZA5phDbREyJUMvkJiCw=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-ws-eventing",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:fMzylqX9QdvusDyMCyIjuq7M2WXCtIIoAqklAZw7v0gGI2Y/b/CPFw3Y9ADv5jVF/dQkVc44LFWdxAHOUWKpXg=="
+ "integrity" : "sha512:tWzS1O99YNYqCkT9So+rdSFPGqzvf03X0uOdAo0DalMOtWjpjSBK7xEJxWUu5jTtNr+i8cKoIyOWBByzpL7c1g=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-ws-mex",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:OCbnmkjsM1YMmUaSjAhuz7B+eShtJCUjdCyDODcUPYiFd8gVJ3ylVjJoa4fODOfmSTRmXOYi2yfmbRIICIrhqA=="
+ "integrity" : "sha512:Gv8OwodMG38D8qipdP3YDCBoGk7A5FJsJ9k3/Y6yHXe2gVvxSMX7BYZwwSX4Hjw3EqLlb1S1NdWAhSQ23vIhKw=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-ws-policy",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:8YLkfz97RR1ODGlE6LFqRTT1zgNtUrukquZNgDxvn3a+YgulbIx6QcAHb9ZPF+WQm56xaG1KRbX7SLJQnSoKvw=="
+ "integrity" : "sha512:TrsG6oVulvqxC9e4uvRc1K6UBjNsR2gptgFnza3czNWcQN4VB06BEXDfIheJQnxaz6iUkQh9NAGDvdIMzGFdHg=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-ws-rm",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:wovj+ztJ+GJJKxy01OnxwluwWcUlVLzv8nR9MlyX7wCmBt/8vELloZh0LX4I4Sp+aogB3s1cHQRLfE1UP7ZILw=="
+ "integrity" : "sha512:MQZYW3pm3VgJHrA+9Wx/YiqT4vEqDaq26L2pdrKLNbXeunAom2ofLJKbQ+XfWbPUlxPl2ipPcCxkbJgqa7P7Ng=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-ws-security",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:QmmQSpYRp1r2Q5bhF3d647BshQgPpVpP/cZ2F+sQBeq5msCOpMKojeh0mHOx+IasH2Fao6S7XHAtiOQIdGqJBg=="
+ "integrity" : "sha512:Evp4MlNrn3H9G59o53rscxlxJDXxRVd15OWkv2rYVVxUxYtOiuml58iUbca8M8seVXluaCdu4+2ByQwBsEK+7g=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-ws-transfer",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:P1mKm2u5ZuRncN0ANc4W84Psn/JhFOdr4kkiqonu6RRb0Qb+UqZ0oJ5yY/q3jF1rNaGbIdx5qgzzn9pRYkKnKQ=="
+ "integrity" : "sha512:NDr03C9F+fXxiY4hWZmZflDjASwFKk01ldYn3ISuP/3T4dkR3WZUkby30KRqNFZm4b03Bs9Nb9giRBAO+8eJqw=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-rt-wsdl",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:offE7mpYv6yfczo1DttudBwn/U97mO8uvjxWVD9Mkhjxl4SeMwipJxa1JZnkQ8fC5O+IJAFwE2/UANGBYb59+g=="
+ "integrity" : "sha512:OUuXclzUK9QcfHY0jGttXGA9D99IknX5Dt6EPLPYzlg6qzbJNWVaWvjy3n/sIj/Xj8+ilHvhbpTZAAOHvsQ17Q=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-tools-common",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:gr+S+AyakKJNroVF+ZVVxECGkFtHXI5zYtxDktB5YZPxeKxgeHAPZPYLxywvj5DSUodCpR04e5czgdFrMWQ4iA=="
+ "integrity" : "sha512:NXuABVMem+e4H7h0D9Gf2t7EBgwwScpoLqLP9WXIO7NLWbJtJiu2mrKHuo2Pzou16T23YtoYZZykQwHPmmDnqg=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-tools-corba",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:Tv+RIdk6Fz+RQvH6n23PIp5/P8wTTNwt1Pq3DZbWflvUTMisjX5/ZDkYQwnD92llebkL+hc/nxzNKJqPBYlFTA=="
+ "integrity" : "sha512:ncYm6yfKPT6MhB2HCuhVEAEou8oxs+xvRp3F8FHnFT7B27+VsUCalxAd4PHUQSOAk0tvQHuhdjTYzeuNhD7Kkg=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-tools-java2ws",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:8xrX4ljShQ/rWEPE2aaYeEujZkE8js3/rvuCSSWA0t1C3oloSbf/FO/vNopRE1yE/lFv+pxPAS4cSFH1Z3KO8Q=="
+ "integrity" : "sha512:FdGG7Unl87fUUm0I89rFILr8ycppFPP1g372bPTynhrbFp/+Ve9Ah8J1WPVsR/qQmmHtveHKN6Og7I4xB10HWg=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-tools-misctools",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:7MJ+yaEXLwlo99hwTMZ+E9/wjoZllbxDZJpKzGt1REgZLPrzAbtW8NkYDiTLwrGOEuFBTWx5bUd62QD9GQBvxw=="
+ "integrity" : "sha512:MWX2MBFnd80wtsKg4T8lyjFvCMyuHI++8Ikn1Ne9SCtTDo3fbzOvTgtEdbd2SSV31d3XCvFOFqd73BwrhsGA0g=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-tools-validator",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:bT5tgBTRA8o3VnlryXND5Y+j0+l/Lo1WXkzw9+cixtNna7DxjNFeyx631Yo1DO2b1K+lq0nGADpQ7rRAlz4nhg=="
+ "integrity" : "sha512:TweqICy+jYqXetHHfGrbaNlsJ5Z4OIpJXzI6MG2/Ztd5h6IPg2Hc7t2RgB7946HNkXUYsScQurkr8CLpmR85Ow=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-tools-wadlto-jaxrs",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:oBe2zUwOf5of+dXM85s4dD12eNcShpQBlyHRY5oQgXZuxw2PMgBQtmKwGJKak0Duh7qZd/dsRUFqKYJfyCwu9A=="
+ "integrity" : "sha512:M+ok2qiIjhbfGRZL+MWgmeCUOusKE4UjzMKrF32hyYm/hCn7VQTI+UMkAL2FusAGoMjMH3IX72Z0NM1c2TG3iw=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-tools-wsdlto-core",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:MbwWQSBRM35s+efRgCO6Ny4TIGPk6BOPEaiyEET2WcazyxlnTAeqFKDmFBcYCz6bskIyVu/B2YP186I7i1uGYA=="
+ "integrity" : "sha512:LnDCN0NMl4Jarru9pap8oiTGdktxxld9i/6UE/T4WTPyONMpRwhOhisoaY0yrw20K16J0GSuXpsaqgB8+sf7NA=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-tools-wsdlto-databinding-jaxb",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:9pOXNDnlz1n3C/TuBfDhfePObTMzUQXWWijJoI40/mF3JeqzJ3ZPDlvYwcgRWs+1hwN9Gq4fs8KY1te1qok+3g=="
+ "integrity" : "sha512:1SZg9IBjFveImIG7kiY9f89tVfrEeDbJUHs9TILgVcKuKb7W2MuZIGQIESRTWmbY9yfkw2g85Vsfc67Va6l4kw=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-tools-wsdlto-frontend-javascript",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:TrORr54YU9VB31H5EwSgmgtMm3xqQR428xb6TQBNU4ofyTPt7CT+nKpfDJyGy1BZncly0oZckQTBnMELbraTcQ=="
+ "integrity" : "sha512:e+WX7smNJPRjKNWCBxvBxuUZp0wZarIG875oyc4YWx5IoPpsPfeoZoTL8difX9RsD5wvNnu8wZcmMfz2BG7Rug=="
}, {
"groupId" : "org.apache.cxf",
"artifactId" : "cxf-tools-wsdlto-frontend-jaxws",
- "version" : "3.5.10",
+ "version" : "3.5.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:d0d1aaMZKYx8HEsu2EB3MSp8UTkZjyRfw3vyIvRNuSaKMRI0kdVaWQtosFaICBS5O78Fb3H8sP3WwTd7sZQntw=="
+ "integrity" : "sha512:89QsXOIoticAKMtIbcB4R66fF4bwoJ8qA0P+HIx1UwAU8XRPyTvbn7FWrr6jZ7S7OHKbeb51bQDO3y4dXn20TA=="
}, {
"groupId" : "org.apache.geronimo.javamail",
"artifactId" : "geronimo-javamail_1.4_mail",
@@ -1913,30 +2099,6 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:pToK7Wki1tHzfnjL3hbyqY29Q/cZgpOpYMdh4sbwrEVncKniHKZN1GCmYS0Lrp002Q7yGkqa6Ale1Gd6C1IJ6w=="
- }, {
- "groupId" : "org.apache.geronimo.specs",
- "artifactId" : "geronimo-activation_1.1_spec",
- "version" : "1.0.2",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:43C4Dcfu8hFLnyMlicutlFAgUqRYiviEDFf06uCQBzF4CBEiUZ+PfuzmfODBBf2551lbXwkVsBuIKYQS9vPmJg=="
- }, {
- "groupId" : "org.apache.geronimo.specs",
- "artifactId" : "geronimo-j2ee-management_1.1_spec",
- "version" : "1.0.1",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:MuOANeepvGPzHKphJCG9wz3blQPjfJe1h0kJJtNYMajjwv7zJKytyaMBqpd6dhs2yUGIpk5T4K7IZBsEohs1lw=="
- }, {
- "groupId" : "org.apache.geronimo.specs",
- "artifactId" : "geronimo-javamail_1.4_spec",
- "version" : "1.6",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:p3fcFHQq/Ur61XrFyXTy5oG9DK9PfDc/UCMMmweEo32tWhPAVRzuTEhBKilys+HBiafBeXFt2h/mnbMQguzrug=="
}, {
"groupId" : "org.apache.geronimo.specs",
"artifactId" : "geronimo-jms_1.1_spec",
@@ -1961,46 +2123,38 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:7hD5Qu2nGZpSKqCDitacm1gRdYC9YBhbTAG/xDkT/UhRVLGz1Dewo2HRvtihiXTIT1vfHLJ+2bwY/jP7pNjx+A=="
- }, {
- "groupId" : "org.apache.geronimo.specs",
- "artifactId" : "geronimo-stax-api_1.0_spec",
- "version" : "1.0.1",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:ow78DCjZaEmZXveuDHUmtMNr2PpHQUl7EIBy4u0yWEFWBWPzrSjE60b5OuZdEAspDptvu3Swomav75lvTPp0/g=="
}, {
"groupId" : "org.apache.geronimo.specs",
"artifactId" : "geronimo-ws-metadata_2.0_spec",
- "version" : "1.1.2",
+ "version" : "1.1.3",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:EbOifT4HKRakfpOXCATN2EL3kQBCKEtBdzcfy2Q0Oar20ZVSe1sq8LohpqbEa+g6kqa9l87uwy3V045xphZYsw=="
+ "integrity" : "sha512:BHeQ6yCarLS6Hxl27qAXYFDXS+/jDDT9F0pKmsngYEpQC/WvJrJfTswR1kTmTu1BNKWuLBlphSUizGdJIL16QQ=="
}, {
"groupId" : "org.apache.httpcomponents.client5",
"artifactId" : "httpclient5",
- "version" : "5.2.1",
+ "version" : "5.4.3",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:D4y8Gyh/Vq+VZVMqpuFqu/jhTOniLWgusVWyT5s244ATBjc7A8uaOtiJY6z/FROPlJ7Ejr6ESRIwpJCnx0Wxiw=="
+ "integrity" : "sha512:5WEJ8MoXRwYxv2litZrYEOsd+3GEiI8gdFdRDI8CMrk3TNBs0Y/dJVZzPJc0KIrpx1aQh7Vp9bwuwToRDUfIxg=="
}, {
"groupId" : "org.apache.httpcomponents.core5",
"artifactId" : "httpcore5-h2",
- "version" : "5.2",
+ "version" : "5.3.4",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:PI69vpMdAU45CitCrq4ew64N7wfFSgwYkn0Nsa/tl4/ZcwRVYCx2kjk7ugKbB73UM1alt3n115soXZ420MRI0Q=="
+ "integrity" : "sha512:/2pv+h9uSXQBF3jqj/tnccUsix7BYff0EffW4OwpiKNs88ljbalWIiqRqB8nGKIVvBdrZ4y275j/RLxs/kuA5w=="
}, {
"groupId" : "org.apache.httpcomponents.core5",
"artifactId" : "httpcore5",
- "version" : "5.2.1",
+ "version" : "5.3.4",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:BmRUqoTjfRCfsZd1cOkTlfgY2XlkG3WPuYTh82LlKOYDGj35ysZ5AUE7kT1y47Kel5oHHlxCpQTH7c3dgSELSQ=="
+ "integrity" : "sha512:qJKzRYufep7g6LIhIWgJlKePcEmM4is8JkYlOIVrfwAOWAevqFPEwP7mOLypFIulsZpJW9kEnaICPwd6EdVnrA=="
}, {
"groupId" : "org.apache.httpcomponents",
"artifactId" : "httpasyncclient",
@@ -2041,6 +2195,14 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:mEHbd3m2R95GaN7Zt56MUQplMHY4T8MFnvGG6l2Cgo4UneSMAWtcuJob6r5gmBQpJlqDJL4xCEc8V693piq9ag=="
+ }, {
+ "groupId" : "org.apache.james",
+ "artifactId" : "apache-mime4j-core",
+ "version" : "0.8.4",
+ "scope" : "compile",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:vzFOw+7PyqAqnyjxmrzG0rMefHTHrVmkAVXneGn7piR1GmZBQmR8Msm+6nrA33hTjFhid5eXydudNxFU2bYrzQ=="
}, {
"groupId" : "org.apache.logging.log4j",
"artifactId" : "log4j-1.2-api",
@@ -2163,44 +2325,36 @@
"integrity" : "sha512:5SF4XZR8rhoCBwsmpD0jW2MZQ5pjZMWCZtP5xFj5oJlAbBCqtfUcXbW6VB6IMiyzUgPGdYtLi7ZflTmjRdqaBA=="
}, {
"groupId" : "org.apache.woden",
- "artifactId" : "woden-api",
- "version" : "1.0M8",
+ "artifactId" : "woden-core",
+ "version" : "1.0M10",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:5ZDKVfvlQScux5zTgxJCq7g2un6cLJkV9DkMY48VLvJMQMoc53U/gqhYQSeGq2E4SJYbfv7X7iss1VZWy65Lwg=="
- }, {
- "groupId" : "org.apache.woden",
- "artifactId" : "woden-impl-dom",
- "version" : "1.0M8",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:pec1koE/wQiliIM8AkFz1OTwNbl1E7wBi3O8FAfPzz789EVLfZxzJP7P/CR3wCPYIR9ThB7hpBHP2t8bYdGD7w=="
+ "integrity" : "sha512:0TQ71yZOm5mOsF+fNk36un5chUANjIggoidr/2dI9leysAaYY0bzWe6XZTq+PEOVfKrlGYz6EGyLQz55SnAh6g=="
}, {
"groupId" : "org.apache.ws.commons.axiom",
"artifactId" : "axiom-api",
- "version" : "1.2.10",
+ "version" : "1.3.0",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:R7ODpB3RE1DZ9DKOOjkC2Tz/U7d9TQdknAhQt0W3xUzXCVxmfksfOTeFeNiCfaGw/DAKPAyIF+lOVguIC4WoEw=="
+ "integrity" : "sha512:Ihh0mdOUmMqJlKvPkaKHOLwUYRbM+U/N1OaVBYZ2T0REtruxx2GGTs7I+BTn2XePDm44n4VO+5bnYW8YAnF+ag=="
}, {
"groupId" : "org.apache.ws.commons.axiom",
"artifactId" : "axiom-dom",
- "version" : "1.2.10",
- "scope" : "compile",
+ "version" : "1.3.0",
+ "scope" : "runtime",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:6zxaRJVLgRVQoXmMSi6UcaJQGTD1cjFDLN6pWOWTz9POo/ew77OFIkrDWftIoBqhQiud5EfoMqo8HiOrRPt6fg=="
+ "integrity" : "sha512:k/MM3Czn+6Kz6tmLHiSjcwLcVLU66AjO307RsJnx/Klmf1vJC22gAO41iah5WDZ/J091tffPRPOnLxrW6dp3pA=="
}, {
"groupId" : "org.apache.ws.commons.axiom",
"artifactId" : "axiom-impl",
- "version" : "1.2.10",
- "scope" : "compile",
+ "version" : "1.3.0",
+ "scope" : "runtime",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:Bq1uk2cXrJiZhvbCK5D9rihPF69n8RVvhVc9phETaviiT0jfLgKt4r5SYdkmrB5Dx3oLWpwXJ9IiWfaxK7+DsA=="
+ "integrity" : "sha512:W5ICTKGViYBP1LW4IA0uxn/cmjRH8IZT7umRTOKJiIKZX2B6gqwjdKaw5/IDuRznfEooIRjXiqB0iW2jWZk/xw=="
}, {
"groupId" : "org.apache.ws.xmlschema",
"artifactId" : "xmlschema-core",
@@ -2276,51 +2430,51 @@
}, {
"groupId" : "org.apache.xmlgraphics",
"artifactId" : "batik-constants",
- "version" : "1.16",
+ "version" : "1.19",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:ewB4ZWlG0wDA0lsk52wWE0waltf9Hd9Rk9tkiu5jgxGsztTi1803UuTW9VrOnasBy4UGUGV7hS+Xa6o1EF682A=="
+ "integrity" : "sha512:o7UACFwo8goiHm7FsnxU+rFAXCOXZaQsUP0tHcTqrrCTu4aIrtPlvpR4o6CgSg2ImQ5DslOzhja1+RAJRpYmkQ=="
}, {
"groupId" : "org.apache.xmlgraphics",
"artifactId" : "batik-css",
- "version" : "1.16",
+ "version" : "1.19",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:fDcexpSXLJt8izBedr+/VUDgqDJku1o+VHD8rNkgPUKTO8n64ko37lo8Syocyg0x1mWYhsWVK6BneW4EcgsO2Q=="
+ "integrity" : "sha512:TCxQmIamkp48Fd7BjS596ZJkYrqAXyIba+jRgLw+4vDeoN60yDyhD9EA+6hjWrVKP5qxfV4n/3ehm/iFvcnqRQ=="
}, {
"groupId" : "org.apache.xmlgraphics",
"artifactId" : "batik-i18n",
- "version" : "1.16",
+ "version" : "1.19",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:HZfoFhNPRAoFZGBmGsAyJ5DgmmozqKf0fVV6n26SUO9XB1gVJm/kuh3qyyOCXnZNKM3lQ0bUMMRehyOCuPAqbw=="
+ "integrity" : "sha512:u+7I9TNrxjHzUx6hEvAY5Wn8/biZfwHyvwta97xWWCVfY6DhQElrwnHA3TKeOL+lNUJUrX7vTao2bdLu6JHv3A=="
}, {
"groupId" : "org.apache.xmlgraphics",
"artifactId" : "batik-shared-resources",
- "version" : "1.16",
+ "version" : "1.19",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:8BGjRiWCjM6j02qqO4thfjiSXU/Wnsv/y4vEXeIiH79E0bjFLX5JyE+cLdSxMGeHxVn+kkUACW5YjtbAImI58Q=="
+ "integrity" : "sha512:igW4quCOkTqYNrDz5Vunn6CluMkYUHA4avR7DngkVVWTrVVwiPxNYMnNqo2L6SQIgusbxUhBN7iYggAulqeKPQ=="
}, {
"groupId" : "org.apache.xmlgraphics",
"artifactId" : "batik-util",
- "version" : "1.16",
+ "version" : "1.19",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:ORnVPAJ1RROcT7mIcPO8ZY/DT59AEP9QulwGewBEVZKXe3E9WaCIB/qjegWRfnULRmIc0YqIVoCqwsHmJL9koA=="
+ "integrity" : "sha512:XdBsiVHZ7H2zEuPUdT94HHP2heN7pP/3iinShH+JJ7hsGdYjtnCrwT/O4zwYkGZOU0x5C5feVuBswheCHPUEqA=="
}, {
"groupId" : "org.apache.xmlgraphics",
"artifactId" : "xmlgraphics-commons",
- "version" : "2.7",
+ "version" : "2.11",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:X+qiJyIlsP7TYy4GtEfDENo2UxknwAyoM783sdBJC1zCz+nQbuJtYencXpfmo6mup/GDElWlu9Y7wVL0lQ7OMw=="
+ "integrity" : "sha512:WfdHiP4J9vkf3NogVylOHrdy6zL0DO4HtIELxMsa39oVUrt6+gfFbb17xzdp77vPD4BtikWrpigV1GXC79RNeg=="
}, {
"groupId" : "org.aspectj",
"artifactId" : "aspectjweaver",
@@ -2329,6 +2483,14 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:SQ/PI4SGhI4ny+1F/UN2Exk8nol0iggY+1Mq7VwhOqsmJNFI7Z/VgIDGk02l9+wSxk5Atku0bRbjYetAQ5PFug=="
+ }, {
+ "groupId" : "org.assertj",
+ "artifactId" : "assertj-core",
+ "version" : "3.27.3",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:RqjBPdfO3l0O79NZseN0hUmRjPiDFJNA0dykzmwckOlOOA5V0U4EQ7g0ek7wAT3nmr3+P52Ebpe++uYU/qHAjg=="
}, {
"groupId" : "org.bouncycastle",
"artifactId" : "bcpkix-jdk18on",
@@ -2353,6 +2515,14 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:ajOMUNZimTyfALuiP5hEPJI7mpX/YdxlOQb1GFf4r67MV6U2v69oSKyOfpzgoh+E7AaIFYUyYSaPl+lRUmvHZg=="
+ }, {
+ "groupId" : "org.brotli",
+ "artifactId" : "dec",
+ "version" : "0.1.2",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:1M0rM/fDWAEv8B22oT6/4egFGlgGmL/82ULEdFEBLPU85JpACxyL91ArAeYx1518ZBcgKhRWIlctef0UXM3mGg=="
}, {
"groupId" : "org.ccil.cowan.tagsoup",
"artifactId" : "tagsoup",
@@ -2393,14 +2563,6 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:AO/F1NF1QPsYDFsg1FZjCosyYt/0ZnZomukWuhbw+9mxpxx7rfslT6rWWX+U/tHtuW93wV9AF46vTYzTXOpejQ=="
- }, {
- "groupId" : "org.codehaus.woodstox",
- "artifactId" : "wstx-asl",
- "version" : "3.2.9",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:ctYwG2wMHiZjSIbVXuBWPpWcw6vfk84FEnn0FhzgPF0Jl0TW5FLlFjYIgjH7espZKezzGagUTzGKS27lmz/71Q=="
}, {
"groupId" : "org.cryptacular",
"artifactId" : "cryptacular",
@@ -2428,51 +2590,35 @@
}, {
"groupId" : "org.eclipse.jetty",
"artifactId" : "jetty-continuation",
- "version" : "9.4.56.v20240826",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:BeK2ewHQojeps4XwYk5mW3YBOcTADpFXgmtNlUQ/msmGQQnyP75ny/HX1op9qLqtfWPtskUaB52Lq+Rud7Imiw=="
- }, {
- "groupId" : "org.eclipse.jetty",
- "artifactId" : "jetty-http",
- "version" : "9.4.56.v20240826",
+ "version" : "9.4.57.v20241219",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:SNVRLTeNWMPfk7vhxo1aSwl+LcdGaZI5PgcxQU3A/kSTEuBn0IdOUD3SfLm2ofLaDR8Vaae0hMHxK9Uzr74nIw=="
+ "integrity" : "sha512:cKuvvl0OeNUhdsWBbLKd4Fq9SsA9WVap4cVUh5FLHtUuHVGroMCQsu00PBQoWuNsW3KiMG0KFRqjrktvo8TRCQ=="
}, {
"groupId" : "org.eclipse.jetty",
"artifactId" : "jetty-io",
- "version" : "9.4.56.v20240826",
+ "version" : "9.4.57.v20241219",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:duw/70CkRKehnEjQSms9KugcCoboqnWh0/9rpKsNnFA0YkS1AuGl3kECBreUp0UiGYNMgIaOrAfnbYNqk8tMFA=="
+ "integrity" : "sha512:K6JuwuiTRiuJSaMM0Eaqbg+cLdoW9wEazJLLYzuX92wxSy5uutLYYeA1zudAF/YzsPfujFFlDqsNo0dv0odHYg=="
}, {
"groupId" : "org.eclipse.jetty",
"artifactId" : "jetty-security",
- "version" : "9.4.56.v20240826",
+ "version" : "9.4.57.v20241219",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:h02zYsv+jmgGd21ea7uHDqDOfZJLAsase9UqOKjdvBQD+kRhLve8Pc0sWYrZ2JzpJpjJVc0XFXuRA/WSGd8Xqw=="
- }, {
- "groupId" : "org.eclipse.jetty",
- "artifactId" : "jetty-server",
- "version" : "9.4.56.v20240826",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:3A0fBaf4R34ff1etswciSq3LHh/tb35d9y2bhEN791J2w7DxPanQecVBrZRgG9vXMUxhR3siTbvck6bVufmEeA=="
+ "integrity" : "sha512:HB/s9ab0QDaKnyS2hgOocXoxXo/NDL2l0swD9aCkRQpXH/wo7qHyGitFLmwRNajlNGc7gLWFSl2BfbeAv73G0w=="
}, {
"groupId" : "org.eclipse.jetty",
"artifactId" : "jetty-util",
- "version" : "9.4.56.v20240826",
+ "version" : "9.4.57.v20241219",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:AldRxFzYoj8bQ26qGEmvJCH3iiqCvAfEF134tOxd/BUkcDYZQVaJeq+4sOyDQGu6ol5Akv6l3dO5ANoP/fquGQ=="
+ "integrity" : "sha512:cSttnJOWjLLcFg2d8KIiQ5qujBMLZt+uQi0paM4Gsd4YLHCOhLPJpXCPtMceMVqW2uEJ2prWTgsfHCcZRCqTbA=="
}, {
"groupId" : "org.eclipse.microprofile.rest.client",
"artifactId" : "microprofile-rest-client-api",
@@ -2537,14 +2683,6 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:sd9RhnzTJFCpDSfqG5EyLPBMhjfhovWskN3zZM/AZhwerMPW8ZxFWpQefx6ZyVwGExOg5IDsDOzIVa4PfQ0JlQ=="
- }, {
- "groupId" : "org.fusesource.hawtbuf",
- "artifactId" : "hawtbuf",
- "version" : "1.11",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:OWlmrfPoy6Cf91KXkV1Bump8YMMnV13/8VP2YXobyv/0oawLqhnZO03cq1EcXiOm/ZWq30XlXiBXcA2juJka8A=="
}, {
"groupId" : "org.glassfish.external",
"artifactId" : "management-api",
@@ -2569,6 +2707,54 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:xWD/Xo8z0SVeHBpcsQyw8tqYQxYGPnG7FhSMuyLKvRj6ZNnWLdO9TumZmKL1NmVAOhM60ynMmie/He4X6bwvLg=="
+ }, {
+ "groupId" : "org.glassfish.hk2.external",
+ "artifactId" : "aopalliance-repackaged",
+ "version" : "2.6.1",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:LZ5TlbqIf6W7aoIJtzEpLUQPXB2y/Mr1bEGx8dn3dHM9ooqoubdp52X+YvNkDXvLLPYUDwBEqLV26eRRRAOMRg=="
+ }, {
+ "groupId" : "org.glassfish.hk2.external",
+ "artifactId" : "jakarta.inject",
+ "version" : "2.6.1",
+ "scope" : "compile",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:f8gZatnuA6gx3/+FyUXkFsOQYHGnqo6/ari3AI3+wK3MwfHcpT7WdorFZ2zUs8Q0cWdPl/9z4fYfWkJ6rtaOBQ=="
+ }, {
+ "groupId" : "org.glassfish.hk2",
+ "artifactId" : "hk2-api",
+ "version" : "2.6.1",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:mr6feNf2yAW2x7UVV5Iw5fpXOrvNgYvtVgaAgNZFhgji6Z1ZN+uVnPHk9M/cT3kAWd/BIxMTzY8wqu+/UY6xxw=="
+ }, {
+ "groupId" : "org.glassfish.hk2",
+ "artifactId" : "hk2-locator",
+ "version" : "2.6.1",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:4sh6Jl8RQEL0wEOX20rcpykf1o4I6XEpV2zrYDKHtXzPWwPQwoVyfruM1/iACSgL3qtCVEddWdoaxBule3zeyw=="
+ }, {
+ "groupId" : "org.glassfish.hk2",
+ "artifactId" : "hk2-utils",
+ "version" : "2.6.1",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:jafNiN5FJwsfz9LEca4JKzlyr3im4OzHbtSsELa9ZxLSpTi9FjpFfyHOpOflxS9UcQj0Sqp5HtD9Bp9pfxKCwQ=="
+ }, {
+ "groupId" : "org.glassfish.hk2",
+ "artifactId" : "osgi-resource-locator",
+ "version" : "1.0.3",
+ "scope" : "compile",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:TYSYOpsccvWGYbV2x4ykVqIQZgLCrSEc1+ctlEZMh3QXOzSjVinFB8fITJgvHeDJv0g1JFjoSAvl+HTSDW5pow=="
}, {
"groupId" : "org.glassfish.jaxb",
"artifactId" : "codemodel",
@@ -2609,6 +2795,38 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:0zlZlzBD+BthlpEUF9Vz2Zx4P9NSs0BcQlT7BsfgE6OuXXJVXy509ABB/kbZlE6cNX7aWs/HsWaunJP7vI1AeQ=="
+ }, {
+ "groupId" : "org.glassfish.jersey.connectors",
+ "artifactId" : "jersey-apache-connector",
+ "version" : "2.30.1",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:62Y6UlayfEPKldnYi+0crfLcf3eYG7QJdV2My6jLGdXE4ktVNmRzPEZtwrDEe37ofKMtzt6goAnkvjQpAgT0UQ=="
+ }, {
+ "groupId" : "org.glassfish.jersey.core",
+ "artifactId" : "jersey-client",
+ "version" : "2.39.1",
+ "scope" : "compile",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:mx3Tu956gGC5NjSKHe7GoWFI4sbt4mRGkCifBXp8QkR1Aq11eCRTFtVtuXVJ8eAvPx+7vIAhz1IrSVzfPm6wLA=="
+ }, {
+ "groupId" : "org.glassfish.jersey.core",
+ "artifactId" : "jersey-common",
+ "version" : "2.39.1",
+ "scope" : "compile",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:1VQyCuenEhBJ1maqRbHkelbY2F2+O/YhMlUEw4o77ajnbtgiB6YJoABwOr+OLd95o3m3xHR6qTjjxDNuX2uBMQ=="
+ }, {
+ "groupId" : "org.glassfish.jersey.inject",
+ "artifactId" : "jersey-hk2",
+ "version" : "2.30.1",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:BHKy7lFCIkdgR0cb1Fy/Rap16ATTUrJjxGkJgbYTNVtzaHRhCFA6m2B422nutJK0U4wIPXK8h6sGhQflHygemQ=="
}, {
"groupId" : "org.glassfish.pfl",
"artifactId" : "pfl-basic",
@@ -2652,11 +2870,11 @@
}, {
"groupId" : "org.htmlunit",
"artifactId" : "neko-htmlunit",
- "version" : "3.1.0",
+ "version" : "4.11.0",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:1nGztVWOsINCGXpp/BSq1LTH1ZnuTm45/aiLTUxa2tLT1Wanci6X4Uaa5LvISvQW7MCAGPI78Zy+vlQx2ELqsA=="
+ "integrity" : "sha512:uvQRoPYBGX/YDS57pgUsqYeRiZY4O8F2k+ewX+WHFxyub3b/nBU4MESZ5SgRkoAK7kkcCeJXH+wf34mboHBesA=="
}, {
"groupId" : "org.jasypt",
"artifactId" : "jasypt",
@@ -2716,11 +2934,11 @@
}, {
"groupId" : "org.jboss.threads",
"artifactId" : "jboss-threads",
- "version" : "3.1.0.Final",
+ "version" : "2.3.6.Final",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:EtK0xsT3MqS5Q3rm6JMIeYGqLYKcm61wic1MsQvM1xBeE29pTkOjblvyNMqBKUEX/Z9qB3lfd8D4DY90jI+lKQ=="
+ "integrity" : "sha512:ljQ/5Jn5e/iNhwpyfNpE9bls/PYpqfH2Sjmov22UBvenGVwRGMVL+W7kDHGekGf+bW5/8MkwumM9mOuNJ/rBIQ=="
}, {
"groupId" : "org.jboss.xnio",
"artifactId" : "xnio-api",
@@ -2747,52 +2965,20 @@
"integrity" : "sha512:Y1ZCWCcB9q4m35HjnVv9k0XEwhnac+caJ/R0CkwMeXD1LO9me7nMTdCMJtmwRH7gA8nlbV7eaIcJdjVsL8xKXA=="
}, {
"groupId" : "org.jdom",
- "artifactId" : "jdom",
- "version" : "1.1",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:mfErkInCqB1iGjVFegIEyd1OqZiMonNr5sWs0AzG3AWGW59kOrAnEy1YwiWW9s3QOpl39yPM/QUTS24CxkIO9w=="
- }, {
- "groupId" : "org.jetbrains.kotlin",
- "artifactId" : "kotlin-stdlib-common",
- "version" : "1.5.0",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:Oe+VYYdOcZi8is82S7CQmnfVX953TsSgmLaTmj+uP+rvkOyvnsl1DzrFgQPouKPYODY8+r3VGQZCxE25k1MJOg=="
- }, {
- "groupId" : "org.jetbrains.kotlin",
- "artifactId" : "kotlin-stdlib-jdk7",
- "version" : "1.5.0",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:o/m17gNIaU8wE/k2Cqt6JnXp/qgIjIxRbGY1dRak020m2kni/7NdjKNIiKh9fC5qwbPGoFqM298x232IpQqmPA=="
- }, {
- "groupId" : "org.jetbrains.kotlin",
- "artifactId" : "kotlin-stdlib-jdk8",
- "version" : "1.5.0",
+ "artifactId" : "jdom2",
+ "version" : "2.0.6.1",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:isXIwZJx/CcX0c3FJDc/tw+mhnzJkWF/ezgCro7hgy4f2PEN9xdqdxvdNR+Ah+rzIfGXv/8f+L5KEJNOxP7uLw=="
- }, {
- "groupId" : "org.jetbrains.kotlin",
- "artifactId" : "kotlin-stdlib",
- "version" : "1.5.0",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:Na34MswP8okuYJ6nbF7FceLgrI3r7l1LfttnkrgLjuQ5X8FILx6cpbLFkqwX8O4MfyDU720kb879u39c3CAX8w=="
+ "integrity" : "sha512:gWQtt2NY+/Ex3+nC8dnCgPwjtr/eahai022sxJChoq9OD7Srtc14AFcYux0VikL9aDTNK/5hbsWWJd8BlR8keA=="
}, {
"groupId" : "org.jetbrains",
"artifactId" : "annotations",
- "version" : "13.0",
+ "version" : "24.1.0",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:ViLQ/+QQ5ycuK7n64QBsrt64bQxi0tnzkpo7PNze8ZYyGPzwzt6C6V759No+1KFz+gVe5uQDiIY3YYHgQj4C/w=="
+ "integrity" : "sha512:ZjOVqIVWHMl+7UEcZ7SWwG7JpUkGGFqHHeh0O/U+khUvS8fCoBGLfzz+hcwKbECKxtWJg5uNJchRY3+FiAMx8g=="
}, {
"groupId" : "org.jfree",
"artifactId" : "jcommon",
@@ -2972,11 +3158,11 @@
}, {
"groupId" : "org.owasp.antisamy",
"artifactId" : "antisamy",
- "version" : "1.7.3",
+ "version" : "1.7.8",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:hVWd29bZLHhx77BmPuzINQGEjyRQC58CSIaBXzDyvxtGj057kW4STOksu/1A2jnopqyg2Jba96Z2KXnR0zp8eg=="
+ "integrity" : "sha512:W/U79yPgCd0dlR3EZodKAOG+m8PjZn34fwrY+RNVBB99MkEy3qpw+/AL0cSLQmWnfuKG0BgzCY9OP561hxKeCQ=="
}, {
"groupId" : "org.owasp.encoder",
"artifactId" : "encoder-jsp",
@@ -2996,11 +3182,11 @@
}, {
"groupId" : "org.owasp.esapi",
"artifactId" : "esapi",
- "version" : "2.5.2.0",
+ "version" : "2.6.2.0",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:qC1cnoxUpSR3nsdSnzNlPFYX6LZkGAeEbmwMt7oMkZioePRJ4jsGt8pnOVFYjvvajxzqLFxkvvwQGWRV66ogZg=="
+ "integrity" : "sha512:IYmTKMz5p1XaIXl93wsDz9mUBGrxXIn1SSGjnXkoNxBpBTOi2uyxh25ZzOsfmbSUmwzsW3S16w6jD4ucatJLbg=="
}, {
"groupId" : "org.owasp",
"artifactId" : "csrfguard",
@@ -3017,14 +3203,6 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:E5L7Ktczeq/CRP00N0GKdeXTDEqmOWB4IE/le2CUYgeOfCAjw8FBfN2XhIZg8oiV/xgo1ZMutvnYd4xTmku5bA=="
- }, {
- "groupId" : "org.rauschig",
- "artifactId" : "jarchivelib",
- "version" : "1.0.0",
- "scope" : "test",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:91iY5nZu6PamgM0w8hXoXr8X5/AoPzfU4siEKybIwVgZmyg9V0jZtycSnDlqmv9qsrr5D0sL3fXKhXEYC5lApw=="
}, {
"groupId" : "org.reactivestreams",
"artifactId" : "reactive-streams",
@@ -3033,6 +3211,14 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:zatr0VbzkQbNa7/UffH0sKidxKooxowx7xKkYxk8aIiX5BXwG41/DUh7Dmtb0vGQRL+GBXBLAk8m1qofT5okcQ=="
+ }, {
+ "groupId" : "org.rnorth.duct-tape",
+ "artifactId" : "duct-tape",
+ "version" : "1.0.8",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:0KBBoObrJrkvFVQDjcFpqH/PCpNUl7ULk8E9eN3omsJjObRaDWml6Nzwdt6g0Yfb6Bzfl6BF8JLQk2cX2OCMMA=="
}, {
"groupId" : "org.seleniumhq.selenium",
"artifactId" : "selenium-api",
@@ -3129,6 +3315,14 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:mj5522ZmpglqMCG7Lh2RjzD1idjeUda2APjr2SUVpRCuLY+HkZzC36g2XWTxAZTKyN+g+5UBYO7w6doG9squuQ=="
+ }, {
+ "groupId" : "org.slf4j",
+ "artifactId" : "slf4j-jdk14",
+ "version" : "1.7.35",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:SqZrxhSvks0pizSZMT2krdAeQEp98W+31//8He8I3r7UTU6JWhukLFTiZ3hx4pVTYasknm+HIwMDHXkJrfX1UQ=="
}, {
"groupId" : "org.springframework.integration",
"artifactId" : "spring-integration-core",
@@ -3305,6 +3499,14 @@
"type" : "jar",
"optional" : false,
"integrity" : "sha512:urXSaGh82l/2WmfYVYvI1IqWhqtdqK5eswgADAFXxqnjoq2uGRQcS9o8HynmpvtcVgnhk+Y8n0W5qAP9SEvdRg=="
+ }, {
+ "groupId" : "org.testcontainers",
+ "artifactId" : "testcontainers",
+ "version" : "1.19.1",
+ "scope" : "test",
+ "type" : "jar",
+ "optional" : false,
+ "integrity" : "sha512:vVIiRiqw+UAAb9yOyVJAVWBa8UUfYE4TwdblJkKlEuuUxEwoz3+CDgBU0vFcF9vjVZKY3oD2esGyKyxeNNXufA=="
}, {
"groupId" : "org.testng",
"artifactId" : "testng",
@@ -3388,19 +3590,11 @@
}, {
"groupId" : "wsdl4j",
"artifactId" : "wsdl4j",
- "version" : "1.6.2",
- "scope" : "compile",
- "type" : "jar",
- "optional" : false,
- "integrity" : "sha512:CjGeJ3/gmXveK0lHggrqcI8mG9LW/UDz7I3gNYpuI2HXCMbssNzuooF64WT7RjFlv29+oj/s5eO+xg2kfox3Xg=="
- }, {
- "groupId" : "xalan",
- "artifactId" : "xalan",
- "version" : "2.7.0",
+ "version" : "1.6.3",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:KeESXxI/8/YF3nS4Zr6ADnilRIYJvWLx9qPfE7x2aKN601k2t/jw6HtgghsS6/yG+liO6XIgS9d3LVuwd7Qphw=="
+ "integrity" : "sha512:N3k2Pv5LfPI7/Gg4jzxrUQXe25GSCA8URTT8rMincBT58+s64ZJzRKJnNkwk3u3r8l4wb4DfwpOFGXNoXMWMUg=="
}, {
"groupId" : "xerces",
"artifactId" : "xercesImpl",
@@ -3444,11 +3638,11 @@
}, {
"groupId" : "xom",
"artifactId" : "xom",
- "version" : "1.3.8",
+ "version" : "1.3.9",
"scope" : "compile",
"type" : "jar",
"optional" : false,
- "integrity" : "sha512:ytL5gUndKlb4uXuUX//ap1MFB6stdaGRCf+jyHRbiw5byQ+pLbUYt897ynBfaaMgte+7XYTDIUGPmBPMvf3IfA=="
+ "integrity" : "sha512:MfPKWjrFEDVNfION2VnHtUvm6MC60SLG4OazZgrOt6kYhYeT6hsQ08o2NWqudIHQcipDISgPf3QllrKptqJ89A=="
}, {
"groupId" : "zxing",
"artifactId" : "zxing-core",
diff --git a/pom.xml b/pom.xml
index 1e744f0ccf3..00cecd2f8b0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,9 +29,9 @@
2.0.17
- 5.4.0
+ 6.4.0
- 3.5.10
+ 3.5.11
@@ -63,22 +63,22 @@
-
-
- javax.xml.bind
- jaxb-api
- 2.3.1
-
-
- org.glassfish.jaxb
- jaxb-runtime
- 2.3.9
-
-
- org.glassfish.jaxb
- jaxb-core
- 2.3.0.1
-
+
+
+ javax.xml.bind
+ jaxb-api
+ 2.3.1
+
+
+ org.glassfish.jaxb
+ jaxb-runtime
+ 2.3.9
+
+
+ org.glassfish.jaxb
+ jaxb-core
+ 2.3.0.1
+
org.springframework
@@ -195,11 +195,24 @@
${slf4j.version}
+
+
+ commons-lang
+ commons-lang
+ 2.4
+
commons-validator
commons-validator
1.9.0
+
+
+
+ commons-beanutils
+ commons-beanutils
+
+
commons-io
@@ -209,7 +222,7 @@
commons-fileupload
commons-fileupload
- 1.5
+ 1.6.0
commons-collections
@@ -221,12 +234,19 @@
commons-digester
commons-digester
1.8
+
+
+
+ commons-beanutils
+ commons-beanutils
+
+
commons-codec
commons-codec
- 1.18.0
+ 1.18.0
org.apache.commons
@@ -236,7 +256,34 @@
org.apache.commons
commons-lang3
- 3.17.0
+ 3.18.0
+
+
+
+
+ commons-beanutils
+ commons-beanutils
+ 1.11.0
+
+
+
+
+ commons-net
+ commons-net
+ 3.11.1
+
+
+
+
+
+ org.apache.httpcomponents
+ httpclient
+ 4.5.14
+
+
+ org.apache.httpcomponents
+ httpmime
+ 4.5.6
@@ -265,6 +312,22 @@
ca.uhn.hapi
hapi-base
1.0.1
+
+
+
+ xalan
+ xalan
+
+
+
+ org.jdom
+ jdom
+
+
+ commons-lang
+ commons-lang
+
+
ca.uhn.hapi
@@ -302,6 +365,14 @@
1.0.1
+
+
+
+ org.jdom
+ jdom2
+ 2.0.6.1
+
+
org.springframework
@@ -328,6 +399,13 @@
org.springframework.integration
spring-integration-ftp
5.3.10.RELEASE
+
+
+
+ commons-net
+ commons-net
+
+
org.springframework.integration
@@ -350,6 +428,12 @@
spring-aop
5.3.39
+
+
+ org.springframework.security
+ spring-security-crypto
+ 5.8.16
+
com.onelogin
@@ -362,13 +446,14 @@
-
+
commons-dbcp
commons-dbcp
1.4
+
com.mysql
@@ -458,6 +543,17 @@
json-lib
2.4
jdk15
+
+
+
+ commons-beanutils
+ commons-beanutils
+
+
+ commons-lang
+ commons-lang
+
+
@@ -508,6 +604,11 @@
com.fasterxml.jackson.core
jackson-annotations
+
+
+ commons-beanutils
+ commons-beanutils
+
@@ -577,18 +678,6 @@
3.1.0
-
-
- org.apache.httpcomponents
- httpclient
- 4.5.14
-
-
- org.apache.httpcomponents
- httpmime
- 4.5.6
-
-
org.quartz-scheduler
@@ -688,6 +777,15 @@
org.slf4j
slf4j-log4j12
+
+
+ commons-beanutils
+ commons-beanutils
+
+
+ commons-lang
+ commons-lang
+
@@ -756,28 +854,31 @@
1.78.1
-
-
- org.springframework.security
- spring-security-crypto
- 5.8.16
-
+
+
+
+ org.glassfish.jersey.core
+ jersey-client
+ 2.39.1
+
-
+
org.apache.axis2
axis2
- 1.5.4
+ 1.8.0
+ pom
org.apache.axis2
axis2-transport-http
- 1.5.4
+ 1.8.0
org.apache.ws.commons.schema
@@ -787,8 +888,27 @@
org.apache.neethi
neethi
+
+
+ org.apache.ant
+ ant
+
+
+
+ org.apache.axis2
+ axis2-adb
+ 1.8.0
+
+
+
+
+
+ org.apache.ant
+ ant
+ 1.10.15
+
@@ -825,6 +945,11 @@
org.apache.struts
struts-tiles
+
+
+ commons-beanutils
+ commons-beanutils
+
@@ -878,9 +1003,60 @@
com.fasterxml.woodstox
woodstox-core
+
+
+ org.eclipse.jetty
+ jetty-server
+
+
+ org.eclipse.jetty
+ jetty-http
+
+
+ io.undertow
+ undertow-core
+
+
+ io.netty
+ netty-common
+
+
+ io.netty
+ netty-handler
+
+
+
+ org.codehaus.jettison
+ jettison
+
+
+
+ org.apache.mina
+ mina-core
+
+
+ org.apache.activemq
+ activemq-openwire-legacy
+
+
+ org.apache.activemq
+ activemq-client
+
+
+ org.apache.cxf
+ cxf-rt-rs-security-jose
+
org.apache.cxf
- cxf-rt-transports-udp
+ cxf-rt-rs-service-description
+
+
+ org.apache.cxf
+ cxf-rt-management
@@ -980,13 +1156,21 @@
+
+
org.owasp.esapi
esapi
- 2.5.2.0
+ 2.6.2.0
+
+
+ commons-lang
+ commons-lang
+
+
-
+
com.medseek.clinical.service
SSOClinicalConnect
@@ -1012,6 +1196,28 @@
commons-exec
1.3
+
+
+
+ org.codehaus.jettison
+ jettison
+ 1.5.4
+
+
+
+
+
+ org.dom4j
+ dom4j
+ 2.1.4
+
+
+
+ org.jetbrains
+ annotations
+ 24.1.0
+ compile
+
@@ -1021,14 +1227,28 @@
selenium-java
3.141.59
test
+
+
+
+ com.squareup.okio
+ okio
+
+
io.github.bonigarcia
webdrivermanager
- 3.8.1
- test
+ 6.1.0
+ test
+
+
+
+ io.netty
+ netty-common
+
+
@@ -1099,12 +1319,33 @@
jaxws-ri
2.3.3
pom
+
+
+
+ com.fasterxml.woodstox
+ woodstox-core
+
+
javax.annotation
javax.annotation-api
1.3.2
+
+
+ javax.servlet.jsp
+ javax.servlet.jsp-api
+ 2.3.3
+ provided
+
+
+
+
+ com.sun.xml.bind
+ jaxb-impl
+ 2.3.3
+
javax.servlet
jstl
diff --git a/src/main/java/ca/openosp/openo/billings/ca/bc/Teleplan/TeleplanAPI.java b/src/main/java/ca/openosp/openo/billings/ca/bc/Teleplan/TeleplanAPI.java
index 52a8d425be4..c1762ba5b3b 100644
--- a/src/main/java/ca/openosp/openo/billings/ca/bc/Teleplan/TeleplanAPI.java
+++ b/src/main/java/ca/openosp/openo/billings/ca/bc/Teleplan/TeleplanAPI.java
@@ -29,17 +29,26 @@
import java.io.File;
import java.io.FileNotFoundException;
import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.impl.client.BasicCookieStore;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.client.entity.UrlEncodedFormEntity;
+import org.apache.http.entity.mime.MultipartEntityBuilder;
+import org.apache.http.message.BasicNameValuePair;
+import org.apache.http.NameValuePair;
+import org.apache.http.impl.cookie.BasicClientCookie;
+import org.apache.http.client.protocol.HttpClientContext;
+import org.apache.http.client.config.CookieSpecs;
+import org.apache.http.client.config.RequestConfig;
+import org.apache.http.entity.ContentType;
-import org.apache.commons.httpclient.Cookie;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpState;
-import org.apache.commons.httpclient.NameValuePair;
-import org.apache.commons.httpclient.cookie.CookiePolicy;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.multipart.FilePart;
-import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;
-import org.apache.commons.httpclient.methods.multipart.Part;
-import org.apache.commons.httpclient.methods.multipart.StringPart;
import org.apache.logging.log4j.Logger;
import ca.openosp.openo.utility.MiscUtils;
@@ -67,7 +76,8 @@ public class TeleplanAPI {
//public String CONTACT_URL = "https://tlpt2.moh.hnet.bc.ca/TeleplanBroker";
public String CONTACT_URL = "https://teleplan.hnet.bc.ca/TeleplanBroker";
- HttpClient httpclient = null;
+ private CloseableHttpClient httpclient = null;
+ private HttpClientContext httpContext = null;
/**
* Creates a new instance of TeleplanAPI
@@ -81,69 +91,79 @@ public TeleplanAPI(String username, String password) {
}
-
private void getClient() {
CONTACT_URL = OscarProperties.getInstance().getProperty("TELEPLAN_URL", CONTACT_URL);
- HttpState initialState = new HttpState();
- // Initial set of cookies can be retrieved from persistent storage and
- // re-created, using a persistence mechanism of choice,
- Cookie mycookie = new Cookie("moh.hnet.bc.ca", "mycookie", "stuff", "/", null, false); // and then added to your HTTP state instance
- initialState.addCookie(mycookie);
-
- // Get HTTP client instance
- //HttpClientParams hcParams = new HttpClientParams();
- //hcParams.setParameter("User-Agent","TeleplanPerl 1.0");
-
- httpclient = new HttpClient(); //hcParams);
- httpclient.getHttpConnectionManager().getParams().setConnectionTimeout(30000);
- httpclient.setState(initialState);
-
- httpclient.getParams().setCookiePolicy(CookiePolicy.RFC_2109);
- httpclient.getParams().setParameter("User-Agent", "TeleplanPerl 1.0");
+ BasicCookieStore cookieStore = new BasicCookieStore();
+ BasicClientCookie cookie = new BasicClientCookie("mycookie", "stuff");
+ cookie.setDomain("moh.hnet.bc.ca");
+ cookie.setPath("/");
+ cookieStore.addCookie(cookie);
+
+ httpContext = HttpClientContext.create();
+ httpContext.setCookieStore(cookieStore);
+
+ RequestConfig requestConfig = RequestConfig.custom()
+ .setConnectTimeout(30_000)
+ .setCookieSpec(CookieSpecs.STANDARD)
+ .build();
+
+ httpclient = HttpClients.custom()
+ .setDefaultCookieStore(cookieStore)
+ .setDefaultRequestConfig(requestConfig)
+ .setUserAgent("TeleplanPerl 1.0")
+ .build();
}
- private TeleplanResponse processRequest(String url, NameValuePair[] data) {
+ private TeleplanResponse processRequest(String url, List data) {
TeleplanResponse tr = null;
try {
- PostMethod post = new PostMethod(url);
- post.setRequestBody(data);
- httpclient.executeMethod(post);
-
- InputStream in = post.getResponseBodyAsStream();
- log.debug("INPUT STREAM " + in + "\n");
-
- tr = new TeleplanResponse();
- tr.processResponseStream(in);
- TeleplanResponseDAO trDAO = new TeleplanResponseDAO();
- trDAO.save(tr);
+ HttpPost post = new HttpPost(url);
+ post.setEntity(new UrlEncodedFormEntity(data, "UTF-8"));
+ try (CloseableHttpResponse response = httpclient.execute(post)) {
+ InputStream in = response.getEntity().getContent();
+ tr = new TeleplanResponse();
+ tr.processResponseStream(in);
+ TeleplanResponseDAO trDAO = new TeleplanResponseDAO();
+ trDAO.save(tr);
+ }
} catch (Exception e) {
MiscUtils.getLogger().error("Error", e);
}
return tr;
- //display(in);
}
- private TeleplanResponse processRequest(String url, Part[] parts) {
+ private TeleplanResponse processRequest(String url, Map parts) {
TeleplanResponse tr = null;
try {
- PostMethod filePost = new PostMethod(url);
- filePost.setRequestEntity(new MultipartRequestEntity(parts, filePost.getParams()));
- httpclient.executeMethod(filePost);
-
- InputStream in = filePost.getResponseBodyAsStream();
- tr = new TeleplanResponse();
- tr.processResponseStream(in);
- TeleplanResponseDAO trDAO = new TeleplanResponseDAO();
- trDAO.save(tr);
-
+ HttpPost post = new HttpPost(url);
+
+ MultipartEntityBuilder builder = MultipartEntityBuilder.create();
+ for (Map.Entry entry : parts.entrySet()) {
+ String name = entry.getKey();
+ Object value = entry.getValue();
+
+ if (value instanceof File) {
+ builder.addBinaryBody(name, (File) value, ContentType.APPLICATION_OCTET_STREAM, ((File) value).getName());
+ } else if (value instanceof String) {
+ builder.addTextBody(name, (String) value, ContentType.TEXT_PLAIN);
+ }
+ }
+
+ post.setEntity(builder.build());
+
+ try (CloseableHttpResponse response = httpclient.execute(post)) {
+ InputStream in = response.getEntity().getContent();
+ tr = new TeleplanResponse();
+ tr.processResponseStream(in);
+ new TeleplanResponseDAO().save(tr);
+ }
} catch (Exception e) {
MiscUtils.getLogger().error("Error", e);
}
return tr;
}
-
//////////
//-------------------------------------------------------------------------
@@ -160,15 +180,13 @@ private TeleplanResponse processRequest(String url, Part[] parts) {
* "FAILURE" Password was not changed
*/
public TeleplanResponse changePassword(String username, String password, String newPassword, String confirmPassword) {
+ List data = new ArrayList<>();
+ data.add(new BasicNameValuePair("username", username));
+ data.add(new BasicNameValuePair("password", password));
+ data.add(new BasicNameValuePair("new.password", newPassword));
+ data.add(new BasicNameValuePair("confirm.password", confirmPassword));
+ data.add(new BasicNameValuePair("ExternalAction", ExternalActionChangePW));
- NameValuePair[] data = {
- new NameValuePair("username", username),
- new NameValuePair("password", password),
- new NameValuePair("new.password", newPassword),
- new NameValuePair("confirm.password", confirmPassword),
-
- new NameValuePair("ExternalAction", ExternalActionChangePW)
- };
return processRequest(CONTACT_URL, data);
}
//-------------------------------------------------------------------------
@@ -186,11 +204,11 @@ public TeleplanResponse changePassword(String username, String password, String
* before the application will return a SUCCESS
*/
public TeleplanResponse login(String username, String password) {
- NameValuePair[] data = {
- new NameValuePair("username", username),
- new NameValuePair("password", password),
- new NameValuePair("ExternalAction", ExternalActionLogon)
- };
+ List data = new ArrayList<>();
+ data.add(new BasicNameValuePair("username", username));
+ data.add(new BasicNameValuePair("password", password));
+ data.add(new BasicNameValuePair("ExternalAction", ExternalActionLogon));
+
return processRequest(CONTACT_URL, data);
}
//-------------------------------------------------------------------------
@@ -202,9 +220,9 @@ public TeleplanResponse login(String username, String password) {
* Results from TeleplanBroker are: "SUCCESS" for valid logoff
*/
public TeleplanResponse logoff() {
- NameValuePair[] data = {
- new NameValuePair("ExternalAction", ExternalActionLogoff)
- };
+ List data = new ArrayList<>();
+ data.add(new BasicNameValuePair("ExternalAction", ExternalActionLogoff));
+
return processRequest(CONTACT_URL, data);
}
//-------------------------------------------------------------------------
@@ -229,14 +247,12 @@ public TeleplanResponse getCurrentLog(String logtype) {
* "FAILURE" for problem
*/
public TeleplanResponse getLog(String logname, String logtype) {
- NameValuePair[] data = {
- new NameValuePair("LOGNAME", logname),
- new NameValuePair("LOGTYPE", logtype),
- new NameValuePair("MODE", "DOWNLOAD"),
- new NameValuePair("ExternalAction", ExternalActionGetLog)
- };
+ List data = new ArrayList<>();
+ data.add(new BasicNameValuePair("LOGNAME", logname));
+ data.add(new BasicNameValuePair("LOGTYPE", logtype));
+ data.add(new BasicNameValuePair("MODE", "DOWNLOAD"));
+ data.add(new BasicNameValuePair("ExternalAction", ExternalActionGetLog));
return processRequest(CONTACT_URL, data);
-
}
//-------------------------------------------------------------------------
@@ -257,9 +273,8 @@ public TeleplanResponse getLog(String logname, String logtype) {
* The filename 001E2805.LOG would convert to 2001_5_28_G05.LOG
*/
public TeleplanResponse getLogList() {
- NameValuePair[] data = {
- new NameValuePair("ExternalAction", ExternalActionGetLogList)
- };
+ List data = new ArrayList<>();
+ data.add(new BasicNameValuePair("ExternalAction", ExternalActionGetLogList));
return processRequest(CONTACT_URL, data);
}
//-------------------------------------------------------------------------
@@ -274,10 +289,9 @@ public TeleplanResponse getLogList() {
* "FAILURE"
*/
public TeleplanResponse getRemittance(boolean includeRemittance) {
- NameValuePair[] data = {
- new NameValuePair("remittance", Boolean.toString(includeRemittance)),
- new NameValuePair("ExternalAction", ExternalActionGetRemit)
- };
+ List data = new ArrayList<>();
+ data.add(new BasicNameValuePair("remittance", Boolean.toString(includeRemittance)));
+ data.add(new BasicNameValuePair("ExternalAction", ExternalActionGetRemit));
return processRequest(CONTACT_URL, data);
}
//-------------------------------------------------------------------------
@@ -304,10 +318,9 @@ public TeleplanResponse getRemittance(boolean includeRemittance) {
* "FAILURE"
*/
public TeleplanResponse getAsciiFile(String filetype) {
- NameValuePair[] data = {
- new NameValuePair("filechar", filetype),
- new NameValuePair("ExternalAction", ExternalActionGetAscii)
- };
+ List data = new ArrayList<>();
+ data.add(new BasicNameValuePair("filechar", filetype));
+ data.add(new BasicNameValuePair("ExternalAction", ExternalActionGetAscii));
return processRequest(CONTACT_URL, data);
}
//-------------------------------------------------------------------------
@@ -333,10 +346,9 @@ public TeleplanResponse getAsciiFile(String filetype) {
* "FAILURE"
*/
public TeleplanResponse getAsciiFileMF(String filetype) {
- NameValuePair[] data = {
- new NameValuePair("filechar", filetype),
- new NameValuePair("ExternalAction", ExternalActionGetAsciiMF)
- };
+ List data = new ArrayList<>();
+ data.add(new BasicNameValuePair("filechar", filetype));
+ data.add(new BasicNameValuePair("ExternalAction", ExternalActionGetAsciiMF));
return processRequest(CONTACT_URL, data);
}
//-------------------------------------------------------------------------
@@ -351,8 +363,9 @@ public TeleplanResponse getAsciiFileMF(String filetype) {
* "FAILURE"
*/
public TeleplanResponse putAsciiFile(File f) throws FileNotFoundException {
-
- Part[] parts = {new StringPart("ExternalAction", "AputAscii"), new FilePart("submitASCII", f)};
+ Map parts = new HashMap<>();
+ parts.put("ExternalAction", "AputAscii");
+ parts.put("submitASCII", f);
return processRequest(CONTACT_URL, parts);
// my ($filename) = @_;
@@ -387,7 +400,9 @@ public TeleplanResponse putAsciiFile(File f) throws FileNotFoundException {
* "FAILURE"
*/
public TeleplanResponse putMSPFile(File f) throws FileNotFoundException {
- Part[] parts = {new StringPart("ExternalAction", "AputRemit"), new FilePart("submitFile", f)};
+ Map parts = new HashMap<>();
+ parts.put("ExternalAction", "AputRemit");
+ parts.put("submitFile", f);
return processRequest(CONTACT_URL, parts);
//
// my ($filename) = @_;
@@ -435,23 +450,19 @@ public TeleplanResponse checkElig(String phn, String dateofbirthyyyy, String dat
String dateofserviceyyyy, String dateofservicemm, String dateofservicedd,
boolean patientvisitcharge, boolean lasteyeexam, boolean patientrestriction) {
-
- NameValuePair[] data = {
- new NameValuePair("PHN", phn),
- new NameValuePair("dateOfBirthyyyy", dateofbirthyyyy),
- new NameValuePair("dateOfBirthmm", dateofbirthmm),
- new NameValuePair("dateOfBirthdd", dateofbirthdd),
- new NameValuePair("dateOfServiceyyyy", dateofserviceyyyy),
- new NameValuePair("dateOfServicemm", dateofservicemm),
- new NameValuePair("dateOfServicedd", dateofservicedd),
- new NameValuePair("PatientVisitCharge", Boolean.toString(patientvisitcharge)),
- new NameValuePair("LastEyeExam", Boolean.toString(lasteyeexam)),
- new NameValuePair("PatientRestriction", Boolean.toString(patientrestriction)),
- new NameValuePair("ExternalAction", ExternalActionCheckE45)
- };
+ List data = new ArrayList<>();
+ data.add(new BasicNameValuePair("PHN", phn));
+ data.add(new BasicNameValuePair("dateOfBirthyyyy", dateofbirthyyyy));
+ data.add(new BasicNameValuePair("dateOfBirthmm", dateofbirthmm));
+ data.add(new BasicNameValuePair("dateOfBirthdd", dateofbirthdd));
+ data.add(new BasicNameValuePair("dateOfServiceyyyy", dateofserviceyyyy));
+ data.add(new BasicNameValuePair("dateOfServicemm", dateofservicemm));
+ data.add(new BasicNameValuePair("dateOfServicedd", dateofservicedd));
+ data.add(new BasicNameValuePair("PatientVisitCharge", Boolean.toString(patientvisitcharge)));
+ data.add(new BasicNameValuePair("LastEyeExam", Boolean.toString(lasteyeexam)));
+ data.add(new BasicNameValuePair("PatientRestriction", Boolean.toString(patientrestriction)));
+ data.add(new BasicNameValuePair("ExternalAction", ExternalActionCheckE45));
return processRequest(CONTACT_URL, data);
-
-
}
//-------------------------------------------------------------------------
diff --git a/src/main/java/ca/openosp/openo/billings/ca/bc/Teleplan/TeleplanCodesManager.java b/src/main/java/ca/openosp/openo/billings/ca/bc/Teleplan/TeleplanCodesManager.java
index df32fb0e33f..20830d0db82 100644
--- a/src/main/java/ca/openosp/openo/billings/ca/bc/Teleplan/TeleplanCodesManager.java
+++ b/src/main/java/ca/openosp/openo/billings/ca/bc/Teleplan/TeleplanCodesManager.java
@@ -30,12 +30,15 @@
import java.io.File;
import java.io.FileReader;
import java.math.BigDecimal;
+import java.nio.file.Path;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import ca.openosp.openo.utility.MiscUtils;
+import ca.openosp.OscarProperties;
+
/**
* @author jay
@@ -60,7 +63,18 @@ public TeleplanCodesManager() {
REM075 ** Description This is a Title description **
REM076 ** **
*/
- public List parse(File f) throws Exception {
+ public List parse(File f) throws Exception {
+ // Define allowed directory (configure this based on your needs)
+ File allowedDir = new File(OscarProperties.getInstance().getProperty("DOCUMENT_DIR"));
+
+ // Convert to Path and normalize
+ Path filePath = f.toPath().normalize().toAbsolutePath();
+ Path allowedPath = allowedDir.toPath().normalize().toAbsolutePath();
+
+ if (!filePath.startsWith(allowedPath)) {
+ throw new SecurityException("File access not allowed outside designated directory");
+ }
+
BufferedReader buff = new BufferedReader(new FileReader(f));
String line = null;
diff --git a/src/main/java/ca/openosp/openo/billings/ca/bc/Teleplan/TeleplanResponse.java b/src/main/java/ca/openosp/openo/billings/ca/bc/Teleplan/TeleplanResponse.java
index c1177ee4718..ad910ccb15a 100644
--- a/src/main/java/ca/openosp/openo/billings/ca/bc/Teleplan/TeleplanResponse.java
+++ b/src/main/java/ca/openosp/openo/billings/ca/bc/Teleplan/TeleplanResponse.java
@@ -33,6 +33,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.nio.file.Path;
import org.apache.logging.log4j.Logger;
import ca.openosp.openo.utility.MiscUtils;
@@ -85,10 +86,21 @@ void processResponseStream(InputStream in) {
File file = new File(tempFile);
realFilename = "teleplan" + this.getFilename() + randNum;
File file2 = new File(directory + realFilename);
+
+ // Define allowed directory (configure this based on your needs)
+ File allowedDir = new File(OscarProperties.getInstance().getProperty("DOCUMENT_DIR"));
+
+ // Convert to Path and normalize
+ Path filePath = file2.toPath().normalize().toAbsolutePath();
+ Path allowedPath = allowedDir.toPath().normalize().toAbsolutePath();
+
+ if (!filePath.startsWith(allowedPath)) {
+ throw new SecurityException("File access not allowed outside designated directory");
+ }
+
boolean success = file.renameTo(file2);
if (!success) {
log.error("File was not successfully renamed");
- //
}
}
diff --git a/src/main/java/ca/openosp/openo/billings/ca/bc/pageUtil/ManageTeleplan2Action.java b/src/main/java/ca/openosp/openo/billings/ca/bc/pageUtil/ManageTeleplan2Action.java
index ecb2f2903a6..279a2e75b69 100644
--- a/src/main/java/ca/openosp/openo/billings/ca/bc/pageUtil/ManageTeleplan2Action.java
+++ b/src/main/java/ca/openosp/openo/billings/ca/bc/pageUtil/ManageTeleplan2Action.java
@@ -29,6 +29,7 @@
import java.io.BufferedReader;
import java.io.File;
import java.io.FileReader;
+import java.nio.file.Path;
import java.util.Date;
import java.util.Enumeration;
import java.util.List;
@@ -159,6 +160,18 @@ public String updateteleplanICDCodesList()
log.debug("real filename " + tr.getRealFilename());
File file = tr.getFile();
+
+ // Define allowed directory (configure this based on your needs)
+ File allowedDir = new File(OscarProperties.getInstance().getProperty("DOCUMENT_DIR"));
+
+ // Convert to Path and normalize
+ Path filePath = file.toPath().normalize().toAbsolutePath();
+ Path allowedPath = allowedDir.toPath().normalize().toAbsolutePath();
+
+ if (!filePath.startsWith(allowedPath)) {
+ throw new SecurityException("File access not allowed outside designated directory");
+ }
+
BufferedReader buff = new BufferedReader(new FileReader(file));
String line = null;
@@ -220,6 +233,18 @@ public String updateExplanatoryCodesList()
log.debug("real filename " + tr.getRealFilename());
File file = tr.getFile();
+
+ // Define allowed directory (configure this based on your needs)
+ File allowedDir = new File(OscarProperties.getInstance().getProperty("DOCUMENT_DIR"));
+
+ // Convert to Path and normalize
+ Path filePath = file.toPath().normalize().toAbsolutePath();
+ Path allowedPath = allowedDir.toPath().normalize().toAbsolutePath();
+
+ if (!filePath.startsWith(allowedPath)) {
+ throw new SecurityException("File access not allowed outside designated directory");
+ }
+
BufferedReader buff = new BufferedReader(new FileReader(file));
String line = null;
@@ -510,6 +535,19 @@ public String checkElig()
String realFile = tr.getRealFilename();
if (realFile != null && !realFile.trim().equals("")) {
File file = tr.getFile();
+
+ // Define allowed directory (configure this based on your needs)
+ File allowedDir = new File(OscarProperties.getInstance().getProperty("DOCUMENT_DIR"));
+
+ // Convert to Path and normalize
+ Path filePath = file.toPath().normalize().toAbsolutePath();
+ Path allowedPath = allowedDir.toPath().normalize().toAbsolutePath();
+
+
+ if (!filePath.startsWith(allowedPath)) {
+ throw new SecurityException("File access not allowed outside designated directory");
+ }
+
BufferedReader buff = new BufferedReader(new FileReader(file));
StringBuilder sb = new StringBuilder();
String line = null;
diff --git a/src/main/java/ca/openosp/openo/casemgmt/web/CaseManagementEntry2Action.java b/src/main/java/ca/openosp/openo/casemgmt/web/CaseManagementEntry2Action.java
index 786c641d8b3..613149eae6c 100644
--- a/src/main/java/ca/openosp/openo/casemgmt/web/CaseManagementEntry2Action.java
+++ b/src/main/java/ca/openosp/openo/casemgmt/web/CaseManagementEntry2Action.java
@@ -250,7 +250,6 @@ public String edit() throws Exception {
String Hour = Integer.toString(todayCal.get(Calendar.HOUR));
String Min = Integer.toString(todayCal.get(Calendar.MINUTE));
- // StringEncoderUtils.a();
String default_view = OscarProperties.getInstance().getProperty("default_view", "");
String contextPath = request.getContextPath();
@@ -405,7 +404,6 @@ else if (nId != null && !"null".equalsIgnoreCase(nId) && Integer.parseInt(nId) >
/* set issue checked list */
// get issues for current demographic, based on providers rights
-
Boolean useNewCaseMgmt = Boolean.valueOf((String) session.getAttribute("newCaseManagement"));
CheckBoxBean[] checkedList = null;
@@ -419,11 +417,6 @@ else if (nId != null && !"null".equalsIgnoreCase(nId) && Integer.parseInt(nId) >
caseManagementViewAction.sortIssuesByOrderId(checkBoxBeanList);
checkedList = checkBoxBeanList.toArray(new CheckBoxBean[checkBoxBeanList.size()]);
- /*
- * List issues = caseManagementMgr.filterIssues(caseManagementMgr.getIssues(Integer.parseInt(demono)), programIdString); checkedList = new CheckBoxBean[issues.size()]; // set issue checked list
- * log.debug("Set Checked Issues " + String.valueOf(current-start)); List allNotes = this.caseManagementMgr.getNotes(demono); for (int i = 0; i < issues.size(); i++) { checkedList[i] = new CheckBoxBean(); CaseManagementIssue iss =
- * issues.get(i); checkedList[i].setIssue(iss); checkedList[i].setUsed(haveIssue(iss.getId(), allNotes)); current = System.currentTimeMillis(); log.debug("Set Checked Issues " + String.valueOf(current-start)); start = current; }
- */
Iterator itr = note.getIssues().iterator();
while (itr.hasNext()) {
int id = ((CaseManagementIssue) itr.next()).getId().intValue();
@@ -476,7 +469,6 @@ else if (nId != null && !"null".equalsIgnoreCase(nId) && Integer.parseInt(nId) >
session.setAttribute("casemgmtNoteLock" + demono, casemgmtNoteLock);
String frmName = "caseManagementEntryForm" + demono;
- //logger.debug("Setting session form - " + frmName + " - " + String.valueOf(cform != null));
logger.debug("note in cform " + cform.getCaseNote_note());
mySessionMap.put(frmName, cform);
@@ -495,14 +487,30 @@ else if (nId != null && !"null".equalsIgnoreCase(nId) && Integer.parseInt(nId) >
}
}
- session.setAttribute("note_sort", request.getParameter("note_sort"));
- session.setAttribute("filter_roles", request.getParameterValues("filter_roles"));
- session.setAttribute("filter_provider", request.getParameterValues("filter_providers"));
- session.setAttribute("issues", request.getParameterValues("issues"));
+ setOrRemove(session, "note_sort", request.getParameter("note_sort"));
+ setOrRemove(session, "filter_roles", request.getParameterValues("filter_roles"));
+ setOrRemove(session, "filter_provider", request.getParameterValues("filter_providers"));
+ setOrRemove(session, "issues", request.getParameterValues("issues"));
return fwd;
}
+ private void setOrRemove(HttpSession session, String key, String value) {
+ if (value != null) {
+ session.setAttribute(key, value);
+ }
+ }
+
+ private void setOrRemove(HttpSession session, String key, String[] values) {
+ if (values == null) {
+ return;
+ } else if (values.length > 0) {
+ session.setAttribute(key, values);
+ } else {
+ session.removeAttribute(key);
+ }
+ }
+
private CaseManagementNote makeNewNote(String providerNo, String demographicNo, HttpServletRequest request) {
CaseManagementNote note = new CaseManagementNote();
note.setProviderNo(providerNo);
@@ -648,9 +656,7 @@ public String issueNoteSaveJson() throws Exception {
String noteId = request.getParameter("noteId");
String demographicNo = request.getParameter("demographic_no");
String issueCode = request.getParameter("issue_id");
-
String issueAlphaCode = request.getParameter("issue_code");
-
String archived = request.getParameter("archived");
Date noteDate = new Date();
@@ -692,7 +698,6 @@ public String issueNoteSaveJson() throws Exception {
issueSet.add(cIssue);
note.setIssues(issueSet);
-
note.setCreate_date(noteDate);
note.setObservation_date(noteDate);
note.setRevision("1");
@@ -811,7 +816,6 @@ public String issueNoteSave() throws Exception {
String[] extNames = {"startdate", "resolutiondate", "proceduredate", "ageatonset", "problemstatus", "treatment", "exposuredetail", "relationship", "lifestage", "hidecpp", "problemdescription", "procedure"};
String[] extKeys = {CaseManagementNoteExt.STARTDATE, CaseManagementNoteExt.RESOLUTIONDATE, CaseManagementNoteExt.PROCEDUREDATE, CaseManagementNoteExt.AGEATONSET, CaseManagementNoteExt.PROBLEMSTATUS, CaseManagementNoteExt.TREATMENT, CaseManagementNoteExt.EXPOSUREDETAIL, CaseManagementNoteExt.RELATIONSHIP, CaseManagementNoteExt.LIFESTAGE, CaseManagementNoteExt.HIDECPP, CaseManagementNoteExt.PROBLEMDESC, CaseManagementNoteExt.PROCEDURE};
- // strNote = strNote.trim();
logger.debug("Saving: " + strNote);
strNote = org.apache.commons.lang.StringUtils.trimToNull(strNote);
if (strNote == null || strNote.equals("")) return null;
@@ -831,7 +835,6 @@ public String issueNoteSave() throws Exception {
if (noteId.isEmpty()) noteId = "0";
if (noteId.equals("0")) {
-
note = new CaseManagementNote();
note.setDemographic_no(demo);
newNote = true;
@@ -876,7 +879,6 @@ public String issueNoteSave() throws Exception {
note.setProviderNo(loggedInInfo.getLoggedInProviderNo());
note.setSigning_provider_no(loggedInInfo.getLoggedInProviderNo());
note.setSigned(true);
-
note.setProvider(loggedInInfo.getLoggedInProvider());
String logAction = new String();
@@ -1089,15 +1091,6 @@ public String issueNoteSave() throws Exception {
note.setPosition(newPos);
}
- /*
- * Remove linked issue(s) and insert message into note
- *
- * if( removeIssue.equals("true") ) { issue_id = request.getParameterValues("issue_id"); issueSet = note.getIssues(); StringBuilder issueNames = new StringBuilder(); for( int idx = 0; idx < issue_id.length; ++idx ) { for(Iterator iter =
- * issueSet.iterator();iter.hasNext();) { CaseManagementIssue cIssue = (CaseManagementIssue)iter.next(); if( cIssue.getIssue_id() == Long.parseLong(issue_id[idx]) ) { issueSet.remove(cIssue); issueNames.append(cIssue.getIssue().getDescription() +
- * "\n"); break; } } } //Force hibernate to save rather than update Set tmpIssues = new HashSet(issueSet); note.setIssues(tmpIssues); strNote += "\n" + new SimpleDateFormat("dd-MMM-yyyy").format(new Date()) + " Removed following issue(s):\n" +
- * issueNames.toString(); note.setNote(strNote); }
- */
-
int revision;
if (note.getRevision() != null) {
@@ -1149,22 +1142,18 @@ public String issueNoteSave() throws Exception {
}
/* Save annotation */
-
String attrib_name = request.getParameter("annotation_attrib");
CaseManagementNote cmn = (CaseManagementNote) session.getAttribute(attrib_name);
if (cmn != null) {
// new annotation created and got it in session attribute
-
caseManagementMgr.saveNoteSimple(cmn);
CaseManagementNoteLink cml = new CaseManagementNoteLink(CaseManagementNoteLink.CASEMGMTNOTE, note.getId(), cmn.getId());
caseManagementMgr.saveNoteLink(cml);
LogAction.addLog(providerNo, LogConst.ANNOTATE, LogConst.CON_CME_NOTE, String.valueOf(cmn.getId()), request.getRemoteAddr(), demo, cmn.getNote());
session.removeAttribute(attrib_name);
-
}
if (!noteId.equals("0")) {
// Not a new note, look for old annotation
-
CaseManagementNoteLink cml_anno = null;
CaseManagementNoteLink cml_dump = null;
List cmll = caseManagementMgr.getLinkByTableIdDesc(CaseManagementNoteLink.CASEMGMTNOTE, Long.valueOf(noteId));
@@ -1226,7 +1215,6 @@ private long noteSave() throws Exception {
CasemgmtNoteLock casemgmtNoteLockSession = (CasemgmtNoteLock) session.getAttribute("casemgmtNoteLock" + demo);
try {
-
if (casemgmtNoteLockSession == null) {
throw new Exception("SESSION CASEMANAGEMENT NOTE LOCK OBJECT IS NULL");
}
@@ -1333,7 +1321,6 @@ private long noteSave() throws Exception {
// System.out.println("Checkedlist from sessionFrm: " + Arrays.toString(checkedlist));
// this gets attached to the CaseManagementNote object
Set issueset = new HashSet();
- // wherever this is populated, it's not here...
Set noteSet = new HashSet();
String ongoing = "";
if (checkedlist != null) {
@@ -1359,7 +1346,6 @@ private long noteSave() throws Exception {
/* remove signature and the related issues from note */
String noteString = note.getNote();
- // noteString = removeSignature(noteString);
noteString = removeCurrentIssue(noteString);
note.setNote(noteString);
@@ -1409,7 +1395,6 @@ private long noteSave() throws Exception {
note.setNote(noteString + issueString);
}
}
- //Ongoing
// update appointment and add verify message to note if verified
String strBeanName = "casemgmt_oscar_bean" + demo;
@@ -1427,7 +1412,6 @@ private long noteSave() throws Exception {
note.setLocked(true);
}
-
Date now = new Date();
String observationDate = this.getObservation_date();
@@ -1467,11 +1451,9 @@ private long noteSave() throws Exception {
}
/* Save annotation */
-
String attrib_name = request.getParameter("annotation_attribname");
CaseManagementNote annotationNote = (CaseManagementNote) session.getAttribute(attrib_name);
- //String ongoing = null; // figure out this
note = caseManagementMgr.saveCaseManagementNote(loggedInInfo, note, issuelist, cpp, ongoing, verify, request.getLocale(), now, annotationNote, userName, (String) session.getAttribute("user"), request.getRemoteAddr(), lastSavedNoteString);
caseManagementMgr.getEditors(note);
this.setCaseNote(note);
@@ -1580,14 +1562,6 @@ private void copyIssueDisplayToCaseManagementIssue(CaseManagementIssue caseManag
}
private String saveCheckedIssues_newCme(HttpServletRequest request, String demo, CaseManagementNote note, List issuelist, CheckBoxBean[] checkedlist, Set issueset, Set noteSet, String ongoing) {
- /*
- * for (int i = 0; i < checkedlist.length; i++) { if (!checkedlist[i].getIssue().isResolved()) ongoing = ongoing + checkedlist[i].getIssue().getIssue().getDescription() + "\n"; String ischecked = request.getParameter("issueCheckList[" + i +
- * "].checked"); CaseManagementIssue iss = checkedlist[i].getIssue(); if (ischecked != null && ischecked.equalsIgnoreCase("on")) { checkedlist[i].setChecked("on"); checkedlist[i].setUsed(true); iss.setNotes(noteSet);
- * issueset.add(checkedlist[i].getIssue()); } else { checkedlist[i].setChecked("off"); checkedlist[i].setUsed(caseManagementMgr.haveIssue(iss.getId(), note.getId(), demo)); checkedlist[i].setUsed(false); }
- *
- * issuelist.add(checkedlist[i].getIssue()); } return ongoing;
- */
-
int demographicNo = Integer.parseInt(demo);
for (int i = 0; i < checkedlist.length; i++) {
@@ -1642,15 +1616,12 @@ private String saveCheckedIssues_newCme(HttpServletRequest request, String demo,
if (!containsIssue(issuelist, caseManagementIssue)) issuelist.add(caseManagementIssue);
}
return ongoing;
-
}
public String save() throws Exception {
-
HttpSession session = request.getSession();
if (session == null || session.getAttribute("userrole") == null) return "expired";
- // String providerNo = getProviderNo(request);
request.setAttribute("change_flag", "false");
String demono = getDemographicNo(request);
@@ -1661,42 +1632,14 @@ public String save() throws Exception {
request.setAttribute("from", request.getParameter("from"));
long noteId = noteSave();
- /*
- * CaseManagementNote preNote=new CaseManagementNote(); if(this.getNoteId()!=null) { Long nId=Long.parseLong(this.getNoteId()); preNote.setId(nId); }
- */
-
/* prepare the message */
-
addActionMessage(getText("note.saved"));
-
- // are we in the new encounter and chaining actions?
String chain = request.getParameter("chain");
if (chain != null && !chain.equals("")) {
- /*
- if (noteId == -1) {
-
- request.setAttribute("NoteLockError", props.getString("oscarEncounter.noteLockError.Msg"));
- } else {
- String varName = "newNote";
- session.setAttribute(varName, false);
- varName = "saveNote" + demono;
- session.setAttribute(varName, Boolean.valueOf(true)); // tell CaseManagementView we have just saved note
- }
-
- if (request.getAttribute("DateError") != null) {
- if (path.indexOf("?") == -1) path.append("?");
- else path.append("&");
-
- path.append("DateError=" + props.getString("oscarEncounter.futureDate.Msg"));
- }
-
- ActionForward forward = new ActionForward();
- forward.setPath(path.toString());*/
return chain;
}
- // this.caseManagementMgr.saveNote();
return "view";
}
@@ -1795,7 +1738,6 @@ public String ajaxsave() throws Exception {
Set noteSet = new HashSet();
int numIssues = Integer.parseInt(request.getParameter("numIssues"));
- // CaseManagementEntryFormBean cform = (CaseManagementEntryFormBean) form;
CheckBoxBean[] checkedlist = sessionFrm.getIssueCheckList();
for (int i = 0; i < numIssues; i++) {
@@ -1848,7 +1790,6 @@ public String ajaxsave() throws Exception {
}
// check if previous note is doc note.
-
Long prevNoteId = note.getId();
this.caseManagementMgr.saveNoteSimple(note);
@@ -1884,7 +1825,6 @@ public String ajaxsave() throws Exception {
LogAction.addLog((String) session.getAttribute("user"), logAction, LogConst.CON_CME_NOTE, String.valueOf(note.getId()), request.getRemoteAddr(), demo, note.getAuditString());
return "issueList_ajax";
-
}
private void releaseNoteLock(String providerNo, Integer demographicNo, Long noteId) {
@@ -1895,7 +1835,6 @@ private void releaseNoteLock(String providerNo, Integer demographicNo, Long note
public String releaseNoteLock() {
LoggedInInfo loggedInInfo = LoggedInInfo.getLoggedInInfoFromSession(request);
String providerNo = loggedInInfo.getLoggedInProviderNo();
-
String demoNo = getDemographicNo(request);
String noteId = request.getParameter("noteId");
String forceRelease = request.getParameter("force");
@@ -1919,7 +1858,6 @@ else if (forceRelease != null && forceRelease.equalsIgnoreCase("true")) {
//nothing to do. lock was not found
}
-
return null;
}
@@ -2132,7 +2070,6 @@ public String addNewIssue() {
request.setAttribute("from", request.getParameter("from"));
- // noteSave(cform, request);
this.setShowList("false");
this.setSearString("");
return "IssueSearch";
@@ -2147,7 +2084,6 @@ public String issueList() throws Exception {
LoggedInInfo loggedInInfo = LoggedInInfo.getLoggedInInfoFromSession(request);
String programId = (String) session.getAttribute("case_program_id");
-// CaseManagementEntryFormBean cform = (CaseManagementEntryFormBean) form;
String providerNo = loggedInInfo.getLoggedInProviderNo();
// get the issue list have search string
@@ -2247,28 +2183,23 @@ public String issueSearch() {
// we need to convert single issue into checkbox array so we can play nicely with CaseManagementEntryFormBean
public String makeIssue() throws Exception {
HttpSession session = request.getSession();
- // String programId = (String) session.getAttribute("case_program_id");
// grab the issue we want to add
String issueId = request.getParameter("newIssueId");
- // String providerNo = getProviderNo(request);
String sessionFrmName = "caseManagementEntryForm" + this.getDemographicNo(request);
CaseManagementEntryFormBean sessionFrm = (CaseManagementEntryFormBean) session.getAttribute(sessionFrmName);
// check to see if this issue has already been associated with this demographic
- //boolean issueExists = false;
long lIssueId = Long.parseLong(issueId);
CheckBoxBean[] existingCaseIssueList = sessionFrm.getIssueCheckList();
for (int idx = 0; idx < existingCaseIssueList.length; ++idx) {
if (existingCaseIssueList[idx].getIssue().getIssue_id() == lIssueId) {
- //issueExists = true;
break;
}
}
// if issue hasn't been added, add it
// if it has do nothing;-> change to if it's already added, still keep it but won't
- //if (!issueExists) {
CheckIssueBoxBean[] caseIssueList = new CheckIssueBoxBean[1];
caseIssueList[0] = new CheckIssueBoxBean();
@@ -2278,7 +2209,6 @@ public String makeIssue() throws Exception {
sessionFrm.setNewIssueCheckList(caseIssueList);
return issueAdd();
- //} else return null;
}
public String issueAdd() throws Exception {
@@ -2366,7 +2296,6 @@ public String issueAdd() throws Exception {
for (int i = 0; i < issueList.length; i++) {
if (issueList[i].isChecked()) {
if (caseManagementIssueDao.getIssuebyId(demono, String.valueOf(issueList[i].getIssue().getId())) != null) {
- //continue;
//issue already added
for (int j = 0; j < oldList.length; j++) {
if (oldList[j].getIssue().getIssue_id() == issueList[i].getIssue().getId().longValue()) { //find old issue and check it
@@ -2419,14 +2348,11 @@ public String changeDiagnosis() {
logger.debug("changeDiagnosis");
if (request.getSession().getAttribute("userrole") == null) return "expired";
-
String inds = this.getDeleteId();
-
String demono = getDemographicNo(request);
request.setAttribute("demoName", getDemoName(demono));
request.setAttribute("demoAge", getDemoAge(demono));
request.setAttribute("demoDOB", getDemoDOB(demono));
-
request.setAttribute("from", request.getParameter("from"));
request.setAttribute("change_diagnosis", Boolean.valueOf(true));
request.setAttribute("change_diagnosis_id", inds);
@@ -2491,7 +2417,6 @@ public String submitChangeDiagnosis() {
this.setIssueCheckList(oldList);
if (substitution != null && origIssueDesc != null)
this.caseManagementMgr.changeIssueInCPP(demono, origIssueDesc, newIssueDesc);
- // updateIssueToConcern(cform);
return "view";
}
@@ -2530,9 +2455,7 @@ public String ajaxChangeDiagnosis() {
sessionFrm.setIssueCheckList(curIssues);
request.setAttribute("caseManagementEntryForm", sessionFrm);
- // updateIssueToConcern(cform);
- // request.setAttribute("issueCheckList", curIssues);
return "issueList_ajax";
}
@@ -2545,15 +2468,12 @@ public String issueDelete() throws Exception {
return null;
}
-
String demono = getDemographicNo(request);
String sessionFrmName = "caseManagementEntryForm" + demono;
CaseManagementEntryFormBean sessionFrm = (CaseManagementEntryFormBean) session.getAttribute(sessionFrmName);
- // noteSave(cform, request);
request.setAttribute("change_flag", "true");
request.setAttribute("from", request.getParameter("from"));
-
request.setAttribute("demoName", getDemoName(demono));
request.setAttribute("demoAge", getDemoAge(demono));
request.setAttribute("demoDOB", getDemoDOB(demono));
@@ -2593,7 +2513,6 @@ public String issueDelete() throws Exception {
if (OscarProperties.getInstance().isCaisiLoaded() && iss != null) {
// reset current concern in CPP
- // updateIssueToConcern(cform);
caseManagementMgr.removeIssueFromCPP(demono, iss);
}
@@ -2631,7 +2550,6 @@ public String issueChange() throws Exception {
request.setAttribute("demoAge", getDemoAge(demono));
request.setAttribute("demoDOB", getDemoDOB(demono));
- // noteSave(cform, request);
CheckBoxBean[] oldList = sessionFrm.getIssueCheckList();
String inds = this.getLineId();
@@ -2835,7 +2753,6 @@ public String displayNotes() throws Exception {
}
public void doDisplayNotes(HttpServletRequest request, PrintWriter out) throws Exception {
-
String ids = request.getParameter("notes2print");
String[] noteIds;
String textStr;
@@ -2911,7 +2828,6 @@ public String print() throws Exception {
boolean printLabs = request.getParameter("printLabs") != null && request.getParameter("printLabs").equalsIgnoreCase("true");
boolean printPreventions = request.getParameter("printPreventions") != null && request.getParameter("printPreventions").equalsIgnoreCase("true");
-
CaseManagementPrint cmp = new CaseManagementPrint();
cmp.doPrint(loggedInInfo, demographicNo, printAllNotes, noteIds, printCPP, printRx, printLabs, printPreventions, (pType != null && "dates".equals(pType)) ? true : false, cStartDate, cEndDate, request, response.getOutputStream());
@@ -2962,12 +2878,10 @@ protected Map getUnlockedNotesMap(HttpServletRequest request) {
return map;
}
-
/*
* Insert encounter reason for new note
*/
protected void insertReason(HttpServletRequest request, CaseManagementNote note) {
-
String encounterText = "";
String apptDate = request.getParameter("appointmentDate");
String reason = request.getParameter("reason");
@@ -2999,7 +2913,6 @@ protected void insertReason(HttpServletRequest request, CaseManagementNote note)
} else {
note.setEncounter_type(encType);
}
-
}
protected String convertDateFmt(String strOldDate, HttpServletRequest request) {
@@ -3098,7 +3011,6 @@ boolean filled(String s) {
}
public boolean haveIssue(Long issid, List allNotes) {
-
Iterator itr = allNotes.iterator();
while (itr.hasNext()) {
CaseManagementNote note = (CaseManagementNote) itr.next();
@@ -3190,22 +3102,12 @@ public String ticklerSaveNote() {
cmn.setEncounter_type(EncounterUtil.EncounterType.FACE_TO_FACE_WITH_CLIENT.getOldDbValue());
cmn.setNote(strNote);
cmn.setObservation_date(creationDate);
- /*
- String programIdStr = (String) request.getSession().getAttribute(SessionConstants.CURRENT_PROGRAM_ID);
- if(programIdStr==null)
- programIdStr = (String) request.getSession().getAttribute("case_program_id");
- Integer programId = null;
- if (programIdStr != null) programId = Integer.valueOf(programIdStr);
-
- cmn.setProgram_no(String.valueOf(programId));
- */
cmn.setProviderNo(loggedInProvider.getProviderNo());
cmn.setRevision(revision);
cmn.setSigned(true);
cmn.setSigning_provider_no(loggedInProvider.getProviderNo());
cmn.setUpdate_date(creationDate);
cmn.setHistory(history);
- //just doing this because the other code does it.
cmn.setReporter_program_team("null");
cmn.setUuid(uuid);
@@ -3216,8 +3118,6 @@ public String ticklerSaveNote() {
caseManagementMgr.saveNoteSimple(cmn);
- //log.debug("note id is " + cmn.getId());
-
//save link, so we know what tickler this note is linked to
CaseManagementNoteLink link = new CaseManagementNoteLink();
link.setNoteId(cmn.getId());
@@ -3326,14 +3226,10 @@ public static boolean determineNoteRole(CaseManagementNote note, String provider
return programSet;
}
-
protected String relateIssueString = "Issues related to this note:";
-
-
protected CaseManagementManager caseManagementMgr = SpringUtils.getBean(CaseManagementManager.class);
protected ClientImageManager clientImageMgr = SpringUtils.getBean(ClientImageManager.class);
protected ProviderManager providerMgr = SpringUtils.getBean(ProviderManager.class);
-
protected String getDemographicNo(HttpServletRequest request) {
String demono = request.getParameter("demographicNo");
if (demono == null || "".equals(demono)) {
@@ -3368,7 +3264,6 @@ protected String getDemoDOB(String demoNo) {
return caseManagementMgr.getDemoDOB(demoNo);
}
-
protected boolean inCaseIssue(Issue iss, List issues) {
Iterator itr = issues.iterator();
while (itr.hasNext()) {
@@ -3403,7 +3298,6 @@ protected WebApplicationContext getSpringContext() {
/* remove related issue list from note */
protected String removeCurrentIssue(String noteString) {
-
noteString = noteString.replaceAll("\r\n", "\n");
noteString = noteString.replaceAll("\r", "\n");
String rt = noteString;
@@ -3419,7 +3313,6 @@ protected String removeCurrentIssue(String noteString) {
/* remove signiature string */
protected String removeSignature(String note) {
-
note = note.replaceAll("\r\n", "\n");
note = note.replaceAll("\r", "\n");
String rt = note;
@@ -3471,16 +3364,12 @@ protected String createIssueString(Set issuelist) {
protected CaseManagementIssue newIssueToCIssue(String demographicNo, Issue iss, Integer programId) {
CaseManagementIssue cIssue = new CaseManagementIssue();
- // cIssue.setActive(true);
cIssue.setAcute(false);
cIssue.setCertain(false);
cIssue.setDemographic_no(Integer.valueOf(demographicNo));
-
cIssue.setIssue_id(iss.getId().longValue());
-
cIssue.setIssue(iss);
cIssue.setMajor(false);
- // cIssue.setMedical_diagnosis(true);
cIssue.setNotes(new HashSet());
cIssue.setResolved(false);
String issueType = iss.getRole();
@@ -3491,8 +3380,7 @@ protected CaseManagementIssue newIssueToCIssue(String demographicNo, Issue iss,
List uList = new ArrayList();
uList.add(cIssue);
caseManagementMgr.saveAndUpdateCaseIssues(uList);
- // add new issues to ongoing concern
- //caseManagementMgr.addNewIssueToConcern((String) this.getDemoNo(), iss.getDescription());
+
return cIssue;
}
@@ -3604,8 +3492,6 @@ private void restoreFromSession() {
private Integer minuteOfEncounterTime;
private Integer hourOfEncTransportationTime;
private Integer minuteOfEncTransportationTime;
- private Integer OscarMsgType;
- private Integer OscarMsgTypeLink;
private String reloadUrl;
@@ -3913,33 +3799,4 @@ public void setReloadUrl(String reloadUrl) {
this.reloadUrl = reloadUrl;
}
- /**
- * @return the OscarMsgType
- *
- public Integer getOscarMsgType() {
- return OscarMsgType;
- }
-
- /**
- * @param OscarMsgType the OscarMsgType to set
- *
- public void setOscarMsgType(Integer OscarMsgType) {
- this.OscarMsgType = OscarMsgType;
- }
-
-
- /**
- * @return the OscarMsgTypeLink
- *
- public Integer getOscarMsgTypeLink() {
- return OscarMsgTypeLink;
- }
-
- /**
- * @param OscarMsgTypeLink the OscarMsgTypeLink to set
- *
- public void setOscarMsgTypeLink(Integer OscarMsgTypeLink) {
- this.OscarMsgTypeLink = OscarMsgTypeLink;
- }*/
-
}
diff --git a/src/main/java/ca/openosp/openo/commn/web/Demographic2Action.java b/src/main/java/ca/openosp/openo/commn/web/Demographic2Action.java
index d960a19d208..b3be2cf4dc6 100644
--- a/src/main/java/ca/openosp/openo/commn/web/Demographic2Action.java
+++ b/src/main/java/ca/openosp/openo/commn/web/Demographic2Action.java
@@ -25,8 +25,8 @@
package ca.openosp.openo.commn.web;
import com.opensymphony.xwork2.ActionSupport;
-import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
import org.apache.commons.io.IOUtils;
import org.apache.struts2.ServletActionContext;
import ca.openosp.openo.commn.dao.DemographicArchiveDao;
@@ -43,8 +43,12 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
import java.util.Iterator;
import java.util.List;
@@ -245,8 +249,9 @@ public String getAddressAndPhoneHistoryAsJson()
}
- response.getWriter().print(JSONArray.fromObject(items));
-
+ ObjectMapper mapper = new ObjectMapper();
+ String json = mapper.writeValueAsString(items);
+ response.getWriter().print(json);
}
@@ -263,13 +268,16 @@ public String checkForDuplicates() {
List duplicateList = demographicDao.getDemographicWithLastFirstDOBExact(lastName, firstName,
yearOfBirth, monthOfBirth, dayOfBirth);
- JSONObject result = new JSONObject();
- result.put("hasDuplicates", false);
- if (duplicateList.size() > 0) {
- result.put("hasDuplicates", true);
- }
+ Map result = new HashMap<>();
+ result.put("hasDuplicates", !duplicateList.isEmpty());
- JSONUtil.jsonResponse(response, JSONObject.fromObject(result));
+ response.setContentType("application/json");
+ response.setCharacterEncoding("UTF-8");
+ try {
+ new ObjectMapper().writeValue(response.getWriter(), result);
+ } catch (Exception e) {
+ MiscUtils.getLogger().error("Error in checkForDuplicates", e);
+ }
return null;
}
diff --git a/src/main/java/ca/openosp/openo/commn/web/FlowSheetCustom2Action.java b/src/main/java/ca/openosp/openo/commn/web/FlowSheetCustom2Action.java
index 4f4f3d28bf3..f0cce904233 100644
--- a/src/main/java/ca/openosp/openo/commn/web/FlowSheetCustom2Action.java
+++ b/src/main/java/ca/openosp/openo/commn/web/FlowSheetCustom2Action.java
@@ -26,9 +26,9 @@
package ca.openosp.openo.commn.web;
import org.apache.logging.log4j.Logger;
-import org.jdom.Element;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Element;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
import ca.openosp.openo.commn.dao.FlowSheetCustomizationDao;
import ca.openosp.openo.commn.dao.FlowSheetUserCreatedDao;
import ca.openosp.openo.commn.model.FlowSheetCustomization;
diff --git a/src/main/java/ca/openosp/openo/db/ArchiveDeletedRecords.java b/src/main/java/ca/openosp/openo/db/ArchiveDeletedRecords.java
index 58570d4a799..5c8ccb2d79a 100644
--- a/src/main/java/ca/openosp/openo/db/ArchiveDeletedRecords.java
+++ b/src/main/java/ca/openosp/openo/db/ArchiveDeletedRecords.java
@@ -28,8 +28,8 @@
import java.util.List;
-import org.jdom.Document;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Document;
+import org.jdom2.output.XMLOutputter;
import ca.openosp.openo.commn.dao.TableModificationDao;
import ca.openosp.openo.commn.model.ProviderLabRoutingModel;
import ca.openosp.openo.commn.model.TableModification;
diff --git a/src/main/java/ca/openosp/openo/db/ResultSetBuilder.java b/src/main/java/ca/openosp/openo/db/ResultSetBuilder.java
index f5abb29a701..7d59f27e6da 100755
--- a/src/main/java/ca/openosp/openo/db/ResultSetBuilder.java
+++ b/src/main/java/ca/openosp/openo/db/ResultSetBuilder.java
@@ -56,10 +56,10 @@
import java.util.Map.Entry;
import java.util.SortedMap;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.Namespace;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.Namespace;
import ca.openosp.openo.commn.model.ProviderLabRoutingModel;
import ca.openosp.openo.util.Textualizer;
diff --git a/src/main/java/ca/openosp/openo/decisionSupport/model/DSGuidelineFactory.java b/src/main/java/ca/openosp/openo/decisionSupport/model/DSGuidelineFactory.java
index 3c671c71d6c..0bce16a6c59 100644
--- a/src/main/java/ca/openosp/openo/decisionSupport/model/DSGuidelineFactory.java
+++ b/src/main/java/ca/openosp/openo/decisionSupport/model/DSGuidelineFactory.java
@@ -39,11 +39,11 @@
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.Logger;
-import org.jdom.Attribute;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.JDOMException;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Attribute;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.JDOMException;
+import org.jdom2.input.SAXBuilder;
import ca.openosp.openo.decisionSupport.model.conditionValue.DSValue;
import ca.openosp.openo.decisionSupport.model.impl.drools.DSGuidelineDrools;
import ca.openosp.openo.utility.MiscUtils;
diff --git a/src/main/java/ca/openosp/openo/decisionSupport/model/impl/drools/DSGuidelineDrools.java b/src/main/java/ca/openosp/openo/decisionSupport/model/impl/drools/DSGuidelineDrools.java
index 0785f76486d..90677b1a432 100644
--- a/src/main/java/ca/openosp/openo/decisionSupport/model/impl/drools/DSGuidelineDrools.java
+++ b/src/main/java/ca/openosp/openo/decisionSupport/model/impl/drools/DSGuidelineDrools.java
@@ -45,8 +45,8 @@
import org.drools.FactException;
import org.drools.RuleBase;
import org.drools.WorkingMemory;
-import org.jdom.Element;
-import org.jdom.Namespace;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
import ca.openosp.openo.decisionSupport.model.DSCondition;
import ca.openosp.openo.decisionSupport.model.DSConsequence;
import ca.openosp.openo.decisionSupport.model.DSDemographicAccess;
diff --git a/src/main/java/ca/openosp/openo/decisionSupport/prevention/DSPreventionDrools.java b/src/main/java/ca/openosp/openo/decisionSupport/prevention/DSPreventionDrools.java
index 96688da0a49..43fba098970 100644
--- a/src/main/java/ca/openosp/openo/decisionSupport/prevention/DSPreventionDrools.java
+++ b/src/main/java/ca/openosp/openo/decisionSupport/prevention/DSPreventionDrools.java
@@ -31,10 +31,10 @@
import org.apache.logging.log4j.Logger;
import org.drools.RuleBase;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.input.SAXBuilder;
import ca.openosp.openo.utility.MiscUtils;
import ca.openosp.OscarProperties;
diff --git a/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/MeasurementFlowSheet.java b/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/MeasurementFlowSheet.java
index 6a73a1d10a1..81396225866 100644
--- a/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/MeasurementFlowSheet.java
+++ b/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/MeasurementFlowSheet.java
@@ -46,7 +46,7 @@
import org.drools.RuleBase;
import org.drools.WorkingMemory;
import org.drools.io.RuleBaseLoader;
-import org.jdom.Element;
+import org.jdom2.Element;
import ca.openosp.openo.commn.dao.DxDao;
import ca.openosp.openo.utility.LoggedInInfo;
import ca.openosp.openo.utility.MiscUtils;
diff --git a/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/MeasurementTemplateFlowSheetConfig.java b/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/MeasurementTemplateFlowSheetConfig.java
index 09dcf76bece..fd16a3f93ff 100644
--- a/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/MeasurementTemplateFlowSheetConfig.java
+++ b/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/MeasurementTemplateFlowSheetConfig.java
@@ -45,11 +45,11 @@
import org.apache.commons.io.IOUtils;
import org.apache.logging.log4j.Logger;
import org.drools.RuleBase;
-import org.jdom.Attribute;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Attribute;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.XMLOutputter;
import ca.openosp.openo.commn.dao.FlowSheetUserCreatedDao;
import ca.openosp.openo.commn.dao.FlowsheetDao;
import ca.openosp.openo.commn.model.FlowSheetCustomization;
diff --git a/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/data/ExportMeasurementType.java b/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/data/ExportMeasurementType.java
index e8a414b960d..1f48a2ec8ac 100644
--- a/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/data/ExportMeasurementType.java
+++ b/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/data/ExportMeasurementType.java
@@ -26,9 +26,9 @@
package ca.openosp.openo.encounter.oscarMeasurements.data;
-import org.jdom.Element;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Element;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
import ca.openosp.openo.encounter.oscarMeasurements.bean.EctMeasurementTypesBean;
import ca.openosp.openo.encounter.oscarMeasurements.bean.EctValidationsBean;
diff --git a/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/data/ImportMeasurementTypes.java b/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/data/ImportMeasurementTypes.java
index ab1490fca92..9f6334c6e3b 100644
--- a/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/data/ImportMeasurementTypes.java
+++ b/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/data/ImportMeasurementTypes.java
@@ -30,9 +30,9 @@
import java.util.List;
import org.apache.logging.log4j.Logger;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
import ca.openosp.openo.utility.MiscUtils;
import ca.openosp.openo.encounter.oscarMeasurements.bean.EctMeasurementTypesBean;
diff --git a/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/hl7/MeasurementHL7Uploader2Action.java b/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/hl7/MeasurementHL7Uploader2Action.java
index a1caddee7eb..303d9d37546 100644
--- a/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/hl7/MeasurementHL7Uploader2Action.java
+++ b/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/hl7/MeasurementHL7Uploader2Action.java
@@ -33,7 +33,7 @@
import javax.servlet.http.HttpServletResponse;
import ca.openosp.openo.utility.MiscUtils;
-import org.apache.commons.httpclient.HttpStatus;
+import org.apache.http.HttpStatus;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
diff --git a/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/util/Recommendation.java b/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/util/Recommendation.java
index 1751b417bd6..0362709b8ae 100644
--- a/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/util/Recommendation.java
+++ b/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/util/Recommendation.java
@@ -30,7 +30,7 @@
import java.util.List;
import org.apache.logging.log4j.Logger;
-import org.jdom.Element;
+import org.jdom2.Element;
import ca.openosp.openo.utility.MiscUtils;
diff --git a/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/util/RecommendationCondition.java b/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/util/RecommendationCondition.java
index 630e01f6148..e55cd791cb9 100644
--- a/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/util/RecommendationCondition.java
+++ b/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/util/RecommendationCondition.java
@@ -28,7 +28,7 @@
import java.util.ArrayList;
-import org.jdom.Element;
+import org.jdom2.Element;
/**
* Stores Conditions for target Colours
diff --git a/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/util/RuleBaseCreator.java b/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/util/RuleBaseCreator.java
index 510c09fbb5f..7f58e69e226 100644
--- a/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/util/RuleBaseCreator.java
+++ b/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/util/RuleBaseCreator.java
@@ -32,10 +32,10 @@
import org.apache.logging.log4j.Logger;
import org.drools.RuleBase;
import org.drools.io.RuleBaseLoader;
-import org.jdom.Element;
-import org.jdom.Namespace;
-import org.jdom.output.Format;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Element;
+import org.jdom2.Namespace;
+import org.jdom2.output.Format;
+import org.jdom2.output.XMLOutputter;
import ca.openosp.openo.drools.RuleBaseFactory;
import ca.openosp.openo.utility.MiscUtils;
diff --git a/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/util/TargetColour.java b/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/util/TargetColour.java
index d450c7d19bf..7085bf8f33d 100644
--- a/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/util/TargetColour.java
+++ b/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/util/TargetColour.java
@@ -31,7 +31,7 @@
import org.apache.logging.log4j.Logger;
-import org.jdom.Element;
+import org.jdom2.Element;
import ca.openosp.openo.utility.MiscUtils;
/**
diff --git a/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/util/TargetCondition.java b/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/util/TargetCondition.java
index d26d06a125c..650d640748a 100644
--- a/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/util/TargetCondition.java
+++ b/src/main/java/ca/openosp/openo/encounter/oscarMeasurements/util/TargetCondition.java
@@ -29,7 +29,7 @@
import java.util.ArrayList;
import org.apache.logging.log4j.Logger;
-import org.jdom.Element;
+import org.jdom2.Element;
import ca.openosp.openo.utility.MiscUtils;
/**
diff --git a/src/main/java/ca/openosp/openo/fax/admin/ManageFaxes2Action.java b/src/main/java/ca/openosp/openo/fax/admin/ManageFaxes2Action.java
index 91721346320..c85f7f72d0c 100644
--- a/src/main/java/ca/openosp/openo/fax/admin/ManageFaxes2Action.java
+++ b/src/main/java/ca/openosp/openo/fax/admin/ManageFaxes2Action.java
@@ -43,7 +43,7 @@
import net.sf.json.JSONObject;
-import org.apache.commons.httpclient.HttpStatus;
+import org.apache.http.HttpStatus;
import org.apache.commons.lang.time.DateUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
diff --git a/src/main/java/ca/openosp/openo/fax/core/FaxImporter.java b/src/main/java/ca/openosp/openo/fax/core/FaxImporter.java
index 2ebd8f2c900..eb5b9f0a388 100644
--- a/src/main/java/ca/openosp/openo/fax/core/FaxImporter.java
+++ b/src/main/java/ca/openosp/openo/fax/core/FaxImporter.java
@@ -31,7 +31,7 @@
import java.util.Date;
import java.util.List;
-import org.apache.commons.httpclient.HttpStatus;
+import org.apache.http.HttpStatus;
import org.apache.commons.lang.time.DateFormatUtils;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
diff --git a/src/main/java/ca/openosp/openo/fax/core/FaxStatusUpdater.java b/src/main/java/ca/openosp/openo/fax/core/FaxStatusUpdater.java
index 52bcb7c76db..0431171abfa 100644
--- a/src/main/java/ca/openosp/openo/fax/core/FaxStatusUpdater.java
+++ b/src/main/java/ca/openosp/openo/fax/core/FaxStatusUpdater.java
@@ -29,7 +29,7 @@
import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.commons.httpclient.HttpStatus;
+import org.apache.http.HttpStatus;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
import org.apache.http.auth.AuthScope;
diff --git a/src/main/java/ca/openosp/openo/integration/hl7/handlers/PhsStarHandler.java b/src/main/java/ca/openosp/openo/integration/hl7/handlers/PhsStarHandler.java
index ab5cc38f81b..ebd8f3e2a8d 100644
--- a/src/main/java/ca/openosp/openo/integration/hl7/handlers/PhsStarHandler.java
+++ b/src/main/java/ca/openosp/openo/integration/hl7/handlers/PhsStarHandler.java
@@ -36,9 +36,9 @@
import java.util.Map;
import org.apache.logging.log4j.Logger;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
import ca.openosp.openo.PMmodule.dao.ProgramDao;
import ca.openosp.openo.PMmodule.dao.ProviderDao;
import ca.openosp.openo.PMmodule.model.Program;
diff --git a/src/main/java/ca/openosp/openo/lab/ca/all/parsers/Factory.java b/src/main/java/ca/openosp/openo/lab/ca/all/parsers/Factory.java
index 05578732aaf..e6cfe98ab7a 100644
--- a/src/main/java/ca/openosp/openo/lab/ca/all/parsers/Factory.java
+++ b/src/main/java/ca/openosp/openo/lab/ca/all/parsers/Factory.java
@@ -45,9 +45,9 @@
import org.apache.commons.codec.binary.Base64;
import org.apache.logging.log4j.Logger;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
import ca.openosp.openo.commn.dao.Hl7TextMessageDao;
import ca.openosp.openo.commn.model.Hl7TextMessage;
import ca.openosp.openo.utility.MiscUtils;
diff --git a/src/main/java/ca/openosp/openo/lab/ca/all/upload/HandlerClassFactory.java b/src/main/java/ca/openosp/openo/lab/ca/all/upload/HandlerClassFactory.java
index 228e10cde4b..4250c43d712 100644
--- a/src/main/java/ca/openosp/openo/lab/ca/all/upload/HandlerClassFactory.java
+++ b/src/main/java/ca/openosp/openo/lab/ca/all/upload/HandlerClassFactory.java
@@ -35,9 +35,9 @@
package ca.openosp.openo.lab.ca.all.upload;
import org.apache.logging.log4j.Logger;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
import ca.openosp.openo.utility.MiscUtils;
import ca.openosp.openo.lab.ca.all.upload.handlers.DefaultHandler;
import ca.openosp.openo.lab.ca.all.upload.handlers.MessageHandler;
diff --git a/src/main/java/ca/openosp/openo/lab/ca/bc/PathNet/Communication/HTTP.java b/src/main/java/ca/openosp/openo/lab/ca/bc/PathNet/Communication/HTTP.java
index f6cf918c807..b5043c81665 100644
--- a/src/main/java/ca/openosp/openo/lab/ca/bc/PathNet/Communication/HTTP.java
+++ b/src/main/java/ca/openosp/openo/lab/ca/bc/PathNet/Communication/HTTP.java
@@ -28,9 +28,15 @@
import java.io.IOException;
import java.io.InputStream;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.HttpException;
-import org.apache.commons.httpclient.methods.GetMethod;
+
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.util.EntityUtils;
+import org.apache.http.HttpEntity;
+
import org.apache.logging.log4j.Logger;
import ca.openosp.openo.utility.MiscUtils;
@@ -44,29 +50,52 @@ public class HTTP {
private static Logger logger = MiscUtils.getLogger();
private String url;
- private HttpClient client;
public HTTP(String url) {
this.url = url;
- this.client = new HttpClient();
}
- public InputStream Get(String queryString) throws IOException, HttpException {
- GetMethod method = new GetMethod(url);
- method.setQueryString(queryString);
- logger.error(this.client.executeMethod(method));
- method.getResponseBodyAsString();
- InputStream response = method.getResponseBodyAsStream();
- method.releaseConnection();
- return response;
+ /**
+ * Executes HTTP GET request and returns response as InputStream.
+ *
+ * @param queryString the query string to append to the URL
+ * @return InputStream containing response body, or null if no content.
+ * Caller must close this stream.
+ * @throws IOException if the HTTP request fails
+ */
+ public InputStream Get(String queryString) throws IOException {
+ try (CloseableHttpClient client = HttpClients.createDefault()) {
+ URIBuilder uriBuilder = new URIBuilder(url);
+ uriBuilder.setCustomQuery(queryString);
+ HttpGet get = new HttpGet(uriBuilder.build());
+
+ CloseableHttpResponse response = client.execute(get);
+ HttpEntity entity = response.getEntity();
+
+ logger.debug("Status code: " + response.getStatusLine().getStatusCode());
+
+ if (entity != null) {
+ return entity.getContent(); // caller must close this InputStream
+ } else {
+ return null;
+ }
+ } catch (Exception e) {
+ throw new IOException("HTTP GET failed", e);
+ }
}
- public String GetString(String queryString) throws IOException, HttpException {
- GetMethod method = new GetMethod(url);
- method.setQueryString(queryString);
- this.client.executeMethod(method);
- String response = method.getResponseBodyAsString();
- method.releaseConnection();
- return response;
+ public String GetString(String queryString) throws IOException {
+ try (CloseableHttpClient client = HttpClients.createDefault()) {
+ URIBuilder uriBuilder = new URIBuilder(url);
+ uriBuilder.setCustomQuery(queryString);
+ HttpGet get = new HttpGet(uriBuilder.build());
+
+ try (CloseableHttpResponse response = client.execute(get)) {
+ logger.error("Status code: " + response.getStatusLine().getStatusCode());
+ return EntityUtils.toString(response.getEntity(), "UTF-8");
+ }
+ } catch (Exception e) {
+ throw new IOException("HTTP GET failed", e);
+ }
}
}
diff --git a/src/main/java/ca/openosp/openo/lab/ca/bc/PathNet/Connection.java b/src/main/java/ca/openosp/openo/lab/ca/bc/PathNet/Connection.java
index a888e1c0a9d..13553a91fc2 100644
--- a/src/main/java/ca/openosp/openo/lab/ca/bc/PathNet/Connection.java
+++ b/src/main/java/ca/openosp/openo/lab/ca/bc/PathNet/Connection.java
@@ -33,7 +33,6 @@
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.commons.httpclient.HttpException;
import org.apache.logging.log4j.Logger;
import ca.openosp.openo.utility.MiscUtils;
import org.w3c.dom.Document;
@@ -146,15 +145,28 @@ public void Acknowledge(boolean success) {
public Document CreateDocument(InputStream input) throws SAXException, IOException, ParserConfigurationException {
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+
+ // Disable external entities
+ factory.setFeature("http://apache.org/xml/features/disallow-doctype-decl", true);
+ factory.setFeature("http://xml.org/sax/features/external-general-entities", false);
+ factory.setFeature("http://xml.org/sax/features/external-parameter-entities", false);
+ factory.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+
+ // Disable XInclude
+ factory.setXIncludeAware(false);
+
+ // Disable expansion of entity references
+ factory.setExpandEntityReferences(false);
+
DocumentBuilder builder = factory.newDocumentBuilder();
return builder.parse(input);
}
- private InputStream CreateInputStream(String queryString) throws HttpException, IOException {
+ private InputStream CreateInputStream(String queryString) throws IOException {
return this.http.Get(queryString);
}
- private String CreateString(String queryString) throws HttpException, IOException {
+ private String CreateString(String queryString) throws IOException {
return this.http.GetString(queryString);
}
}
diff --git a/src/main/java/ca/openosp/openo/olis/OLISProtocolSocketFactory.java b/src/main/java/ca/openosp/openo/olis/OLISProtocolSocketFactory.java
index 4e24070cf43..e986de381b3 100644
--- a/src/main/java/ca/openosp/openo/olis/OLISProtocolSocketFactory.java
+++ b/src/main/java/ca/openosp/openo/olis/OLISProtocolSocketFactory.java
@@ -28,7 +28,6 @@
import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.Socket;
@@ -36,51 +35,48 @@
import java.security.KeyStore;
import java.security.SecureRandom;
-import javax.net.SocketFactory;
-
-
-import org.apache.commons.httpclient.params.HttpConnectionParams;
-import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
import ca.openosp.OscarProperties;
+import javax.net.SocketFactory;
import javax.net.ssl.KeyManagerFactory;
import javax.net.ssl.SSLContext;
-public class OLISProtocolSocketFactory implements SecureProtocolSocketFactory {
+public class OLISProtocolSocketFactory extends SSLConnectionSocketFactory {
SSLContext context = null;
public OLISProtocolSocketFactory() throws Exception {
+ super(createSSLContext(), new String[]{"TLSv1.2"}, null, SSLConnectionSocketFactory.getDefaultHostnameVerifier());
+ }
+ private static SSLContext createSSLContext() throws Exception {
String pKeyFile = OscarProperties.getInstance().getProperty("olis_ssl_keystore").trim();
String pKeyPassword = OscarProperties.getInstance().getProperty("olis_ssl_keystore_password").trim();
-
KeyManagerFactory keyManagerFactory = KeyManagerFactory.getInstance("SunX509");
KeyStore keyStore = KeyStore.getInstance("JKS");
- InputStream keyInput = new FileInputStream(pKeyFile);
- keyStore.load(keyInput, pKeyPassword.toCharArray());
- keyInput.close();
+ try (InputStream keyInput = new FileInputStream(pKeyFile)) {
+ keyStore.load(keyInput, pKeyPassword.toCharArray());
+ }
keyManagerFactory.init(keyStore, pKeyPassword.toCharArray());
- context = SSLContext.getInstance("TLS");
+ SSLContext context = SSLContext.getInstance("TLS");
context.init(keyManagerFactory.getKeyManagers(), null, new SecureRandom());
+ return context;
}
+
+ public Socket createSocket(final String host, final int port, final InetAddress localAddress, final int localPort, final int timeout) throws IOException {
+ SocketFactory socketFactory = context.getSocketFactory();
- public Socket createSocket(final String host, final int port, final InetAddress localAddress, final int localPort, final HttpConnectionParams params) throws IOException {
- if (params == null) {
- throw new IllegalArgumentException("Parameters may not be null");
- }
- int timeout = params.getConnectionTimeout();
- SocketFactory socketfactory = context.getSocketFactory();
- if (timeout == 0) {
- return socketfactory.createSocket(host, port, localAddress, localPort);
+ if (timeout <= 0) {
+ return socketFactory.createSocket(host, port, localAddress, localPort);
} else {
- Socket socket = socketfactory.createSocket();
- SocketAddress localaddr = new InetSocketAddress(localAddress, localPort);
- SocketAddress remoteaddr = new InetSocketAddress(host, port);
- socket.bind(localaddr);
- socket.connect(remoteaddr, timeout);
+ Socket socket = socketFactory.createSocket();
+ SocketAddress localAddr = new InetSocketAddress(localAddress, localPort);
+ SocketAddress remoteAddr = new InetSocketAddress(host, port);
+ socket.bind(localAddr);
+ socket.connect(remoteAddr, timeout);
return socket;
}
}
diff --git a/src/main/java/ca/openosp/openo/olis1/Driver.java b/src/main/java/ca/openosp/openo/olis1/Driver.java
index ec8c4609794..68a9de8260f 100644
--- a/src/main/java/ca/openosp/openo/olis1/Driver.java
+++ b/src/main/java/ca/openosp/openo/olis1/Driver.java
@@ -40,9 +40,6 @@
import javax.xml.validation.SchemaFactory;
import ca.openosp.openo.messenger.data.MsgMessageData;
-import org.apache.axis2.transport.http.HTTPConstants;
-import org.apache.commons.httpclient.protocol.Protocol;
-import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
import org.bouncycastle.cert.X509CertificateHolder;
import org.bouncycastle.cert.jcajce.JcaCertStore;
import org.bouncycastle.cms.CMSProcessableByteArray;
@@ -115,9 +112,6 @@ public static String submitOLISQuery(LoggedInInfo loggedInInfo, HttpServletReque
String olisRequestURL = OscarProperties.getInstance().getProperty("olis_request_url", "https://olis.ssha.ca/ssha.olis.webservices.ER7/OLIS.asmx");
OLISStub olis = new OLISStub(olisRequestURL);
- if (OscarProperties.getInstance().getProperty("olis_simulate", "no").equals("no")) {
- olis._getServiceClient().getOptions().setProperty(HTTPConstants.CUSTOM_PROTOCOL_HANDLER, new Protocol("https", (ProtocolSocketFactory) new OLISProtocolSocketFactory(), 443));
- }
olisRequest.getHIALRequest().setClientTransactionID(message.getTransactionId());
olisRequest.getHIALRequest().setSignedRequest(new HIALRequestSignedRequest());
diff --git a/src/main/java/ca/openosp/openo/prescript/util/LimitedUseLookup.java b/src/main/java/ca/openosp/openo/prescript/util/LimitedUseLookup.java
index 183e2760149..f635ad1e2be 100644
--- a/src/main/java/ca/openosp/openo/prescript/util/LimitedUseLookup.java
+++ b/src/main/java/ca/openosp/openo/prescript/util/LimitedUseLookup.java
@@ -36,10 +36,10 @@
import java.util.List;
import org.apache.logging.log4j.Logger;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.filter.ElementFilter;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.filter.ElementFilter;
+import org.jdom2.input.SAXBuilder;
import ca.openosp.openo.commn.dao.ResourceStorageDao;
import ca.openosp.openo.commn.model.ResourceStorage;
import ca.openosp.openo.utility.MiscUtils;
diff --git a/src/main/java/ca/openosp/openo/prescript/util/RenalDosingFactory.java b/src/main/java/ca/openosp/openo/prescript/util/RenalDosingFactory.java
index 749b514ffaa..a7e7bbc7172 100644
--- a/src/main/java/ca/openosp/openo/prescript/util/RenalDosingFactory.java
+++ b/src/main/java/ca/openosp/openo/prescript/util/RenalDosingFactory.java
@@ -31,9 +31,9 @@
import java.util.Hashtable;
import java.util.List;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
import ca.openosp.openo.utility.MiscUtils;
/**
diff --git a/src/main/java/ca/openosp/openo/prevention/PreventionDisplayConfig.java b/src/main/java/ca/openosp/openo/prevention/PreventionDisplayConfig.java
index c05fc74de4a..70480061d8c 100644
--- a/src/main/java/ca/openosp/openo/prevention/PreventionDisplayConfig.java
+++ b/src/main/java/ca/openosp/openo/prevention/PreventionDisplayConfig.java
@@ -36,10 +36,10 @@
import ca.openosp.openo.commn.model.Demographic;
import org.apache.logging.log4j.Logger;
-import org.jdom.Attribute;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Attribute;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
import ca.openosp.openo.commn.dao.CVCImmunizationDao;
import ca.openosp.openo.commn.dao.CVCMappingDao;
import ca.openosp.openo.commn.dao.CVCMedicationDao;
diff --git a/src/main/java/ca/openosp/openo/report/ClinicalReports/ClinicalReportManager.java b/src/main/java/ca/openosp/openo/report/ClinicalReports/ClinicalReportManager.java
index a095404d515..7c8253088fd 100644
--- a/src/main/java/ca/openosp/openo/report/ClinicalReports/ClinicalReportManager.java
+++ b/src/main/java/ca/openosp/openo/report/ClinicalReports/ClinicalReportManager.java
@@ -34,9 +34,9 @@
import java.util.List;
import org.apache.commons.lang3.StringUtils;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
import ca.openosp.openo.utility.MiscUtils;
import ca.openosp.OscarProperties;
diff --git a/src/main/java/ca/openosp/openo/report/ClinicalReports/DroolsNumerator2.java b/src/main/java/ca/openosp/openo/report/ClinicalReports/DroolsNumerator2.java
index a4f0d1cd834..064f188a082 100644
--- a/src/main/java/ca/openosp/openo/report/ClinicalReports/DroolsNumerator2.java
+++ b/src/main/java/ca/openosp/openo/report/ClinicalReports/DroolsNumerator2.java
@@ -37,7 +37,7 @@
import org.drools.RuleBase;
import org.drools.WorkingMemory;
import org.drools.io.RuleBaseLoader;
-import org.jdom.Element;
+import org.jdom2.Element;
import ca.openosp.openo.utility.LoggedInInfo;
import ca.openosp.openo.utility.MiscUtils;
diff --git a/src/main/java/ca/openosp/openo/report/ClinicalReports/DroolsNumerator4.java b/src/main/java/ca/openosp/openo/report/ClinicalReports/DroolsNumerator4.java
index a6278b197aa..c0cbd6d562c 100644
--- a/src/main/java/ca/openosp/openo/report/ClinicalReports/DroolsNumerator4.java
+++ b/src/main/java/ca/openosp/openo/report/ClinicalReports/DroolsNumerator4.java
@@ -38,7 +38,7 @@
import org.drools.RuleBase;
import org.drools.WorkingMemory;
import org.drools.io.RuleBaseLoader;
-import org.jdom.Element;
+import org.jdom2.Element;
import ca.openosp.openo.utility.LoggedInInfo;
import ca.openosp.openo.utility.MiscUtils;
diff --git a/src/main/java/ca/openosp/openo/report/ClinicalReports/DroolsNumerator5.java b/src/main/java/ca/openosp/openo/report/ClinicalReports/DroolsNumerator5.java
index ad2e79a0cca..cce4c41af22 100644
--- a/src/main/java/ca/openosp/openo/report/ClinicalReports/DroolsNumerator5.java
+++ b/src/main/java/ca/openosp/openo/report/ClinicalReports/DroolsNumerator5.java
@@ -38,7 +38,7 @@
import org.drools.RuleBase;
import org.drools.WorkingMemory;
import org.drools.io.RuleBaseLoader;
-import org.jdom.Element;
+import org.jdom2.Element;
import ca.openosp.openo.utility.LoggedInInfo;
import ca.openosp.openo.utility.MiscUtils;
diff --git a/src/main/java/ca/openosp/openo/report/pageUtil/RptByExamplesFavorite2Action.java b/src/main/java/ca/openosp/openo/report/pageUtil/RptByExamplesFavorite2Action.java
index b02a46d072f..77c98dd883b 100644
--- a/src/main/java/ca/openosp/openo/report/pageUtil/RptByExamplesFavorite2Action.java
+++ b/src/main/java/ca/openosp/openo/report/pageUtil/RptByExamplesFavorite2Action.java
@@ -72,7 +72,12 @@ public String execute() throws ServletException, IOException {
break;
}
}
- return "edit";
+ } else {
+ String favoriteName = this.getFavoriteName();
+ String query = this.getQuery();
+
+ String queryWithEscapeChar = StringEscapeUtils.escapeSql(query);
+ write2Database(providerNo, favoriteName, queryWithEscapeChar);
}
// Save new favorite
diff --git a/src/main/java/ca/openosp/openo/report/reportByTemplate/ReportManager.java b/src/main/java/ca/openosp/openo/report/reportByTemplate/ReportManager.java
index 338a8647c62..d7042a8b6f2 100644
--- a/src/main/java/ca/openosp/openo/report/reportByTemplate/ReportManager.java
+++ b/src/main/java/ca/openosp/openo/report/reportByTemplate/ReportManager.java
@@ -35,10 +35,10 @@
import java.util.UUID;
import org.apache.commons.lang.StringEscapeUtils;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.input.SAXBuilder;
-import org.jdom.output.XMLOutputter;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
+import org.jdom2.output.XMLOutputter;
import ca.openosp.openo.commn.dao.ReportTemplatesDao;
import ca.openosp.openo.commn.model.ReportTemplates;
import ca.openosp.openo.managers.SecurityInfoManager;
diff --git a/src/main/java/ca/openosp/openo/utility/OntarioMD.java b/src/main/java/ca/openosp/openo/utility/OntarioMD.java
index c91cbaa6d50..2aeb5528c87 100644
--- a/src/main/java/ca/openosp/openo/utility/OntarioMD.java
+++ b/src/main/java/ca/openosp/openo/utility/OntarioMD.java
@@ -32,14 +32,16 @@
import org.apache.commons.collections.OrderedMap;
import org.apache.commons.collections.map.LinkedMap;
-import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.RequestEntity;
-import org.apache.commons.httpclient.methods.StringRequestEntity;
-import org.jdom.Document;
-import org.jdom.Element;
-import org.jdom.filter.ElementFilter;
-import org.jdom.input.SAXBuilder;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.util.EntityUtils;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.filter.ElementFilter;
+import org.jdom2.input.SAXBuilder;
import ca.openosp.OscarProperties;
@@ -67,21 +69,23 @@ public boolean showOntarioMDLink() {
public Hashtable loginToOntarioMD(String username, String password, String incomingRequestor) throws Exception {
//public ArrayList soapHttpCall(int siteCode, String userId, String passwd, String xml) throws Exception
Hashtable h = null;
- PostMethod post = new PostMethod("https://www.ontariomd.ca/services/OMDAutomatedAuthentication");
- post.setRequestHeader("SOAPAction", "");
- post.setRequestHeader("Content-Type", "text/xml; charset=utf-8");
+ HttpPost post = new HttpPost("https://www.ontariomd.ca/services/OMDAutomatedAuthentication");
+ post.setHeader("SOAPAction", "");
+ post.setHeader("Content-Type", "text/xml; charset=utf-8");
String soapMsg = "" + username + "" + password + "" + incomingRequestor + " ";
- RequestEntity re = new StringRequestEntity(soapMsg, "text/xml", "utf-8");
+ StringEntity entity = new StringEntity(soapMsg, "UTF-8");
+ post.setEntity(entity);
- post.setRequestEntity(re);
+ try (CloseableHttpClient httpclient = HttpClients.createDefault();
+ CloseableHttpResponse response = httpclient.execute(post)) {
+
+ InputStream responseStream = response.getEntity().getContent();
+ h = parseReturn(responseStream);
+
+ EntityUtils.consume(response.getEntity());
- HttpClient httpclient = new HttpClient();
- // Execute request
- try {
- httpclient.executeMethod(post);
- h = parseReturn(post.getResponseBodyAsStream());
} catch (Exception e) {
MiscUtils.getLogger().error("Error", e);
} finally {
@@ -94,12 +98,25 @@ public Hashtable loginToOntarioMD(String username, String password, String incom
private Hashtable parseReturn(InputStream is) {
Hashtable h = null;
try {
-
-
+ // Create secure SAXBuilder with XXE protection
SAXBuilder parser = new SAXBuilder();
+
+ // Security features to prevent XXE attacks
+ setFeatureSafely(parser, "http://apache.org/xml/features/disallow-doctype-decl", true);
+ setFeatureSafely(parser, "http://xml.org/sax/features/external-general-entities", false);
+ setFeatureSafely(parser, "http://xml.org/sax/features/external-parameter-entities", false);
+ setFeatureSafely(parser, "http://apache.org/xml/features/nonvalidating/load-external-dtd", false);
+
+ try {
+ parser.setExpandEntities(false);
+ } catch (Exception ex) {
+ MiscUtils.getLogger().error("Could not disable entity expansion: " + ex.getMessage());
+ }
Document doc = parser.build(is);
Element root = doc.getRootElement();
+
h = new Hashtable();
+
String jsessionID = g(root.getDescendants(new ElementFilter("jsessionID")));
String ptLoginToken = g(root.getDescendants(new ElementFilter("ptLoginToken")));
String returnCode = g(root.getDescendants(new ElementFilter("returnCode")));
@@ -114,6 +131,14 @@ private Hashtable parseReturn(InputStream is) {
return h;
}
+ private void setFeatureSafely(SAXBuilder parser, String feature, boolean value) {
+ try {
+ parser.setFeature(feature, value);
+ } catch (Exception ex) {
+ MiscUtils.getLogger().warn("Could not set feature " + feature + ": " + ex.getMessage());
+ }
+ }
+
private String g(Iterator iter) {
String ret = null;
if (iter.hasNext()) {
diff --git a/src/main/java/ca/openosp/openo/utility/VelocityUtils.java b/src/main/java/ca/openosp/openo/utility/VelocityUtils.java
index 6b52897de7b..542dc70309f 100644
--- a/src/main/java/ca/openosp/openo/utility/VelocityUtils.java
+++ b/src/main/java/ca/openosp/openo/utility/VelocityUtils.java
@@ -30,7 +30,6 @@
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
import org.apache.velocity.exception.ResourceNotFoundException;
-import org.apache.velocity.runtime.log.Log4JLogChute;
import org.apache.velocity.tools.generic.DateTool;
import org.apache.velocity.tools.generic.EscapeTool;
import org.apache.velocity.tools.generic.NumberTool;
@@ -49,8 +48,6 @@ private static VelocityEngine getInitialisedVelocityEngine() {
try {
VelocityEngine velocityEngine = new VelocityEngine();
velocityEngine.setProperty("parser.pool.size", 10);
- velocityEngine.setProperty("runtime.log.logsystem.class", Log4JLogChute.class.getName());
- velocityEngine.setProperty("runtime.log.logsystem.log4j.logger", logger.getName());
velocityEngine.init();
return velocityEngine;
} catch (Exception var1) {
diff --git a/src/main/webapp/casemgmt/tripsearch.jsp b/src/main/webapp/casemgmt/tripsearch.jsp
index c9b51d9751a..11681b5a63b 100755
--- a/src/main/webapp/casemgmt/tripsearch.jsp
+++ b/src/main/webapp/casemgmt/tripsearch.jsp
@@ -30,12 +30,15 @@
<%@page import="java.util.Iterator" %>
<%@page import="java.util.List" %>
<%@page import="java.net.URLEncoder" %>
-<%@page import="org.apache.commons.httpclient.HttpClient" %>
-<%@page import="org.apache.commons.httpclient.methods.GetMethod" %>
-<%@page import="org.jdom.Document" %>
-<%@page import="org.jdom.Element" %>
-<%@page import="org.jdom.filter.ElementFilter" %>
-<%@page import="org.jdom.input.SAXBuilder" %>
+<%@ page import="org.apache.http.client.HttpClient" %>
+<%@ page import="org.apache.http.client.methods.HttpGet" %>
+<%@ page import="org.apache.http.impl.client.HttpClients" %>
+<%@ page import="org.apache.http.HttpResponse" %>
+<%@ page import="org.apache.http.util.EntityUtils" %>
+<%@page import="org.jdom2.Document" %>
+<%@page import="org.jdom2.Element" %>
+<%@page import="org.jdom2.filter.ElementFilter" %>
+<%@page import="org.jdom2.input.SAXBuilder" %>
<%@page import="ca.openosp.openo.utility.MiscUtils" %>
<%@page import="org.apache.logging.log4j.Logger" %>
> searchTripDatabase(String searchString) throws Exception {
Logger logger = MiscUtils.getLogger();
List> h = null;
- GetMethod post = new GetMethod("http://www.tripdatabase.com/search/xml?key=MCM001&criteria=" + URLEncoder.encode(searchString, "UTF-8"));
-
- HttpClient httpclient = new HttpClient();
+
+ HttpClient httpclient = HttpClients.createDefault();
+ HttpGet httpGet = new HttpGet("http://www.tripdatabase.com/search/xml?key=MCM001&criteria=" + URLEncoder.encode(searchString, "UTF-8"));
+
try {
- int result = httpclient.executeMethod(post);
- if (result != 200) {
- logger.debug("result " + result);
+ HttpResponse response = httpclient.execute(httpGet);
+ int statusCode = response.getStatusLine().getStatusCode();
+
+ if (statusCode != 200) {
+ logger.error("HTTP request failed with status: " + statusCode);
}
- h = parseReturn(post.getResponseBodyAsStream());
+
+ InputStream responseStream = response.getEntity().getContent();
+ h = parseReturn(responseStream);
} catch (Exception e) {
- logger.debug("searchTripDB", e);
+ logger.error("searchTripDB", e);
} finally {
// Release current connection to the connection pool
- post.releaseConnection();
+ httpGet.releaseConnection();
}
return h;
}
diff --git a/src/main/webapp/lab/CumulativeLabValues3.jsp b/src/main/webapp/lab/CumulativeLabValues3.jsp
index 55dc60d5fa1..4e7d9fce9e0 100644
--- a/src/main/webapp/lab/CumulativeLabValues3.jsp
+++ b/src/main/webapp/lab/CumulativeLabValues3.jsp
@@ -25,7 +25,7 @@
--%>
<%@page
- import="ca.openosp.openo.demographic.data.*,java.util.*,java.sql.Connection,ca.openosp.openo.prevention.*,ca.openosp.openo.lab.ca.on.*,ca.openosp.openo.util.*,ca.openosp.openo.lab.*,ca.openosp.openo.lab.ca.all.util.CumulativeLabValuesComparator,org.jdom.*,ca.openosp.openo.db.*,org.jdom.input.*,java.io.InputStream" %>
+ import="ca.openosp.openo.demographic.data.*,java.util.*,java.sql.Connection,ca.openosp.openo.prevention.*,ca.openosp.openo.lab.ca.on.*,ca.openosp.openo.util.*,ca.openosp.openo.lab.*,ca.openosp.openo.lab.ca.all.util.CumulativeLabValuesComparator,org.jdom2.*,ca.openosp.openo.db.*,org.jdom2.input.*,java.io.InputStream" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
<%@ taglib uri="/WEB-INF/oscar-tag.tld" prefix="oscar" %>
<%@ taglib uri="/WEB-INF/security.tld" prefix="security" %>
diff --git a/src/main/webapp/oscarEncounter/oscarMeasurements/adminFlowsheet/EditFlowsheet.jsp b/src/main/webapp/oscarEncounter/oscarMeasurements/adminFlowsheet/EditFlowsheet.jsp
index acbdba48b8f..024cd3f2dc6 100644
--- a/src/main/webapp/oscarEncounter/oscarMeasurements/adminFlowsheet/EditFlowsheet.jsp
+++ b/src/main/webapp/oscarEncounter/oscarMeasurements/adminFlowsheet/EditFlowsheet.jsp
@@ -27,7 +27,7 @@
<%@ page
import="ca.openosp.openo.demographic.data.*,java.util.*,ca.openosp.openo.prevention.*,ca.openosp.openo.encounter.oscarMeasurements.*,ca.openosp.openo.encounter.oscarMeasurements.bean.*,java.net.*" %>
<%@ page
- import="org.jdom.Element,ca.openosp.openo.encounter.oscarMeasurements.data.*,org.jdom.output.Format,org.jdom.output.XMLOutputter,ca.openosp.openo.encounter.oscarMeasurements.util.*,java.io.*" %>
+ import="org.jdom2.Element,ca.openosp.openo.encounter.oscarMeasurements.data.*,org.jdom2.output.Format,org.jdom2.output.XMLOutputter,ca.openosp.openo.encounter.oscarMeasurements.util.*,java.io.*" %>
<%@ page import="org.springframework.web.context.support.WebApplicationContextUtils" %>
<%@ page import="org.springframework.web.context.WebApplicationContext" %>
<%@ page import="ca.openosp.openo.commn.dao.*,ca.openosp.openo.commn.model.FlowSheetCustomization" %>
diff --git a/src/main/webapp/oscarEncounter/oscarMeasurements/adminFlowsheet/NewFlowsheet.jsp b/src/main/webapp/oscarEncounter/oscarMeasurements/adminFlowsheet/NewFlowsheet.jsp
index 6cea86a175e..e6ea48981e2 100644
--- a/src/main/webapp/oscarEncounter/oscarMeasurements/adminFlowsheet/NewFlowsheet.jsp
+++ b/src/main/webapp/oscarEncounter/oscarMeasurements/adminFlowsheet/NewFlowsheet.jsp
@@ -26,7 +26,7 @@
<%@page contentType="text/html" %>
<%@page import="java.util.*,ca.openosp.openo.demographic.data.*,java.util.*,ca.openosp.openo.prevention.*,ca.openosp.openo.encounter.oscarMeasurements.*,ca.openosp.openo.encounter.oscarMeasurements.bean.*,java.net.*" %>
-<%@page import="org.jdom.Element,ca.openosp.openo.encounter.oscarMeasurements.data.*,org.jdom.output.Format,org.jdom.output.XMLOutputter,ca.openosp.openo.encounter.oscarMeasurements.util.*" %>
+<%@page import="org.jdom2.Element,ca.openosp.openo.encounter.oscarMeasurements.data.*,org.jdom2.output.Format,org.jdom2.output.XMLOutputter,ca.openosp.openo.encounter.oscarMeasurements.util.*" %>
<%@page import="ca.openosp.openo.commn.dao.FlowSheetUserCreatedDao,ca.openosp.openo.commn.model.FlowSheetUserCreated,ca.openosp.openo.utility.SpringUtils" %>
<%
FlowSheetUserCreatedDao flowSheetUserCreatedDao = (FlowSheetUserCreatedDao) SpringUtils.getBean(FlowSheetUserCreatedDao.class);
diff --git a/src/main/webapp/oscarEncounter/oscarMeasurements/adminFlowsheet/UpdateFlowsheet.jsp b/src/main/webapp/oscarEncounter/oscarMeasurements/adminFlowsheet/UpdateFlowsheet.jsp
index fd642c616a7..70f35cde1a1 100644
--- a/src/main/webapp/oscarEncounter/oscarMeasurements/adminFlowsheet/UpdateFlowsheet.jsp
+++ b/src/main/webapp/oscarEncounter/oscarMeasurements/adminFlowsheet/UpdateFlowsheet.jsp
@@ -42,7 +42,7 @@
<%@ page
import="ca.openosp.openo.demographic.data.*,java.util.*,ca.openosp.openo.prevention.*,ca.openosp.openo.encounter.oscarMeasurements.*,ca.openosp.openo.encounter.oscarMeasurements.bean.*,java.net.*" %>
<%@ page
- import="org.jdom.Element,ca.openosp.openo.encounter.oscarMeasurements.data.*,org.jdom.output.Format,org.jdom.output.XMLOutputter,ca.openosp.openo.encounter.oscarMeasurements.util.*,java.io.*" %>
+ import="org.jdom2.Element,ca.openosp.openo.encounter.oscarMeasurements.data.*,org.jdom2.output.Format,org.jdom2.output.XMLOutputter,ca.openosp.openo.encounter.oscarMeasurements.util.*,java.io.*" %>
<%@ page import="org.springframework.web.context.support.WebApplicationContextUtils" %>
<%@ page import="org.springframework.web.context.WebApplicationContext" %>
<%@ page import="ca.openosp.openo.commn.dao.*,ca.openosp.openo.commn.model.FlowSheetCustomization" %>
diff --git a/src/main/webapp/oscarRx/SideLinksEditFavorites.jsp b/src/main/webapp/oscarRx/SideLinksEditFavorites.jsp
index 0d58f3ca047..caccc53dd4f 100755
--- a/src/main/webapp/oscarRx/SideLinksEditFavorites.jsp
+++ b/src/main/webapp/oscarRx/SideLinksEditFavorites.jsp
@@ -30,6 +30,8 @@
%>
<%@page import="ca.openosp.openo.prescript.data.RxPatientData" %>
+<%@page import="ca.openosp.openo.prescript.data.RxPrescriptionData" %>
+<%@page import="ca.openosp.openo.prescript.pageUtil.RxSessionBean" %>
<%@ page import="ca.openosp.openo.utility.LoggedInInfo" %>
<%@ page import="ca.openosp.openo.commn.model.Allergy" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
diff --git a/src/main/webapp/oscarRx/SideLinksEditFavorites2.jsp b/src/main/webapp/oscarRx/SideLinksEditFavorites2.jsp
index 8301cf1ccee..793a4853919 100755
--- a/src/main/webapp/oscarRx/SideLinksEditFavorites2.jsp
+++ b/src/main/webapp/oscarRx/SideLinksEditFavorites2.jsp
@@ -26,6 +26,7 @@
<%@page import="ca.openosp.openo.commn.dao.DxresearchDAO" %>
<%@page import="ca.openosp.openo.commn.model.Dxresearch" %>
<%@page import="ca.openosp.openo.prescript.data.RxPatientData" %>
+<%@page import="ca.openosp.openo.prescript.pageUtil.RxSessionBean" %>
<%@page import="ca.openosp.openo.utility.SpringUtils" %>
<%@page import="ca.openosp.openo.managers.CodingSystemManager" %>
<%@page import="org.apache.commons.lang.StringEscapeUtils" %>
diff --git a/src/main/webapp/oscarRx/SideLinksNoEditFavorites.jsp b/src/main/webapp/oscarRx/SideLinksNoEditFavorites.jsp
index 1f0f729bf1e..f55e9820279 100755
--- a/src/main/webapp/oscarRx/SideLinksNoEditFavorites.jsp
+++ b/src/main/webapp/oscarRx/SideLinksNoEditFavorites.jsp
@@ -26,6 +26,7 @@
<%@page import="ca.openosp.openo.prescript.data.RxPatientData" %>
<%@ page import="ca.openosp.openo.utility.LoggedInInfo" %>
<%@ page import="ca.openosp.openo.prescript.data.RxPrescriptionData" %>
+<%@page import="ca.openosp.openo.prescript.pageUtil.RxSessionBean" %>
<%@ page import="ca.openosp.openo.commn.model.Allergy" %>
<%@ taglib uri="/WEB-INF/security.tld" prefix="security" %>
<%
diff --git a/src/main/webapp/oscarRx/SideLinksNoEditFavorites2.jsp b/src/main/webapp/oscarRx/SideLinksNoEditFavorites2.jsp
index 40ed115bb44..b835f2f528a 100755
--- a/src/main/webapp/oscarRx/SideLinksNoEditFavorites2.jsp
+++ b/src/main/webapp/oscarRx/SideLinksNoEditFavorites2.jsp
@@ -26,6 +26,7 @@
<%@page import="ca.openosp.openo.prescript.data.RxPatientData" %>
<%@ page import="ca.openosp.openo.utility.LoggedInInfo" %>
<%@ page import="ca.openosp.openo.prescript.data.RxPrescriptionData" %>
+<%@page import="ca.openosp.openo.prescript.pageUtil.RxSessionBean" %>
<%@ page import="ca.openosp.openo.commn.model.Allergy" %>
<%@ taglib uri="/WEB-INF/security.tld" prefix="security" %>
<%
diff --git a/src/main/webapp/provider/appointmentprovideradminday.jsp b/src/main/webapp/provider/appointmentprovideradminday.jsp
index 4a026d06e7d..d4c771f4028 100644
--- a/src/main/webapp/provider/appointmentprovideradminday.jsp
+++ b/src/main/webapp/provider/appointmentprovideradminday.jsp
@@ -2375,10 +2375,10 @@