From 230ac848ebd72ff476d925a7b03fbf0d4b447580 Mon Sep 17 00:00:00 2001
From: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Date: Tue, 20 Aug 2019 16:39:50 +0200
Subject: [PATCH] ignore old plugins folder

---
 .../src/main/java/sonia/scm/plugin/PluginProcessor.java   | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java b/scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java
index b91ee9b1ee..0613f4ef07 100644
--- a/scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java
+++ b/scm-webapp/src/main/java/sonia/scm/plugin/PluginProcessor.java
@@ -60,6 +60,8 @@ import java.util.Date;
 import java.util.List;
 import java.util.Set;
 
+import static java.util.stream.Collectors.toList;
+
 //~--- JDK imports ------------------------------------------------------------
 
 /**
@@ -171,7 +173,11 @@ public final class PluginProcessor
 
     extract(archives);
 
-    List<Path> dirs = collectPluginDirectories(pluginDirectory);
+    List<Path> dirs =
+      collectPluginDirectories(pluginDirectory)
+      .stream()
+      .filter(dir -> !dir.endsWith("sonia.scm.plugins"))
+      .collect(toList());
 
     logger.debug("process {} directories: {}", dirs.size(), dirs);