From f5ba7433cbc4244b5b9dc687f31c45bfefc586cb Mon Sep 17 00:00:00 2001 From: Giovanni Allegri Date: Thu, 30 May 2024 18:05:02 +0200 Subject: [PATCH 1/4] fixed image URLs (#185) --- data/printing/config.yaml | 46 +++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/data/printing/config.yaml b/data/printing/config.yaml index 7a3b4b3..995d083 100644 --- a/data/printing/config.yaml +++ b/data/printing/config.yaml @@ -162,7 +162,7 @@ layouts: items: - !image maxWidth: 752 - url: '/${configDir}/print_header.png' + url: 'file://${configDir}/print_header.png' - !text font: Helvetica fontSize: 22 @@ -282,7 +282,7 @@ layouts: items: - !image maxWidth: 782 - url: '/${configDir}/print_header.png' + url: 'file://${configDir}/print_header.png' - !map width: 592 height: 400 @@ -323,7 +323,7 @@ layouts: - !image maxWidth: 40 maxHeight: 40 - url: 'file:/${configDir}/Arrow_North_CFCF.svg' + url: 'file://${configDir}/Arrow_North_CFCF.svg' rotation: '${rotation}' - !columns absoluteX: 30 @@ -374,7 +374,7 @@ layouts: items: - !image maxWidth: 550 - url: '/${configDir}/print_header.png' + url: 'file://${configDir}/print_header.png' - !map height: 600 width: 535 @@ -388,7 +388,7 @@ layouts: - !image maxWidth: 40 maxHeight: 40 - url: 'file:/${configDir}/Arrow_North_CFCF.svg' + url: 'file://${configDir}/Arrow_North_CFCF.svg' rotation: '${rotation}' - !columns absoluteX: 30 @@ -451,7 +451,7 @@ layouts: items: - !image maxWidth: 782 - url: '/${configDir}/print_header.png' + url: 'file://${configDir}/print_header.png' - !map width: 780 height: 400 @@ -465,7 +465,7 @@ layouts: - !image maxWidth: 40 maxHeight: 40 - url: 'file:/${configDir}/Arrow_North_CFCF.svg' + url: 'file://${configDir}/Arrow_North_CFCF.svg' rotation: '${rotation}' - !columns absoluteX: 30 @@ -516,7 +516,7 @@ layouts: items: - !image maxWidth: 550 - url: '/${configDir}/print_header.png' + url: 'file://${configDir}/print_header.png' - !map height: 600 width: 535 @@ -530,7 +530,7 @@ layouts: - !image maxWidth: 40 maxHeight: 40 - url: 'file:/${configDir}/Arrow_North_CFCF.svg' + url: 'file://${configDir}/Arrow_North_CFCF.svg' rotation: '${rotation}' - !columns absoluteX: 30 @@ -631,7 +631,7 @@ layouts: items: - !image maxWidth: 782 - url: '/${configDir}/print_header.png' + url: 'file://${configDir}/print_header.png' - !map width: 780 height: 400 @@ -645,7 +645,7 @@ layouts: - !image maxWidth: 40 maxHeight: 40 - url: 'file:/${configDir}/Arrow_North_CFCF.svg' + url: 'file://${configDir}/Arrow_North_CFCF.svg' rotation: '${rotation}' - !columns absoluteX: 30 @@ -734,7 +734,7 @@ layouts: items: - !image maxWidth: 800 - url: '/${configDir}/print_header.png' + url: 'file://${configDir}/print_header.png' - !map width: 550 height: 850 @@ -775,7 +775,7 @@ layouts: - !image maxWidth: 40 maxHeight: 40 - url: 'file:/${configDir}/Arrow_North_CFCF.svg' + url: 'file://${configDir}/Arrow_North_CFCF.svg' rotation: '${rotation}' - !columns absoluteX: 42 @@ -838,7 +838,7 @@ layouts: items: - !image maxWidth: 1105 - url: '/${configDir}/print_header.png' + url: 'file://${configDir}/print_header.png' - !map width: 837 height: 594 @@ -879,7 +879,7 @@ layouts: - !image maxWidth: 40 maxHeight: 40 - url: 'file:/${configDir}/Arrow_North_CFCF.svg' + url: 'file://${configDir}/Arrow_North_CFCF.svg' rotation: '${rotation}' - !columns absoluteX: 42 @@ -930,7 +930,7 @@ layouts: items: - !image maxWidth: 780 - url: '/${configDir}/print_header.png' + url: 'file://${configDir}/print_header.png' - !map width: 760 height: 850 @@ -944,7 +944,7 @@ layouts: - !image maxWidth: 40 maxHeight: 40 - url: 'file:/${configDir}/Arrow_North_CFCF.svg' + url: 'file://${configDir}/Arrow_North_CFCF.svg' rotation: '${rotation}' - !columns absoluteX: 42 @@ -1007,7 +1007,7 @@ layouts: items: - !image maxWidth: 1105 - url: '/${configDir}/print_header.png' + url: 'file://${configDir}/print_header.png' - !map width: 1102 height: 594 @@ -1021,7 +1021,7 @@ layouts: - !image maxWidth: 40 maxHeight: 40 - url: 'file:/${configDir}/Arrow_North_CFCF.svg' + url: 'file://${configDir}/Arrow_North_CFCF.svg' rotation: '${rotation}' - !columns absoluteX: 42 @@ -1072,7 +1072,7 @@ layouts: items: - !image maxWidth: 780 - url: '/${configDir}/print_header.png' + url: 'file://${configDir}/print_header.png' - !map width: 760 height: 850 @@ -1086,7 +1086,7 @@ layouts: - !image maxWidth: 40 maxHeight: 40 - url: 'file:/${configDir}/Arrow_North_CFCF.svg' + url: 'file://${configDir}/Arrow_North_CFCF.svg' rotation: '${rotation}' - !columns absoluteX: 42 @@ -1187,7 +1187,7 @@ layouts: items: - !image maxWidth: 1105 - url: '/${configDir}/print_header.png' + url: 'file://${configDir}/print_header.png' - !map width: 1102 height: 594 @@ -1201,7 +1201,7 @@ layouts: - !image maxWidth: 40 maxHeight: 40 - url: 'file:/${configDir}/Arrow_North_CFCF.svg' + url: 'file://${configDir}/Arrow_North_CFCF.svg' rotation: '${rotation}' - !columns absoluteX: 42 From 9bae61fd78c78009ce1ca47f09c32472eceeacf2 Mon Sep 17 00:00:00 2001 From: "G. Allegri" Date: Fri, 31 May 2024 09:35:05 +0200 Subject: [PATCH 2/4] fixes print config unknown width/height fields --- data/printing/config.yaml | 68 +++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/data/printing/config.yaml b/data/printing/config.yaml index 995d083..370d760 100644 --- a/data/printing/config.yaml +++ b/data/printing/config.yaml @@ -60,8 +60,8 @@ hosts: ip: 127.0.0.1 - !localMatch dummy: true - - !acceptAll - dummy: true + #- !acceptAll + # dummy: true - !dnsMatch host: localhost port: 80 @@ -170,7 +170,7 @@ layouts: spacingAfter: 100 align: left text: '${mapTitle}' - maxLength: 100 + #maxLength: 100 - !map width: 500 height: 320 @@ -191,7 +191,7 @@ layouts: absoluteX: 542 absoluteY: 435 width: 235 - height: 500 + #height: 500 items: - !legends horizontalAlignment: left @@ -239,7 +239,7 @@ layouts: nbColumns: 1 items: - !text - width: 420 + #width: 420 text: '(c) example.com' fontEncoding: Cp1252 fontSize: 7 @@ -247,7 +247,7 @@ layouts: vertAlign: top spacingAfter: 2 - !text - width: 420 + #width: 420 text: '${now MM.dd.yyyy}' fontEncoding: Cp1252 fontSize: 5 @@ -258,7 +258,7 @@ layouts: vertAlign: top fontSize: 8 text: '${comment}' - maxLength: 1200 + #maxLength: 1200 - !scalebar align: right vertAlign: middle @@ -335,14 +335,14 @@ layouts: nbColumns: 1 items: - !text - width: 300 + #width: 300 text: '${comment}' fontEncoding: Cp1252 fontSize: 9 align: left vertAlign: middle - !text - width: 300 + #width: 300 text: '${now MM.dd.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -408,7 +408,7 @@ layouts: widths: [395] items: - !text - width: 300 + #width: 300 text: '${comment}' fontEncoding: Cp1252 fontSize: 9 @@ -424,7 +424,7 @@ layouts: nbColumns: 1 items: - !text - width: 300 + #width: 300 text: '${now MM.dd.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -477,14 +477,14 @@ layouts: nbColumns: 1 items: - !text - width: 300 + #width: 300 text: '${comment}' fontEncoding: Cp1252 fontSize: 9 align: left vertAlign: middle - !text - width: 300 + #width: 300 text: '${now MM.dd.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -550,7 +550,7 @@ layouts: widths: [395] items: - !text - width: 300 + #width: 300 text: '${comment}' fontEncoding: Cp1252 fontSize: 9 @@ -566,7 +566,7 @@ layouts: nbColumns: 1 items: - !text - width: 300 + #width: 300 text: '${now MM.dd.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -579,7 +579,7 @@ layouts: type: 'bar sub' intervals: 5 lastPage: - rotation: true + #rotation: true pageSize: 595 842 landscape: false items: @@ -657,14 +657,14 @@ layouts: nbColumns: 1 items: - !text - width: 300 + #width: 300 text: '${comment}' fontEncoding: Cp1252 fontSize: 9 align: left vertAlign: middle - !text - width: 300 + #width: 300 text: '${now MM.dd.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -682,7 +682,7 @@ layouts: type: 'bar sub' intervals: 5 lastPage: - rotation: true + #rotation: true pageSize: 842 595 landscape: false items: @@ -795,7 +795,7 @@ layouts: widths: [424] items: - !text - width: 424 + #width: 424 text: '${comment}' fontEncoding: Cp1252 fontSize: 9 @@ -811,7 +811,7 @@ layouts: nbColumns: 1 items: - !text - width: 424 + #width: 424 text: '${now MM.dd.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -891,14 +891,14 @@ layouts: nbColumns: 1 items: - !text - width: 424 + #width: 424 text: '${comment}' fontEncoding: Cp1252 fontSize: 9 align: left vertAlign: middle - !text - width: 424 + #width: 424 text: '${now MM.dd.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -964,7 +964,7 @@ layouts: widths: [424] items: - !text - width: 424 + #width: 424 text: '${comment}' fontEncoding: Cp1252 fontSize: 9 @@ -980,7 +980,7 @@ layouts: nbColumns: 1 items: - !text - width: 424 + #width: 424 text: '${now MM.dd.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -1033,14 +1033,14 @@ layouts: nbColumns: 1 items: - !text - width: 424 + #width: 424 text: '${comment}' fontEncoding: Cp1252 fontSize: 9 align: left vertAlign: middle - !text - width: 424 + #width: 424 text: '${now MM.dd.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -1106,7 +1106,7 @@ layouts: widths: [424] items: - !text - width: 424 + #width: 424 text: '${comment}' fontEncoding: Cp1252 fontSize: 9 @@ -1122,7 +1122,7 @@ layouts: nbColumns: 1 items: - !text - width: 424 + #width: 424 text: '${now MM.dd.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -1135,7 +1135,7 @@ layouts: type: 'bar sub' intervals: 5 lastPage: - rotation: true + #rotation: true pageSize: 842 1190 landscape: false items: @@ -1213,14 +1213,14 @@ layouts: nbColumns: 1 items: - !text - width: 424 + #width: 424 text: '${comment}' fontEncoding: Cp1252 fontSize: 9 align: left vertAlign: middle - !text - width: 424 + #width: 424 text: '${now MM.dd.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -1238,7 +1238,7 @@ layouts: type: 'bar sub' intervals: 5 lastPage: - rotation: true + #rotation: true pageSize: 1190 842 landscape: false items: @@ -1274,4 +1274,4 @@ layouts: backgroundColor: #ffffff reorderColumns: true dontBreakItems: true - overflow: true + overflow: true \ No newline at end of file From f73348dbfc29aa6395aac7ca483920492f74cd15 Mon Sep 17 00:00:00 2001 From: "G. Allegri" Date: Thu, 11 Jul 2024 11:03:42 +0200 Subject: [PATCH 3/4] remove the SNAPSHOT gs-sec-oauth2-core lib --- libs/gs-sec-oauth2-core-2.24-SNAPSHOT.jar | Bin 35609 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 libs/gs-sec-oauth2-core-2.24-SNAPSHOT.jar diff --git a/libs/gs-sec-oauth2-core-2.24-SNAPSHOT.jar b/libs/gs-sec-oauth2-core-2.24-SNAPSHOT.jar deleted file mode 100644 index d18dcc861034a1f1828ed7a2de33d4464025631c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 35609 zcmb5V19YU_wk{mowrzH7+qP}n6?Safw$n*Ewr$($q?5n*{`TGXe&_t>o_lK4sP`RJ zbB*ziIiK}RJgXFCK*3;u{_%?TwbA_N&A&dN|6Jw7RE6lJ>!GEQ8ogoUPVdq{Al;I+1EvC}UG z6%r|ST~Bf#f)KW69Kv+qqZ&U8EH_}dIWe5GNMD(wy49hY&}Mx?O(3$sL}!Par>N6n%U5K0|mdYOs$@l>z?`h|bN;{BV*V#v7c&z#XDe5)|H~qR z|9X*wk(;X}%fHt`{S$Aq#lRpVe}IGu4g`epXRVQ=qpg*Rk*k%1y@-RotC^=OgQuNs zO>%#1784R+W{LnT{H|bYrFZmcDX}a;tJ(Y(`+q&k$aD$?e|QAjuB9d1v53 z-@Y$wUe*BKYaGse6A||Wd9z#)ZMl+$C6eF2@9BDr<0ec$<)J(apATi#d_2D%fz96@ zSwC#&1~Q-JNqr^u)xC;vJWG4%2T8S{4YD9ehIZrU@avP~W%aEGk)DO1UWP53W5~ha z@L##he{1*49v_s&j}!&a@`f5XivLz;3%$;{D{F4k ziC=&JrOp|>c-i=sFqIfcEtI#AMpnf3?LCG5q}Eem53O5^TV9Qb zlLqMh{H~ooSI!%ft5_Lc8 z3fJ{U%Jq2iCx7;2cqPWT_Whl14r~uQx+$h-O-dMj2dyqg6gGBD*fv-_3}}_wFEzEj z-!0vxdNLR_n7$YrRN~B`4D<2n)dMlyaYU3Ox`(qYbEDk?@e_ytA@mHyNj>L(LLT`i z{3L&_5@rr6|HP!w|HgoUjRS+DvxB3Vv#XVvOG)gE^&k`6@QoLY5Cg6)1+1wR0^jAl z9t6JYh_0%R3|ub0X~%3^US_RdkkQB6%*z?&k{UeXGxGYe8R&Z$37)c%%&j~%BNYMY zrE;Wv9rXaKA=D55Oma{a3jPF@pDUNFtA|jJaNEk0hk_FkLgpoY{(?4{Sx;b|!i2Y2 zP>Rc7Wn?e|W^_gjN9!-?L!MFsUV&t{q`^c>F0cvF+b ze*|8jcY&;En|cuk7?^FKc{7Nwnu|MxcFKi^KSua>`Sd%L1~;+Eg>ocvOB|#-#j8UE zNcXcEPb(5oRw-5%!@|e5%jzbW620bdDOIrj*pM_zT9Cgv9eifsBW6f&`4|ngtP&BM z6mrVldcglyugo%Mv+C+EI>PizwM`a2MOmfQCVtiSJY>d4Kjon6%Ry|&UlMZqn4a8! z{&OXKY4zYs*JPski?%?G;ehX;xUv4G&>#5k&VZN(*|z=T2m(+bAm@KLlW55PZS)Tt2WKnqfANp0nX;LSgPXI7nW&ko zk(I3rgNdz?i%XC4gfu8KTF=>rcFppNwxf|4-sx}{iRBPvGDfv4vHkp=I}VQ=*;upc zZQN!%ita10f3hbf0!gPL(&T=x^9)yZeA-Hx1<)!Wg{0Vs7%|#Q(>Q(uU3rxc;_S&f zT&T3RHeRTMnCx4T5#|%u4S=nJEqP`TVTI&6$!PdF%t(<>d`X;7xQB49cYZ%rr@&O! z4InPIJ|fbr8``YHor2=VcQ{Pc(pccS3tk>G=mYUv5|-xZ-YSU%D{8%bh#f{(3~k9U%}n)p|a$oY{_~YkPi$R zhMCR@?)#lkB^-Z`y%#ZH$K+43LWKteB=$dyy|S5|gR7aUgN>Q}KWN6v#Oz<;tkHz@ z#2Z5Y)JSwtC=&yK#(WRqs;8fz>0QOz&}@w)lW7$kk{l3C=B(;UXkNB@S>0mA0D~fj zrbc2S3yRY<;{&RcN(-s%tzH-vFAk80Ba+9@|-I(pwMydYF$!pKy?5vuYonnQpj6sk;HfVIWJbn;gJ; z^sYmGym2_Oq1H_bFl*sA==?!zJc0eQ3#uIkGPP-}0%c`@pX zdNkocs zKS3bJosrPem9({dT3)Y1WeYokkA}Jya}5J7Wk6wrdwd#EqYzO==fmrjf+b(d0$|!Q z6&QMN99Y&HWWfi?&cs2jxD&F`O~*Iqw!tp-X~;=fcfas?G!^HNNCK_>S>(7VaVD+O z@Wn}_-0FzF*ojiG#qt8Rf!-Qit4I+md1O17BdhH_jjxk5xxP$5N`G0*!MBzv4LyQQ z7hJeLN-@Z`Ne@GFp>eIMxMW|_vHZ3Lp!Rk_9ULH73}+o^Qk0&#T(lGEg$z-uJPJ$r=9vfA1Ny!$Gb+cLm9)+IsKwwqb@Eb;aB>|JT+}6~ZZ|`n7 zl9_XA6ppSAM-K8t?rDoG4f{f8&US@`bMP~rf0@;VNV&TFsTMfyd0d9@WyByF9sKu1 z|wxBc6vCrxwWxzYRw5Q2NQ_-N(s>$qiT8<5Y-%!&Q1!^FX{L z{0W5gQwjpIPa_=MdS`cOR~(kDMf|4^9rC+$Zyzs^Cn&FTZXE6gxj}VTDoeV9U2fl5 ztJUBKFEW7%RIfE_sa+>{!l4m1Uc?%lb<+igEM_bm_q{Nj`S`QNvW5vsn^#W$0>hku zeexJrW0I5hNTY<&#?*VjWGH^|&CdusIWn@m&>7_+N_Jluh4R;Cz|5``_(Q0jPAgz$ z-vx(1j**J9VX9F#-0Ir~X*>JE^aoUK)P6KhZzyBcYZRbv-v)+(?u1NM3l%jr1MMw| zV$JM&j#YeJ;1Us0Mntzb-)dRXw1$mgUhGctTtBFA{{p8s$l<=6hVs!<72OOEUL$zo z3!`_cvw#g|!&!WILZap5-ODYl%()40v)hH!8-8QsxGR1KYK1rOfh3@OX96$KufYBR zCm?{J)F?j0$o7HKx39%|0>Yzd+@3U_+*gV!(-s%CWBE$&U$*~(^BE{Gk07R_*#9<@ zSP>;)^~(BLXoUKW_LLW(%?hU0@8tsGRngc!Fdm)~T=O*3Y0s~F?mp_*nDZni4)GJ< zEUo8&h%x<8wUTVs*=fX$88w!O!!hbg%c$mfTUe+Mg`I z`i$zM<{YHm{pgw09iv%7I}1&N;-Ek~4uba6b$lapjogd9i!A-7cXH}|?>3g$5xL-F z#hi_sGxX)Eujf_90-s;z1+9$?f{LJfCK*zb-a^6ny)Yto3MPprbE0xAIGK9JdgVUc z^Qsb&UAbBAw6(ru%;rpdea#GSR9Qlsn>V%Fb%k^uz;FcR{5)5JMrXg(P}Eh`<5pi) z=b>R?5HM34{ocjnz46}aZhO?Plv}D@7J3kMOQy)8gyVEQd6m~xP44js4@aZP?*V@# zlQeV8l$WM;Ev-B?bJ{5Hafd}%#8CTD;e0WwyzBz|CZX9rJ7;}1G2nh&y?(#8wjybe zNYJF~H-MY} z^TZwD6}0tTd1WBzG@qma&P~;Kcq)TiVKl)~y@VeRqgux@fXk0H3U6dS72d^HR-*MM zS@R!`;2KW`IQew;vL!APYB^y~t58HBb@#g}DRi?vxoRydZQy=BvrWeq1{0L}!1;ze zJJUvW^?56fK;!=Ws`=4&F?{uaLK`RGJT?O;%)*V3b5R8#!#lb0+IS%N?}!D3MmQ-V zkcv-8LWDoNN0hj}k0J?FsYDPcIdOM@UU2&HRW<;Z?efwcWuA{JSL*H#LeLx~9Wt&x z7cwgLhOsEqkf6`dmh6ZPV4@j{-D@JxsH50GGQbR0G7O!QtMAZh&Tpes3E;z5ufK>m+ zCNFehWoer^01acDe|efJ5h4-94q6T@noDYR?3?@@)b|JKLzd zedaDmi=>r`?TcU-yaB5pLUh$X*f8MP34WZ#UA+wGCVp>%Y%Jf)Iip*(4Ac>NFJ4!AB=dp81*cP1cSvz zNE}Kw<~h)ZRPU6@4%hdg&Fq;otEjv=Pb3+djzd}wsFX)y%FP8(Kmv^ z@NUg2DyBVpa0=B2u*E>Zlhc@h!$koz0Hw^>t5f>*C2n|jg52e@*cJ=Q~tfW$NZr4*I(fcd%)Rk zJJEP!t;^A;N7>3F)Dw}eEs&1zeishaYPLE=E*|80$cGSLH-xVopHhh1N5pEo?4o`( zE4?pPf3ISzvarIB|5UG0f4Uff|F(+#zcem?wIeBU4bmdaXn?Q9^(r?f7e}YXp}^<} z6{YOZD2>g7C$`d3DK4(I{VJ|kApYd^<`r(JU<+ux`+%JQe*T?p;B4cv0r#+if!q>J zRK|#rBK2H(d+MQ7T;+BF-p*KCx6CG3_W^Tp#)Le#!csHJI_^xA+3y}`qAr+=wA1hs z1>&c7xSmqR*$O8x?*h^b)JL)AE)HZi5?>3oI(5ivOx0=Qv?r{$hEFBe_n6GG*>-CY z(R-fO7~*@?P%c%?wofuokb*{SM9m!i=XZl_dAy2>rvUKKDK`U zp$Wthp8AA<00Qzr0RoczZ(aEB{_el^Ws8Q54ypv2e;OFZiW)LF8qHD^PDFc6i&}IV z2~jCLrqoaI8g4QXmdwljYlxrgSv@=NH9POH>-=`73%pl|r*Y>CtXbq>iP|8qW;41w zF4H^~$JxK%^8`LY9C3DRpon|nM;zsbngKxjIBvBzp0JVToALL@-!=y}8r^hSuSb`+ z%$YhI#r+d$lxfxd%L>3>*zttb#pFfO@UDX^2Ign=&L=B8 ziS}&KW0PwEgQF9C4>TC6ys8c5`5wtS%=R-bK1?^}bUM7owe^$4v_oa>CP!CfgvSi1 zS`tA7%yRaKW*G;L=Me2&b@`0eYgU69O<@_iEn2aRn$LcuR%@I2UM4@YFdQpxou^w~7MLWGXBVF!+>gYC@5$UL&! z-SVrG)`(IOmE~mnJVjKb}f-nVZlGyBWKyk z+reuH>l6y2tS0DRUEW(!r`OKFZ|qnmJ5tz997&~>E$hPFOUu#kBy2o&CA4CpM#gmnE2)uSaw!*TJo$Bc#s+;huDK(78m0_y6*wTF?ZlpjwXm(s3bkIEEDefaQ^^N5%z8KvG#v0a4b7C}OZBOm$L0)c zI3h}dd%NExgPLY#C*kAN6EjY&yX?TvH~&C{ckV91)-Q$<#yz?EoH3!w1f__3n7M$c z5gmCqeBoBzkh;C2p9$G@nS@%Gbf3ez(BfMJzr+(rjaFlccZ8h1-e$~5myR5i2Z zhHXNGow2;?sPUcTsky72B;2c8e47XZsljvTa;y~Sx<*<)ZJoTS3%ey(nlyQrlvGTV zKmYI~T2deIq1P!uBX3^SY_8Kc>kPsEM<6>o=QQkV`=}bptu~4IsI@ISX!+8$b8_Sad7u%dHd?m@LPbL695oT<-mz+w#$7kkM z@`q4%Nu9oS;0lwVa)N@&(y_tZ?Ly`hrL}!;VD#rPY;&hj?KSKd0D!)f$>E*(oPCG1 zE>qr zWhw`&wJe_w3Dp8Ag5DYTt21lvy9}EMG1UaIfk&T$aK77!HcYLmA`+E~BX-f}GGPG< znqy@37Iw)@Z3Brm%6Z;u4isJ-d9YY>B9D)8qyKdE{- zn*Ei|TaxV*78KD&zS2_NXw7Uv(UAyesd1suLtl+yu@kA&!BJqyL`~+GE~w757a&o3 zQv^xGi}qRw$33sjnCS|8nJyAt+`XsyUOYapu3iZ9`hY#7O5jwJU6Yw>j5G&h5J2NX zGvrJZ%MPo{(`85*yDRpXMb5SS%&K~am^wQWf4;*GI10Gq^SFZsyr1$}FfIG#g;(X` zi}4zJEgB7fN@Pofu zZsu916g|9lr!v_GM$Hl|_UdZAfL4=Ru+pKeWArzKh_{;F&i6FzT7&*h{q2&ayIvV@ zbGo*p4JQ<3$`Ue^v&sWEj5fxans=$L^+DpaNbR;@GFQ$Nl&QtOt|@3
  • lkZVb@| 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 Qw=c6d#h*ma-~Rf40R9}(R{#J2 From b7ad0d3c01c1dbca8b35d532e307e2bd06690173 Mon Sep 17 00:00:00 2001 From: "G. Allegri" Date: Thu, 11 Jul 2024 11:35:12 +0200 Subject: [PATCH 4/4] keep the original gs-sec-oauth2 lib --- .github/workflows/artifacts.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/artifacts.sh b/.github/workflows/artifacts.sh index 68777cd..5ee94e1 100644 --- a/.github/workflows/artifacts.sh +++ b/.github/workflows/artifacts.sh @@ -15,8 +15,6 @@ mkdir _tmp pushd _tmp unzip ../geoserver_vanilla.war -## get rid of clashing/outdated dependencies -rm -Rfv WEB-INF/lib/gs-sec-oauth2-core* ## copy the new ones cp -v ../geoserver-geonode-ext/libs/* WEB-INF/lib/