diff --git a/Plan/build.gradle b/Plan/build.gradle index 0e4bc1735..8897765e9 100644 --- a/Plan/build.gradle +++ b/Plan/build.gradle @@ -83,7 +83,7 @@ subprojects { redisBungeeVersion = "0.3.8-SNAPSHOT" redisBungeeProxioDevVersion = "0.7.3" - commonsTextVersion = "1.11.0" + commonsTextVersion = "1.12.0" commonsCompressVersion = "1.26.1" commonsCodecVersion = "1.16.1" caffeineVersion = "3.1.8" @@ -94,7 +94,7 @@ subprojects { sqliteVersion = "3.42.0.1" adventureVersion = "4.14.0" hikariVersion = "5.1.0" - slf4jVersion = "2.0.11" + slf4jVersion = "2.0.13" geoIpVersion = "4.2.0" gsonVersion = "2.10.1" dependencyDownloadVersion = "1.3.1" diff --git a/Plan/react/dashboard/package.json b/Plan/react/dashboard/package.json index bcfc107eb..e0390409e 100644 --- a/Plan/react/dashboard/package.json +++ b/Plan/react/dashboard/package.json @@ -20,15 +20,15 @@ "@fullcalendar/react": "^6.1.11", "@highcharts/map-collection": "^2.1.0", "@testing-library/jest-dom": "^6.4.2", - "@testing-library/react": "^14.2.2", + "@testing-library/react": "^15.0.2", "@testing-library/user-event": "^14.5.2", "axios": "^1.6.8", "bootstrap": "^5.3.3", "export-to-csv": "^1.2.4", "highcharts": "^10.3.3", - "i18next": "^23.10.1", + "i18next": "^23.11.2", "i18next-chained-backend": "^4.6.2", - "i18next-http-backend": "^2.5.0", + "i18next-http-backend": "^2.5.1", "i18next-localstorage-backend": "^4.2.0", "masonry-layout": "^4.2.2", "moment": "^2.30.1", @@ -39,9 +39,9 @@ "react-i18next": "^14.1.0", "react-mcjsonchat": "^1.0.0", "react-router-dom": "6", - "sass": "^1.74.1", + "sass": "^1.75.0", "source-map-explorer": "^2.5.2", - "swagger-ui": "^5.13.0", + "swagger-ui": "^5.16.1", "web-vitals": "^3.0.2" }, "scripts": { @@ -69,6 +69,6 @@ }, "devDependencies": { "@vitejs/plugin-react": "^4.2.1", - "vite": "^5.2.8" + "vite": "^5.2.9" } } diff --git a/Plan/react/dashboard/yarn.lock b/Plan/react/dashboard/yarn.lock index bf9814177..9dff1d8a1 100644 --- a/Plan/react/dashboard/yarn.lock +++ b/Plan/react/dashboard/yarn.lock @@ -323,7 +323,7 @@ core-js-pure "^3.30.2" regenerator-runtime "^0.14.0" -"@babel/runtime-corejs3@^7.24.1": +"@babel/runtime-corejs3@^7.24.4": version "7.24.4" resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.24.4.tgz#b9ebe728087cfbb22bbaccc6f9a70d69834124a0" integrity sha512-VOQOexSilscN24VEY810G/PqtpFvx/z6UqDIjIWbDe2368HhDLkYN5TYwaEz/+eRCUkhJ2WaNLLmQAlxzfWj4w== @@ -744,7 +744,7 @@ ramda-adjunct "^4.1.1" unraw "^3.0.0" -"@swagger-api/apidom-core@>=0.99.0 <1.0.0", "@swagger-api/apidom-core@^0.99.1": +"@swagger-api/apidom-core@>=0.99.1 <1.0.0", "@swagger-api/apidom-core@^0.99.1": version "0.99.1" resolved "https://registry.yarnpkg.com/@swagger-api/apidom-core/-/apidom-core-0.99.1.tgz#18326ebede2e76bc8360e294208fad0f80cc4a73" integrity sha512-oWU9Re2B7hPFAnm4ymN2HNOqevMqZsvL4Fjud2qN+KFWNvZ1/r8kwQaj0Pba5Kwka2bcWo0aEfWNayP4axTB+Q== @@ -766,7 +766,7 @@ dependencies: "@babel/runtime-corejs3" "^7.20.7" -"@swagger-api/apidom-json-pointer@>=0.99.0 <1.0.0", "@swagger-api/apidom-json-pointer@^0.99.1": +"@swagger-api/apidom-json-pointer@>=0.99.1 <1.0.0", "@swagger-api/apidom-json-pointer@^0.99.1": version "0.99.1" resolved "https://registry.yarnpkg.com/@swagger-api/apidom-json-pointer/-/apidom-json-pointer-0.99.1.tgz#97f31141817166474b8a0993f9dcf9b9264dc75d" integrity sha512-4fOOKTLoBWpfX2eGNx93sqBsS1KRCtBFOq75n1jMcRbs1rrj+JxcaiTFUE+6BZqIqBsCqTmRMYE/HsgwBS3vhQ== @@ -874,7 +874,7 @@ ramda-adjunct "^4.1.1" ts-mixer "^6.0.3" -"@swagger-api/apidom-ns-openapi-3-1@>=0.99.0 <1.0.0", "@swagger-api/apidom-ns-openapi-3-1@^0.99.1": +"@swagger-api/apidom-ns-openapi-3-1@>=0.99.1 <1.0.0", "@swagger-api/apidom-ns-openapi-3-1@^0.99.1": version "0.99.1" resolved "https://registry.yarnpkg.com/@swagger-api/apidom-ns-openapi-3-1/-/apidom-ns-openapi-3-1-0.99.1.tgz#b85b9aeea010def1b9dfdbc6f4a4b0fc3b766847" integrity sha512-XsRxM9WC+WywBo+rr/YUayQRsV2mN8AzBxVlKzJoZ+pBgmPYe24n3Ma/0FTr8zGwQyg4DtOBwydlYz8QFrLPFA== @@ -1089,7 +1089,7 @@ tree-sitter-yaml "=0.5.0" web-tree-sitter "=0.20.3" -"@swagger-api/apidom-reference@>=0.99.0 <1.0.0": +"@swagger-api/apidom-reference@>=0.99.1 <1.0.0": version "0.99.1" resolved "https://registry.yarnpkg.com/@swagger-api/apidom-reference/-/apidom-reference-0.99.1.tgz#48a601355a7f08ac40d87e38bbd76a0306a84202" integrity sha512-g7xp+ZL/iRX6CEwdUnqqsLfZmaSRlXwEZV8LF1k4k13/o7Qcf7bsPv0fOVGa8ZC29zM8k//FVavwWoXvT2xrFQ== @@ -1133,18 +1133,18 @@ dependencies: tslib "^2.4.0" -"@testing-library/dom@^9.0.0": - version "9.0.0" - resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-9.0.0.tgz#cc50e8df2a7dccff95555102beebbae60e95e95e" - integrity sha512-+/TLgKNFsYUshOY/zXsQOk+PlFQK+eyJ9T13IDVNJEi+M+Un7xlJK+FZKkbGSnf0+7E1G6PlDhkSYQ/GFiruBQ== +"@testing-library/dom@^10.0.0": + version "10.0.0" + resolved "https://registry.yarnpkg.com/@testing-library/dom/-/dom-10.0.0.tgz#ae1ab88aad35a728a38264041163174cafd7e8dd" + integrity sha512-PmJPnogldqoVFf+EwbHvbBJ98MmqASV8kLrBYgsDNxQcFMeIS7JFL48sfyXvuMtgmWO/wMhh25odr+8VhDmn4g== dependencies: "@babel/code-frame" "^7.10.4" "@babel/runtime" "^7.12.5" "@types/aria-query" "^5.0.1" - aria-query "^5.0.0" + aria-query "5.3.0" chalk "^4.1.0" dom-accessibility-api "^0.5.9" - lz-string "^1.4.4" + lz-string "^1.5.0" pretty-format "^27.0.2" "@testing-library/jest-dom@^6.4.2": @@ -1161,13 +1161,13 @@ lodash "^4.17.15" redent "^3.0.0" -"@testing-library/react@^14.2.2": - version "14.2.2" - resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-14.2.2.tgz#74f855215c57d423282486a395a4348a837d3c5a" - integrity sha512-SOUuM2ysCvjUWBXTNfQ/ztmnKDmqaiPV3SvoIuyxMUca45rbSWWAT/qB8CUs/JQ/ux/8JFs9DNdFQ3f6jH3crA== +"@testing-library/react@^15.0.2": + version "15.0.2" + resolved "https://registry.yarnpkg.com/@testing-library/react/-/react-15.0.2.tgz#d0fd7e9c41b819557639acf5f18e4cd1007ec295" + integrity sha512-5mzIpuytB1ctpyywvyaY2TAAUQVCZIGqwiqFQf6u9lvj/SJQepGUzNV18Xpk+NLCaCE2j7CWrZE0tEf9xLZYiQ== dependencies: "@babel/runtime" "^7.12.5" - "@testing-library/dom" "^9.0.0" + "@testing-library/dom" "^10.0.0" "@types/react-dom" "^18.0.0" "@testing-library/user-event@^14.5.2": @@ -1340,7 +1340,7 @@ argparse@^2.0.1: resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== -aria-query@^5.0.0: +aria-query@5.3.0, aria-query@^5.0.0: version "5.3.0" resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-5.3.0.tgz#650c569e41ad90b51b3d7df5e5eed1c7549c103e" integrity sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A== @@ -1705,10 +1705,10 @@ dom-helpers@^5.0.1, dom-helpers@^5.2.0, dom-helpers@^5.2.1: "@babel/runtime" "^7.8.7" csstype "^3.0.2" -dompurify@=3.0.11: - version "3.0.11" - resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.0.11.tgz#c163f5816eaac6aeef35dae2b77fca0504564efe" - integrity sha512-Fan4uMuyB26gFV3ovPoEoQbxRRPfTu3CvImyZnhGq5fsIEO+gEFLp45ISFt+kQBWsK5ulDdT0oV28jS1UrwQLg== +dompurify@=3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-3.1.0.tgz#8c6b9fe986969a33aa4686bd829cbe8e14dd9445" + integrity sha512-yoU4rhgPKCo+p5UrWWWNKiIq+ToGqmVVhk0PmMYBK4kRsR3/qhemNFL8f6CFmBd4gMwm3F4T7HBoydP5uY07fA== drange@^1.0.2: version "1.1.1" @@ -2030,10 +2030,10 @@ i18next-chained-backend@^4.6.2: dependencies: "@babel/runtime" "^7.23.2" -i18next-http-backend@^2.5.0: - version "2.5.0" - resolved "https://registry.yarnpkg.com/i18next-http-backend/-/i18next-http-backend-2.5.0.tgz#8396a7df30bfe722eff7a65f629df32a61720414" - integrity sha512-Z/aQsGZk1gSxt2/DztXk92DuDD20J+rNudT7ZCdTrNOiK8uQppfvdjq9+DFQfpAnFPn3VZS+KQIr1S/W1KxhpQ== +i18next-http-backend@^2.5.1: + version "2.5.1" + resolved "https://registry.yarnpkg.com/i18next-http-backend/-/i18next-http-backend-2.5.1.tgz#97141b65d860a124b6c9feee181e565c753b0629" + integrity sha512-+rNX1tghdVxdfjfPt0bI1sNg5ahGW9kA7OboG7b4t03Fp69NdDlRIze6yXhIbN8rbHxJ8IP4dzRm/okZ15lkQg== dependencies: cross-fetch "4.0.0" @@ -2044,10 +2044,10 @@ i18next-localstorage-backend@^4.2.0: dependencies: "@babel/runtime" "^7.22.15" -i18next@^23.10.1: - version "23.10.1" - resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.10.1.tgz#217ce93b75edbe559ac42be00a20566b53937df6" - integrity sha512-NDiIzFbcs3O9PXpfhkjyf7WdqFn5Vq6mhzhtkXzj51aOcNuPNcTwuYNuXCpHsanZGHlHKL35G7huoFeVic1hng== +i18next@^23.11.2: + version "23.11.2" + resolved "https://registry.yarnpkg.com/i18next/-/i18next-23.11.2.tgz#4c0e8192a9ba230fe7dc68b76459816ab601826e" + integrity sha512-qMBm7+qT8jdpmmDw/kQD16VpmkL9BdL+XNAK5MNbNFaf1iQQq35ZbPrSlqmnNPOSUY4m342+c0t0evinF5l7sA== dependencies: "@babel/runtime" "^7.23.2" @@ -2274,10 +2274,10 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -lz-string@^1.4.4: - version "1.4.4" - resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.4.4.tgz#c0d8eaf36059f705796e1e344811cf4c498d3a26" - integrity sha1-wNjq82BZ9wV5bh40SBHPTEmNOiY= +lz-string@^1.5.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941" + integrity sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ== masonry-layout@^4.2.2: version "4.2.2" @@ -2766,10 +2766,10 @@ react-mcjsonchat@^1.0.0: resolved "https://registry.yarnpkg.com/react-mcjsonchat/-/react-mcjsonchat-1.0.0.tgz#6a0c748b074c06a2d64a66db76e5fb2036c48a9a" integrity sha512-H/OYi1iRYFG2Bntj1EYWfTxOaWtIopHy6ILoaXtD3OFONK7kQnp0lXFf6sw1G3BU0DL7s8NL4+AmMCer/A5eIQ== -react-redux@^9.1.0: - version "9.1.0" - resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-9.1.0.tgz#46a46d4cfed4e534ce5452bb39ba18e1d98a8197" - integrity sha512-6qoDzIO+gbrza8h3hjMA9aq4nwVFCKFtY2iLxCtVT38Swyy2C/dJCGBXHeHLtx6qlg/8qzc2MrhOeduf5K32wQ== +react-redux@^9.1.1: + version "9.1.1" + resolved "https://registry.yarnpkg.com/react-redux/-/react-redux-9.1.1.tgz#852ec13084bd7375e26db697d2fc9027ffada204" + integrity sha512-5ynfGDzxxsoV73+4czQM56qF43vsmgJsO22rmAvU5tZT2z5Xow/A2uhhxwXuGTxgdReF3zcp7A80gma2onRs1A== dependencies: "@types/use-sync-external-store" "^0.0.3" use-sync-external-store "^1.0.0" @@ -2944,10 +2944,10 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@~5.2.0: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -sass@^1.74.1: - version "1.74.1" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.74.1.tgz#686fc227d3707dd25cb2925e1db8e4562be29319" - integrity sha512-w0Z9p/rWZWelb88ISOLyvqTWGmtmu2QJICqDBGyNnfG4OUnPX9BBjjYIXUpXCMOOg5MQWNpqzt876la1fsTvUA== +sass@^1.75.0: + version "1.75.0" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.75.0.tgz#91bbe87fb02dfcc34e052ddd6ab80f60d392be6c" + integrity sha512-ShMYi3WkrDWxExyxSZPst4/okE9ts46xZmJDSawJQrnte7M1V9fScVB+uNXOVKRBt0PggHOwoZcn8mYX4trnBw== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" @@ -3129,17 +3129,17 @@ supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -swagger-client@^3.26.4: - version "3.26.6" - resolved "https://registry.yarnpkg.com/swagger-client/-/swagger-client-3.26.6.tgz#d272ef5aeb3fd278f5c9c4b94ec98a9703cba92c" - integrity sha512-PYYca8BsamZaOjlKr5ombOTeDje1ddiYAKGstpmAU3iU+mBKgqHiw5G2J77SC9+chKU5y0aJzmQX4hNu3p2y5A== +swagger-client@^3.27.0: + version "3.27.0" + resolved "https://registry.yarnpkg.com/swagger-client/-/swagger-client-3.27.0.tgz#555e1990448f1fe83164adb9a6120380abef3c43" + integrity sha512-DyuHrUzHxysUbhsCgPfsWKH3EULDwjD7jkRl0SHvXAd6gtZS3e3RHUZjDBA4cbrcgDiIuC7Ju/YIOkE+rKCutw== dependencies: "@babel/runtime-corejs3" "^7.22.15" - "@swagger-api/apidom-core" ">=0.99.0 <1.0.0" + "@swagger-api/apidom-core" ">=0.99.1 <1.0.0" "@swagger-api/apidom-error" ">=0.99.0 <1.0.0" - "@swagger-api/apidom-json-pointer" ">=0.99.0 <1.0.0" - "@swagger-api/apidom-ns-openapi-3-1" ">=0.99.0 <1.0.0" - "@swagger-api/apidom-reference" ">=0.99.0 <1.0.0" + "@swagger-api/apidom-json-pointer" ">=0.99.1 <1.0.0" + "@swagger-api/apidom-ns-openapi-3-1" ">=0.99.1 <1.0.0" + "@swagger-api/apidom-reference" ">=0.99.1 <1.0.0" cookie "~0.6.0" deepmerge "~4.3.0" fast-json-patch "^3.0.0-1" @@ -3150,18 +3150,18 @@ swagger-client@^3.26.4: qs "^6.10.2" traverse "~0.6.6" -swagger-ui@^5.13.0: - version "5.13.0" - resolved "https://registry.yarnpkg.com/swagger-ui/-/swagger-ui-5.13.0.tgz#700e40ca8d32eb18cbb67667a6fc0e0d151f328c" - integrity sha512-ul9ui69CTxb9+P4Ek3njwHnQqLeYfK0AMBvIDAwIrz4YV7DJqZR9hCy4ZDlMBzIacbaDMwnwqeIULlOPJTia1g== +swagger-ui@^5.16.1: + version "5.16.2" + resolved "https://registry.yarnpkg.com/swagger-ui/-/swagger-ui-5.16.2.tgz#5cd9def8a75b8d34fee6813b248fcd86f5be6e90" + integrity sha512-SfedFxGvqu9HtkAXpMEkF7jyTFG7cX4GhxBKxm2BaYMp30IlBE6aQAdwsTmatRw6X2fm9LQeUQJK7OuVVrBVRQ== dependencies: - "@babel/runtime-corejs3" "^7.24.1" + "@babel/runtime-corejs3" "^7.24.4" "@braintree/sanitize-url" "=7.0.1" base64-js "^1.5.1" classnames "^2.5.1" css.escape "1.5.1" deep-extend "0.6.0" - dompurify "=3.0.11" + dompurify "=3.1.0" ieee754 "^1.2.1" immutable "^3.x.x" js-file-download "^0.4.12" @@ -3178,7 +3178,7 @@ swagger-ui@^5.13.0: react-immutable-proptypes "2.2.0" react-immutable-pure-component "^2.2.0" react-inspector "^6.0.1" - react-redux "^9.1.0" + react-redux "^9.1.1" react-syntax-highlighter "^15.5.0" redux "^5.0.1" redux-immutable "^4.0.0" @@ -3186,7 +3186,7 @@ swagger-ui@^5.13.0: reselect "^5.1.0" serialize-error "^8.1.0" sha.js "^2.4.11" - swagger-client "^3.26.4" + swagger-client "^3.27.0" url-parse "^1.5.10" xml "=1.0.1" xml-but-prettier "^1.0.1" @@ -3362,10 +3362,10 @@ util-deprecate@^1.0.1: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw== -vite@^5.2.8: - version "5.2.8" - resolved "https://registry.yarnpkg.com/vite/-/vite-5.2.8.tgz#a99e09939f1a502992381395ce93efa40a2844aa" - integrity sha512-OyZR+c1CE8yeHw5V5t59aXsUPPVTHMDjEZz8MgguLL/Q7NblxhZUlTu9xSPqlsUO/y+X7dlU05jdhvyycD55DA== +vite@^5.2.9: + version "5.2.9" + resolved "https://registry.yarnpkg.com/vite/-/vite-5.2.9.tgz#cd9a356c6ff5f7456c09c5ce74068ffa8df743d9" + integrity sha512-uOQWfuZBlc6Y3W/DTuQ1Sr+oIXWvqljLvS881SVmAj00d5RdgShLcuXWxseWPd4HXwiYBFW/vXHfKFeqj9uQnw== dependencies: esbuild "^0.20.1" postcss "^8.4.38"