diff options
| author | Antoine Vigneau <antoine.vigneau@sonarsource.com> | 2023-12-06 16:29:06 +0100 |
|---|---|---|
| committer | sonartech <sonartech@sonarsource.com> | 2023-12-07 20:03:15 +0000 |
| commit | 32a1a4dae1fdc1c366975cf98f44423b7b0b07c2 (patch) | |
| tree | efc99fa89afccd04f8ff98b007c9e6aba8435220 /server | |
| parent | 8b15bdf5aab5461c17e7f78674db5b9085f394f2 (diff) | |
| download | sonarqube-32a1a4dae1fdc1c366975cf98f44423b7b0b07c2.tar.gz sonarqube-32a1a4dae1fdc1c366975cf98f44423b7b0b07c2.zip | |
SONAR-20652 Upgrade Orchestrator to 4.5.0.1700
Diffstat (limited to 'server')
4 files changed, 4 insertions, 4 deletions
diff --git a/server/sonar-db-dao/build.gradle b/server/sonar-db-dao/build.gradle index f4210fdc6d3..d777d3c04e3 100644 --- a/server/sonar-db-dao/build.gradle +++ b/server/sonar-db-dao/build.gradle @@ -27,7 +27,7 @@ dependencies { testImplementation 'org.assertj:assertj-core' testImplementation 'org.assertj:assertj-guava' testImplementation 'org.mockito:mockito-core' - testImplementation 'org.sonarsource.orchestrator:sonar-orchestrator' + testImplementation 'org.sonarsource.orchestrator:sonar-orchestrator-junit4' testImplementation project(':sonar-testing-harness') testImplementation project(':sonar-plugin-api-impl') diff --git a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/OrchestratorSettingsUtils.java b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/OrchestratorSettingsUtils.java index 5acb7e9d1d7..c2540c2b092 100644 --- a/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/OrchestratorSettingsUtils.java +++ b/server/sonar-db-dao/src/testFixtures/java/org/sonar/db/OrchestratorSettingsUtils.java @@ -68,7 +68,7 @@ public class OrchestratorSettingsUtils { settings.setProperty(entry.getKey(), interpolatedValue); } } catch (Exception e) { - throw new IllegalStateException("Cannot load Orchestrator properties from:" + url, e); + throw new IllegalStateException("Cannot load OrchestratorRule properties from:" + url, e); } finally { IOUtils.closeQuietly(input); } diff --git a/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java b/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java index a2d2857812c..96d439e66e9 100644 --- a/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java +++ b/server/sonar-process/src/main/java/org/sonar/process/ProcessProperties.java @@ -178,7 +178,7 @@ public class ProcessProperties { SONAR_UPDATECENTER_ACTIVATE("sonar.updatecenter.activate", "true"), /** - * Used by Orchestrator to ask for shutdown of monitor process + * Used by OrchestratorRule to ask for shutdown of monitor process */ ENABLE_STOP_COMMAND("sonar.enableStopCommand"), diff --git a/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/DefaultAdminCredentialsVerifierFilter.java b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/DefaultAdminCredentialsVerifierFilter.java index e6fe4e594ed..c487f0c4cfa 100644 --- a/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/DefaultAdminCredentialsVerifierFilter.java +++ b/server/sonar-webserver-auth/src/main/java/org/sonar/server/authentication/DefaultAdminCredentialsVerifierFilter.java @@ -39,7 +39,7 @@ import static org.sonar.server.authentication.AuthenticationRedirection.redirect public class DefaultAdminCredentialsVerifierFilter extends ServletFilter { private static final String RESET_PASSWORD_PATH = "/account/reset_password"; private static final String CHANGE_ADMIN_PASSWORD_PATH = "/admin/change_admin_password"; - // This property is used by Orchestrator to disable this force redirect. It should never be used in production, which + // This property is used by OrchestratorRule to disable this force redirect. It should never be used in production, which // is why this is not defined in org.sonar.process.ProcessProperties. private static final String SONAR_FORCE_REDIRECT_DEFAULT_ADMIN_CREDENTIALS = "sonar.forceRedirectOnDefaultAdminCredentials"; |