From 5dc2bc2d5b4baa68970f5b72d6814787a1eda6ba Mon Sep 17 00:00:00 2001 From: Tibor Blenessy Date: Thu, 11 Nov 2021 15:13:58 +0100 Subject: [PATCH] SONAR-15644 Remove CSS plugin (#4975) CSS analysis is integrated into the javascript plugin --- build.gradle | 3 +- .../src/pages/analysis/languages/css.md | 18 ----- .../src/pages/analysis/languages/overview.md | 6 +- .../static/SonarCloudNavigationTree.json | 1 - .../static/SonarQubeNavigationTree.json | 50 +++++--------- .../static/StaticNavigationTree.json | 69 ++++++------------- sonar-application/bundled_plugins.gradle | 3 +- 7 files changed, 44 insertions(+), 106 deletions(-) delete mode 100644 server/sonar-docs/src/pages/analysis/languages/css.md diff --git a/build.gradle b/build.gradle index c10d3b80c44..714be74eb81 100644 --- a/build.gradle +++ b/build.gradle @@ -268,8 +268,7 @@ subprojects { dependency 'com.sonarsource.slang:sonar-apex-plugin:1.8.3.2219' dependency 'com.sonarsource.swift:sonar-swift-plugin:4.3.2.5043' dependency 'com.sonarsource.tsql:sonar-tsql-plugin:1.5.1.4340' - dependency 'org.sonarsource.config:sonar-config-plugin:1.0.0.32' - dependency 'org.sonarsource.css:sonar-css-plugin:1.4.2.2002' + dependency 'org.sonarsource.config:sonar-config-plugin:1.0.0.32' dependency 'org.sonarsource.dotnet:sonar-csharp-plugin:8.29.0.36737' dependency 'org.sonarsource.dotnet:sonar-vbnet-plugin:8.29.0.36737' dependency 'org.sonarsource.flex:sonar-flex-plugin:2.6.2.2641' diff --git a/server/sonar-docs/src/pages/analysis/languages/css.md b/server/sonar-docs/src/pages/analysis/languages/css.md deleted file mode 100644 index c2c13fa0123..00000000000 --- a/server/sonar-docs/src/pages/analysis/languages/css.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -title: CSS -url: /analysis/languages/css/ ---- - - - -## Prerequisites -In order to analyze CSS code, you need to have Node.js >= 8 installed on the machine running the scan. Set property `sonar.nodejs.executable` to an absolute path to Node.js executable, if standard `node` is not available. - -If you have a community plugin that handles CSS installed on your SonarQube instance it will conflict with SonarCSS, so it should be removed. - -## Language-Specific Properties - -Discover and update the CSS-specific [properties](/analysis/analysis-parameters/) in: Project **[Administration > General Settings > CSS](/#sonarqube-admin#/admin/settings?category=css)** - -## Related Pages -* [Importing External Issues](/analysis/external-issues/) (StyleLint.io) diff --git a/server/sonar-docs/src/pages/analysis/languages/overview.md b/server/sonar-docs/src/pages/analysis/languages/overview.md index c4ff0783387..0a1ad057918 100644 --- a/server/sonar-docs/src/pages/analysis/languages/overview.md +++ b/server/sonar-docs/src/pages/analysis/languages/overview.md @@ -5,15 +5,15 @@ url: /analysis/languages/overview/ SonarQube provides analysis of different languages depending on the edition you're running. -| Language | Community Edition | Developer Edition | Enterprise Edition and Data Center Edtion | -| ------------------------------------ | ---------------------- | ---------------------- | ----------------------------------------- | +| Language | Community Edition | Developer Edition | Enterprise Edition and Data Center Edtion | +| --------------------------------------------- | ---------------------- | ---------------------- | ----------------------------------------- | | [ABAP](/analysis/languages/abap/) | | ![](/images/check.svg) | ![](/images/check.svg) | | [Apex](/analysis/languages/apex/) | | | ![](/images/check.svg) | | [C#](/analysis/languages/csharp/) | ![](/images/check.svg) | ![](/images/check.svg) | ![](/images/check.svg) | | [C](/analysis/languages/cfamily/) | | ![](/images/check.svg) | ![](/images/check.svg) | | [C++](/analysis/languages/cfamily/) | | ![](/images/check.svg) | ![](/images/check.svg) | | [COBOL](/analysis/languages/cobol/) | | | ![](/images/check.svg) | -| [CSS](/analysis/languages/css/) | ![](/images/check.svg) | ![](/images/check.svg) | ![](/images/check.svg) | +| [CSS](/analysis/languages/javascript/) | ![](/images/check.svg) | ![](/images/check.svg) | ![](/images/check.svg) | | [Flex](/analysis/languages/flex/) | ![](/images/check.svg) | ![](/images/check.svg) | ![](/images/check.svg) | | [Go](/analysis/languages/go/) | ![](/images/check.svg) | ![](/images/check.svg) | ![](/images/check.svg) | | [Java](/analysis/languages/java/) | ![](/images/check.svg) | ![](/images/check.svg) | ![](/images/check.svg) | diff --git a/server/sonar-docs/static/SonarCloudNavigationTree.json b/server/sonar-docs/static/SonarCloudNavigationTree.json index 3e254a6ddc3..959f91ac13a 100644 --- a/server/sonar-docs/static/SonarCloudNavigationTree.json +++ b/server/sonar-docs/static/SonarCloudNavigationTree.json @@ -16,7 +16,6 @@ "/analysis/languages/csharp/", "/analysis/languages/cfamily/", "/analysis/languages/cobol/", - "/analysis/languages/css/", "/analysis/languages/flex/", "/analysis/languages/go/", "/analysis/languages/html/", diff --git a/server/sonar-docs/static/SonarQubeNavigationTree.json b/server/sonar-docs/static/SonarQubeNavigationTree.json index 8544d7eb058..c2a6520a0b7 100644 --- a/server/sonar-docs/static/SonarQubeNavigationTree.json +++ b/server/sonar-docs/static/SonarQubeNavigationTree.json @@ -1,10 +1,7 @@ [ { "title": "Requirements", - "children": [ - "/requirements/requirements/", - "/requirements/hardware-recommendations/" - ] + "children": ["/requirements/requirements/", "/requirements/hardware-recommendations/"] }, { "title": "Analyzing Source Code", @@ -32,7 +29,6 @@ "/analysis/languages/csharp/", "/analysis/languages/cfamily/", "/analysis/languages/cobol/", - "/analysis/languages/css/", "/analysis/languages/flex/", "/analysis/languages/go/", "/analysis/languages/html/", @@ -57,26 +53,20 @@ "/analysis/generic-test/", { "title": "Importing External Issues", - "children": [ - "/analysis/external-issues/", - "/analysis/generic-issue/" - ] + "children": ["/analysis/external-issues/", "/analysis/generic-issue/"] }, "/analysis/background-tasks/", - "/analysis/pull-request/", + "/analysis/pull-request/", { "title": "Branches", - "children": [ - "/branches/overview/", - "/branches/branches-faq/" - ] + "children": ["/branches/overview/", "/branches/branches-faq/"] }, - { + { "title": "CI Integration", "children": [ "/analysis/ci-integration-overview/", - "/analysis/jenkins/", - "/analysis/codemagic/" + "/analysis/jenkins/", + "/analysis/codemagic/" ] }, "/analysis/scm-integration/", @@ -89,15 +79,12 @@ "children": [ "/analysis/github-integration/", "/analysis/gitlab-integration/", - { + { "title": "Bitbucket Integration", - "children": [ - "/analysis/bitbucket-integration/", - "/analysis/bitbucket-cloud-integration/" - ] + "children": ["/analysis/bitbucket-integration/", "/analysis/bitbucket-cloud-integration/"] }, "/analysis/azuredevops-integration/" - ] + ] }, { "title": "User Guide", @@ -110,17 +97,14 @@ { "title": "Rules", "children": [ - "/user-guide/rules/", - "/user-guide/security-rules/", - "/user-guide/built-in-rule-tags/" + "/user-guide/rules/", + "/user-guide/security-rules/", + "/user-guide/built-in-rule-tags/" ] }, { "title": "User Account", - "children": [ - "/user-guide/user-account/", - "/user-guide/user-token/" - ] + "children": ["/user-guide/user-account/", "/user-guide/user-token/"] }, "/user-guide/issues/", "/user-guide/security-hotspots/", @@ -139,9 +123,9 @@ "/project-administration/project-existence/", "/project-administration/managing-project-history/", "/project-administration/narrowing-the-focus/", - "/project-administration/new-code-period/", - "/project-administration/managing-portfolios/", - "/project-administration/managing-applications/", + "/project-administration/new-code-period/", + "/project-administration/managing-portfolios/", + "/project-administration/managing-applications/", "/project-administration/portfolio-pdf-configuration/", "/project-administration/project-settings/", "/project-administration/webhooks/" diff --git a/server/sonar-docs/static/StaticNavigationTree.json b/server/sonar-docs/static/StaticNavigationTree.json index 11cc337479b..c2d96691dea 100644 --- a/server/sonar-docs/static/StaticNavigationTree.json +++ b/server/sonar-docs/static/StaticNavigationTree.json @@ -2,10 +2,7 @@ "/setup/get-started-2-minutes/", { "title": "Requirements", - "children": [ - "/requirements/requirements/", - "/requirements/hardware-recommendations/" - ] + "children": ["/requirements/requirements/", "/requirements/hardware-recommendations/"] }, { "title": "Setup and Upgrade", @@ -14,27 +11,18 @@ "/setup/install-server/", { "title": "Configure and Operate a Server", - "children": [ - "/setup/operate-server/", - "/setup/environment-variables/" - ] + "children": ["/setup/operate-server/", "/setup/environment-variables/"] }, "/setup/install-plugin/", "/setup/install-cluster/", "/setup/operate-cluster/", - { + { "title": "Deploy on Kubernetes", - "children": [ - "/setup/sonarqube-on-kubernetes/", - "/setup/sonarqube-cluster-on-kubernetes/" - ] + "children": ["/setup/sonarqube-on-kubernetes/", "/setup/sonarqube-cluster-on-kubernetes/"] }, { "title": "Upgrade the Server", - "children": [ - "/setup/before-you-upgrade/", - "/setup/upgrading/" - ] + "children": ["/setup/before-you-upgrade/", "/setup/upgrading/"] }, "/setup/upgrade-notes/", "/setup/troubleshooting/" @@ -66,7 +54,6 @@ "/analysis/languages/csharp/", "/analysis/languages/cfamily/", "/analysis/languages/cobol/", - "/analysis/languages/css/", "/analysis/languages/flex/", "/analysis/languages/go/", "/analysis/languages/html/", @@ -91,28 +78,22 @@ "/analysis/generic-test/", { "title": "Importing External Issues", - "children": [ - "/analysis/external-issues/", - "/analysis/generic-issue/" - ] + "children": ["/analysis/external-issues/", "/analysis/generic-issue/"] }, "/analysis/background-tasks/", - "/analysis/pull-request/", + "/analysis/pull-request/", { "title": "Branches", - "children": [ - "/branches/overview/", - "/branches/branches-faq/" - ] + "children": ["/branches/overview/", "/branches/branches-faq/"] }, - { + { "title": "CI Integration", "children": [ "/analysis/ci-integration-overview/", - "/analysis/jenkins/", - "/analysis/codemagic/" + "/analysis/jenkins/", + "/analysis/codemagic/" ] - }, + }, "/analysis/scm-integration/", "/analysis/security_configuration/", "/analysis/analysis-with-java-11/" @@ -123,15 +104,12 @@ "children": [ "/analysis/github-integration/", "/analysis/gitlab-integration/", - { + { "title": "Bitbucket Integration", - "children": [ - "/analysis/bitbucket-integration/", - "/analysis/bitbucket-cloud-integration/" - ] + "children": ["/analysis/bitbucket-integration/", "/analysis/bitbucket-cloud-integration/"] }, "/analysis/azuredevops-integration/" - ] + ] }, { "title": "User Guide", @@ -144,17 +122,14 @@ { "title": "Rules", "children": [ - "/user-guide/rules/", - "/user-guide/security-rules/", - "/user-guide/built-in-rule-tags/" + "/user-guide/rules/", + "/user-guide/security-rules/", + "/user-guide/built-in-rule-tags/" ] }, { "title": "User Account", - "children": [ - "/user-guide/user-account/", - "/user-guide/user-token/" - ] + "children": ["/user-guide/user-account/", "/user-guide/user-token/"] }, "/user-guide/issues/", "/user-guide/security-hotspots/", @@ -173,9 +148,9 @@ "/project-administration/project-existence/", "/project-administration/managing-project-history/", "/project-administration/narrowing-the-focus/", - "/project-administration/new-code-period/", - "/project-administration/managing-portfolios/", - "/project-administration/managing-applications/", + "/project-administration/new-code-period/", + "/project-administration/managing-portfolios/", + "/project-administration/managing-applications/", "/project-administration/portfolio-pdf-configuration/", "/project-administration/project-settings/", "/project-administration/webhooks/" diff --git a/sonar-application/bundled_plugins.gradle b/sonar-application/bundled_plugins.gradle index 291b80094e4..9146e17de45 100644 --- a/sonar-application/bundled_plugins.gradle +++ b/sonar-application/bundled_plugins.gradle @@ -1,5 +1,4 @@ -dependencies { - bundledPlugin 'org.sonarsource.css:sonar-css-plugin@jar' +dependencies { bundledPlugin "org.sonarsource.dotnet:sonar-csharp-plugin@jar" bundledPlugin "org.sonarsource.dotnet:sonar-vbnet-plugin@jar" bundledPlugin 'org.sonarsource.flex:sonar-flex-plugin@jar' -- 2.39.5