From c42635f65d4bbdd1e9f76509ced7f0555c623818 Mon Sep 17 00:00:00 2001
From: Dmitry Baev <baev@users.noreply.github.com>
Date: Mon, 29 Jan 2024 20:12:50 +0000
Subject: [PATCH] gradle 8

---
 allure-scalatest/build.gradle.kts        |   2 +-
 build.gradle.kts                         |  71 ++++--
 gradle/wrapper/gradle-wrapper.jar        | Bin 59536 -> 60756 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 gradlew                                  | 263 ++++++++++++++---------
 gradlew.bat                              |  14 +-
 settings.gradle.kts                      |   2 +-
 7 files changed, 224 insertions(+), 130 deletions(-)

diff --git a/allure-scalatest/build.gradle.kts b/allure-scalatest/build.gradle.kts
index 382bbfbf5..910d28ad2 100644
--- a/allure-scalatest/build.gradle.kts
+++ b/allure-scalatest/build.gradle.kts
@@ -22,7 +22,7 @@ if (hasProperty("scalaVersion")) {
 }
 
 val baseScalaVersion = selectedScalaVersion.substring(0, selectedScalaVersion.lastIndexOf("."))
-project.base.archivesBaseName = "allure-scalatest_$baseScalaVersion"
+project.base.archivesName.set("allure-scalatest_$baseScalaVersion")
 
 for (sv in availableScalaVersions) {
     val taskSuffix = sv.replace('.', '_')
diff --git a/build.gradle.kts b/build.gradle.kts
index 4d6d8249d..913e6410f 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,3 +1,5 @@
+import com.github.spotbugs.snom.SpotBugsTask
+
 val gradleScriptDir by extra("${rootProject.projectDir}/gradle")
 val qualityConfigsDir by extra("$gradleScriptDir/quality-configs")
 val spotlessDtr by extra("$qualityConfigsDir/spotless")
@@ -5,7 +7,7 @@ val spotlessDtr by extra("$qualityConfigsDir/spotless")
 val libs = subprojects.filterNot { it.name in "allure-bom" }
 
 tasks.withType(Wrapper::class) {
-    gradleVersion = "7.5.1"
+    gradleVersion = "8.5"
 }
 
 plugins {
@@ -13,12 +15,14 @@ plugins {
     `java-library`
     `maven-publish`
     signing
+    checkstyle
+    pmd
+    id("com.github.spotbugs")
     id("com.diffplug.spotless")
     id("io.github.gradle-nexus.publish-plugin")
     id("io.qameta.allure-adapter") apply false
     id("io.qameta.allure-report")
     id("io.spring.dependency-management")
-    id("ru.vyarus.quality")
 }
 
 java {
@@ -125,13 +129,15 @@ configure(subprojects) {
 
 configure(libs) {
     val project = this
+    apply(plugin = "checkstyle")
+    apply(plugin = "pmd")
+    apply(plugin = "com.github.spotbugs")
     apply(plugin = "com.diffplug.spotless")
     apply(plugin = "io.qameta.allure-report")
     apply(plugin = "io.qameta.allure-adapter")
     apply(plugin = "io.spring.dependency-management")
     apply(plugin = "java")
     apply(plugin = "java-library")
-    apply(plugin = "ru.vyarus.quality")
 
     val orgSlf4jVersion = "1.7.36"
     val assertJVersion = "1.9.9.1"
@@ -142,7 +148,7 @@ configure(libs) {
             mavenBom("org.junit:junit-bom:5.9.2")
         }
         dependencies {
-            dependency("com.github.spotbugs:spotbugs:4.7.3")
+            dependency("com.github.spotbugs:spotbugs:4.8.3")
             dependency("com.github.tomakehurst:wiremock:2.27.2")
             dependency("com.google.inject:guice:5.1.0")
             dependency("com.google.testing.compile:compile-testing:0.19")
@@ -260,16 +266,24 @@ configure(libs) {
         }
     }
 
-    quality {
-        configDir = qualityConfigsDir
-        checkstyleVersion = dependencyManagement.managedVersions["com.puppycrawl.tools:checkstyle"]
-        pmdVersion = dependencyManagement.managedVersions["net.sourceforge.pmd:pmd-java"]
-        spotbugsVersion = dependencyManagement.managedVersions["com.github.spotbugs:spotbugs"]
-        spotbugs = true
-        pmd = true
-        checkstyle = true
-        htmlReports = false
-        enabled = !project.hasProperty("disableQuality")
+    val enableQuality = true
+    fun excludeGeneratedSources(source: FileTree): FileTree = (source - fileTree("build/generated-sources")).asFileTree
+
+    checkstyle {
+        toolVersion = dependencyManagement.managedVersions["com.puppycrawl.tools:checkstyle"]!!
+        configDirectory = rootProject.layout.projectDirectory.dir("gradle/quality-configs/checkstyle")
+    }
+
+    pmd {
+        toolVersion = dependencyManagement.managedVersions["net.sourceforge.pmd:pmd-java"]!!
+        ruleSets = listOf()
+        ruleSetFiles = rootProject.files("gradle/quality-configs/pmd/pmd.xml")
+    }
+
+    spotbugs {
+        toolVersion = dependencyManagement.managedVersions["com.github.spotbugs:spotbugs"]!!
+        excludeFilter = rootProject.file("gradle/quality-configs/spotbugs/exclude.xml")
+
         afterEvaluate {
             val spotbugs = configurations.findByName("spotbugs")
             if (spotbugs != null) {
@@ -281,11 +295,36 @@ configure(libs) {
         }
     }
 
+    tasks.withType(Checkstyle::class) {
+        source = excludeGeneratedSources(source)
+        enabled = enableQuality
+    }
+
+    tasks.withType(Pmd::class) {
+        source = excludeGeneratedSources(source)
+        enabled = enableQuality
+    }
+
+    tasks.withType(SpotBugsTask::class) {
+        enabled = enableQuality
+    }
+
+    tasks.checkstyleTest {
+        enabled = false
+    }
+
+    tasks.pmdTest {
+        enabled = false
+    }
+
+    tasks.spotbugsTest {
+        enabled = false
+    }
+
     spotless {
         java {
             target("src/**/*.java")
             removeUnusedImports()
-            @Suppress("INACCESSIBLE_TYPE")
             licenseHeaderFile("$spotlessDtr/header.java", "(package|import|open|module|//startfile)")
             endWithNewline()
             replaceRegex("one blank line after package line", "(package .+;)\n+import", "$1\n\nimport")
@@ -293,7 +332,6 @@ configure(libs) {
         }
         scala {
             target("src/**/*.scala")
-            @Suppress("INACCESSIBLE_TYPE")
             licenseHeaderFile("$spotlessDtr/header.java", "(package|//startfile)")
             endWithNewline()
             replaceRegex("one blank line after package line", "(package .+;)\n+import", "$1\n\nimport")
@@ -301,7 +339,6 @@ configure(libs) {
         }
         groovy {
             target("src/**/*.groovy")
-            @Suppress("INACCESSIBLE_TYPE")
             licenseHeaderFile("$spotlessDtr/header.java", "(package|//startfile) ")
             endWithNewline()
             replaceRegex("one blank line after package line", "(package .+;)\n+import", "$1\n\nimport")
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180f2ae8848c63b8b4dea2cb829da983f2fa..249e5832f090a2944b7473328c07c9755baa3196 100644
GIT binary patch
delta 10158
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
Py&qIq5D-Lb|5*PA>zeod

delta 9041
zcmY*<Ra9KTwr$fuf?JT#KnNb(gS)%CySr=S5D3~hba1y2JZNxtcXti$kDL468|Uo(
zQFG3kRcnvEYShQ7nqGvBn}GdE3j-<J#i%K;JEpIpg}Fq8#Ah7BaoJ*TLcp1fU`;Py
zY!95*mtTE!5SU3tVLZzWZCe+{4VsWHVPR%Ftj{DNaQV<<v<#9O)}v#(KyO963W?UE
zB=0Ouv4VM9;fdZyL7P^G3H1sIz9Zrr6)`^tbB=`-I%?*uv6oSg=hery+ef+4=e?Y8
znDS16T_adJ`-J6|ID(7}Y>t@kVBCBP!g$Qih>$!M(|j-I?-C8+=cK0w!?cVWy9LXH
zd%I}(h%K_>9Qvap&`U=={XcolW-VA%#t9ljo~WmY8+Eb|zcKX3eyx7qiuU|a)zU<G
zyGbv5r~ad@f>5cYm5{k5IAa3ibZf_B&=YT!-XyL<a-DCvMWgdk*b|IE3`W=pCh?UN
z|G+;?Kx|}1MeeKG%e~Avg(yI|v4tfseHS9wgE^yVq^UIXaU8;N5Jvekd+VpSX!O2%
z$Q}XwU>ap%QRdebT+PIcg$KjM3HqA3uZ5|yBj2vv8$L{#$>P=xi+J<emB~^mE*ULc
zNG_|JgyG^>&zLILkooDarGpiupEiuy`9uy&>yEr95d)<a(sI%-B+)Tbos1E<MZB$h
zqyu*fYHKs7CD>64m+~`y*NClGrY|5MLlv!)d5$QEtqW)BeBhrd)W5g1{S@J-t8_J1
zthp@?CJY}$LmSecnf3aicXde(pXfeCei4=~ZN=7VoeU|rEEIW^!UBtx<QCR*Hb$Pt
z*P&TW7$Ii4nkiK2l3Q{u+~<?ax?>Gc6W$x6;0fjRs7Nn)*b9JW5*9uVA<lf7wT<;{
zE3v9p&0seMC4<O%VLG*?`SR;<Oyr!(O~c(qSrKAg?~oL@PYB}Caw-0(g;w$;4>wi)
zj&N7W;i<<sd-^01jRy88l}ZuoEF#ZLI0tC)n0ZTgS_KZdjJlHjb~*ovYqoOfebrdP
zZIv-?2bGGm0GLUz*)63Xh-wdfE3XXUbB;}_&r9FS*R@Sg{VrIu@*SienLS;?C893d
zS%kwI!3@9T1PPLxFE>Qy80(5gsyEIEQm>_+4@4Ol)F?0{YzD(6V~e=zXmc2+R~P~<
zuz5pju;(akH2+w5w!vnpoikD5_{L<6T`uCCi@_Uorr`L(8zh~x!yEK*!LN02Q1Iri
z>v*dEX<(+_;6ZAOIzxm@PbfY4a>ws4D82&_{9UHCfll!x`6o8*i0ZB+B#Ziv%RgtG
z*S}<4!&COp)*ZMmXzl0A8mWA$)fCEzk$Wex*YdB}_-v|k9>jKy^Y>3me;{{|Ab~AL
zQC(naNU=JtU3aP6P>Fm-!_k1XbhdS0t~?uJ$ZvLbvow10>nh*%_Kh>7AD#IflU8SL
zMRF1fmMX#v8m=MG<L#Xq3R)}1-tQerH9_L*4>Gb7y5r!Qf~Y}vBW}fsG<{1CHX7Yz
z=w*V9(vOs6eO>CDuhurDTf3DVVF^j~rqP*7S-$ML<a>SW7Ab>8H-80ly;9Q0BWoNV
zz8Wr2CdK!rW0`sMD&y{Ue{`mEkXm0%S2k;J^iMe|sV5xQbt$ojzfQE+6aM9LWH`t&
z8B;Ig7S<1Dwq`3W*w59L(opjq)ll4E-c?MivCh!4>$0^*=DKI&T2&j?;Z82_iZV$H
zKmK7tEs<BYT(sc+0$&{^zdL@<#vX5RZ9UuKHJXl0Qe7N^Caj!b@ovM*i8@~~Aefoq
z3-+)X#k9hj2G*KdYrTAfliUVuPW_!-BF}8Pg_|Y#;G>7;MI-Vo(9wc1b)kc(t(Yk?
z#Hgo8PG_jlF1^|6ge%;(MG~6fuKDFFd&}>BlhBTh&mmuKsn>2buYS=<5BWw^`ncCb
zrCRWR5`IwKC@URU8^aOJjSrhvO>s}O&RBD8&V=Fk2@~zYY?$qO&!9%s>YecVY0zhK
zBxKGTTyJ(uF`p27CqwPU1y7*)r}y;{|0FUO)-8dKT^>=LUoU_6P^^utg|<kBV1q(+
zDn%Z-pC68v=8hUpv7KURD!BjTKyLfyiq6@`n`43_H`br$+;`KyXaX?!SqZGC_xw>*
zuj}LBA*gS?4EeEdy$bn#FGex)`#y|vg77N<SSfkK+&Z`$y}X-#T73c}CHVd~z@s~T
zU+9klaFL9!O$XDE&+M;O$ivYmQLT5Eqr#`e5=|T`EU5-f0qH2XF;mSc>VEjTUn8%t
z@l|7T({SM!y$PZy9lb2N;BaF}MfGM%rZk10aqvUF`CDaC)&Av|eED$x_;qSoAka*2
z2rR+OTZTAPBx`vQ{;Z{B4Ad}}qOBqg>P4xf%ta|}9kJ2$od>@gyC6Bf&DUE>sqqBT
zYA>(sA=Scl2C_EF8)9d8xwdBSnH5uL=I4hch6KCHj-{99IywUD{HR`d(vk@Kvl)WD
zXC(v{ZTsyLy{rio*6Wi6<M$E1UD26tfRkujOBi|V7!*_c>Lck%L(7T~Is-F_`2R}q
z!H1ylg_)Mv&_|b1{tVl!t{;PDa!0v6^Zqs_<d7AP2qq;-xMDu@V0PoEbb1X}3Z4l$
zV-G2++s{FN^kX9+Z|Or^BMbSv6>`RdxI%@vR)n|`i`7O<Hq0kg><>CIMzqI00y{;`
zhoMyy>1}>?kAk~ND6}`qlUR=B+a&bvA)BWf%`@N)gt@@Ji2`p1GzRGC$r1<2KBO3N
z++YMLD9c|bxC;za_UVJ*r6&Ea;_YC>-Ebe-H=VAgDmx+?Q=DxCE<WMit^>4=yQXrn
z7(0X#oIjyfZUd}fv2$;4?8y|0!L^ep_rMz|1gU-hcgVYIlI~o>o$K&)$rwo(KJO~R
zDcGKo-@im7C<&2$6+q-xtxlR`I4vL|wFd<`a|T}*Nt;(~Vwx&2QG_j$r0Dk<H4ukw
zoKhI(Ld275>tR+6I4W)gUx*cDVBwGe00aa803ZYiwy;d{1p)y0?*IT8ddPS`E~MiS
z1d%Vm0Hb4LN2*f8FZ|6xRQev@ZK-?(oPs+mT*{%NqhGL_0dJ$?rAxA<dme-e40@Wo
zKT4t6rT<8);W=|ztzm5jzr5VR8xqB$bjPO{aS0iTg}rCdn^B6}N)Lpab+cvqs1~cC
zd-2Pk^rLbQ*~<?d`4#Vt#!Y5D&h?n3tM1BkKd^oQ&Vga*kd2y6)dp7`O~quF8p>{2
z`r3MBv&)xblcd>@hArncJpL~C(_HTo&D&CS!_J5Giz$^2EfR_)xjgPg`Bq^u%1C*+
z7W*HGp|{B?dOM}|E)Cs$61y8>&-rHBw;A<vh+XQH4P8p5eOa9BMHh)iIp{3eC0J>8
zgkWw}r$nT%t(1^GLeAVyj1l@)6UkHdM!%LJg|0%BO74M593&LlrksrgoO{iEz$}HK
z4V>WXgk|7Ya!Vgm#WO^ZLtVjxwZ&k5wT6RteViH3ds{VO+2xMJZ`hToOz~_+hRfY{
z%M;ZDKRNTsK5#h6goUF(h#VXSB|7byWWle*d0$IHP+FA`y)Q^5W!|&N$ndaHexdTn
z{vf?T$(9b&tI&O`^+IqpCheAFth;KY(kSl2su_9|Y1B{o9`mm)z^E`Bqw!n+JCRO)
zGbIpJ@sp<iJ)yS$4&el&oou>vz=*Jki{wufWm|m`)<Bf0RG4Ym&b0IabF!;EDq?W5
zmwaAJ$}l+ehT!)NqW0By2GQmg^X3*xk#o9dlZfvECJ>X<yi%AkBroP)L_9}FTq`}_
zjP#u)eesa-x=jmT15t4;oE!o;xijzlefoGd&mwdw<!LUAeQKI}j#-?3j&b3nFqODx
z@oT~5L_fU$?}e$40Hxc?!3F?CAnQe6z*>mDsxvbJR5dLF=kuf_C>dl}{nGO(g4I$8
zSSW#5$?vqUDZHe_%`Zm?Amd^>I4SkBvy+i}wiQYBxj0F1a$*%T+6}Yz?lX&iQ}zaU
zI@%8cw<EHY10o%3eT>VGtF3!Ke3D<eZd-U1o^St{h}NdQg7RB+$w#y%W#bDq!RaNT
zmeToYlvO#OlP+DOEj%OIFD2uGcvW`IrC53TEnGCyU4nSS$51C>e$dL5^j-$Bh3+By
zrS<N>R3c2a>XtaE#TB}^#hq@!vnZ1(An#bk_eKR{?;Z&0cgh4$cMNU2HL=m=YjMTI
zT$BRltXs4T=im;Ao+$Bk3Dz(3!C;rTqelJ?RF)d~d<X2#YayDAOV}2n2g+!UcUJHQ
z*-kET>P9>$_6dbz=_8#MQFMMX0S$waWxY#mtDn}1U{<MN9Z;3|8l-AyB?Wd@K<#o{
z4MSU@LcaqTktW64G)>4PGeRH5?a>{>TU@1UlucMAmzrd@PCwr|il)m1fooO7Z{Vyr
z6wn=2A5z(9g9-OU10X_ei50@~)$}w4u)b+mt)z-sz0X32m}NKTt4>!O{^4wA(|3A8
zkr(DxtMnl$Hol>~XNU<DwJCpn%>E?h9;*pGG&kl*q_<zrfX=4wK$NZ2KYm49*5>pb
z&*$lH70zI=D^s)fU~A7cg4^tUF6*Oa+3W0=7FFB*bf$Kbqw1&amO50YeZM)SDScqy
zTw$-M$NA<_We!@4!|-?V3CEPnfN4t}AeM9W$iSWYz8f;5H)V$pRjMhRV@Z&jDz#FF
zXyWh7UiIc7=0U9L35=$G54RjAupR&4j`(O3i?qjOk6gb!WjNtl1Fj-VmltDTos-Bl
z*OLfOleS~o3`?l!jTYIG!V7?c<;Xu(&#~xf-f(-jwow-0Hv7JZG>}YKvB=rRbdMyv
zmao*-<ELVylXHLHN9&60_c0&0xfNY+N~`4IX$!mhgEquw>!L?)##-S#V^}oRm7^Db
zT5C2RFY4>ov~?w!3l_H}t=#X=vY-*LQy(w>u%r`zQ`_RukSqIv@WyGXa-ppbk-X=g
zyn?TH(`-m*in(w=Ny$%dHNSVxsL|_+X=+kM+v_w{ZC(okof9k1RP5qDvcA-d&u{5U
z?)a9LXht1f6|Tdy5FgXo;sqR|CKxDKruU9RjK~P6xN+4;0eAc|^x%UO^&NM4!nK_!
z6X14Zkk=5tqpl&d6FYuMmlLGQZep0UE3`fT>xzgH>C*hQ2VzCQlO`^kThU6q%3&K^
zf^kfQm|7SeU#c%f8e?A<9mALLJ-;)p_bv6$pp~49_o;>Y=GyU<FTTk3a^wN!$l_Lf
z>Q)*prjFbkU;z%HkOW_*a#j^0b@GF|`6c}7>=W{Ef!#dz5lpkN>@IH+(sx~QMEFe4
z1GeKK67;&P%ExtO>}^JxBeHii)ykX8W@aWhJO!H(w)DH4sPatQ$F-Phiqx_clj`9m
zK;z7X6gD2)8kG^aTr|oY>v<xD`_e}^`p?itAMz4$u!1pUR?=hn=M?T&15YG<lX95s
zeA(t|^!b{e03BIcT&V(bAVzRrlh6e4&t~m%BP>mgOPQ4`_W+xj2j!$YT9x(DH6pF~
zd_C#8c>Gfb)k2Ku4~t=Xb>T^8KW;2HPN#%}@@hC1lNf~Xk)~oj=w-Y11a@DtIyYk8
z9^|_RIAA(1qUSs3rowxr&OuRVFL8(zSqU_rGlqHpkeYT4z7DGdS0q4V-b!3fsv$Yb
zPq4UP^3XFd(G%JAN|0y>?&sLzNir30K(lyzNYvCtE2gDyy-nthPlrXXU75fhoS7kA
zg%GYyBEFQ(xgdjt<WJKy+fjm);V<Q+LFEa&VDsn;*Wuv;_gJi<C9A>v+>?>Q!G!8&
z3+F>)4|N+F1<I=K?Pw4f;qFwD{PA*<U@FMSWxI&aBb3m$bM{lHpn~f0C$>a^T?XC8
zxRRx7-{DV%uUYt&*$z2uQTbZDbUn)PozID*(i^{JDjNq`v?;&OW^&~{ZPE_e+?RMk
z!7O5CUKJSnGZvjTbLX2$zwYRZs_$f{T!hvVHuTg77|O;zBHlA|GIUu_bh4`Bl?7KE
zYB~a`b?O;0SfD?0EZiPYpVf=P4=|zr(u_w}oP0S`YOZziX9cuwpll&%<sQ1p7AuXL
z*@PUop3K}qZEWSl9U1r8UhLr$bDP!{81}Do)F|<u!v2%g3mnqeoX{hw(G4}!VMjqE
z)E70LT$^KBEl+#$p4FFtMeM~^A0rsnb!Y7F2{$<AZ2bN+SaWae5-;xOvJGBzd+{aI
zS8}iU&K}y{eJkmrx#x3l4n51mOJm?S7$6v}V(h$>QMv4bBC_JdP#rT3>MliqySv0&
zh)r=vw?no&;5T}QVTkHKY%t`%{#*#J;aw!wPs}?q2$(e0Y#cdBG1T09ypI@#<t@Hc
zYRfn{p~4}p@j%ic@2uva3>-y24+fzhJem1NSZ$TC<IdqHGmRX4a@T?%?YlFA@{2Sa
zJRt~_UTPRBpDvKpDd&rrT{z}~hwQ8xhXP!9#;BuHdY1t98tJJM#HY**tX(IC_~=XG
zbks>AjU2|ebYG&&6p(0f>wQoNqVa#6J^W!3$gIWEw7d<^k!U~O5v=8goq$jC`p8CS
zrox#Jw3w`k&Ty7UVbm35nZ}FYT5`fN)TO6R`tEUFotxr^BTXZGt|n(Ym<BDcxC}L=
zP<m@21eBbhT9~<!$;iXfV^;AOX+GpgHI&m_c(3oy99yjGZZSP(DLyrgR-b&oEmGN-
z^Kn)yd4iEzbFc3}44SoGb?}tW>qmr^pCu^^w?uX!ONbm?q{y9FehdmcJuV8V%A-ma
zgl=n9+op{wkj-}N;6t;(JA1A#VF3S9AFh6EXRa0~7qop~3^~t1>hc6rdS_4!+D?Xh
z5y?j}*p@*-pmlTb#7C0x{E(E@%eepK_YycNkhrYH^0m)YR&gRuQi4ZqJNv6Rih0zQ
zqjMuSng>Ps;?M0YVyh<;D3~;60;>exDe)Vq3x@GRf!$wgFY5w4=Jo=g*E{76%~jqr
zxTtb_L4Cz_E4RTfm@0eXfr1%ho?zP(>dsRarS>!^uAh~bd0lEhe2x7AEZQmBc%rU;
z&FUrs&mIt8DL`L4JpiFp3NNyk3N>iL6;Nohp*XbZZn%BDhF_y{&<kSKd*sW$w?*Eb
zIlNU{(I<Vyy$1gNL0p~n%W+?KAA-b=TAi%Qvb56m!sj|~EfvU>{X3UtX(7aAyG63P
zELC;>2L`jnFS#vC->A(hZ!tGi7N7^YtW7-LB6!SVdEM&7N?g}r4rW2wLn{Ni*I~$Y
z@#;KwJIl0^?eX{JWiHQxDvccnNKBhHW0h6`j=)OH1`)7)69B$XNT@)l1s25M+~o2_
zpa&X<_vHxN_oR|B#ir2p*VNB~o6Z1OE&~a+_|AxS)(@Dgznq(b(|K8BN_nQ7+>N`=
zXOx_@AhcmmcRvp6eX#4z6sn=V0%KonKFVY@+m&)Rx!Z5U@WdyHMCF4_qzJNpzc9Fw
z7Bdzx54(e7>wcEqHKqH-Paiut;~ZVJpS6_q>ub)zD#TQ4j*i(I8DvS$BfyX~A%<#}
z*=g2$8s;YYjEHl`<aR7t8k*KWs*O4(ZeM9--WL*z`9J)=8<A0pm5iZvsV-Rd=S=w|
z?_O%7K#^;;l;}xZM=qd0%ult2Hz+sfz4v0x@|hDX9xZ9DS6?5>7cKw!a9PFRt8tVR
zM&X|bs?B1#ycjl>AzgbdRkr-@NmBc^ys)aoT75F(yweV&Y-3hNNXj-valA&=)G{NL
zX?smr5sQWi3n;GGPW{%vW)xw-#D0QY%zjXxYj?($b4JzpW0sWY!fkwC5bJMkhTp$J
z6CNVLd=-Ktt7D<^-f|=wjNjf0l%@iu2dR+zdQ&9NLa(B_okKdRy^!Q!F$Ro=hF$-r
z!3@ocUs^7?cvdTMPbn*8S-o!PsF;>FcBkBkg&ET`W`lp?j`Z}4>DF|}9407lK9<NK
z4%vQBXKsYAW@50vSxB3kcp0F;K;3mdC3>y~^No&pT7J|rVQ9Dh>qg|%=gxxg=<U>!
z>WX$!;7s~gDPmPF<--(?CvEnvV*E1KdXpr>XVv!DN~PyISE7d+K_9+W^pnR6cX&?E
ziLr{0`JIs@NcA|;8L|p!3H~9y8mga2Dsm4I?rBS7$3wcT!_l*$^8U3hKUri|_I3N2
zz$xY`)IWA7P*Y1BJtyBEh?8EEvs8Oyl^{(+`gi{9hwpcN#I%Z0j$^yBp?z<;Ny!G$
zra3J_^i0(~LiKuITs%v)qE+YrJr?~w+)`Rcte^O=nwmPg@&!Q7FGTtjpTdI6wH&ZV
z)2}VZY6(MbP`tgoew++(p<fXt4ix3r28%r&<gH`n7hEyV&jr`vxU%{YrjG>t$jVj-
zvPK)pSJ)U(XfUqBqZNo|za#Xx+IVEb?HGQ^wUVH&wTdWgP(z#ijyvXjwk>tFBUn*2
zuj5ENQjT{2&T`k;q54*Z>O~djuUBNwc6l(BzY?Ed4SIt9QA&8+>qaRIck?WdD0rh@
zh`VTZPwSNNCcLH3J}(q<Alk2UZ1DFqkF7`@*$URR@^*@iVLPMNF<|!;<=(W|bx+No
z-*b~|!G4tw!<n=q|MK&?muiuBEXxuajrbCL-ESdG7*~eCsN3-c?1FpjV3I9OiwTgl
zQIc5nK8Iquc5#ZkGI5=X00qprKiK;{;GUtQ5}mS5IIRVlk{&3_FVoP)Npk)~xB{a>
zdEtu@HfxDTpEqWruG=86m;QVO{}E&q8qYWhmA>(FjW`V&rg!CEL1oZCZcA<xy$#3;
zaHF=O>X@yX(2tg8`>m1psG0ZpO+Rnph@Bhjj!~|+S=@+U{*ukwGrBj{5xfIHHP7|}
z^7@g2;d%FMO8f(MS&6c##mrX2i(5uiX1o(=Vw89IQcHw)n{ZTS@``xT$Af@CQTP#w
zl3kn6+MJP+l(;K-rWgjpdBU|CB4>W%cObZBH^Am~EvRO%D>uU^HVRXi<BMNX2v>$1
zb?Pr~ZlopLfT5l%03SjI7>YiGZZs=n(A!c;N9%%aByY<R&)Y{`K2d$pXT?y?(Mg9c
z^1hEw!AQnQRpk1Es)iD~WRy+o3|6j;eU6ym(IixCh^@fT%q9a5c1UN*cc#Klu;PpE
z5kW4F9m(3~3g0_NG;qx5WA#d(C1H>~5(-hS4z_i2wgKYsG%OhhxH#^5i%&9ESb(@#
zV_f5${Gf=$BK)1VY=NX#f+M}6f`OWmpC*OU3&+P@n>$Xvco*Nm$c<=`S|lY6S}Ut-
z80}ztIpkV>W%^Ox`enpk<25_i7`RPiDugxHfUDBD8$bp9XR15>a?r^#&!1Ne6n{MI
z){H`!jwrx}8b-w@@E8H0v)l!5!W8En=u67v+`iNoz<_h4{V*qQK+@)JP^JqsKAedZ
zNh4toE+I7;^}7kkj|hzNVFWkZ$N9rxPl9|_@2kbW*4}&o%(L`WpQCN2M?gz>cyWHk
zul<o=)rN06Va07DuNdsLUXinZj>MwRxpdpx+~P(({@%UY20LwM7sA&1M|`bEoq)Id
zyUHt>@vfu**UOL9wiW*C75cc&qBX37qLd`<;$gS+mvL^v3Z8i4p6(@Wv`N|U6Exn<
zd`@WxqU^8u^Aw+uw#vuDEIByaD)vucU2{4xRseczf_TJXUwaUK+E_IoItXJq88${0
z=K5jGehPa2)CnH&Lcxv&1jQ=T8>*vgp1^%)c&C2TL69;vSN)Q)e#Hj7!oS<jSihkQ
zcp@B)c39W-{M7M`tL`u1#fI2;+HG}3xJ!N~E%eIkew3q?{hQE-A*bTXPSK}&4gN~+
z;ghcmpQS<enTf3c?<4S8Fz~sW@ZBdBqv#;qj}JLOA7-%Pbsph70W}6^pdYLj@m7^k
zo_Dl=`GhzsVra~i?RP|smU~fh(Iuf@F1{aa!NQE@krAI-q-5n7Sz?qQTc?=?p(9CR
zy8t(wWqJNHlCd0JTRdtfgMj_Da4#^R@l_Jvq_m49FHHW!J_Sw<sdGTwkD_mI@P8kr
z&FAu%Lbk!pI7u|axY<Xm+gdzjNPQbzI7o47HMp?x!P`lB*SLSZ(DZhM5Zd4-3%W>0
zlrEmJ=w4N9pID5KEY5qz;?2Q<d8cODvh71+hSbIWVO)%GnPoB5=(EGHJB&#{T4#Sv
zp>}0|4ESEio&cLrp221LTt~j3KjUB`LU?tP=p;B=WSXo;C?8(pnF6@?-ZD0m3DYZ*
z#SzaXh|)hmTC|zQOG>aEMw%4&2XU?prlk5(M3ay-YC^QLRMN+TIB*;TB=wL_atpeD
zh-!sS%<J^Q{RARS_8C0~@T)q7p}WaJ=xdbi3|=SM<M<hD_w7!CCUUm;6^;382>A`3
z=^?niQx+^za_wQd2hRR=hsR0uzUoyOcrY!z7W)G2|C-_gqc`wrG5qCuU!Z?g*GL^H
z?j^<_-A6BC^Dp`p(i0!1&?U{YlF@!|W{E@h=qQ&5*|U~V8wS;m!RK(Q6aX~oH9ToE
zZYKXZoRV~!?P1ADJ74J-PFk2A{e&gh2o)@yZOZu<g!2-Gq&gDELsf5*2Obw--3uWs
z0QOA|a4N&nC;i+SuHRXWoeC+nRvWt}=Dk1);2>Bi^0+Hkp`dX;cZs9C<V+v<pcpNi
z-^5FOCd)W-pdGom!%$#Def$u~Jp}~~!b&EOx2x&7X<F$y>RM+##;P!*BlA%M48TuR
zWUgfD1DLsLs+-4XC>o>wbv-B)!t*47ON5wgoMX%llnmXG%L8209Vi;yZ`+N2v2Ox+
zMe7JHunQE$ckHHhEYRA+e`A3=XO5L%fMau71`XL7v)b{f1rkTY+WWSIkH#sG=pLqe
zA(xZIp>_=4$zKq<?`-?B!#igJrPj9->0t_G7q9@L<d8ib-Mx#-Q#!}B-RqV60bUOv
zEia6wEAzYNOa5=n#Q@89d<wmD0fwu=jKQr}^3!%I{r4ULd)dEepNMN#S_Fx3{<8!>
zZ5D-0{8o%7f>0szA#c;rjL;4Y%hl}wYrx1R`Viq|Pz}c-{{LJY070ym@E~mt*pTyG
z79bfcWTGGEje;PLD;N-XHw=`wS^howfzb$%oP8n)lN$o$ZWjZx|6iSsi2piI_7s7z
zX#b$@z6kIJ^9{-Y^~wJ!s0V^Td5V7#4&pyU#NHw#9)N&qbpNFDR1jqC00W}91OnnS
z{$J@GBz%bka`xsz;rb_iJ|rgmpUVyEZ)Xi*SO5U&|NFkTHb3y@e@%{WrvE&Jp#Lw^
zcj13CbsW+V>i@rj@SEfFf0<Oo{+S#P-$O``n1C$W|0r533dHS*2DqvV$vH9wcIv-1
zq!8+3CLogen}G!qeM|!c*+4c%7$HkX7?8VT5D>@yjS@nbPB0)6D`<rOKQ(XR$o?y&
zqX&cznF4aKL<1c6fMg=mLIjs-fcTye+hrc0q$eZ`4Ie^}0)i~RsZ-u>l<y5<K-5-1
zzz{IRX+;kR3WO-}5kihvxPab4|KQ#>A;e%61nh`-qhydO!uS7jXGQd%i7opEnOL;|
zDn!3EUm(V796;f?fA+RDF<@%qKlo)`0VtL74`!~516_aogYP%QfG#<2kQ!pijthz2
zpaFX3|D$%C7!bL242U?-e@2QZ`q$~lgZbvgfLLyVfT1OC5<8@6lLi=A{stK#zJmWd
zlx+(HbgX)l$RGwH|2rV@P3o@xCrxch0$*z1ASpy(n+d4d2XWd~2AYjQm`xZU3af8F
p+x$Nxf1895@0bJirXkdpJh+N7@Nb7x007(DEB&^Lm}dWn{T~m64-^0Z

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index ae04661ee..a59520664 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 744e882ed..a69d9cb6c 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,101 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index ac1b06f93..53a6b238d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,7 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/settings.gradle.kts b/settings.gradle.kts
index a1c4358dd..a3c39ddc5 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -56,8 +56,8 @@ pluginManagement {
         id("io.qameta.allure-download") version "2.11.2"
         id("io.qameta.allure-report") version "2.11.2"
         id("io.spring.dependency-management") version "1.1.0"
-        id("ru.vyarus.quality") version "4.7.0"
         id("com.google.protobuf") version "0.9.1"
+        id("com.github.spotbugs") version "6.0.6"
         kotlin("jvm") version "1.7.10"
     }
 }