From 57d18d24d13983da7a761a87956d973ddfb2da6f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 24 Jun 2024 11:10:56 +0000 Subject: [PATCH 01/11] Update scalatest to 3.2.19 --- project/Commons.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Commons.scala b/project/Commons.scala index 82cfd26a2..90312ec53 100644 --- a/project/Commons.scala +++ b/project/Commons.scala @@ -26,7 +26,7 @@ object Commons extends ProjectGroup("commons") { val guavaVersion = "33.2.1-jre" val jsr305Version = "3.0.2" - val scalatestVersion = "3.2.18" + val scalatestVersion = "3.2.19" val scalatestplusScalacheckVersion = "3.2.14.0" val scalacheckVersion = "1.18.0" val jettyVersion = "10.0.21" From a634fe18035c5f26623e01f993a4edae92f79043 Mon Sep 17 00:00:00 2001 From: Dawid Dworak Date: Mon, 1 Jul 2024 15:43:44 +0200 Subject: [PATCH 02/11] Fix Redis tests by with new, valid certificate --- redis/tls/ca.crt | 28 +++++++++++------------ redis/tls/gen-test-certs.sh | 2 +- redis/tls/redis.crt | 44 +++++++++++++++++++----------------- redis/tls/redis.p12 | Bin 2755 -> 2835 bytes 4 files changed, 38 insertions(+), 36 deletions(-) diff --git a/redis/tls/ca.crt b/redis/tls/ca.crt index d976e6800..4d2793d6f 100644 --- a/redis/tls/ca.crt +++ b/redis/tls/ca.crt @@ -1,7 +1,7 @@ -----BEGIN CERTIFICATE----- -MIIFSzCCAzOgAwIBAgIUb59CZW3sU9ECytCAHGuxtY9f7eQwDQYJKoZIhvcNAQEL +MIIFSzCCAzOgAwIBAgIUUHKvsekETAVQJQlbKOf3YjWhnPUwDQYJKoZIhvcNAQEL BQAwNTETMBEGA1UECgwKUmVkaXMgVGVzdDEeMBwGA1UEAwwVQ2VydGlmaWNhdGUg -QXV0aG9yaXR5MB4XDTIzMDYxNTEyMTEwMFoXDTMzMDYxMjEyMTEwMFowNTETMBEG +QXV0aG9yaXR5MB4XDTI0MDcwMTEzNDE1NVoXDTM0MDYyOTEzNDE1NVowNTETMBEG A1UECgwKUmVkaXMgVGVzdDEeMBwGA1UEAwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5 MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsb6eG0YFqy8DPluvx3MP M7TIyZLaV60hdzAp6VfHPh7T1iTi0T6l0PiCtYk1tdSRxNftHgaBvd5ETy8iMBLG @@ -16,16 +16,16 @@ NlsUGR8Y0dAH/5tyJ4yv8WnVg0O/XaOewcUZr+6+GpLyzv0U6Z7e9uP1+w7Lt3Ov bwaWmJlEK+2J4/Df5l+5RAn2GHMhr7DneUTYsXRHvZdKkKX8x0QZa6P42WMbTln+ 9B7cZgH5QvpZVgqpvGmiJQ8CAwEAAaNTMFEwHQYDVR0OBBYEFO+sz38Nkc7XaSdC /9hLVH0yooloMB8GA1UdIwQYMBaAFO+sz38Nkc7XaSdC/9hLVH0yooloMA8GA1Ud -EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBALGGExNCYnuLjtO9MSEdZUus -81ZVN+048lV6rd+JM8IY04DsBkofzNdOjXygsVYKq/il6DORqjvUlhygsybcDlyK -IW9CYdNIMihsoSpbYQLelCChiG2cUWh6vaAtIpxSsUbZVkTyK6iOCk6Xvp8EIzvU -lgnY3v3TjohvftGz2ltQ2HUMvPQk7HjvnUioX1K2l6+ZFRAODLJBh7VMNestzJK0 -R0RjBWtGQNw8oBgpWhC9cyyoqKT6RGypZ7zZwPM/Taw06h8abfQ5hqQqyFYUkXcH -KHISqfZvmunKnPh0slmvIcjouUM9M9X1oct8oKf29DNX0uXgyx5vQs7ftfQEq3BV -NLqU6upKn0Rhk9aK8lDOJx0t8JcMZhJY4RAgfV4ctIaD1AUznjX3CsjoZvrbRz0w -/AUsPYINcCfCNDdvcjFB33XJFJpbieuBCNKX0+yUz/TIpXLORwZbQOlTJcnbKOLI -5lGgXcikRK7rWWkF9/3rzKr/5Xn8Px9BEDnLcxEsP3tdldZS8jC5OnpWxs52OJPS -4WP7AUG+qd5Dl95ITsoSDxL6+/q55rqSUPyIyu97k4/GopwSqbpM98c243fwtEvV -9sxMiWxhszDjEneQ3WA8wCN3GAURJTjSsPQFBzWCZVDMyV/K4P+BhnmCYMwPJaEn -yugNK6U+Va0gbnmtiXBM +EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAELIMKFsF6twoKxmgrzHABOf +FGlZK/gZWkFUcjLeLNt3fvZ+6PNwRO64yArKUGmOWrsXW55b3ntPWV5opven7fNl +N4DSd16daYM9UGQk3pDoXaAe+ev5yZI4INCjNh1M4PNxAhaODBpLl2Rdj1hC4cdp +Av4EWzCmpmIKLC9X4R7KPgVqe2q3qbwNZe1yMXfqMOir/itpvVRZJNeLId2xqLUP +VnMDpvptSCQWA9wywsFNMQOEGsTYlbXOcCDy/peQyJ12s19QyTkHRmXktlOeuAV6 +w+h4xIxWi62J5JeTCqXig5Q+Qf6HRlB/dPlj89vpddAtZVNtrr3y/a9V2Tn8dpbF +qMfGv9gshHs2igod3M94nVc0bx077gU28NYfngWDK8y5tqCrTu2209vOK8Evam8y +g+qSZmOW0y3BwEk63VJhLXk+gPGvlXBOavP5x94h2X3U/fC35Z1Ddg/dQyiKWZpv +EqesTEY702H0wtP7eOXKBRPSGZ4NtZY/c9VJkSDPYvWH9fUIHzpn30vR6bLBeCHE +sUDZ1xo1g2SY6rYFNnJ/Nnx6OzJwZaemCCOCFpWiRrFLmmmPYgFDX8Gp8ntgHOEv +k6EBbnERTdWYIg3hicJMSrs6LdQcLxmswHiPEZTmZzSdcYV/nfIwpt/lpzRDADrW +A+lNQmHBrTta4ytkukFQ -----END CERTIFICATE----- diff --git a/redis/tls/gen-test-certs.sh b/redis/tls/gen-test-certs.sh index 6a944b264..04b94f2f4 100755 --- a/redis/tls/gen-test-certs.sh +++ b/redis/tls/gen-test-certs.sh @@ -25,7 +25,7 @@ generate_cert() { -CAkey ca.key \ -CAserial ca.txt \ -CAcreateserial \ - -days 365 \ + -days 3650 \ $opts \ -out $certfile } diff --git a/redis/tls/redis.crt b/redis/tls/redis.crt index 63cdac9e0..189f67040 100644 --- a/redis/tls/redis.crt +++ b/redis/tls/redis.crt @@ -1,23 +1,25 @@ -----BEGIN CERTIFICATE----- -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 +fUZWQ9sBSO282CEDeilhdlvI3ob0 -----END CERTIFICATE----- diff --git a/redis/tls/redis.p12 b/redis/tls/redis.p12 index 17e123d0cd0659dbe5c54c85b62bf6788aef8ed1..2092c64cd4e41f829b6cbd50c5552f545667c224 100644 GIT binary patch literal 2835 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 Wn5n$g0K|ylKza0NnlAmV+W!Kd9VZn4 literal 2755 zcmai$X*3iJ7sqE9%M1+}OEE+qON60DjV((ulVq1HWhcuZ`z!YJR1Ct86EDHsc0PgoPxW6AcU8M4UZZHv)?(J5k^+2SS4VSH zzuB0jYFtjL&nc^(w_d-h6lr6ma{Zed+@t|?`Nv7Gv6kOTY^n*PD;lTn*K|hxA}s5r z^B2>xt|9^^LtC39ee3TxPguTzTXTIbeE-xVNKGfsX+*uLz* zd72v<^Wk@ZRGd5a(5ibl)=}(J+oG6(A%d`Aq0&WyQGjljr3ezek|X zZzyr}YuY}foI?jSh?ElcEnPhfX;#D7Vw2+Tt0F6zT@f?b5lgIs*oKm%WrnW&Bst4f z=0~v#>w1&$2JMNPk}6T?hldwIX=kzkxz9FNi7B$Ev96h*t41ypcf6{E?~EhV^VI8I zr=ILt>}6yNf9<{$tfbNm%bUq<6uY;9FWcfh!_Jf2^G<&y0CA03)UB~4@!~}`6Zb2# z7OXIc-}I)r=4SP|Qu7iqah-xy(H+V2Bj9<3C@vju4u8`Eh3Gq*81?C4=j$@Dvqxyv z8dDK4my>PndgLXS2RtaE(ik?hd^7Qta7rC_!}t-OZ}>v+gZPL`lRX846f1Cc{`->l zlU*M1lG4nD$?+EmQ346A?EI=TJ?hW1?h3}T79C+Rs|^8g-4B({__$Htcjf2n={S%75kN% z>(5`;OW}VpPIl%oDk4Lc6bQTxKPt(_d>be5h&ntm88JKB*af@x zz+Mf!t~V8&z-$|eqZTzAxm=jX(9opMJjO6h<-_!IVLh^#vq_1Q;|V#o6&HY2mpnJ#fPd^hCerp`LjKNQY z0ZjwdV*AHT3P>dW&Rg2~`z3FQg9<8%su9g*hE0@Vu1kB|#f3?V>2iQ3f3?^}xy(oe zf85Si^5=)yN6I?PjqYoFvxOvckn-Mw_!g0)+GoZa-mmN7aoH)emW+<7VNbc)No38E zgMOG@z=y~~5iu-rfB5t_@K^#sF)Y5vw%2jpW99fi3ppV`rsGiY*p&M>!1t(w{Yy<3*R0tz0 zJU@BmY&6DCJF0aN70te1>!JQ&;rdbuS;F<1v4&%vY-Xcp(DQwUcB(`b{6>f!{`(~9 zIUaRq?pHC>Ptn|MZ!7!(l6n2wOhJ$&p=B^j_HC3FvG4U)WMlOf3s%(k3aUw)LG&*8oX zsRL__hHvBsDP-kmi1B>Qpqm}o_h`#8zcH}?KA;w%8vayY)MAs|u(~e?o}6|deeF57 znJ%Zpq5tgao3~6TS=aF}mMg3DWZo}+LGjMTboerZocp{zKi6xvKSi2ns;XKz5mItq z9Nt&xDPdAN-B{5m&r6?Z%yvxf==?jgG%KG8gF7;g-do7px_8pgBdx zYurYz!p=N=q7vU4C)MF}N~-Q~IRAd9e>&AuZVy2C&Bq*uGEaIA`MvHw=>cUH=%tw4 zMz`5@cMyLnnm|W)XR7e?7M5SwCV69Dt!&!N2-Ui9*WeZ%_AzhFOx(^2ZD_@R@D$TS z*yGFXvN{C6u|_z@#g35!2w+{2&0?jrA%#~kLzhvYr~Qc?VrJX)YrFR}E-Rng&mInAveLFf z!~*+}_>>JHw_!U|Qv0s9N34(QgxomJc;RHUL1rUf#To54;JKWG8KUETys5-wakm6w z^T^WP`6t;%>SvJCChzp$@~jdaxfCtO9&0zI^-c7ORrA~LMUq=i3oOE|*ie)Lny~fV zA0G!j$(Zi;1_!BwBfpC8>M9~hoC^%YH5O+B!KB$A@VjA6t#IDi7D%UHXq`&4K#t;LGqW#mQy(4W zh~NZUt zr*9a<=?dT*x)onsjyKdqQP0V2y!^|a zblaNHH{p{w`I6gB4@$17!=cA-gRhqDoV>Pah-e=tCF>K-`BEIntw#fiL+^iMwBjF3gbop)8Aq=v`>iq0CgBjIJP^ From b16dd4b973d927ed93d6cca7c76e57f4925d2b59 Mon Sep 17 00:00:00 2001 From: Dawid Dworak Date: Mon, 1 Jul 2024 15:43:44 +0200 Subject: [PATCH 03/11] Fix Redis tests by with new, valid certificate --- redis/tls/ca.crt | 28 +++++++++++------------ redis/tls/gen-test-certs.sh | 2 +- redis/tls/redis.crt | 44 +++++++++++++++++++----------------- redis/tls/redis.p12 | Bin 2755 -> 2835 bytes 4 files changed, 38 insertions(+), 36 deletions(-) diff --git a/redis/tls/ca.crt b/redis/tls/ca.crt index d976e6800..4d2793d6f 100644 --- a/redis/tls/ca.crt +++ b/redis/tls/ca.crt @@ -1,7 +1,7 @@ -----BEGIN CERTIFICATE----- -MIIFSzCCAzOgAwIBAgIUb59CZW3sU9ECytCAHGuxtY9f7eQwDQYJKoZIhvcNAQEL +MIIFSzCCAzOgAwIBAgIUUHKvsekETAVQJQlbKOf3YjWhnPUwDQYJKoZIhvcNAQEL BQAwNTETMBEGA1UECgwKUmVkaXMgVGVzdDEeMBwGA1UEAwwVQ2VydGlmaWNhdGUg -QXV0aG9yaXR5MB4XDTIzMDYxNTEyMTEwMFoXDTMzMDYxMjEyMTEwMFowNTETMBEG +QXV0aG9yaXR5MB4XDTI0MDcwMTEzNDE1NVoXDTM0MDYyOTEzNDE1NVowNTETMBEG A1UECgwKUmVkaXMgVGVzdDEeMBwGA1UEAwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5 MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsb6eG0YFqy8DPluvx3MP M7TIyZLaV60hdzAp6VfHPh7T1iTi0T6l0PiCtYk1tdSRxNftHgaBvd5ETy8iMBLG @@ -16,16 +16,16 @@ NlsUGR8Y0dAH/5tyJ4yv8WnVg0O/XaOewcUZr+6+GpLyzv0U6Z7e9uP1+w7Lt3Ov bwaWmJlEK+2J4/Df5l+5RAn2GHMhr7DneUTYsXRHvZdKkKX8x0QZa6P42WMbTln+ 9B7cZgH5QvpZVgqpvGmiJQ8CAwEAAaNTMFEwHQYDVR0OBBYEFO+sz38Nkc7XaSdC /9hLVH0yooloMB8GA1UdIwQYMBaAFO+sz38Nkc7XaSdC/9hLVH0yooloMA8GA1Ud -EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBALGGExNCYnuLjtO9MSEdZUus -81ZVN+048lV6rd+JM8IY04DsBkofzNdOjXygsVYKq/il6DORqjvUlhygsybcDlyK -IW9CYdNIMihsoSpbYQLelCChiG2cUWh6vaAtIpxSsUbZVkTyK6iOCk6Xvp8EIzvU -lgnY3v3TjohvftGz2ltQ2HUMvPQk7HjvnUioX1K2l6+ZFRAODLJBh7VMNestzJK0 -R0RjBWtGQNw8oBgpWhC9cyyoqKT6RGypZ7zZwPM/Taw06h8abfQ5hqQqyFYUkXcH -KHISqfZvmunKnPh0slmvIcjouUM9M9X1oct8oKf29DNX0uXgyx5vQs7ftfQEq3BV -NLqU6upKn0Rhk9aK8lDOJx0t8JcMZhJY4RAgfV4ctIaD1AUznjX3CsjoZvrbRz0w -/AUsPYINcCfCNDdvcjFB33XJFJpbieuBCNKX0+yUz/TIpXLORwZbQOlTJcnbKOLI -5lGgXcikRK7rWWkF9/3rzKr/5Xn8Px9BEDnLcxEsP3tdldZS8jC5OnpWxs52OJPS -4WP7AUG+qd5Dl95ITsoSDxL6+/q55rqSUPyIyu97k4/GopwSqbpM98c243fwtEvV -9sxMiWxhszDjEneQ3WA8wCN3GAURJTjSsPQFBzWCZVDMyV/K4P+BhnmCYMwPJaEn -yugNK6U+Va0gbnmtiXBM +EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAELIMKFsF6twoKxmgrzHABOf +FGlZK/gZWkFUcjLeLNt3fvZ+6PNwRO64yArKUGmOWrsXW55b3ntPWV5opven7fNl +N4DSd16daYM9UGQk3pDoXaAe+ev5yZI4INCjNh1M4PNxAhaODBpLl2Rdj1hC4cdp +Av4EWzCmpmIKLC9X4R7KPgVqe2q3qbwNZe1yMXfqMOir/itpvVRZJNeLId2xqLUP +VnMDpvptSCQWA9wywsFNMQOEGsTYlbXOcCDy/peQyJ12s19QyTkHRmXktlOeuAV6 +w+h4xIxWi62J5JeTCqXig5Q+Qf6HRlB/dPlj89vpddAtZVNtrr3y/a9V2Tn8dpbF +qMfGv9gshHs2igod3M94nVc0bx077gU28NYfngWDK8y5tqCrTu2209vOK8Evam8y +g+qSZmOW0y3BwEk63VJhLXk+gPGvlXBOavP5x94h2X3U/fC35Z1Ddg/dQyiKWZpv +EqesTEY702H0wtP7eOXKBRPSGZ4NtZY/c9VJkSDPYvWH9fUIHzpn30vR6bLBeCHE +sUDZ1xo1g2SY6rYFNnJ/Nnx6OzJwZaemCCOCFpWiRrFLmmmPYgFDX8Gp8ntgHOEv +k6EBbnERTdWYIg3hicJMSrs6LdQcLxmswHiPEZTmZzSdcYV/nfIwpt/lpzRDADrW +A+lNQmHBrTta4ytkukFQ -----END CERTIFICATE----- diff --git a/redis/tls/gen-test-certs.sh b/redis/tls/gen-test-certs.sh index 6a944b264..04b94f2f4 100755 --- a/redis/tls/gen-test-certs.sh +++ b/redis/tls/gen-test-certs.sh @@ -25,7 +25,7 @@ generate_cert() { -CAkey ca.key \ -CAserial ca.txt \ -CAcreateserial \ - -days 365 \ + -days 3650 \ $opts \ -out $certfile } diff --git a/redis/tls/redis.crt b/redis/tls/redis.crt index 63cdac9e0..189f67040 100644 --- a/redis/tls/redis.crt +++ b/redis/tls/redis.crt @@ -1,23 +1,25 @@ -----BEGIN CERTIFICATE----- -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 +fUZWQ9sBSO282CEDeilhdlvI3ob0 -----END CERTIFICATE----- diff --git a/redis/tls/redis.p12 b/redis/tls/redis.p12 index 17e123d0cd0659dbe5c54c85b62bf6788aef8ed1..2092c64cd4e41f829b6cbd50c5552f545667c224 100644 GIT binary patch literal 2835 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 Wn5n$g0K|ylKza0NnlAmV+W!Kd9VZn4 literal 2755 zcmai$X*3iJ7sqE9%M1+}OEE+qON60DjV((ulVq1HWhcuZ`z!YJR1Ct86EDHsc0PgoPxW6AcU8M4UZZHv)?(J5k^+2SS4VSH zzuB0jYFtjL&nc^(w_d-h6lr6ma{Zed+@t|?`Nv7Gv6kOTY^n*PD;lTn*K|hxA}s5r z^B2>xt|9^^LtC39ee3TxPguTzTXTIbeE-xVNKGfsX+*uLz* zd72v<^Wk@ZRGd5a(5ibl)=}(J+oG6(A%d`Aq0&WyQGjljr3ezek|X zZzyr}YuY}foI?jSh?ElcEnPhfX;#D7Vw2+Tt0F6zT@f?b5lgIs*oKm%WrnW&Bst4f z=0~v#>w1&$2JMNPk}6T?hldwIX=kzkxz9FNi7B$Ev96h*t41ypcf6{E?~EhV^VI8I zr=ILt>}6yNf9<{$tfbNm%bUq<6uY;9FWcfh!_Jf2^G<&y0CA03)UB~4@!~}`6Zb2# z7OXIc-}I)r=4SP|Qu7iqah-xy(H+V2Bj9<3C@vju4u8`Eh3Gq*81?C4=j$@Dvqxyv z8dDK4my>PndgLXS2RtaE(ik?hd^7Qta7rC_!}t-OZ}>v+gZPL`lRX846f1Cc{`->l zlU*M1lG4nD$?+EmQ346A?EI=TJ?hW1?h3}T79C+Rs|^8g-4B({__$Htcjf2n={S%75kN% z>(5`;OW}VpPIl%oDk4Lc6bQTxKPt(_d>be5h&ntm88JKB*af@x zz+Mf!t~V8&z-$|eqZTzAxm=jX(9opMJjO6h<-_!IVLh^#vq_1Q;|V#o6&HY2mpnJ#fPd^hCerp`LjKNQY z0ZjwdV*AHT3P>dW&Rg2~`z3FQg9<8%su9g*hE0@Vu1kB|#f3?V>2iQ3f3?^}xy(oe zf85Si^5=)yN6I?PjqYoFvxOvckn-Mw_!g0)+GoZa-mmN7aoH)emW+<7VNbc)No38E zgMOG@z=y~~5iu-rfB5t_@K^#sF)Y5vw%2jpW99fi3ppV`rsGiY*p&M>!1t(w{Yy<3*R0tz0 zJU@BmY&6DCJF0aN70te1>!JQ&;rdbuS;F<1v4&%vY-Xcp(DQwUcB(`b{6>f!{`(~9 zIUaRq?pHC>Ptn|MZ!7!(l6n2wOhJ$&p=B^j_HC3FvG4U)WMlOf3s%(k3aUw)LG&*8oX zsRL__hHvBsDP-kmi1B>Qpqm}o_h`#8zcH}?KA;w%8vayY)MAs|u(~e?o}6|deeF57 znJ%Zpq5tgao3~6TS=aF}mMg3DWZo}+LGjMTboerZocp{zKi6xvKSi2ns;XKz5mItq z9Nt&xDPdAN-B{5m&r6?Z%yvxf==?jgG%KG8gF7;g-do7px_8pgBdx zYurYz!p=N=q7vU4C)MF}N~-Q~IRAd9e>&AuZVy2C&Bq*uGEaIA`MvHw=>cUH=%tw4 zMz`5@cMyLnnm|W)XR7e?7M5SwCV69Dt!&!N2-Ui9*WeZ%_AzhFOx(^2ZD_@R@D$TS z*yGFXvN{C6u|_z@#g35!2w+{2&0?jrA%#~kLzhvYr~Qc?VrJX)YrFR}E-Rng&mInAveLFf z!~*+}_>>JHw_!U|Qv0s9N34(QgxomJc;RHUL1rUf#To54;JKWG8KUETys5-wakm6w z^T^WP`6t;%>SvJCChzp$@~jdaxfCtO9&0zI^-c7ORrA~LMUq=i3oOE|*ie)Lny~fV zA0G!j$(Zi;1_!BwBfpC8>M9~hoC^%YH5O+B!KB$A@VjA6t#IDi7D%UHXq`&4K#t;LGqW#mQy(4W zh~NZUt zr*9a<=?dT*x)onsjyKdqQP0V2y!^|a zblaNHH{p{w`I6gB4@$17!=cA-gRhqDoV>Pah-e=tCF>K-`BEIntw#fiL+^iMwBjF3gbop)8Aq=v`>iq0CgBjIJP^ From 0025de64e20f2e2afc44ffc33edd2ebb62b5796a Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 26 Jun 2024 13:04:30 +0000 Subject: [PATCH 04/11] Update pekko-stream to 1.0.3 --- project/Commons.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Commons.scala b/project/Commons.scala index 90312ec53..b6af5bc03 100644 --- a/project/Commons.scala +++ b/project/Commons.scala @@ -35,7 +35,7 @@ object Commons extends ProjectGroup("commons") { val typesafeConfigVersion = "1.4.3" val commonsIoVersion = "1.3.2" // test only val scalaLoggingVersion = "3.9.5" - val pekkoVersion = "1.0.2" + val pekkoVersion = "1.0.3" val monixVersion = "3.4.1" val circeVersion = "0.14.5" // benchmark only val upickleVersion = "3.1.2" // benchmark only From 1371072ac806212ab6cef7fd201a4b1a81b6bdb6 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 24 Jun 2024 11:09:56 +0000 Subject: [PATCH 05/11] Update sbt-github-actions to 0.24.0 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 92441735b..f119466af 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -9,4 +9,4 @@ addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0") addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.3") addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4") -addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.23.0") +addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.24.0") From 4e992df920cc9f0197af392836e95136362a2572 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 24 Jun 2024 11:10:53 +0000 Subject: [PATCH 06/11] Regenerate GitHub Actions workflow Executed command: sbt githubWorkflowGenerate --- .github/workflows/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dd7f96d20..573b8d54a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,6 +49,9 @@ jobs: java-version: 21 cache: sbt + - name: Setup sbt + uses: sbt/setup-sbt@v1 + - name: Cache Redis uses: actions/cache@v2 with: @@ -107,6 +110,9 @@ jobs: java-version: 21 cache: sbt + - name: Setup sbt + uses: sbt/setup-sbt@v1 + - env: PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} PGP_SECRET: ${{ secrets.PGP_SECRET }} From 6ae62b96b04c08f7beee99e735ed9cdd6f7f821c Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Fri, 14 Jun 2024 14:09:25 +0000 Subject: [PATCH 07/11] Update spring-context to 5.3.37 --- project/Commons.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Commons.scala b/project/Commons.scala index b6af5bc03..750c3be37 100644 --- a/project/Commons.scala +++ b/project/Commons.scala @@ -31,7 +31,7 @@ object Commons extends ProjectGroup("commons") { val scalacheckVersion = "1.18.0" val jettyVersion = "10.0.21" val mongoVersion = "5.1.1" - val springVersion = "5.3.36" + val springVersion = "5.3.37" val typesafeConfigVersion = "1.4.3" val commonsIoVersion = "1.3.2" // test only val scalaLoggingVersion = "3.9.5" From 3feb9c40880d3199e42b235b24a375b97eb8e302 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 4 Jul 2024 13:30:43 +0000 Subject: [PATCH 08/11] Update jetty-client, jetty-server, ... to 10.0.22 --- project/Commons.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Commons.scala b/project/Commons.scala index 750c3be37..29e9106bc 100644 --- a/project/Commons.scala +++ b/project/Commons.scala @@ -29,7 +29,7 @@ object Commons extends ProjectGroup("commons") { val scalatestVersion = "3.2.19" val scalatestplusScalacheckVersion = "3.2.14.0" val scalacheckVersion = "1.18.0" - val jettyVersion = "10.0.21" + val jettyVersion = "10.0.22" val mongoVersion = "5.1.1" val springVersion = "5.3.37" val typesafeConfigVersion = "1.4.3" From 507f43002ccbd97d9dd19a09231817fc0a4d95f6 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 10 Jul 2024 13:21:08 +0000 Subject: [PATCH 09/11] Update mongodb-driver-core, ... to 5.1.2 --- project/Commons.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/Commons.scala b/project/Commons.scala index 29e9106bc..d20714536 100644 --- a/project/Commons.scala +++ b/project/Commons.scala @@ -30,7 +30,7 @@ object Commons extends ProjectGroup("commons") { val scalatestplusScalacheckVersion = "3.2.14.0" val scalacheckVersion = "1.18.0" val jettyVersion = "10.0.22" - val mongoVersion = "5.1.1" + val mongoVersion = "5.1.2" val springVersion = "5.3.37" val typesafeConfigVersion = "1.4.3" val commonsIoVersion = "1.3.2" // test only From 3f9da7bc6b2c88aa2f7643f08503b190fb248190 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Wed, 10 Jul 2024 13:21:23 +0000 Subject: [PATCH 10/11] Update sbt to 1.10.1 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 4067c483a..ebb337b0b 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,2 +1,2 @@ # suppress inspection "UnusedProperty" -sbt.version=1.10.0 +sbt.version=1.10.1 From f100cd4ff1256fad211f88f8c5ceb6eed467f0dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Kozak?= Date: Thu, 18 Jul 2024 13:36:54 +0200 Subject: [PATCH 11/11] Fix Redis tests by with new, valid certificate --- redis/tls/ca.crt | 28 ++++++++++++++-------------- redis/tls/redis.crt | 44 +++++++++++++++++++++----------------------- redis/tls/redis.p12 | Bin 2835 -> 2755 bytes 3 files changed, 35 insertions(+), 37 deletions(-) diff --git a/redis/tls/ca.crt b/redis/tls/ca.crt index 4d2793d6f..9e4114584 100644 --- a/redis/tls/ca.crt +++ b/redis/tls/ca.crt @@ -1,7 +1,7 @@ -----BEGIN CERTIFICATE----- -MIIFSzCCAzOgAwIBAgIUUHKvsekETAVQJQlbKOf3YjWhnPUwDQYJKoZIhvcNAQEL +MIIFSzCCAzOgAwIBAgIUYISY8omJ687qm1/oc9ttcK6EnUcwDQYJKoZIhvcNAQEL BQAwNTETMBEGA1UECgwKUmVkaXMgVGVzdDEeMBwGA1UEAwwVQ2VydGlmaWNhdGUg -QXV0aG9yaXR5MB4XDTI0MDcwMTEzNDE1NVoXDTM0MDYyOTEzNDE1NVowNTETMBEG +QXV0aG9yaXR5MB4XDTI0MDcxODExMzY1MFoXDTM0MDcxNjExMzY1MFowNTETMBEG A1UECgwKUmVkaXMgVGVzdDEeMBwGA1UEAwwVQ2VydGlmaWNhdGUgQXV0aG9yaXR5 MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAsb6eG0YFqy8DPluvx3MP M7TIyZLaV60hdzAp6VfHPh7T1iTi0T6l0PiCtYk1tdSRxNftHgaBvd5ETy8iMBLG @@ -16,16 +16,16 @@ NlsUGR8Y0dAH/5tyJ4yv8WnVg0O/XaOewcUZr+6+GpLyzv0U6Z7e9uP1+w7Lt3Ov bwaWmJlEK+2J4/Df5l+5RAn2GHMhr7DneUTYsXRHvZdKkKX8x0QZa6P42WMbTln+ 9B7cZgH5QvpZVgqpvGmiJQ8CAwEAAaNTMFEwHQYDVR0OBBYEFO+sz38Nkc7XaSdC /9hLVH0yooloMB8GA1UdIwQYMBaAFO+sz38Nkc7XaSdC/9hLVH0yooloMA8GA1Ud -EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAELIMKFsF6twoKxmgrzHABOf -FGlZK/gZWkFUcjLeLNt3fvZ+6PNwRO64yArKUGmOWrsXW55b3ntPWV5opven7fNl -N4DSd16daYM9UGQk3pDoXaAe+ev5yZI4INCjNh1M4PNxAhaODBpLl2Rdj1hC4cdp -Av4EWzCmpmIKLC9X4R7KPgVqe2q3qbwNZe1yMXfqMOir/itpvVRZJNeLId2xqLUP -VnMDpvptSCQWA9wywsFNMQOEGsTYlbXOcCDy/peQyJ12s19QyTkHRmXktlOeuAV6 -w+h4xIxWi62J5JeTCqXig5Q+Qf6HRlB/dPlj89vpddAtZVNtrr3y/a9V2Tn8dpbF -qMfGv9gshHs2igod3M94nVc0bx077gU28NYfngWDK8y5tqCrTu2209vOK8Evam8y -g+qSZmOW0y3BwEk63VJhLXk+gPGvlXBOavP5x94h2X3U/fC35Z1Ddg/dQyiKWZpv -EqesTEY702H0wtP7eOXKBRPSGZ4NtZY/c9VJkSDPYvWH9fUIHzpn30vR6bLBeCHE -sUDZ1xo1g2SY6rYFNnJ/Nnx6OzJwZaemCCOCFpWiRrFLmmmPYgFDX8Gp8ntgHOEv -k6EBbnERTdWYIg3hicJMSrs6LdQcLxmswHiPEZTmZzSdcYV/nfIwpt/lpzRDADrW -A+lNQmHBrTta4ytkukFQ +EwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggIBAJB4WRmu8H27LK3Az0Od+FbJ +i39yaSvnJapQFKwakC+uv2rGE+wl6ALSUalhYt9C11/zci4VIGD+Vwf3hHqCq7wY +IsTBrXGhdkwjoZkIkvTnfFG2S7/B8noSd7x879gAvsdVm/Y8wcbDgQ1uU+L9vsQk +xFmGKdUj4YoX+tMgQ63H9cuBfiRfKjkGZ9xPIVf/nIvfwAvbNZDiowS+p7CWaHKb +CJ5kXpf9ix4yR4g4lxIiRwt/Vaeehgoprask9QybEqFJuizACTPjlU6Q4r8U/cVt +tFlsCFFXrQ3YYhHjeYOLpXMw7jQrWFI3Sf1OdR6zCbYdJiwnQnr94id3KJX3ENHR +RS5vZP0ojpLFaMuZtJrTBC1fuKRZZZfx56aVM//lEZYbxiwbkgVgwHWggGHaFXAe +CA9y0MqVjqhpm1Jz534KcawpL1Gw8R4nevtMMXPK10CVy+eB0px3LrTt+R2Ok+uG +a5zZGwzVqVpvYv+GL2Zbw/DFyZNbYA5OH0QvGWy8KJbEOwYWtibRSPu/zNtkH9Vo +gQJ0HGI+R/rrV9E4uBJY72O9KJdn3Jo+LlRprmNz4XqXEmvetkTLPhMKkB5/TbNY +q6Yt9s8cux8bK7q4QA0KD7oKv7RA7lLDugPZVRrFfADuYS1qNgN+fpPT3ecZNTUz +MD36lUINyg5xabq6O65Q -----END CERTIFICATE----- diff --git a/redis/tls/redis.crt b/redis/tls/redis.crt index 189f67040..b9d7b5a13 100644 --- a/redis/tls/redis.crt +++ b/redis/tls/redis.crt @@ -1,25 +1,23 @@ -----BEGIN CERTIFICATE----- -MIIEMTCCAhmgAwIBAgIUXMsSW9pjn6lmZ6PfzpWaVEMkG2UwDQYJKoZIhvcNAQEL -BQAwNTETMBEGA1UECgwKUmVkaXMgVGVzdDEeMBwGA1UEAwwVQ2VydGlmaWNhdGUg -QXV0aG9yaXR5MB4XDTI0MDcwMTEzNDE1NloXDTM0MDYyOTEzNDE1NlowLDETMBEG -A1UECgwKUmVkaXMgVGVzdDEVMBMGA1UEAwwMR2VuZXJpYy1jZXJ0MIIBIjANBgkq -hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA69KOus7IddiXUBKW8E16lPtUDyeN1EiO -hpWK8FQ6AGmcHNDJEQCBSG09O/v+yR27HX2lGDEzNdex8YfstcD0koNUlaJidRhU -41p3qMT6IxtWbyVEjBRGPZFhaCRKqrwyOVvFYybzKG4nVf/EJKhXeSAbX/t07oIz -ePk+VRMcCZ4DcjHd60ty8BLiJPgNK13/b8VNHCm0l/fFITl/Hro75lxyEqgHqes4 -AXjL21R8FCJclM2MiVnoM0NHzU/MQ8PdV4n1or4G6l2i3AKvUwliE5gq4w74X9ZS -1TUCQEulHTmqqfhH2kJDxcWM5QbIljnFRRx9T/QR+aG7bblVBIl9+wIDAQABo0Iw -QDAdBgNVHQ4EFgQUzDGS4id/EtlUjD01hTYtkgcR0dMwHwYDVR0jBBgwFoAU76zP -fw2RztdpJ0L/2EtUfTKiiWgwDQYJKoZIhvcNAQELBQADggIBABBlVAwFIfnp85cg -W14v1KhAdmOzRmYoK66W7DuOQ4CG3Z98szQ9gtJDfJkcsZhcMvWuUDLR8322fS8Z -p/83Lk15kfQFeYaWF5ASWmeEqov2h8BjXLVDn+ybozxikZDXewYDATCN6izDug1N -tDpsWhpFjbPqotWF3KgdSTu1JdF7niuC6H5IlCWZ5STk3Y7Y3FPhh6RB61PDkODT -cKvhtOqDYkRrOp9U/RzvpyWktv42zHUMesjxg6onqmqczAhqiQDLE50N/UXy+wRU -vzpdIl8RrbGalLvAqYYb0AZdJWbr08gdYBtDWAeFIJ+Ae4VXuFvye2l2mCOjHvBj -PA4msMcCZIhIahEY97J85T2iW9VEZsVPA5dyYZyxh3634XGp6bD64KUoDDF/OAH5 -hqk5esQo/UCUyKX1btcVTmgiZItMLTnhmFmTu2MtSDglaA8oC9yR+ilrILVFa8+I -Xl+9zRqpYlZRuqqkk4/ZDTwTZfZKiPum12mgMK/MW13ht+UIbRul0gHQqYpFNAVi -hWXif58NuOqdtARaOgfnYoo61kB8akEEoeUhJTYIfpfTFTD9bMpAMyjR6g+/Nn4p -73sqpj4uYHv7fEfKftdTY8YyQeplU3ihjhvTa2+GXQ6xvQCguKJc6Kysf1a78nnz -fUZWQ9sBSO282CEDeilhdlvI3ob0 +MIID6DCCAdACFA7xTsMYbPXDFmFDMEWRlVY2XOrmMA0GCSqGSIb3DQEBCwUAMDUx +EzARBgNVBAoMClJlZGlzIFRlc3QxHjAcBgNVBAMMFUNlcnRpZmljYXRlIEF1dGhv +cml0eTAeFw0yNDA3MTgxMTM2NTBaFw0zNDA3MTYxMTM2NTBaMCwxEzARBgNVBAoM +ClJlZGlzIFRlc3QxFTATBgNVBAMMDEdlbmVyaWMtY2VydDCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAOvSjrrOyHXYl1ASlvBNepT7VA8njdRIjoaVivBU +OgBpnBzQyREAgUhtPTv7/skdux19pRgxMzXXsfGH7LXA9JKDVJWiYnUYVONad6jE ++iMbVm8lRIwURj2RYWgkSqq8MjlbxWMm8yhuJ1X/xCSoV3kgG1/7dO6CM3j5PlUT +HAmeA3Ix3etLcvAS4iT4DStd/2/FTRwptJf3xSE5fx66O+ZcchKoB6nrOAF4y9tU +fBQiXJTNjIlZ6DNDR81PzEPD3VeJ9aK+BupdotwCr1MJYhOYKuMO+F/WUtU1AkBL +pR05qqn4R9pCQ8XFjOUGyJY5xUUcfU/0Efmhu225VQSJffsCAwEAATANBgkqhkiG +9w0BAQsFAAOCAgEAOAclVDRCj/WUcFARkKbjr94+blEYA3S8GsFjaM2n4npISiVR +rWVhc+9fhmY16gDHbJyoC6izxqYEjWz7wvwejxGRlRnMvP/1T7jTMOJ+YY9/0hox +3sjSmQgOMtMIvRo02mqMWlPoHV3NzJIpP8mA47cZvTzhJjdOljor5jIE0dj42192 +eJu13HoN1Aev3HrIKGOj1DEUGW4gpAQA8FNha2ROs63xyrXTt1gkXGbYI3koPSt2 +mJsBY0axZwAHxuM/LP38uV71zQVOduLdHTlppDUjuNabA5tac/A1kkSgFymnvGJ5 +1J6cVdaveV7y9CnGXbFc1T6mFwJvsBsfki9SyVFvO9ieGT7i/CF6yh2cZemyIEKh +MrnmnpdZX8NjM4g6voCH+8klI/irG8rnV/c6vsi73x4qIREerAcsEzAUsvzOrFov +XWkDRX/PRnFFiZIEBEtoSXLIICPaNzRmWJ/OJHLr/9Dh61BZBFdlSgnq0RYIIGMP +bfPIkZy0jmWfIljjwpHLocbSY5NdL+ZPeMHzoisiBNKfRAd0yHsh7DWiX57vFVwi +OXMiITpNj/iNDWX1TzSVi7vtr6cBDE/2jhzvY4yjfZBFG2TudPGlcHmXLN27Enll +YiAYnZ8PrH1zWT/xITdPcVlMyEwEyXMHWwjsgZR2vYzyCO0LS13oHWnhnIo= -----END CERTIFICATE----- diff --git a/redis/tls/redis.p12 b/redis/tls/redis.p12 index 2092c64cd4e41f829b6cbd50c5552f545667c224..be5c02577dd6fa7aae96cb4ab0fe5229cb498b92 100644 GIT binary patch literal 2755 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 Wn5n$g0K|ylKza0NnlAmV+W!Kd9VZn4