diff options
author | Grégoire Aubert <gregoire.aubert@sonarsource.com> | 2018-05-28 13:10:23 +0200 |
---|---|---|
committer | SonarTech <sonartech@sonarsource.com> | 2018-06-12 20:20:58 +0200 |
commit | bdde08fff517a28f6f639e724b810a3679fdc452 (patch) | |
tree | 88cd623b8cc7518c677327ffdacf8e3ed5014643 /sonar-core | |
parent | 1dc4a86ad69635505e99f3cefe16e6542a7d4dfb (diff) | |
download | sonarqube-bdde08fff517a28f6f639e724b810a3679fdc452.tar.gz sonarqube-bdde08fff517a28f6f639e724b810a3679fdc452.zip |
SONAR-10696 Remove ability to upgrade/downgrade an edition from Marketplace (#269)
* SONAR-10699 Remove upgrade/downgrade buttons
* SONAR-10697 Drop edition.json support in the marketplace
* SONAR-10717 Drop 'sonar.editions.jsonUrl' property
* SONAR-10702 Edition's "Learn more" links redirect to the form page with arguments
* SONAR-10698 Get Edition data from the doc
* SONAR-10700 Remove LicenseEditionForm and LicenseEditionSet from Marketplace
Diffstat (limited to 'sonar-core')
3 files changed, 1 insertions, 26 deletions
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 286d0ece9be..9d2d9e48c43 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 @@ -47,7 +47,6 @@ public class CorePropertyDefinitions { public static final String ORGANIZATIONS_CREATE_PERSONAL_ORG = "sonar.organizations.createPersonalOrg"; public static final String ONBOARDING_TUTORIAL_SHOW_TO_NEW_USERS = "sonar.onboardingTutorial.showToNewUsers"; public static final String DISABLE_NOTIFICATION_ON_BUILT_IN_QPROFILES = "sonar.builtInQualityProfiles.disableNotificationOnUpdate"; - public static final String EDITIONS_CONFIG_URL = "sonar.editions.jsonUrl"; private CorePropertyDefinitions() { // only static stuff @@ -232,15 +231,6 @@ public class CorePropertyDefinitions { .category(CATEGORY_ORGANIZATIONS) .type(BOOLEAN) .hidden() - .build(), - - // EDITIONS - PropertyDefinition.builder(EDITIONS_CONFIG_URL) - .name("Defines URL of JSON file with the definitions of SonarSource editions.") - .defaultValue("https://update.sonarsource.org/editions.json") - .category(CATEGORY_ORGANIZATIONS) - .type(BOOLEAN) - .hidden() .build())); return defs; } 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 a8fb7a71477..e0348723652 100644 --- a/sonar-core/src/main/resources/org/sonar/l10n/core.properties +++ b/sonar-core/src/main/resources/org/sonar/l10n/core.properties @@ -2150,9 +2150,6 @@ marketplace.installed=Installed marketplace.installing=Installing... marketplace.upgrade=Upgrade marketplace.downgrade=Downgrade -marketplace.downgrade_to_community_edition=Downgrade to Community Edition -marketplace.uninstall_x_confirmation=Are you sure you want to uninstall {0} and get back to the Community Edition? -marketplace.pending=Pending... marketplace.checking_license=Checking your license... marketplace._installed=installed marketplace.available_under_commercial_license=Available under our commercial editions @@ -2178,24 +2175,12 @@ marketplace.uninstall=Uninstall marketplace.i_accept_the=I accept the marketplace.commercial_edition=Commercial Edition marketplace.terms_and_conditions=Terms and Conditions -marketplace.editions_unavailable=Explore our Commercial Editions on {url}: advanced feature packs brought to you by SonarSource -marketplace.edition_status.AUTOMATIC_IN_PROGRESS=Installing your new Commercial Edition... Please wait... -marketplace.edition_status.AUTOMATIC_READY=Commercial Edition successfully installed. Please restart the server to activate your new edition. -marketplace.edition_status.UNINSTALL_IN_PROGRESS=Commercial Edition successfully downgraded. Please restart the server to remove the features. -marketplace.edition_status.MANUAL_IN_PROGRESS=Commercial Edition can't automatically be installed because of internet access issues. Please manually install the package. -marketplace.edition_status_x.AUTOMATIC_IN_PROGRESS=Installing your new {0}... Please wait... -marketplace.edition_status_x.AUTOMATIC_READY={0} successfully installed. Please restart the server to activate your new edition. -marketplace.edition_status_x.UNINSTALL_IN_PROGRESS=Successfully downgraded to {0}. Please restart the server to remove the features. -marketplace.edition_status_x.MANUAL_IN_PROGRESS={0} can't automatically be installed because of internet access issues. Please manually install the package. marketplace.release_notes=Release Notes -marketplace.how_to_install=How to install it? -marketplace.see_documentation_to_enable_cluster=See {url} documentation to set up a cluster. marketplace.how_to_setup_cluster_url=Further configuration is required to set up a cluster. See {url} documentation. marketplace.enter_license_for_x=Enter your license key for {0} marketplace.wrong_license_type=Your license is not compatible with any existing editions. Please provide a valid license. marketplace.wrong_license_type_x=Your license is not compatible with the selected edition. Please provide a valid license for {0}. marketplace.i_need_a_license=I need a license key -marketplace.download_package=Download package marketplace.search=Search by features, tags, or categories... diff --git a/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java index b3054a31a22..75724cd1569 100644 --- a/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java +++ b/sonar-core/src/test/java/org/sonar/core/config/CorePropertyDefinitionsTest.java @@ -30,7 +30,7 @@ public class CorePropertyDefinitionsTest { @Test public void all() { List<PropertyDefinition> defs = CorePropertyDefinitions.all(); - assertThat(defs).hasSize(59); + assertThat(defs).hasSize(58); } @Test |