From a795e2bc5567d76131958d4cc135c51fdf3368be Mon Sep 17 00:00:00 2001 From: Peter Verhas Date: Wed, 29 May 2024 18:45:50 +0200 Subject: [PATCH] dependency versions updated --- README.jrf | 2 +- documentation/macros/for.adoc | 2 +- jamal-snippet/README.adoc | 2 +- jamal-sql/demodb.mv.db | Bin 20480 -> 20480 bytes .../src/test/resources/demoConverted.docx | Bin 12792 -> 12792 bytes .../test/resources/includetestConverted.docx | Bin 34572 -> 34572 bytes .../src/test/resources/pictureConverted.docx | Bin 21869 -> 21869 bytes .../src/test/resources/sampleConverted.docx | Bin 40811 -> 40817 bytes jamal-xls/pom.jam | 2 +- jamal-xls/pom.xml | 2 +- version.jim | 9 +++++---- versions.adoc | 14 +++++++------- versions.adoc.jam | 4 ++-- 13 files changed, 19 insertions(+), 18 deletions(-) diff --git a/README.jrf b/README.jrf index 37a88652..0ef095b3 100644 --- a/README.jrf +++ b/README.jrf @@ -1,5 +1,5 @@ # This is a Jamal reference file containing serialized base64 encoded macros -# Created: 2024-05-29 12:19:49 +0200 +# Created: 2024-05-29 18:43:48 +0200 # id|openStr|closeStr|verbatim|tailParameter|pure|content|parameters # TOC VE9D|eyU=|JX0=|0|0|0|Ci4gPDxJbnN0YWxsYXRpb24+PgouIDw8R1M+PgouIDw8Q29uZmlndXJhdGlvbj4+Ci4gPDxGZWF0dXJlcz4+Ci4gPDxDb250cmlidXRpbmc+PgouIDw8RG9jdW1lbnRhdGlvbj4+Ci4gPDxMaWNlbnNlPj4KLiA8PENoYW5nZWxvZz4+Ci4gPDxSb2FkbWFwPj4KLiA8PFN1cHBvcnQ+PgouIDw8RkFRPj4KLiA8PE1haW50ZW5hbmNlPj4=| diff --git a/documentation/macros/for.adoc b/documentation/macros/for.adoc index 2cfa6e88..e1ef65e2 100644 --- a/documentation/macros/for.adoc +++ b/documentation/macros/for.adoc @@ -334,4 +334,4 @@ a) b) c) d) Note that this alternative format can only be used for the values list and not for the variables. -The variables of the for loop should always be listed between `(` and `)` characters. \ No newline at end of file +The variables of the for loop should always be listed between `(` and `)` characters. diff --git a/jamal-snippet/README.adoc b/jamal-snippet/README.adoc index da0017f4..03f80bee 100644 --- a/jamal-snippet/README.adoc +++ b/jamal-snippet/README.adoc @@ -3816,7 +3816,7 @@ will result in the output .output [source] ---- -2024-05-29 12:19:49 +2024-05-29 18:43:49 ---- diff --git a/jamal-sql/demodb.mv.db b/jamal-sql/demodb.mv.db index 636641e2d3b64bd0c4dcced2675b87e94cb1034d..79b3519f3c4ee7d51f1aeddeb9b34d742cad5c3e 100644 GIT binary patch literal 20480 zcmeHPO>^5s7?#qsQBztN2But?QQf3%W`t)~((3Dklemeg?G)R|q^HbETD6%vcE)i+ z!wLQb|A0RL7vMrKaOT39AHWPV+&S=SCE1eWey3m4^-Q!{X;<&7N2}fE{ZQ6DUGuyB z;J#-jWqbE)=3#`87Ti1R-S@C*FiQ)%jP^XN1p`KhEcCDwnW60?L@h1q5BBKLGqfW% zIN0q&Gu|cYvSDzK4LsX&U6UBmyd-`C0fB%(Kp-Fx5C{ka1Ofs9fq+0jARrJB2)q^q z)`k85T5uOa1p)#Afq+0jARrJB2nYlO0s;YnfIvVX@G21)2l)-H%i<9KKE2BhJfiK< z2OhH!l=~hDn6C}`{h>!tVbs4Bv>bLR@N5WWx^gb;og{ISZK>1)*Z0FoHj-SY|*X zgnY%aL+r57RxH9(mvrfDP7 zb*}aYcgy$m^4`(Gus>ks&@VR+yWK6?J!GqNNIS>-Otg7CKH3C^!w2Q9BqN1|9LN~N zg_|@0gpU^|8Ux_1{#O~)S*zKz$-6k&dI(o4FCPzCWiX(}S+AF%z|5Ig0rBJ?|K!z) zhshsLz2Cc=JsEwX0X*$`-*3Y}fXS{w_ZODCeZR#bHekJgEyM%mv#06OU_;7VOOpK4 z+Nbi_vywb>21d;l_1bp3+EG_p)k>$jv%FcWud2FkmekTkJvpduwyQ0*c2jL`bkyp0 zt=(y>rIOmN)H~|+>*{)?y&jj9)kdv(RaGw@rQKF4E9=!&wNqKHSJl$(&EC`rwr5p3{oLj1`meg9aQ(Xgbv8?81y{;vv+8d4PPN%xvDXA;# zl~!e?18ue{tvj{m+6|qMrTL`=^~%LoD*AS-)_{}ht?Heez`f)oj1R`ba~j^@a^TKatJ}HuMQ!2b+N`e6 z{PnYZK6!HI=9Kf&mD&*2E?nY;ew7!-0x!%(UXW|Nu&(pMzQGG;i5IRU&1~QN=ZyT3 zbQTuRvd*^#-x4K0LV_?#cNoofeBQv~TbpkkzID&_=pHNYyvGX|r}3b^kX2ytj`m>y zf6R~f_gSwqpuGc_>mVWTAn7`!ewUR|zGA%3+Yi~^KD-ZbtxLRq*bDph{@pSzR&}n4 zx5I^alR~b=UAa~H(XN-Ru3oO0k>(So({!9T=#wd3(`C5CyN;AQ**T1g zP4sC^7Wq{GN4VXSva$tvDN%C-%*mD+OBh`b;ODKf#hu@F#uyTG(x><6i^;m|%9iZN zhD>JTVItd5FdA=s7*{{6|2Hcs(gjZ2%5kD4%I)LazCO1HlT&#&JQwq}GENFTDad(# zFc$EmJf?ssO$F5pR1j*rN9;DIg)tp`;8~Cz8Xs%G{xpIZ^FxFJ;5vDNNT_z$J3N5w z(Gg)x>Xl(`05H8kBN6A1#5c8m5FGB)UU2LoBd;`0m9`2>nEG+LxMr% znAKX&b103u(yn3Wl`bHiCEeNurSS=+jVB=O#7ZMQC?ai}&!IFtD`4t|Sx_3w_|k~- z$KdGWYAn_oS24jM%2oX+uwZ)qMv}BGSROx@+)%V$dd_UC6x z7ZoOMlGy(apH<*nflT5Hma+YRZS6pk=AUX2%q@sUZr^;@7RPLGCC;64_u4eJRQ&2@i*t(?;6#fb;3BHC8!IurK4u>Vs(iLn1; z%eI`@>B9b>bW;fXA3g;Y_WvlVCG7v4NiXdGcgZvr_xcJDIB9?9?SC@1|0xS8xW`|f z{a>^QlK6i(%|LOv(=m?!7d)l3$m*@c{wJK=`)>Gxc7N7AiT^(o@qdvcFqt3m62k8y z{{L2FqP!vT|4&5x|E-MwH(o~k|8Eih7xDitgvyhQ!PANV%m3c`WmcNYhd%OQ4e}ge zjm&RdwE6RX>m=qMr-EjF>uE9nM<#_9V*Wr9r#XZtQ%BRB(VRmV7sBTxb+#A78YjKj zPe@dFbR_H9l}?B*1iErcXI|`tF^|IMNp%!HPtRuI^R)U5;qwnf{QnhLYC?oS;Pep~ a+y9yUowxttpX+7+MbD>T|C3X<|NjR)ZuB$& literal 20480 zcmeHP%Wm7o8YUelX55puC|Y#OD0UJTtU4FoSCwtWRx8V?BpdF^Acw=mh%6bh?8ZI7 zLA&dw+w%tJ1=>x!D7riAvpGOFUG)k22K_lCB~n(>T%5E)Mu7Qq$QjPhkHeYoztEdL zF~Z(}J@Cy`b`HMeK1K)`?EXprfsak<*aqwIpzmXY4S6u)k&oTjjGPdmz&7H+@Guzp z)HvnCrTzbx;4V9r2uK7Z0ulj14j6rq)B6f(0F*-QpzGK_OB4$)d0H8*nKTNU$Mg!(E zi|ZHjgCv6ae{bw4bMGq}MmA%Vx(k>Rju_Lh6M2s9@&)2W+_acx!dc?DTriDzk+i)ct=tXW=Q2grdP9un7e;{_X;7_msRQ53^ppxGv~ zVuV7?b|UQZ$kA-ijuF8`vpEkUZZpk}u@^AxX^!Pl6x){O#sL6@OpOO2N5nC;*fbqv zdhU(E@Lu&ksUDslj|M|tjlyc{q}SUGdMA867zN$4BQEPa9v@>0!_mX)Zkmz8BLQRr z;?kXf0m5g?Qb%zc<@8;gu04V)RaehOyfz#LXL+j^pupUvL;?BaAOGa_ zsfQ^ZPjk?}mp>UYRRNxMa}ai5Ai!j|6&x+C_6A{_$9%~9j4vev<-;dwvc*S%sI4gK z4;$aAmoF>o+$9(_*Y%rwoqAVaYu9Vt`u^%pqq(jVVpjCZHIg3GcRKa9-ngT;w!3q7#3*lbcCXKkLMJz|Z`Axie0Ko}aI-exVx8@(HtPI!PQftr<M;wpe6-0u0l@&$P%RdWo?`IO*YB6`fjr~uV~5}g0@wYL`ziI$Ax{ea0ruA^&q;E@U|*W1xbZ< zRUAw@_+Fh*K$N9|k`fh!(!nXeD`;Ut2Os)2WQQilwqSo2K}`4|LJYW0ksuP!IO(4p zL-y#HFs9|&s4xH=QlgPa@JA~&jR9jPM?s&R`G^*k#+lM~Non(((gASU$0=x7?X?Rw^)Tvog8msut zG38IdA(LX#tvxAX3rDC>3}a@)^!k;e7`w1MeypgU{ZD!SBalD;7mkDc|2rUIP(Mhe zD9DXO;B`V^GWq8AcQK2e8j~z~)3Rx7(~B{q^Q$aQ`nRU0qI{wU!cw;XBQaBox4$@3 zT3%`5wo?1w6|)L_E0Fj2oHDWhZ*KgiD2q?D2o@GZTG%&Vx5Y6ZT&Z*C6hzCYR;*ovjs0G5<#Foax0bh0m?b* cZhsf;fB5Hm`G3(1U9kTl1t2$sFGeo@0WSQ~WdHyG diff --git a/jamal-word/src/test/resources/demoConverted.docx b/jamal-word/src/test/resources/demoConverted.docx index ff712c404b5c79a9f1b2ed140181d8f38fafad53..356bb705b873a651dbe241902fd691341d09047f 100644 GIT binary patch delta 192 zcmey7{3Dqsz?+#xgn@&DgJI&-jXZl9nI=x%e40@OOn+qR0MpehlR@-k0k)GM>Dz3k z+#p&=$P6s)B|IHWKNeZW3=;2_fEeQ?b%Gbf7ty%I2Bar{(6a|ohWh3pDofu6M6J-b m1yRrS!Ezb~U|za`2S{+EfgOnY2%!uO!EyzL)*!*PhTZ@T>_;sC delta 192 zcmey7{3Dqsz?+#xgn@&DgJDwAMxMQlOp}r}pJr46(;t~Sz;rdsWDq@BfbAqm`Zk*> zH;5JzG6PF{2~P*pk42U-gT%WfAjWt}o!|xWMKo@)0qMyf^z1>Dp}skY%F?$1Q7iOq mLDX}7u$+bgn3rzg0TSG3UOh%@OQ#UVXlmgR-nZASRJuF3F+JG&Z6C~fu z?+NDL5Kv_T@&5~52?5fR4cNptze#`31`@lQx0?q<&#Jxw=9e^eg7i%O-)s+}99qml vRAq||h}zy_3!=V3DAQIC5U;+~4n*y5bplb$ZD1u%ZPsA9Hb)S3sLcxi{Vh*) delta 199 zcmeC_W9sQ+;tB9(W)WfF;NW1GoV1Z=CL`12q|M72rNH!Irte^S4@(i4Heie91j+aE zdxH5l1XP(o{Qp8%LV)yS12*x^Z_?khfyD0S?dAc|v#M`^`6W%AAU%`+H`{|KhZb`X vRoP+#qPDl#f~ap0%Cyx3#H(+$15x{1oj??G8(4``n>ARj%@IT$YV!gBUg=8Q diff --git a/jamal-word/src/test/resources/pictureConverted.docx b/jamal-word/src/test/resources/pictureConverted.docx index 494c4bbdbc6e87b519c18df527022d2eb3652a50..93f9e5c2a8bd520068cf9efc341ee0dbfd068a46 100644 GIT binary patch delta 270 zcmaF6it+6#MxFp~W)=|!4h{~6iBmW7Twr9HICb+q#sDyF!2AzFvzCJCy>; z>ste+qy0NU^yFs&_8>|<&>Tc11loY8d4aYd>TV!dPA&+{iw*Js2`&$^15wX|oIsRz kFqoGe3|6u#*cvPs>4wqLf3u0LLw7kpKVy delta 270 zcmaF6it+6#MxFp~W)=|!4h{~6$w?b|E-*4pPTG8rF#t>(F#m(ltfgRjIa?B#=H_VS z0I8cK5DMnM6r9Qg;x~v0Nr31nI&Q2W`i>zp8;E{rexC!5FZd#5fTofE`|hvDCJNu0Gaz?4*&oF diff --git a/jamal-word/src/test/resources/sampleConverted.docx b/jamal-word/src/test/resources/sampleConverted.docx index a4bbc6f21e269dd5c9a0d53f7806a328e62e7bda..2776d297eaa85df7897211276f362fd93b77ec75 100644 GIT binary patch delta 2307 zcmYk;dpy(o9|v&8$wYHW5p!)dk`&U+Wg+Yo<$j4MYSftfE$r(uP3JSe)WVeg_@=PwoJ=#7RNX8sOLjh<(SA*Y8LcU-FTUAc03t3NnS*=db08j^0|q zjF0y7&$BGqHCCfVYhHwev-jBbhzfWJ;Nd%_E_{G*Zpp63nLR8EKzsNA2%gri&(z)3#l~jaQQnOng&D#=%Nw#^LURW;g%gh^nR%TKiU!y7lXuVOPgaKCOoHam?=q`hyko2LdRB(hQ1(8Q1?Jr|RrvC|;?bYhf2 zn0O{0vk<%@dU@MBE=s`^-qVNNA%$gg?x=Ewoes-Bap>j($(j#{+aFu`?y6~k$IMr1 z_+swc3QRq0CkK&t8p1csf!Fx!Ly0!_N+~bxyH1^5K}Wy0ul+SNK1Y}Il%}|loyIoSSnq{Mab@bwfFY{5(4}#R0A#AN8 zJ*4(-Kv4uE`MBPtahDgg*C1g{kBr1F8J+49@G6YjvHLF@u8I?|gZwzOGV3*7RJ<*f&cvte6gq&>mt9MEjSGOB_9%zKtzmMCxYcG}? zJ`}>YXkl9;9fU7DH9NH<9yq)-m8)v0xW;fAOIbu(G$GaOr}x$jeE#0~H+ZjQ9qw7& zVeir~PrdyD={=oD*m-t;FAX?)4ykl;` z+Ee=0HE>GXK{qb9`P+%)BB@58*q+WgDPOaIaWJOMt8EK39+ep{VpKqU3ewk-a~977 z7vf`{PMhgQPV<42y(GW#!VQHu2X&ja2{GCZop33GGh4!4f5yqC1wl5w3Duc+&J;+N zEWkRY(D~X-2wCE3c{w$AGfyuxf=m2uX}ro!t`4s8`WtPc^P2~-WpNPOpWRXuYS zc9qWUo-WgYWg?$7o#@L=Wgsl zjS#MG{_FY_w3`0DEqBoDKA}rwi+M+KF%P<%N)VZ2W;hDwUpa9f>th-KLS!FT`@%It z6JwIYV}I~{0i!L_>Sb2y{h$%M)5z+x&@{5lIyAI*Z-XJ(LXBP~5DbEno>75Z-Y)x3 zHUO*sg@&w7&SgJm=^Z6lWL`hS;*$P&mY+-H-f5xJ({#-2y8#2$E6x;=g;2Sif-70F zW*=bf{^mBY5(rcQ#=tvwg^Io&uD*Zq`liw`+F7+C@3zvYWFkV!v3Hgh8>f5wwDOiG#T41V3LksY2}9Qm zw7Ki^p7f)v8Pyi$&E`&)`Gyr`=}N42k3*8iT1dr;z9s7-l3Gt6@);;g*9J(sbYyeL8?HO>r`z!mDy5a!nkY`K(s#P&)KO_js~NcTbGejZ zWuiLiVV(+ z0*oJ?E_R%YZ?!DT2Z_V+{p&P0dLb^&id=niyOQ(l8=$yx^>9wt=v{8hBS#f$j+SRO zwYZ@7;cuIVmW|Q1NR%`2f`rwf1i}lStRKuLfMo~?#B#Z^)Kd3>P6OmG z)YrK~PSaaFU`Wq+Q$7y|N9!35j{lz_YF4A^{OkdsJoVEtw$XpZ9t{tI*(mm(ZQQ+3=8#FeDkUQzFTT%}3I8He%$XGaE9Ro$|;!Y(A6q*qozi@}{IW*&a1R qd`wY4xp4=@AY4ZBxnNw delta 2391 zcmYk;c{tQx7Xa|D-Dt|5rIBSS%Cu0@W-!*tSVyT4*&@5K556r#6ftTnGomRCQ}%r# z5`IxKvSnZTA%o1=vcK<@!iDLzbKE+1#-`+bh1HMc-X!BXe?C!C zeB_+ssM}i7e|~2Rfo51`m@0cHXBG3!#o8n4>=7rn*N83o??XE(j$MfIkC zP6)?o;6b8YO{qiH&eCEOW2S)T7T(e|!6vi6FYw9??MD_nK}&K$)plqH{2Kp$M>=EO z|LK%{9ofEKCx}ihq5Y^}W;8_%yV=^mo;&@0TDHEt_)33+4L#i^uXaR(n4XtWrh3)j zdSL8%xW1X&mu|1y%qGSs*DEePWo|>u$M%%oluAcNVPscqo8_)35$2BBhcw3FXeJ8{ zU2_%g{ck)rv7P|ZpS2JI5<;o1c_UdVzG?HreVgbB+d-zJtf%@=g-BmM35J;YUcb3V z&)ix2L2(imhPij)upV;|$BN|dlj2`TtRoN1Gn!#%zRgLjt^PyM|Vu{@D_=*pp#)drK%f zv4-D4-G1-n*KFD%cR$&*6i<#FC>x%xAXa)n*hz~c^BGJ%Kf?350vdE{>8Mv!ZOsgR z3330K!wz1#*94sZ$0mdxa?otp5o$*9DJLjFf1k;6`JSMwl}gN5$>|m5!jYX)hlIc<-XbpLv02)dojFe zbUhx$+0jA=`MT&vb#Gh2c9CVcVA&;!>IzD}H&***6qr{%OUPowDdFV#*7+0m$1i@@ z8HtrZ74)eY|2WGhcF~(?nxPwk!iMyuVm}PNSF;zC{DEpXcL%z>)^#Hh&+Fdh!FMzA z>IYv;0bU@a;?If~*_49yNB(pWP%nCL-EpE|B=z}FP8a0d2gEjjTQ?zTh&V})V6 znH9)#n2})rHhMz$To#yycDGhDdxITo+O1Ctf8AfT9g+-VM@D7U`E7n4$YZsq&F87I zoW#Q0r#+IgL_QjfPsCaKJch>y$mGO*Lm5~c0<%TYexJr5jUty*#j__Y48;@SNdLn= z#{*q-)S}fyL#g|4RATnxtxi#>Yb@U>_&xX+mY*;x&k2S$o>hVRQ-#9rDv{{OnR|_r z%kK*n)a!$yDaLV1Lb(sZ=TsywR3)0oC92Qp+jUCooePTd^Vg4i3i6=^GZaaA*T#Fm zDmG;1fX#iw>4+*Thq1eOgqsRwP`tA-GC^XMu_kEj7-ML5O6hz}39pT4)+1E>A;aqZ zNVr<-y#;dI9~H6lISD23yjK!N(k8G#*e?r(14e05*`8*om2p<`{Z8rS8#Rx|J|vyZ7ioy5$_cmU3VjVtQWt$$Jpqvf zU15A4@$AX9t>=kw5qUf1L-ERYFP zM9PmS=Ok=QVh?w?Zxmx925)>s#jo$T7#pLzjTS}cq)Q7bTTVxC6Ppz?6m?a^5}BVc z2Go79qhb+T(RNkPcfC1cAN3ZG^Oo?O$-Sj;zMH0-{M$;HLzp`rC z4a27bTs~iwkLfbaBu=3%hhN5l{_%Jbh%RIBk(1!TR`*mtZT+wWND!-B4jVf*l`p-5 zy)@yBj(*USe~m3NGUX&}W;cy-cHj;D>Ev($wyF?FO)3#@DY`wjh>o7fG3GwNZy;lO zh_#SUGCnx*W?3IHo?T6-PdCq&NeQ(;bjYUE|9}+Mq7fej<&~3lf69Ts4YYVGbM7#- zuhx}gX&)lLacf|xmbs=WvYp6%U z=(fj|-(4t=J?(BYRVfSxkN(pC7R6}j#)Sq{nZ>HkcG&b1$J&x--*)3A;Yp94Z_sf01IjX)F1NQx=t+`GL<)<5 z!KnMEd`2IMZ7I>Ccwg^Y^&88|sEzP$?VJtTW=DgHvS{~84+=y~_- zuXFvXx@1lJPUtOVuu9zNuYIgCgPYCzK>o+z@ykP7q9_*o*4fXKJ9Y%poMp35DdHizhmN?Wld* z5w org.apache.commons commons-compress - 1.26.1 + 1.26.2 \ No newline at end of file diff --git a/version.jim b/version.jim index b21d9880..c7db3633 100644 --- a/version.jim +++ b/version.jim @@ -65,10 +65,10 @@ MAVEN_COMPILER_PLUGIN_VERSION=3.13.0 -- https://repo.maven.apache.org/mave MAVEN_JAVADOC_PLUGIN_VERSION=3.6.3 -- https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-javadoc-plugin MAVEN_GPG_PLUGIN_VERSION=3.2.4 -- https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-gpg-plugin/ MAVEN_ASSEMBLY_PLUGIN_VERSION=3.7.1 -- https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-assembly-plugin/ -MAVEN_PLUGIN_API=4.0.0-alpha-13 -- https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/ +MAVEN_PLUGIN_API=4.0.0-beta-3 -- https://repo.maven.apache.org/maven2/org/apache/maven/maven-plugin-api/ MAVEN_PLUGIN_ANNOTATIONS=3.13.0 -- https://repo.maven.apache.org/maven2/org/apache/maven/plugin-tools/maven-plugin-annotations/ MAVEN_PLUGIN_PLUGIN_VERSION=3.13.0 -- https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-plugin-plugin -SONATYPE_PLUGIN_VERSION=1.6.13 -- https://repo.maven.apache.org/maven2/org/sonatype/plugins/nexus-staging-maven-plugin +SONATYPE_PLUGIN_VERSION=1.7.0 -- https://repo.maven.apache.org/maven2/org/sonatype/plugins/nexus-staging-maven-plugin SUREFIRE_PLUGIN_VERSION=3.2.5 -- https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-surefire-plugin MAVEN_SOURCE_PLUGIN_VERSION=3.3.1 -- https://repo.maven.apache.org/maven2/org/apache/maven/plugins/maven-source-plugin APPASSEMBLER_PLUGIN_VERSION=2.1.0 -- https://repo.maven.apache.org/maven2/org/codehaus/mojo/appassembler-maven-plugin @@ -93,7 +93,7 @@ ASCIIDOCTORJ_VERSION=3.0.0-alpha.1 -- https://repo.maven.apache.org/mave JSCRIPTBASIC_VERSION=3.0.0 -- https://repo.maven.apache.org/maven2/com/scriptbasic/jscriptbasic/ MARKDOWN_TO_ASCIIDOC=2.0.1 -- https://repo.maven.apache.org/maven2/io/github/markdown-asciidoc/markdown-to-asciidoc/ MAVEN_DOWNLOADER=1.1.0 -- https://repo.maven.apache.org/maven2/com/javax0/mavenDownload/mavenDownloader/ -SOURCE_BUDDY=2.5.0 -- https://repo.maven.apache.org/maven2/com/javax0/sourcebuddy/SourceBuddy/ +SOURCE_BUDDY=2.5.1 -- https://repo.maven.apache.org/maven2/com/javax0/sourcebuddy/SourceBuddy/ JAVA_LEX=1.0.2 -- https://repo.maven.apache.org/maven2/com/javax0/javaLex/javaLex/ REFI=1.0.1 -- https://repo.maven.apache.org/maven2/com/javax0/refi/ SLF4J=2.0.7 -- https://repo.maven.apache.org/maven2/org/slf4j/slf4j-api/ @@ -102,6 +102,7 @@ ASM_TREE_VERSION=9.7 -- https://repo.maven.apache.org/mave H2_VERSION=2.2.224 -- https://repo.maven.apache.org/maven2/com/h2database/h2/ JSQLPARSER_VERSION=4.9 -- https://repo.maven.apache.org/maven2/com/github/jsqlparser/jsqlparser/ -- dependencies needed for the Maven extension (not the plugin) -MAVEN_CORE_VERSION=4.0.0-alpha-13 -- https://repo.maven.apache.org/maven2/org/apache/maven/maven-core +MAVEN_CORE_VERSION=4.0.0-beta-3 -- https://repo.maven.apache.org/maven2/org/apache/maven/maven-core PLEXUS_COMPONENT_METADATA_VERSION=2.2.0 -- https://repo.maven.apache.org/maven2/org/codehaus/plexus/plexus-component-metadata +COMMONS_COMPRESS_VERSION=1.26.2 -- https://repo.maven.apache.org/maven2/org/apache/commons/commons-compress } diff --git a/versions.adoc b/versions.adoc index bc57b770..5695da10 100644 --- a/versions.adoc +++ b/versions.adoc @@ -18,13 +18,13 @@ If all dependencies are up-to-date, then the output should not contain any `*[re * `OK` `MAVEN_ASSEMBLY_PLUGIN_VERSION` `3.7.1` -* `OK` `MAVEN_PLUGIN_API` `4.0.0-alpha-13` +* `OK` `MAVEN_PLUGIN_API` `4.0.0-beta-3` * `OK` `MAVEN_PLUGIN_ANNOTATIONS` `3.13.0` * `OK` `MAVEN_PLUGIN_PLUGIN_VERSION` `3.13.0` -* `OK` `SONATYPE_PLUGIN_VERSION` `1.6.13` +* `OK` `SONATYPE_PLUGIN_VERSION` `1.7.0` * `OK` `SUREFIRE_PLUGIN_VERSION` `3.2.5` @@ -59,15 +59,15 @@ If all dependencies are up-to-date, then the output should not contain any `*[re When upgrading the newer version, check that the dependency on -* `OK` `COMMONS_COMPRESS_VERSION` `1.26.1` +* `OK` `COMMONS_COMPRESS_VERSION` `1.26.2` of the OOXML package is higher than 1.25.0 Version 1.25.0 has two vulnerabilities CVE-2024-26308 and CVE-2024-25710. The OOXML library version 5.2.5 depends on the vulnerable version. -The version 1.26.1 of the compress library is explicitly added to the `jamal-xls` module as a dependency. +The version 1.26.2 of the compress library is explicitly added to the `jamal-xls` module as a dependency. It may not be needed when the poi-ooxml library also updates its dependency. - +It has to be checked when stepping up from 5.2.5 to a newer version. ==== @@ -83,9 +83,9 @@ When the new Asciidoctor version is released and used as an IntelliJ plugin we w * `OK` `MAVEN_DOWNLOADER` `1.1.0` -* `OK` `SOURCE_BUDDY` `2.5.0` +* `OK` `SOURCE_BUDDY` `2.5.1` -* `OK` `MAVEN_CORE_VERSION` `4.0.0-alpha-13` +* `OK` `MAVEN_CORE_VERSION` `4.0.0-beta-3` * `OK` `PLEXUS_COMPONENT_METADATA_VERSION` `2.2.0` diff --git a/versions.adoc.jam b/versions.adoc.jam index 0ac66ed5..d1018fce 100644 --- a/versions.adoc.jam +++ b/versions.adoc.jam @@ -47,7 +47,7 @@ endif〕〕 [NOTE] ==== When upgrading the newer version, check that the dependency on -〔@define COMMONS_COMPRESS_VERSION=1.26.1〕 + 〔CHECK :COMMONS_COMPRESS_VERSION:org/apache/commons/commons-compress〕 of the OOXML package is higher than 1.25.0 @@ -56,7 +56,7 @@ Version 1.25.0 has two vulnerabilities CVE-2024-26308 and CVE-2024-25710. The OOXML library version 5.2.5 depends on the vulnerable version. The version 〔COMMONS_COMPRESS_VERSION〕 of the compress library is explicitly added to the `jamal-xls` module as a dependency. It may not be needed when the poi-ooxml library also updates its dependency. - +It has to be checked when stepping up from 5.2.5 to a newer version. ==== 〔CHECK :ASCIIDOCTORJ_VERSION:org/asciidoctor/asciidoctorj〕