From d089f05aca497ec89fa1e4ebee25728294ccba1e Mon Sep 17 00:00:00 2001 From: Eric Hartmann Date: Thu, 24 May 2018 09:02:29 +0200 Subject: [PATCH] SONAR-10689 Plugins are now always installed The bundled plugins have been removed --- .../ce/container/CePluginJarExploderTest.java | 5 ---- .../server/platform/ServerFileSystem.java | 7 ------ .../server/platform/ServerFileSystemImpl.java | 5 ---- .../plugins/ServerPluginRepository.java | 19 -------------- .../plugins/ServerPluginRepositoryTest.java | 25 ------------------- sonar-application/build.gradle | 3 +-- 6 files changed, 1 insertion(+), 63 deletions(-) diff --git a/server/sonar-ce/src/test/java/org/sonar/ce/container/CePluginJarExploderTest.java b/server/sonar-ce/src/test/java/org/sonar/ce/container/CePluginJarExploderTest.java index a5828ba8c78..6f961fc7332 100644 --- a/server/sonar-ce/src/test/java/org/sonar/ce/container/CePluginJarExploderTest.java +++ b/server/sonar-ce/src/test/java/org/sonar/ce/container/CePluginJarExploderTest.java @@ -134,11 +134,6 @@ public class CePluginJarExploderTest { throw new UnsupportedOperationException(); } - @Override - public File getBundledPluginsDir() { - throw new UnsupportedOperationException(); - } - @Override public File getPluginIndex() { throw new UnsupportedOperationException(); diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerFileSystem.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerFileSystem.java index 17524356cc2..350a1c36787 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerFileSystem.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerFileSystem.java @@ -71,13 +71,6 @@ public interface ServerFileSystem { */ File getInstalledPluginsDir(); - /** - * Directory of the plugins packaged by default with application. These - * plugins are installed during the first fresh startup. - * @return a directory which may or not exist - */ - File getBundledPluginsDir(); - /** * The file listing all the installed plugins. Used by scanner only. * @return an existing file diff --git a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerFileSystemImpl.java b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerFileSystemImpl.java index 6764f85b804..d7f982ad4f1 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/platform/ServerFileSystemImpl.java +++ b/server/sonar-server/src/main/java/org/sonar/server/platform/ServerFileSystemImpl.java @@ -95,11 +95,6 @@ public class ServerFileSystemImpl implements ServerFileSystem, org.sonar.api.pla return new File(getHomeDir(), "extensions/plugins"); } - @Override - public File getBundledPluginsDir() { - return new File(getHomeDir(), "lib/bundled-plugins"); - } - @Override public File getPluginIndex() { return new File(deployDir, "plugins/index.txt"); diff --git a/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java b/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java index 0be17a3958d..ef7faf3c594 100644 --- a/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java +++ b/server/sonar-server/src/main/java/org/sonar/server/plugins/ServerPluginRepository.java @@ -61,7 +61,6 @@ import static org.sonar.core.util.FileUtils.deleteQuietly; /** * Entry point to install and load plugins on server startup. It manages *