From 07fa607500c405a0c5701483c0b8e4cd288de159 Mon Sep 17 00:00:00 2001 From: Emmanuel Hugonnet Date: Mon, 9 Oct 2023 18:41:26 +0200 Subject: [PATCH] [WFCORE-6542]: Upgrade the Windows service tools. * Adding explicit dependency on commons-daemon artefact * Removing old binaries * Using the maven dependency plugin to extract and rename the binaries * Updating the assembly.xml to have them at their proper place in the docs folder Issue: https://issues.redhat.com/browse/WFCORE-6542 Signed-off-by: Emmanuel Hugonnet --- core-feature-pack/common/assembly.xml | 4 ++ core-feature-pack/common/pom.xml | 45 ++++++++++++++++++ .../scripts/service/amd64/wildfly-service.exe | Bin 221184 -> 0 bytes .../docs/contrib/scripts/service/service.bat | 11 ++--- .../contrib/scripts/service/wildfly-mgr.exe | Bin 223744 -> 0 bytes .../scripts/service/wildfly-service.exe | Bin 198144 -> 0 bytes .../galleon-feature-pack/pom.xml | 38 +++++++++++++++ pom.xml | 8 ++++ 8 files changed, 100 insertions(+), 6 deletions(-) delete mode 100644 core-feature-pack/common/src/main/resources/content/docs/contrib/scripts/service/amd64/wildfly-service.exe delete mode 100644 core-feature-pack/common/src/main/resources/content/docs/contrib/scripts/service/wildfly-mgr.exe delete mode 100644 core-feature-pack/common/src/main/resources/content/docs/contrib/scripts/service/wildfly-service.exe diff --git a/core-feature-pack/common/assembly.xml b/core-feature-pack/common/assembly.xml index e832025d72b..f9428205cc8 100644 --- a/core-feature-pack/common/assembly.xml +++ b/core-feature-pack/common/assembly.xml @@ -16,6 +16,10 @@ src/main/resources + + target/resources + + diff --git a/core-feature-pack/common/pom.xml b/core-feature-pack/common/pom.xml index 1b5cc6df2e1..39e930a4708 100644 --- a/core-feature-pack/common/pom.xml +++ b/core-feature-pack/common/pom.xml @@ -29,6 +29,13 @@ commons-cli + + commons-daemon + commons-daemon + bin-windows + zip + + v>&foQSj}m^$QQCcw=ZORRF4M}iDe79qG1$?Tifw^e-cm=Y zshbe)x?ty=f;uhn8#^>o^$UKHI&^ML{l{F#{ak;5{Q|LtufhMiFL3R#<{63{|Hw~- zExc!kdtj&j$9YAPqaW-H-o(26baixZw)*t&E)_qh+araad-)pHy7DPwlGGyDRGI0* z_2B{C+E#;|a1VD4giS*7 z8!hm&4eD!$?U_qqa}p~!ur8i=#dGf1Cp6p>uxC(wV7t0*f|;;igU`nK)B9mJv|Ggv zfbCX2{6pATZWL_ke&{SU;#zWSuh@`_9XWWYK0J!{Z&xFeV0Yz%o$WDs^iVu=_~B+u zmM;MFW%$|<=JJ#KVDk!JDd5E4TsW7YKKOMT6A#J`p7%`|NSf*2nDh4~@C#rcHS>*b z1LpkA{QLC_pNhR5>BF&W2Z2Y?w8Ap)rB($VZU4qc+UyUgj=VE!mnW^ z+{A`1;Gs zuphtZ=XDKl&D?jsYc695k*++4hrD7=e8%6%Kl)5I%~u)^+DmD8e<;5Kno>_9>?zp8 zUk&>W`jp)G;@Umw%j=i?w622voH}+WPo>X%U-j(JO!$X9$Njpj<6kw$GErS!Jh^7;=wl3u#;w+;GdMAyH$OXyAAfq>tKsL;hr>m z>R6%O3XCm;IU%yQN_O;7AC31YJ$~)Y%@(`w+Gt>YM%(ZkpI-(|%GH()E7T;|AH@vl zE;z8A>cT_wecX_qLidfZUpWpRpUW3cs~qg7&--v(jWky5s%S&W{rBPU<8XzCDaQcA z7K8Ql4{4=BTGH14sa(ciC^>Nuw(Or)OII(RQ96AA`(5%S`LhZq1D|bKt6_U*^UErh z&oP*MPJW_3G=_GLu-WFkJ|5*aNGM;;Q4C7}Z?1FUSeZ6O=!#?25(Of?c#3iLy}`oGjW0UVt4S{2O>4CuJ6O1pM&i?bMXmWHV1p9 z>)@}EFLe?=!cUo{&zK?}lsUwSIPjYLu562%aMpKU3L96=M;iWc*wVBA(Vn(uBJJ$( zQJDx^v31L4E802GmxOadw!P+0T_<7EvX-!$bsat@9+Y3?CCV_`WbzxHpR3FGp}geS z9>GDwuk}xssq0|5Jg4t|=(8MtnHo02&a(8_XU=sUdhF#l!ehXrL3|~BVTYgp3BP$v zx?i|SFTzfk$shH>UK0=U5!;C0X*^;F_mDnRUpthZ-0z3q1$$H0dB5$b%cp;+hMn-# zMRzmo=4r&M3$fE7$|LQ=4TB*&#C0|2JxOru4&i_Gimssu$yrp{q;R_@-@q5yAlsGE<96@ z^dI4g65JX}cj9V>UF)UhdLQ&!>$J6fUlW&3&7T(dr(=A)AK0nGkq(;Pqz`eZt}zKD zYTlcF`?0Qhjv-(#;~p^kKvGQKI^k!m3-Sx)^Iw`zYQvu}_-LQ%gI{b1YW4&2i{^EX z^|h7tmwsmOz3e;s_utJpupM~bE5{AZFEwS_Um9jzAN2&^S+~{f9|%AHz(;=jlTOWe zM&)l2TRiHoem-R?tI~~%m3Hz+23sG)A4z=7_pBJ?p&k}=Pp6M_?~oN$0D^q zXJNI(XSKas^O;fRBB_IQu}%UI)Z{->d4IfMwJO+_rgpA}eb>jeC&p1^96cj;o)KG) z_k3R0H|FOon{}`**2%g-kEkz!$fVM2fv4LG*x;;3wO=Stz91ec61#wQ+i!I0Q?8S)LJ{S1lJRZV>l)Y-Q z(3|nO>08P;+~32VX#(1TanytcpizBz>)#Cg7sKA|#Y&vtTY2tGv0_Y-!v(vL@0R@F z-WhQiDCOsra9ooA?9om=chbMpM2DN$3T$Mfzal#Jn5&HALiqg|+8e&5-ejej0Hlz)H zxPG%8zHz-TZ!6+UeT@D0@qjbeUq3GxlKO>|Wjn64Z4gRaG{qLne{Zm*!{rL;wtE*I{Qg?0` z?Qr{s8ihThj5NgUP9F{VNEi%RNts1?IS*%QEtvuMupi0${OtLvf9Ds#|GNGhw5#^f zs>-#Wj;^1+)+-iFlQp)T8&|+Dd6hbSY_Ir8f4m&~orv|9C1>P}lQWaZ6T{-(Q17_< zN&6V_EXRqQ=XhlF|0Cf49PzWF-;ws6WUl=!>6b;{72=-_Ulzv4*t%|^#OA&A<$1(2 z*ss#z!;qB$KNrMtXAIIc^GC?uYofh}oK-*`9hW>r4Ug}KI6ZO7-s{!7tp6-xB~h0p zj+@plK|QO)4~%t+uOfVYxz|Boxs~wE$je?0y59!k7bh3o*q`sd2*-#LwOp z-dnxv8i2TriK^t}QHewK<@L*`{}T2OOC&DAz>rpzM-ji0euktk{nhCwv=IAWL*s_1 zHwShX|9#S(G13^jMyYSrAG!C3#CUj2H?WtW6m0`!#YVB?~d8=BxDC)6|SfW7MS4!z9*I3gRL3 z=+HvF^1FY#3t#p-fBNIs*c-j7zJN^og6)I+OTbGwZy^R4W2RlZav6J5tKkpsQW3p7 zBR*3I;<;fQ{xjk?A?_M|S?3`xAmc`U`_*Of8Q-%F{`%YC)0hLB!fk6{kGD=8#JLwo zKG~=WU}xyD_d<-1*gLdsV=N&ZpY7JyUrD{^%SzRrT{&t?<~pPdRd}cX&5JVuuARp@ z2_GWH*+3PEHF(DR7>~GDj1jvI>+p;NS5aDocnbN5iG(;li1ky3wPpIOU%)!wdF%&X zDk~%}-$lI7JBRk|R>zMX#Gc7s?D=g~bEi*M<42}QOf2pPQsy#V(y78v)G7Eb-voX$ z#}AiyQ;bP8xJM_6gTXbFxIwS0RO|)QZ}RG;5>|HU#5dlp!8k8P~}84`!0?CeRLF>wsB-407%XAIu*lH-U4S1NWFjCm2+r;D2X!Dz@F z#H84|&WHnvK1@H}58=nmSXGSmNdIoei1`3AV1M2w>?0n-o_2|p1-t6IVeOmU$y&8Q zVp>*|o)v#m#>!xP49S6idC5t25&PhzE#o2#hcD&IwCPf>_zFXIX}@mX(|?*WD;+X~ zKDH|%H%Ke46@`P&^h4giYolWQ-l*PpuT`9o{!Modv4cLW{EcfWS+MUSjf^;-OF)~q;s4!2g|=;`LRtkXN59T@E+gh2 z+l7A9j2S?@NvCq0@vt>>xoX+?H!2A+f7s64Z>CQ&@iqM6wcjSkY~z}Kg!jU-LFh$T zmIx5(y0@*g^=Ma#GAlvz(xAY9_s_p~SuFI~`)l~=vChZnPsYU~D^h*y6cuG>73lOp zNq=je6K#b~JZnNCzxNMSKXeqRLy`KJ9X>;{EqVw z;}LRc(fjf}^?Tw+-JjPrzh^mlh$}Mry|-m-xLQ^ux?MVABWFWjCoOm;z(U+-q>c4| zzjqhTYM@Sve!L@lotglM+E%4T9d(2j|trLtf4Fe?NV~ z2<5?k-H60kwS3VWwGlB8s6R0=rfVt2>4C3z6dO98_jl{7>*6=0;U7ILL8Z9t7^^}M zSG74}qD_PD$r!P)CAoM);`Yp(G+OO}-A>+)Y?ZlYIqY`E`|JM(F>mPyK;39d);hIv z;cUbb9EKQf3q)sKvt+i|8hm;<5BAcS5AWG5G5B=-NwGG>NpfP`8znJKix1?gccCZt z==6%}i`Z*}!d?}f;gg*8u!lP)iE%RY_l%jTpEE9MLS!HLZq4!qDrfUrwSM&?<&GYx z27m^%|6xoX#!AuOU-H@E6z$(3`v-3h>7}+pXWoanFk0s4Va!>UHbZ5tTc*YgcdP!0 z^JM;h5n||3S6h-cQ>|OEK;}A{ub8tOqpWQh!!}7f>+hY==N*Wbw0Zps;Q{@w`TN?g z`TdDckNV-zC|Fu}w1U+18Wce9nj3H$*;Md*AlA3DVJ@XHZEPrQd+tzp24r0mj zESy{^k5)cyu{>_ET77pARex{!CI07cF^^lM%$1KdL%F>zVV1%8zoVrGu7WM0mTtHY z#{Zpg&A%Ow-@vi$jc~<8ms%s|BKY4SJ&u2TV*dNtV|**j;vn7^PctD@l6uGijdlRNL@~OYOy?L`Gu*D-tyFAf}yD;5V!|gnp&F6 z72z5naFJeKdEbfp;!GGn3_LR|F9M#fC^uS4WmyTJC$WwO1-+>M-e*?JGr;b5!1g&n z%YTjKs;T99JnQMB{DZVZAnI#t`A5JM>Vtt?Lwt3+@Q&PI0i153tw-n`h-X9Pxk0b) zcZ20o}C)M7-02yZO%wr zoXcr%6_8^01hi@WM9U`|H-5ru?dpiIJ3aPDtJh`q#@MYv3APAiVXi1|vdwL`c5)@+ zOE1c{J`)ty>33G#+TB)^WOcc%@h-O=g+#cVUbiDW(ThiMMuApawA*fvw>!O_K&v&( zZkN)#h4u_?-_aW7h_hQG9UkK&RG#ec#-JQ;jKgD1cDZA%Q7Fk48R=lfwm7T9i3jlp z7;byC%}wl3Z9DR#_LUZxk;1chU!>N-;N$(cUD4h7Bm2UjS#=oYsJ#Fl%sFfVEvvSa8@MP)48Np09=W>S^s0 z)T2jGx1PZr!>pk_tnEX)bqMYm9NG=tlqi zeSpH&Lm)0JMPIQ!(P0U~L`vg0BwKF0`3NvoJK|Wg4hD?=5 zoRO|%PoM!qwP4krbo z4Kg&qn&=3MAaAq^h_c0b>;bJ?HmRc=;_d&bTE$IFa5wQI&i6H!w|)Yn%isR~|DeGC E0P>9wc>n+a diff --git a/core-feature-pack/galleon-feature-pack/pom.xml b/core-feature-pack/galleon-feature-pack/pom.xml index 29123a8ffb0..36f0916468b 100644 --- a/core-feature-pack/galleon-feature-pack/pom.xml +++ b/core-feature-pack/galleon-feature-pack/pom.xml @@ -78,6 +78,44 @@ ${server.output.dir.prefix}-galleon-pack-${project.version} + + org.apache.maven.plugins + maven-dependency-plugin + 3.6.0 + + + unpack + generate-resources + + unpack + + + + + commons-daemon + commons-daemon + ${version.commons-daemon} + bin-windows + zip + true + ${project.build.directory}/resources/content/docs/contrib/scripts/service/ + **/*.exe + + + prunsrv + wildfly-service + + + prunmgr + wildfly-mgr + + + + + + + + org.apache.maven.plugins maven-resources-plugin diff --git a/pom.xml b/pom.xml index 4f4bf1d4a5d..23362ff58a2 100644 --- a/pom.xml +++ b/pom.xml @@ -168,6 +168,7 @@ 0.1.55 1.5.0 3.2.2 + 1.3.4 3.12.0 2.10.0 4.1.99.Final @@ -700,6 +701,13 @@ commons-cli ${version.commons-cli} + + commons-daemon + commons-daemon + bin-windows + zip + ${version.commons-daemon} + io.smallrye jandex