From 3aca68cd8f087c23cc8d9fb75a7156fd1f53ad6f Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Sun, 21 Jan 2018 14:50:44 +0300
Subject: [PATCH] #2427 Include debug plugins in DBeaver core (required by
 egit)

Former-commit-id: 2ca46231e3b72db60d4b40356f9f07d6867be96a
---
 features/org.jkiss.dbeaver.core.feature/feature.xml  | 11 +++++++++++
 features/org.jkiss.dbeaver.debug.feature/feature.xml |  3 +--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/features/org.jkiss.dbeaver.core.feature/feature.xml b/features/org.jkiss.dbeaver.core.feature/feature.xml
index 6368d57f2e..3bbd6735bf 100644
--- a/features/org.jkiss.dbeaver.core.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.core.feature/feature.xml
@@ -30,8 +30,19 @@
         <import plugin="org.eclipse.jface.text"/>
         <import plugin="org.eclipse.ui.views"/>
         <import plugin="org.eclipse.search"/>
+
+        <!--
+            GEF/draw2d are needed by all custom renderers (ERD, Locks, etc)
+        -->
         <import plugin="org.eclipse.draw2d"/>
         <import plugin="org.eclipse.gef"/>
+
+        <!--
+            Debug plugins are required (implicitly) by many 3rd party extensions like Git.
+            And we need them anyway.
+        -->
+        <import plugin="org.eclipse.debug.core"/>
+        <import plugin="org.eclipse.debug.ui"/>
     </requires>
 
     <!-- 3rd party -->
diff --git a/features/org.jkiss.dbeaver.debug.feature/feature.xml b/features/org.jkiss.dbeaver.debug.feature/feature.xml
index 88a2b68bb8..89040a643d 100644
--- a/features/org.jkiss.dbeaver.debug.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.debug.feature/feature.xml
@@ -18,8 +18,7 @@
    </license>
 
    <requires>
-      <import plugin="org.eclipse.debug.core"/>
-      <import plugin="org.eclipse.debug.ui"/>
+      <import feature="org.jkiss.dbeaver.core.feature" version="1.0.0"/>
    </requires>
 
    <plugin
-- 
GitLab