diff options
author | Wouter Admiraal <wouter.admiraal@sonarsource.com> | 2022-01-25 15:46:48 +0100 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2022-01-27 20:03:04 +0000 |
commit | 1a2f7a181ffb7fb62b9d6e7c672462a84e2fda84 (patch) | |
tree | 0fb31cb04b5a56cbe2f81b53916cb2d18325d4cd /server/sonar-webserver-api | |
parent | 7261026023ba9905e62173712da183931b503ff9 (diff) | |
download | sonarqube-1a2f7a181ffb7fb62b9d6e7c672462a84e2fda84.tar.gz sonarqube-1a2f7a181ffb7fb62b9d6e7c672462a84e2fda84.zip |
SONAR-15776 Remove deprecation for 'Plugin-Dependencies' attribute
This reverts commit b77a6640703c3a7740b7d4b42c2b54aba7c417cd
Diffstat (limited to 'server/sonar-webserver-api')
2 files changed, 0 insertions, 15 deletions
diff --git a/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/PluginJarLoader.java b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/PluginJarLoader.java index 951d6c4eb2c..0d841b6ca60 100644 --- a/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/PluginJarLoader.java +++ b/server/sonar-webserver-api/src/main/java/org/sonar/server/plugins/PluginJarLoader.java @@ -155,11 +155,6 @@ public class PluginJarLoader { return false; } - if (plugin.getType() != BUNDLED && !plugin.getRequiredPlugins().isEmpty()) { - LOG.warn("Use of 'Plugin-Dependencies' mechanism is planned for removal. Update the plugin {} [{}] to shade its dependencies instead.", - plugin.getName(), plugin.getKey()); - } - for (PluginInfo.RequiredPlugin requiredPlugin : plugin.getRequiredPlugins()) { PluginInfo installedRequirement = allPluginsByKeys.get(requiredPlugin.getKey()); if (installedRequirement == null) { diff --git a/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/PluginJarLoaderTest.java b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/PluginJarLoaderTest.java index 0c18988aa70..fcb2220441c 100644 --- a/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/PluginJarLoaderTest.java +++ b/server/sonar-webserver-api/src/test/java/org/sonar/server/plugins/PluginJarLoaderTest.java @@ -195,16 +195,6 @@ public class PluginJarLoaderTest { } @Test - public void warn_if_external_plugin_has_dependencies() throws IOException { - copyTestPluginTo("test-base-plugin", fs.getInstalledExternalPluginsDir()); - copyTestPluginTo("test-require-plugin", fs.getInstalledExternalPluginsDir()); - - underTest.loadPlugins(); - assertThat(logs.logs()).contains("Use of 'Plugin-Dependencies' mechanism is planned for removal. " - + "Update the plugin Test Require Plugin [testrequire] to shade its dependencies instead."); - } - - @Test public void fail_if_external_plugin_has_same_key_has_bundled_plugin() throws IOException { File jar = createJar(fs.getInstalledExternalPluginsDir(), "plugin1", "main", null); createJar(fs.getInstalledBundledPluginsDir(), "plugin1", "main", null); |