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 }} diff --git a/project/Commons.scala b/project/Commons.scala index 82cfd26a2..d20714536 100644 --- a/project/Commons.scala +++ b/project/Commons.scala @@ -26,16 +26,16 @@ 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" - val mongoVersion = "5.1.1" - val springVersion = "5.3.36" + val jettyVersion = "10.0.22" + val mongoVersion = "5.1.2" + val springVersion = "5.3.37" 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 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 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") diff --git a/redis/tls/ca.crt b/redis/tls/ca.crt index d976e6800..9e4114584 100644 --- a/redis/tls/ca.crt +++ b/redis/tls/ca.crt @@ -1,7 +1,7 @@ -----BEGIN CERTIFICATE----- -MIIFSzCCAzOgAwIBAgIUb59CZW3sU9ECytCAHGuxtY9f7eQwDQYJKoZIhvcNAQEL +MIIFSzCCAzOgAwIBAgIUYISY8omJ687qm1/oc9ttcK6EnUcwDQYJKoZIhvcNAQEL BQAwNTETMBEGA1UECgwKUmVkaXMgVGVzdDEeMBwGA1UEAwwVQ2VydGlmaWNhdGUg -QXV0aG9yaXR5MB4XDTIzMDYxNTEyMTEwMFoXDTMzMDYxMjEyMTEwMFowNTETMBEG +QXV0aG9yaXR5MB4XDTI0MDcxODExMzY1MFoXDTM0MDcxNjExMzY1MFowNTETMBEG 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/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/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..b9d7b5a13 100644 --- a/redis/tls/redis.crt +++ b/redis/tls/redis.crt @@ -1,7 +1,7 @@ -----BEGIN CERTIFICATE----- -MIID6DCCAdACFBVWgEvHURW3htcbsJDAcazAYh/FMA0GCSqGSIb3DQEBCwUAMDUx +MIID6DCCAdACFA7xTsMYbPXDFmFDMEWRlVY2XOrmMA0GCSqGSIb3DQEBCwUAMDUx EzARBgNVBAoMClJlZGlzIFRlc3QxHjAcBgNVBAMMFUNlcnRpZmljYXRlIEF1dGhv -cml0eTAeFw0yMzA2MTUxMjExMDBaFw0yNDA2MTQxMjExMDBaMCwxEzARBgNVBAoM +cml0eTAeFw0yNDA3MTgxMTM2NTBaFw0zNDA3MTYxMTM2NTBaMCwxEzARBgNVBAoM ClJlZGlzIFRlc3QxFTATBgNVBAMMDEdlbmVyaWMtY2VydDCCASIwDQYJKoZIhvcN AQEBBQADggEPADCCAQoCggEBAOvSjrrOyHXYl1ASlvBNepT7VA8njdRIjoaVivBU OgBpnBzQyREAgUhtPTv7/skdux19pRgxMzXXsfGH7LXA9JKDVJWiYnUYVONad6jE @@ -9,15 +9,15 @@ OgBpnBzQyREAgUhtPTv7/skdux19pRgxMzXXsfGH7LXA9JKDVJWiYnUYVONad6jE HAmeA3Ix3etLcvAS4iT4DStd/2/FTRwptJf3xSE5fx66O+ZcchKoB6nrOAF4y9tU fBQiXJTNjIlZ6DNDR81PzEPD3VeJ9aK+BupdotwCr1MJYhOYKuMO+F/WUtU1AkBL pR05qqn4R9pCQ8XFjOUGyJY5xUUcfU/0Efmhu225VQSJffsCAwEAATANBgkqhkiG -9w0BAQsFAAOCAgEAQAPLGJc/8TUC+7pdhDiC6lLcYZly9xneW/TT1kZ6sOIYAXM/ -HE2xrVVkTMA5HUbr3+V8YWFsy3mnryn1YYRZlPEAZOxMxwbIT8RmSInOv0dChUu2 -kDosxnaXYT4PUKIgEer7GryVP2Ng0osofB9gzxzqPdvMVgEnRoC6osq5I3PXyXf3 -5/0Q0IGApYPDGVFmQIlQG9QYQU5xsszYBGTvA68DP2tCEyGwQgMwfbHruD1h7BbN -8jxtYzkkZgRheph6YNspJoIEP0/cKzFtpv6xXwbMFDM/6BI/ry1/G6vrMBhw/9L8 -4a9WU1FQn1BJ5JKMIRZQC4AfyB1+uAOwg7YsWuq5O6f2K1vPqFB8VRBGdUuNnbTS -yPQmEk0RiNlbaLw0/T+QTWq4IWwnFRIeiF0IoccnDtWghXZwCP2pYowvNOlriNpe -Q0wjDJgGUn6Rwhze9yp76Rpm7sjxyRAIn5WVnnXSkpcRKoaHGKzIPcpF0Uwl1x5Q -M00vlvmukpElbFChJGxn2SHtWv4vIeFtySpwbAzrwnMzCj8Pe7JsvC2UVOpAjc+N -riA9F+w+aA9o8cAM/4LGAeU0fc1HJzaom1BNpW3LoE4PAYwXgPmpz2XuIqXBbduV -Sw+Z/gjHm2ybkP1Xr0eYcxcoQqzixubAv1faEpjf0iJX0hOn0A1ToWoTcnA= +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 17e123d0c..be5c02577 100644 Binary files a/redis/tls/redis.p12 and b/redis/tls/redis.p12 differ