From 03dac47b7871900ee88f0e8584b6f1b98c4738cb Mon Sep 17 00:00:00 2001 From: stanislavh Date: Tue, 9 Apr 2024 14:34:20 +0200 Subject: [PATCH] SONAR-21999 Change lts wording to lta --- .../sonar/server/platform/DatabaseServerCompatibility.java | 2 +- .../server/platform/DatabaseServerCompatibilityTest.java | 4 ++-- sonar-core/src/main/resources/org/sonar/l10n/core.properties | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java index c7d15567768..25596c1abd8 100644 --- a/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java +++ b/server/sonar-webserver-core/src/main/java/org/sonar/server/platform/DatabaseServerCompatibility.java @@ -52,7 +52,7 @@ public class DatabaseServerCompatibility implements Startable { if (status == DatabaseVersion.Status.REQUIRES_UPGRADE) { Optional currentVersion = this.version.getVersion(); if (currentVersion.isPresent() && currentVersion.get() < DatabaseVersion.MIN_UPGRADE_VERSION) { - throw MessageException.of("Current version is too old. Please upgrade to Long Term Support version firstly."); + throw MessageException.of("The version of SonarQube is too old. Please upgrade to the Long-Term Active version first."); } boolean blueGreen = configuration.getBoolean(ProcessProperties.Property.BLUE_GREEN_ENABLED.getKey()).orElse(false); if (!blueGreen) { diff --git a/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java index dd4a986497f..334ab3bb43c 100644 --- a/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java +++ b/server/sonar-webserver-core/src/test/java/org/sonar/server/platform/DatabaseServerCompatibilityTest.java @@ -52,7 +52,7 @@ public class DatabaseServerCompatibilityTest { } @Test - public void fail_if_requires_firstly_to_upgrade_to_lts() { + public void fail_if_requires_firstly_to_upgrade_to_lta() { DatabaseVersion version = mock(DatabaseVersion.class); when(version.getStatus()).thenReturn(DatabaseVersion.Status.REQUIRES_UPGRADE); when(version.getVersion()).thenReturn(Optional.of(12L)); @@ -60,7 +60,7 @@ public class DatabaseServerCompatibilityTest { var compatibility = new DatabaseServerCompatibility(version, config); assertThatThrownBy(compatibility::start) .isInstanceOf(MessageException.class) - .hasMessage("Current version is too old. Please upgrade to Long Term Support version firstly."); + .hasMessage("The version of SonarQube is too old. Please upgrade to the Long-Term Active version first."); } @Test diff --git a/sonar-core/src/main/resources/org/sonar/l10n/core.properties b/sonar-core/src/main/resources/org/sonar/l10n/core.properties index 30ceba145ea..0349083ec70 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -3231,7 +3231,7 @@ system.hide_intermediate_versions=Hide intermediate versions system.how_to_upgrade=How to upgrade? system.latest_version=Latest Version system.latest_patch=Patch Release -system.lts_version=Latest LTS Version +system.lts_version=Latest LTA Version system.log_level.warning=This level has performance impacts, please make sure to get back to INFO level once your investigation is done. Please note that when the server is restarted, logging will revert to the level configured in sonar.properties. system.log_level.warning.short=Current logs level has performance impacts, get back to INFO level. system.log_level.info=Your selection does not affect the Search Engine. -- 2.39.5