diff options
31 files changed, 40 insertions, 40 deletions
diff --git a/README.md b/README.md index 13740774dd0..eeebd1f62d2 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ SonarQube provides the capability to not only show health of an application but - [Website](https://www.sonarqube.org) - [Download](https://www.sonarqube.org/downloads/) -- [Documentation](https://docs.sonarqube.org) +- [Documentation](https://docs.sonarsource.com/sonarqube) - [Twitter](https://twitter.com/SonarQube) - [SonarSource](https://www.sonarsource.com), author of SonarQube - [Issue tracking](https://jira.sonarsource.com/browse/SONAR/), read-only. Only SonarSourcers can create tickets. @@ -17,7 +17,7 @@ SonarQube provides the capability to not only show health of an application but ## Have Question or Feedback? -For support questions ("How do I?", "I got this error, why?", ...), please first read the [documentation](https://docs.sonarqube.org) and then head to the [SonarSource Community](https://community.sonarsource.com/c/help/sq/10). The answer to your question has likely already been answered! 🤓 +For support questions ("How do I?", "I got this error, why?", ...), please first read the [documentation](https://docs.sonarsource.com/sonarqube) and then head to the [SonarSource Community](https://community.sonarsource.com/c/help/sq/10). The answer to your question has likely already been answered! 🤓 Be aware that this forum is a community, so the standard pleasantries ("Hi", "Thanks", ...) are expected. And if you don't get an answer to your thread, you should sit on your hands for at least three days before bumping it. Operators are not standing by. 😄 diff --git a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v100/LogMessageIfSonarScimEnabledPresentProperty.java b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v100/LogMessageIfSonarScimEnabledPresentProperty.java index c6ce70da1c3..5fa37bfefb9 100644 --- a/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v100/LogMessageIfSonarScimEnabledPresentProperty.java +++ b/server/sonar-db-migration/src/main/java/org/sonar/server/platform/db/migration/version/v100/LogMessageIfSonarScimEnabledPresentProperty.java @@ -29,7 +29,7 @@ public class LogMessageIfSonarScimEnabledPresentProperty extends DataChange { private static final Logger LOG = LoggerFactory.getLogger(LogMessageIfSonarScimEnabledPresentProperty.class); public static final String SONAR_SCIM_ENABLED = "sonar.scim.enabled"; - private static final String SCIM_DOC_URL = "https://docs.sonarqube.org/10.1/instance-administration/authentication/saml/scim/overview/"; + private static final String SCIM_DOC_URL = "https://docs.sonarsource.com/sonarqube/10.1/instance-administration/authentication/saml/scim/overview/"; public LogMessageIfSonarScimEnabledPresentProperty(Database db) { super(db); diff --git a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/LogMessageIfSonarScimEnabledPresentPropertyTest.java b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/LogMessageIfSonarScimEnabledPresentPropertyTest.java index f0c196d068a..b3a2aaa121a 100644 --- a/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/LogMessageIfSonarScimEnabledPresentPropertyTest.java +++ b/server/sonar-db-migration/src/test/java/org/sonar/server/platform/db/migration/version/v100/LogMessageIfSonarScimEnabledPresentPropertyTest.java @@ -62,7 +62,7 @@ public class LogMessageIfSonarScimEnabledPresentPropertyTest { .containsExactly("'" + SONAR_SCIM_ENABLED + "' property is defined but not read anymore. Please read the upgrade notes" + " for the instruction to upgrade. User provisioning is deactivated until reactivated from the SonarQube" + " Administration Interface (\"General->Authentication\"). " - + "See documentation: https://docs.sonarqube.org/10.1/instance-administration/authentication/saml/scim/overview/"); + + "See documentation: https://docs.sonarsource.com/sonarqube/10.1/instance-administration/authentication/saml/scim/overview/"); } @Test diff --git a/server/sonar-web/src/main/js/app/components/__tests__/DocumentationRedirect-test.tsx b/server/sonar-web/src/main/js/app/components/__tests__/DocumentationRedirect-test.tsx index a8db8911181..45d78f8cba9 100644 --- a/server/sonar-web/src/main/js/app/components/__tests__/DocumentationRedirect-test.tsx +++ b/server/sonar-web/src/main/js/app/components/__tests__/DocumentationRedirect-test.tsx @@ -29,7 +29,7 @@ it('should redirect to static doc for specific version', async () => { expect(await screen.findByRole('link')).toHaveAttribute( 'href', - 'https://docs.sonarqube.org/10.0/land' + 'https://docs.sonarsource.com/sonarqube/10.0/land' ); }); @@ -38,7 +38,7 @@ it('should redirect to static doc for latest version', async () => { expect(await screen.findByRole('link')).toHaveAttribute( 'href', - 'https://docs.sonarqube.org/latest/land' + 'https://docs.sonarsource.com/sonarqube/latest/land' ); }); diff --git a/server/sonar-web/src/main/js/app/components/app-state/AppStateContext.tsx b/server/sonar-web/src/main/js/app/components/app-state/AppStateContext.tsx index ed03861f3e5..185e42ef2e7 100644 --- a/server/sonar-web/src/main/js/app/components/app-state/AppStateContext.tsx +++ b/server/sonar-web/src/main/js/app/components/app-state/AppStateContext.tsx @@ -28,6 +28,6 @@ export const DEFAULT_APP_STATE = { qualifiers: [], settings: {}, version: '', - documentationUrl: 'https://docs.sonarqube.org/latest', + documentationUrl: 'https://docs.sonarsource.com/sonarqube/latest', }; export const AppStateContext = React.createContext<AppState>(DEFAULT_APP_STATE); diff --git a/server/sonar-web/src/main/js/app/components/app-state/__tests__/__snapshots__/AppStateContextProvider-test.tsx.snap b/server/sonar-web/src/main/js/app/components/app-state/__tests__/__snapshots__/AppStateContextProvider-test.tsx.snap index 9881aed06e7..aef5aa5c076 100644 --- a/server/sonar-web/src/main/js/app/components/app-state/__tests__/__snapshots__/AppStateContextProvider-test.tsx.snap +++ b/server/sonar-web/src/main/js/app/components/app-state/__tests__/__snapshots__/AppStateContextProvider-test.tsx.snap @@ -4,7 +4,7 @@ exports[`should set value correctly 1`] = ` <AppStateContextProvider appState={ { - "documentationUrl": "https://docs.sonarqube.org/10.0", + "documentationUrl": "https://docs.sonarsource.com/sonarqube/10.0", "edition": "community", "productionDatabase": true, "qualifiers": [ diff --git a/server/sonar-web/src/main/js/app/components/indexation/PageUnavailableDueToIndexation.tsx b/server/sonar-web/src/main/js/app/components/indexation/PageUnavailableDueToIndexation.tsx index 6dfa918d7bc..f59a04ab525 100644 --- a/server/sonar-web/src/main/js/app/components/indexation/PageUnavailableDueToIndexation.tsx +++ b/server/sonar-web/src/main/js/app/components/indexation/PageUnavailableDueToIndexation.tsx @@ -50,7 +50,7 @@ export class PageUnavailableDueToIndexation extends React.PureComponent<WithInde id="indexation.page_unavailable.description.additional_information" values={{ link: ( - <Link to="https://docs.sonarqube.org/latest/instance-administration/reindexing/"> + <Link to="https://docs.sonarsource.com/sonarqube/latest/instance-administration/reindexing/"> {translate('learn_more')} </Link> ), diff --git a/server/sonar-web/src/main/js/app/components/indexation/__tests__/__snapshots__/IndexationContextProvider-test.tsx.snap b/server/sonar-web/src/main/js/app/components/indexation/__tests__/__snapshots__/IndexationContextProvider-test.tsx.snap index c8202de2b54..143f0fac15f 100644 --- a/server/sonar-web/src/main/js/app/components/indexation/__tests__/__snapshots__/IndexationContextProvider-test.tsx.snap +++ b/server/sonar-web/src/main/js/app/components/indexation/__tests__/__snapshots__/IndexationContextProvider-test.tsx.snap @@ -4,7 +4,7 @@ exports[`should render correctly and start polling if issue sync is needed 1`] = <IndexationContextProvider appState={ { - "documentationUrl": "https://docs.sonarqube.org/10.0", + "documentationUrl": "https://docs.sonarsource.com/sonarqube/10.0", "edition": "community", "needIssueSync": true, "productionDatabase": true, diff --git a/server/sonar-web/src/main/js/app/components/indexation/__tests__/__snapshots__/PageUnavailableDueToIndexation-test.tsx.snap b/server/sonar-web/src/main/js/app/components/indexation/__tests__/__snapshots__/PageUnavailableDueToIndexation-test.tsx.snap index 53932900198..2d3cf8c163a 100644 --- a/server/sonar-web/src/main/js/app/components/indexation/__tests__/__snapshots__/PageUnavailableDueToIndexation-test.tsx.snap +++ b/server/sonar-web/src/main/js/app/components/indexation/__tests__/__snapshots__/PageUnavailableDueToIndexation-test.tsx.snap @@ -21,7 +21,7 @@ exports[`should render correctly 1`] = ` values={ { "link": <StandoutLink - to="https://docs.sonarqube.org/latest/instance-administration/reindexing/" + to="https://docs.sonarsource.com/sonarqube/latest/instance-administration/reindexing/" > learn_more </StandoutLink>, diff --git a/server/sonar-web/src/main/js/apps/issues/sidebar/Sidebar.tsx b/server/sonar-web/src/main/js/apps/issues/sidebar/Sidebar.tsx index ad2a4340e02..2b86e04154c 100644 --- a/server/sonar-web/src/main/js/apps/issues/sidebar/Sidebar.tsx +++ b/server/sonar-web/src/main/js/apps/issues/sidebar/Sidebar.tsx @@ -425,7 +425,7 @@ export class SidebarClass extends React.PureComponent<Props> { id="indexation.filters_unavailable" values={{ link: ( - <Link to="https://docs.sonarqube.org/latest/instance-administration/reindexing/"> + <Link to="https://docs.sonarsource.com/sonarqube/latest/instance-administration/reindexing/"> {translate('learn_more')} </Link> ), diff --git a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/__snapshots__/HotspotDisabledFilterTooltip-test.tsx.snap b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/__snapshots__/HotspotDisabledFilterTooltip-test.tsx.snap index baba3c9fd1a..6e09e138b58 100644 --- a/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/__snapshots__/HotspotDisabledFilterTooltip-test.tsx.snap +++ b/server/sonar-web/src/main/js/apps/security-hotspots/components/__tests__/__snapshots__/HotspotDisabledFilterTooltip-test.tsx.snap @@ -20,7 +20,7 @@ exports[`should render correctly and stop event propagation 1`] = ` </span> <a class="sw-ml-1" - href="https://docs.sonarqube.org/latest/instance-administration/reindexing/" + href="https://docs.sonarsource.com/sonarqube/latest/instance-administration/reindexing/" rel="noopener noreferrer" target="_blank" > diff --git a/server/sonar-web/src/main/js/helpers/mocks/definitions-list.ts b/server/sonar-web/src/main/js/helpers/mocks/definitions-list.ts index 6b56a5ad3f4..3d92f418a3a 100644 --- a/server/sonar-web/src/main/js/helpers/mocks/definitions-list.ts +++ b/server/sonar-web/src/main/js/helpers/mocks/definitions-list.ts @@ -554,7 +554,7 @@ export const definitions: ExtendedSettingDefinition[] = [ key: 'sonar.cobol.aucobol.preprocessor.directives.default', name: 'AcuCobol preprocessor default directives', description: - 'This property allows to set preprocessor directives used to compile every COBOL program. See the \'ACUCOBOL-GT Source Code Control directives\' section in the <a target="_blank" href="http://docs.sonarqube.org/display/PLUG/COBOL+Plugin+Advanced+Configuration">documentation of the plugin</a>.', + 'This property allows to set preprocessor directives used to compile every COBOL program. See the \'ACUCOBOL-GT Source Code Control directives\' section in the <a target="_blank" href="http://docs.sonarsource.com/sonarqube/display/PLUG/COBOL+Plugin+Advanced+Configuration">documentation of the plugin</a>.', category: 'COBOL', subCategory: 'Preprocessor', options: [], diff --git a/server/sonar-web/src/main/js/helpers/testMocks.ts b/server/sonar-web/src/main/js/helpers/testMocks.ts index b2363cbe26a..533cff7bd1a 100644 --- a/server/sonar-web/src/main/js/helpers/testMocks.ts +++ b/server/sonar-web/src/main/js/helpers/testMocks.ts @@ -82,7 +82,7 @@ export function mockAppState(overrides: Partial<AppState> = {}): AppState { qualifiers: ['TRK'], settings: {}, version: '1.0', - documentationUrl: 'https://docs.sonarqube.org/10.0', + documentationUrl: 'https://docs.sonarsource.com/sonarqube/10.0', ...overrides, }; } 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 ce44950cd2e..3bb8fe2be13 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 { } String msg = "The database must be manually upgraded. Please backup the database and browse /setup. " - + "For more information: https://docs.sonarqube.org/latest/setup/upgrading"; + + "For more information: https://docs.sonarsource.com/sonarqube/latest/setup/upgrading"; LoggerFactory.getLogger(DatabaseServerCompatibility.class).warn(msg); Logger logger = LoggerFactory.getLogger(STARTUP_LOGGER_NAME); logger.warn(HIGHLIGHTER); 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 2e76e9934d0..8ba2175f2c2 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 @@ -69,10 +69,10 @@ public class DatabaseServerCompatibilityTest { assertThat(logTester.logs()).hasSize(4); assertThat(logTester.logs(Level.WARN)).contains( "The database must be manually upgraded. Please backup the database and browse /setup. " - + "For more information: https://docs.sonarqube.org/latest/setup/upgrading", + + "For more information: https://docs.sonarsource.com/sonarqube/latest/setup/upgrading", "################################################################################", "The database must be manually upgraded. Please backup the database and browse /setup. " - + "For more information: https://docs.sonarqube.org/latest/setup/upgrading", + + "For more information: https://docs.sonarsource.com/sonarqube/latest/setup/upgrading", "################################################################################"); } diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/ListActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/ListActionIT.java index 1e6feffe7f6..a2e7caa8f69 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/ListActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/ListActionIT.java @@ -93,7 +93,7 @@ public class ListActionIT { @Before public void setup() { - when(documentationLinkGenerator.getDocumentationLink(any())).thenReturn("https://docs.sonarqube.org/9.9/project-administration/defining-new-code/"); + when(documentationLinkGenerator.getDocumentationLink(any())).thenReturn("https://docs.sonarsource.com/sonarqube/9.9/project-administration/defining-new-code/"); ws = new WsActionTester(new ListAction(dbClient, userSession, componentFinder, dao, documentationLinkGenerator)); } @@ -102,7 +102,7 @@ public class ListActionIT { WebService.Action definition = ws.getDef(); - assertThat(definition.description()).contains("https://docs.sonarqube.org/9.9/project-administration/defining-new-code/"); + assertThat(definition.description()).contains("https://docs.sonarsource.com/sonarqube/9.9/project-administration/defining-new-code/"); assertThat(definition.key()).isEqualTo("list"); assertThat(definition.isInternal()).isFalse(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/SetActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/SetActionIT.java index 08e4cc457cb..10821ffde29 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/SetActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/SetActionIT.java @@ -79,7 +79,7 @@ public class SetActionIT { @Before public void setup() { - when(documentationLinkGenerator.getDocumentationLink(any())).thenReturn("https://docs.sonarqube.org/9.9/project-administration/defining-new-code/"); + when(documentationLinkGenerator.getDocumentationLink(any())).thenReturn("https://docs.sonarsource.com/sonarqube/9.9/project-administration/defining-new-code/"); ws = new WsActionTester(new SetAction(dbClient, userSession, componentFinder, editionProvider, dao, documentationLinkGenerator)); } @@ -87,7 +87,7 @@ public class SetActionIT { public void test_definition() { WebService.Action definition = ws.getDef(); - assertThat(definition.description()).contains("https://docs.sonarqube.org/9.9/project-administration/defining-new-code/"); + assertThat(definition.description()).contains("https://docs.sonarsource.com/sonarqube/9.9/project-administration/defining-new-code/"); assertThat(definition.key()).isEqualTo("set"); assertThat(definition.isInternal()).isFalse(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/ShowActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/ShowActionIT.java index d7c2463c759..390e3fd007d 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/ShowActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/ShowActionIT.java @@ -65,7 +65,7 @@ public class ShowActionIT { @Before public void setup() { - when(documentationLinkGenerator.getDocumentationLink(any())).thenReturn("https://docs.sonarqube.org/latest/project-administration/defining-new-code/"); + when(documentationLinkGenerator.getDocumentationLink(any())).thenReturn("https://docs.sonarsource.com/sonarqube/latest/project-administration/defining-new-code/"); ws = new WsActionTester(new ShowAction(dbClient, userSession, componentFinder, dao, documentationLinkGenerator)); } @@ -73,7 +73,7 @@ public class ShowActionIT { public void test_definition() { WebService.Action definition = ws.getDef(); - assertThat(definition.description()).contains("https://docs.sonarqube.org/latest/project-administration/defining-new-code/"); + assertThat(definition.description()).contains("https://docs.sonarsource.com/sonarqube/latest/project-administration/defining-new-code/"); assertThat(definition.key()).isEqualTo("show"); assertThat(definition.isInternal()).isFalse(); diff --git a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/UnsetActionIT.java b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/UnsetActionIT.java index 84b6b8b89b9..82b559c6bdc 100644 --- a/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/UnsetActionIT.java +++ b/server/sonar-webserver-webapi/src/it/java/org/sonar/server/newcodeperiod/ws/UnsetActionIT.java @@ -69,7 +69,7 @@ public class UnsetActionIT { @Before public void setup(){ - when(documentationLinkGenerator.getDocumentationLink(any())).thenReturn("https://docs.sonarqube.org/9.9/project-administration/defining-new-code/"); + when(documentationLinkGenerator.getDocumentationLink(any())).thenReturn("https://docs.sonarsource.com/sonarqube/9.9/project-administration/defining-new-code/"); ws = new WsActionTester(new UnsetAction(dbClient, userSession, componentFinder, editionProvider, dao, documentationLinkGenerator)); } @@ -77,7 +77,7 @@ public class UnsetActionIT { public void test_definition() { WebService.Action definition = ws.getDef(); - assertThat(definition.description()).contains("https://docs.sonarqube.org/9.9/project-administration/defining-new-code/"); + assertThat(definition.description()).contains("https://docs.sonarsource.com/sonarqube/9.9/project-administration/defining-new-code/"); assertThat(definition.key()).isEqualTo("unset"); assertThat(definition.isInternal()).isFalse(); diff --git a/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/activity-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/activity-example.json index 6cdf07a26d9..65cb3713b4d 100644 --- a/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/activity-example.json +++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/activity-example.json @@ -18,7 +18,7 @@ "warningCount": 2, "warnings": [ "The properties \u0027sonar.login\u0027 and \u0027sonar.password\u0027 are deprecated and will be removed in the future. Please pass a token with the \u0027sonar.token\u0027 property instead.", - "Missing blame information for 2 files. This may lead to some features not working correctly. Please check the analysis logs and refer to \u003ca href\u003d\"https://docs.sonarqube.org/latest/analyzing-source-code/scm-integration/\" rel\u003d\"noopener noreferrer\" target\u003d\"_blank\"\u003ethe documentation\u003c/a\u003e." + "Missing blame information for 2 files. This may lead to some features not working correctly. Please check the analysis logs and refer to \u003ca href\u003d\"https://docs.sonarsource.com/sonarqube/latest/analyzing-source-code/scm-integration/\" rel\u003d\"noopener noreferrer\" target\u003d\"_blank\"\u003ethe documentation\u003c/a\u003e." ] }, { diff --git a/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/task-example.json b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/task-example.json index 094be01c949..d6cc1ea3385 100644 --- a/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/task-example.json +++ b/server/sonar-webserver-webapi/src/main/resources/org/sonar/server/ce/ws/task-example.json @@ -17,7 +17,7 @@ "warningCount": 2, "warnings": [ "The properties 'sonar.login' and 'sonar.password' are deprecated and will be removed in the future. Please pass a token with the 'sonar.token' property instead.", - "Missing blame information for 2 files. This may lead to some features not working correctly. Please check the analysis logs and refer to <a href=\"https://docs.sonarqube.org/latest/analyzing-source-code/scm-integration/\" rel=\"noopener noreferrer\" target=\"_blank\">the documentation</a>." + "Missing blame information for 2 files. This may lead to some features not working correctly. Please check the analysis logs and refer to <a href=\"https://docs.sonarsource.com/sonarqube/latest/analyzing-source-code/scm-integration/\" rel=\"noopener noreferrer\" target=\"_blank\">the documentation</a>." ] } } diff --git a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java index 58926e4b783..5c4cb53e7d9 100644 --- a/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java +++ b/server/sonar-webserver-webapi/src/test/java/org/sonar/server/ui/ws/GlobalActionTest.java @@ -330,7 +330,7 @@ public class GlobalActionTest { @Test public void call_shouldReturnDocumentationUrl() { init(); - String url = "https://docs.sonarqube.org/10.0"; + String url = "https://docs.sonarsource.com/sonarqube/10.0"; when(documentationLinkGenerator.getDocumentationLink(null)).thenReturn(url); String json = call(); diff --git a/server/sonar-webserver/src/main/java/org/sonar/server/platform/PlatformImpl.java b/server/sonar-webserver/src/main/java/org/sonar/server/platform/PlatformImpl.java index 5cfd89446b9..1723d6c72dd 100644 --- a/server/sonar-webserver/src/main/java/org/sonar/server/platform/PlatformImpl.java +++ b/server/sonar-webserver/src/main/java/org/sonar/server/platform/PlatformImpl.java @@ -100,7 +100,7 @@ public class PlatformImpl implements Platform { // if AutoDbMigration kicked in or no DB migration was required, startup can be resumed in another thread if (dbRequiresMigration()) { - LOGGER.info("Database needs to be migrated. Please refer to https://docs.sonarqube.org/latest/setup/upgrading"); + LOGGER.info("Database needs to be migrated. Please refer to https://docs.sonarsource.com/sonarqube/latest/setup/upgrading"); } else { this.autoStarter = createAutoStarter(); diff --git a/sonar-application/src/main/assembly/conf/sonar.properties b/sonar-application/src/main/assembly/conf/sonar.properties index b999c3ab851..0dd994e4b1d 100644 --- a/sonar-application/src/main/assembly/conf/sonar.properties +++ b/sonar-application/src/main/assembly/conf/sonar.properties @@ -10,7 +10,7 @@ # - be overridden by environment variables. The name of the corresponding environment variable is the # upper-cased name of the property where all the dot ('.') and dash ('-') characters are replaced by # underscores ('_'). For example, to override 'sonar.web.systemPasscode' use 'SONAR_WEB_SYSTEMPASSCODE'. -# - be encrypted. See https://docs.sonarqube.org/latest/instance-administration/security/#settings-encryption +# - be encrypted. See https://docs.sonarsource.com/sonarqube/latest/instance-administration/security/#settings-encryption #-------------------------------------------------------------------------------------------------- # DATABASE diff --git a/sonar-application/src/main/assembly/extensions/jdbc-driver/oracle/README.txt b/sonar-application/src/main/assembly/extensions/jdbc-driver/oracle/README.txt index 54e11ac42f5..9db4bb675d4 100644 --- a/sonar-application/src/main/assembly/extensions/jdbc-driver/oracle/README.txt +++ b/sonar-application/src/main/assembly/extensions/jdbc-driver/oracle/README.txt @@ -1,2 +1,2 @@ -Please copy an Oracle JDBC driver in this directory. See compatible versions at https://docs.sonarqube.org/latest/requirements/prerequisites-and-overview/. +Please copy an Oracle JDBC driver in this directory. See compatible versions at https://docs.sonarsource.com/sonarqube/latest/requirements/prerequisites-and-overview/. Note that only a single JAR file is accepted. A failure is raised at startup if multiple JAR files are available. diff --git a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java index 403a03cc2e8..6479ae5bce8 100644 --- a/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java +++ b/sonar-core/src/main/java/org/sonar/core/config/CorePropertyDefinitions.java @@ -124,7 +124,7 @@ public class CorePropertyDefinitions { .build(), PropertyDefinition.builder(DOCUMENTATION_BASE_URL) .name("Base URL of the documentation") - .description("Base URL to be used in SonarQube documentation links, such as <i>https://docs.sonarqube.org/</i>") + .description("Base URL to be used in SonarQube documentation links, such as <i>https://docs.sonarsource.com/sonarqube/</i>") .defaultValue(DefaultDocumentationLinkGenerator.DOCUMENTATION_PUBLIC_URL) .hidden() .type(STRING) diff --git a/sonar-core/src/main/java/org/sonar/core/documentation/DefaultDocumentationLinkGenerator.java b/sonar-core/src/main/java/org/sonar/core/documentation/DefaultDocumentationLinkGenerator.java index dbfa0740328..fb98f8abac9 100644 --- a/sonar-core/src/main/java/org/sonar/core/documentation/DefaultDocumentationLinkGenerator.java +++ b/sonar-core/src/main/java/org/sonar/core/documentation/DefaultDocumentationLinkGenerator.java @@ -27,7 +27,7 @@ import org.sonar.core.config.CorePropertyDefinitions; import org.sonar.core.platform.SonarQubeVersion; public class DefaultDocumentationLinkGenerator implements DocumentationLinkGenerator { - public static final String DOCUMENTATION_PUBLIC_URL = "https://docs.sonarqube.org/"; + public static final String DOCUMENTATION_PUBLIC_URL = "https://docs.sonarsource.com/sonarqube/"; private final String documentationBaseUrl; diff --git a/sonar-markdown/src/main/java/org/sonar/markdown/HtmlLinkChannel.java b/sonar-markdown/src/main/java/org/sonar/markdown/HtmlLinkChannel.java index fee0602d547..c9ee6a8f72b 100644 --- a/sonar-markdown/src/main/java/org/sonar/markdown/HtmlLinkChannel.java +++ b/sonar-markdown/src/main/java/org/sonar/markdown/HtmlLinkChannel.java @@ -27,8 +27,8 @@ import java.util.regex.Pattern; /** * Markdown interprets text in brackets followed by text in parentheses to generate documented links. * - * E.g., the input [See documentation](http://docs.sonarqube.org/display/SONAR) will produce - * {@literal<a href="http://docs.sonarqube.org/display/SONAR">}See documentation{@literal</a>} + * E.g., the input [See documentation](http://docs.sonarsource.com/sonarqube/display/SONAR) will produce + * {@literal<a href="http://docs.sonarsource.com/sonarqube/display/SONAR">}See documentation{@literal</a>} */ class HtmlLinkChannel extends RegexChannel<MarkdownOutput> { diff --git a/sonar-markdown/src/test/java/org/sonar/markdown/MarkdownTest.java b/sonar-markdown/src/test/java/org/sonar/markdown/MarkdownTest.java index 1476b589ac4..be76487e9f9 100644 --- a/sonar-markdown/src/test/java/org/sonar/markdown/MarkdownTest.java +++ b/sonar-markdown/src/test/java/org/sonar/markdown/MarkdownTest.java @@ -39,8 +39,8 @@ public class MarkdownTest { @Test public void shouldDecorateDocumentedLink() { - assertThat(Markdown.convertToHtml("For more details, please [check online documentation](http://docs.sonarqube.org/display/SONAR).")) - .isEqualTo("For more details, please <a href=\"http://docs.sonarqube.org/display/SONAR\" target=\"_blank\" rel=\"noopener noreferrer\">check online documentation</a>."); + assertThat(Markdown.convertToHtml("For more details, please [check online documentation](http://docs.sonarsource.com/sonarqube/display/SONAR).")) + .isEqualTo("For more details, please <a href=\"http://docs.sonarsource.com/sonarqube/display/SONAR\" target=\"_blank\" rel=\"noopener noreferrer\">check online documentation</a>."); } diff --git a/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/DefaultActiveRulesLoader.java b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/DefaultActiveRulesLoader.java index 5768377de8e..1de4988f3b3 100644 --- a/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/DefaultActiveRulesLoader.java +++ b/sonar-scanner-engine/src/main/java/org/sonar/scanner/rule/DefaultActiveRulesLoader.java @@ -103,7 +103,7 @@ public class DefaultActiveRulesLoader implements ActiveRulesLoader { ActiveList activeList = actives.get(r.getKey()); if (activeList == null) { throw MessageException.of("Elasticsearch indices have become inconsistent. Consider re-indexing. " + - "Check documentation for more information https://docs.sonarqube.org/latest/setup/troubleshooting"); + "Check documentation for more information https://docs.sonarsource.com/sonarqube/latest/setup/troubleshooting"); } Active active = activeList.getActiveList(0); diff --git a/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/DefaultActiveRulesLoaderTest.java b/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/DefaultActiveRulesLoaderTest.java index 60b19337d23..32bb1fb2d23 100644 --- a/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/DefaultActiveRulesLoaderTest.java +++ b/sonar-scanner-engine/src/test/java/org/sonar/scanner/rule/DefaultActiveRulesLoaderTest.java @@ -98,7 +98,7 @@ public class DefaultActiveRulesLoaderTest { assertThatThrownBy(() -> loader.load("c+-test_c+-values-17445")) .isInstanceOf(MessageException.class) .hasMessage("Elasticsearch indices have become inconsistent. Consider re-indexing. " + - "Check documentation for more information https://docs.sonarqube.org/latest/setup/troubleshooting"); + "Check documentation for more information https://docs.sonarsource.com/sonarqube/latest/setup/troubleshooting"); } private String urlOfPage(int page) { |