From 29aaa0074f1bbab69bbefca0b266cb599cc85ff4 Mon Sep 17 00:00:00 2001 From: Brandon Ording Date: Fri, 21 Mar 2025 13:02:56 -0400 Subject: [PATCH 1/2] Adjust test to one week out instead of two --- .../LicenseTest.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ServiceControl.Audit.Persistence.Tests.RavenDB/LicenseTest.cs b/src/ServiceControl.Audit.Persistence.Tests.RavenDB/LicenseTest.cs index 6b28389aea..4b5a8a9d8a 100644 --- a/src/ServiceControl.Audit.Persistence.Tests.RavenDB/LicenseTest.cs +++ b/src/ServiceControl.Audit.Persistence.Tests.RavenDB/LicenseTest.cs @@ -37,7 +37,7 @@ public async Task EnsureLicenseIsValid() Assert.That(details.Status, Is.EqualTo("Commercial")); Assert.That(details.Expired, Is.False); Assert.That(details.Type, Is.EqualTo("Professional")); - Assert.That(DateTime.UtcNow.AddDays(14), Is.LessThan(details.Expiration), $"The RavenDB license expires {details.Expiration} which is less than 2 weeks. Contact RavenDB at for the new license."); + Assert.That(DateTime.UtcNow.AddDays(7), Is.LessThan(details.Expiration), $"The RavenDB license expires {details.Expiration} which is less than one week. Contact RavenDB at for the new license."); }); } } From ea42eb7b52ac59a70e00fc8eb39c82e5c0ca4f1c Mon Sep 17 00:00:00 2001 From: Brandon Ording Date: Fri, 21 Mar 2025 13:16:31 -0400 Subject: [PATCH 2/2] Update RavenDB.Embedded to 5.4.207 --- src/Directory.Packages.props | 2 +- src/ServiceControl.RavenDB/EmbeddedDatabase.cs | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props index 719137eab9..a666940e26 100644 --- a/src/Directory.Packages.props +++ b/src/Directory.Packages.props @@ -59,7 +59,7 @@ - + diff --git a/src/ServiceControl.RavenDB/EmbeddedDatabase.cs b/src/ServiceControl.RavenDB/EmbeddedDatabase.cs index 327b7db368..a8fba63648 100644 --- a/src/ServiceControl.RavenDB/EmbeddedDatabase.cs +++ b/src/ServiceControl.RavenDB/EmbeddedDatabase.cs @@ -57,18 +57,19 @@ public static EmbeddedDatabase Start(EmbeddedDatabaseConfiguration databaseConfi { CommandLineArgs = [ - $"--License.Path=\"{licenseFileNameAndServerDirectory.LicenseFileName}\"", $"--Logs.Mode={databaseConfiguration.LogsMode}", // HINT: If this is not set, then Raven will pick a default location relative to the server binaries // See https://github.com/ravendb/ravendb/issues/15694 $"--Indexing.NuGetPackagesPath=\"{nugetPackagesPath}\"" ], - AcceptEula = true, DataDirectory = databaseConfiguration.DbPath, ServerUrl = databaseConfiguration.ServerUrl, LogsPath = databaseConfiguration.LogPath }; + serverOptions.Licensing.EulaAccepted = true; + serverOptions.Licensing.LicensePath = licenseFileNameAndServerDirectory.LicenseFileName; + if (!string.IsNullOrWhiteSpace(licenseFileNameAndServerDirectory.ServerDirectory)) { serverOptions.ServerDirectory = licenseFileNameAndServerDirectory.ServerDirectory;