From e3204bd37683920f81721e2e9437da7d5e6b30c0 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Fri, 19 Jul 2019 15:29:05 +0200
Subject: [PATCH] #6303 Filter panel redesign

---
 bundles/org.jkiss.utils/META-INF/MANIFEST.MF                     | 1 +
 bundles/org.jkiss.wmi/META-INF/MANIFEST.MF                       | 1 +
 plugins/org.jkiss.dbeaver.cmp.simple.ui/META-INF/MANIFEST.MF     | 1 +
 plugins/org.jkiss.dbeaver.cmp.simple/META-INF/MANIFEST.MF        | 1 +
 plugins/org.jkiss.dbeaver.core.application/META-INF/MANIFEST.MF  | 1 +
 plugins/org.jkiss.dbeaver.core.eclipse/META-INF/MANIFEST.MF      | 1 +
 plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF              | 1 +
 plugins/org.jkiss.dbeaver.data.gis.view/META-INF/MANIFEST.MF     | 1 +
 plugins/org.jkiss.dbeaver.data.gis/META-INF/MANIFEST.MF          | 1 +
 plugins/org.jkiss.dbeaver.data.office/META-INF/MANIFEST.MF       | 1 +
 plugins/org.jkiss.dbeaver.data.transfer/META-INF/MANIFEST.MF     | 1 +
 plugins/org.jkiss.dbeaver.debug.core/META-INF/MANIFEST.MF        | 1 +
 plugins/org.jkiss.dbeaver.debug.ui/META-INF/MANIFEST.MF          | 1 +
 plugins/org.jkiss.dbeaver.ext.athena/META-INF/MANIFEST.MF        | 1 +
 plugins/org.jkiss.dbeaver.ext.bigquery/META-INF/MANIFEST.MF      | 1 +
 plugins/org.jkiss.dbeaver.ext.clickhouse/META-INF/MANIFEST.MF    | 1 +
 plugins/org.jkiss.dbeaver.ext.db2.i/META-INF/MANIFEST.MF         | 1 +
 plugins/org.jkiss.dbeaver.ext.db2.zos/META-INF/MANIFEST.MF       | 1 +
 plugins/org.jkiss.dbeaver.ext.db2/META-INF/MANIFEST.MF           | 1 +
 plugins/org.jkiss.dbeaver.ext.derby/META-INF/MANIFEST.MF         | 1 +
 plugins/org.jkiss.dbeaver.ext.erd/META-INF/MANIFEST.MF           | 1 +
 plugins/org.jkiss.dbeaver.ext.es.ui/META-INF/MANIFEST.MF         | 1 +
 plugins/org.jkiss.dbeaver.ext.exasol/META-INF/MANIFEST.MF        | 1 +
 plugins/org.jkiss.dbeaver.ext.firebird/META-INF/MANIFEST.MF      | 1 +
 .../META-INF/MANIFEST.MF                                         | 1 +
 plugins/org.jkiss.dbeaver.ext.generic.ui/META-INF/MANIFEST.MF    | 1 +
 plugins/org.jkiss.dbeaver.ext.generic/META-INF/MANIFEST.MF       | 1 +
 plugins/org.jkiss.dbeaver.ext.greenplum/META-INF/MANIFEST.MF     | 1 +
 plugins/org.jkiss.dbeaver.ext.h2/META-INF/MANIFEST.MF            | 1 +
 plugins/org.jkiss.dbeaver.ext.hana/META-INF/MANIFEST.MF          | 1 +
 plugins/org.jkiss.dbeaver.ext.hive/META-INF/MANIFEST.MF          | 1 +
 plugins/org.jkiss.dbeaver.ext.hsqldb/META-INF/MANIFEST.MF        | 1 +
 plugins/org.jkiss.dbeaver.ext.import_config/META-INF/MANIFEST.MF | 1 +
 plugins/org.jkiss.dbeaver.ext.informix/META-INF/MANIFEST.MF      | 1 +
 plugins/org.jkiss.dbeaver.ext.mockdata/META-INF/MANIFEST.MF      | 1 +
 plugins/org.jkiss.dbeaver.ext.mssql.ui/META-INF/MANIFEST.MF      | 1 +
 plugins/org.jkiss.dbeaver.ext.mssql/META-INF/MANIFEST.MF         | 1 +
 plugins/org.jkiss.dbeaver.ext.mysql.ui/META-INF/MANIFEST.MF      | 1 +
 plugins/org.jkiss.dbeaver.ext.mysql/META-INF/MANIFEST.MF         | 1 +
 plugins/org.jkiss.dbeaver.ext.netezza/META-INF/MANIFEST.MF       | 1 +
 plugins/org.jkiss.dbeaver.ext.oracle.ui/META-INF/MANIFEST.MF     | 1 +
 plugins/org.jkiss.dbeaver.ext.oracle/META-INF/MANIFEST.MF        | 1 +
 plugins/org.jkiss.dbeaver.ext.phoenix/META-INF/MANIFEST.MF       | 1 +
 .../META-INF/MANIFEST.MF                                         | 1 +
 .../META-INF/MANIFEST.MF                                         | 1 +
 plugins/org.jkiss.dbeaver.ext.postgresql.ui/META-INF/MANIFEST.MF | 1 +
 plugins/org.jkiss.dbeaver.ext.postgresql/META-INF/MANIFEST.MF    | 1 +
 .../org.jkiss.dbeaver.ext.sample.database/META-INF/MANIFEST.MF   | 1 +
 .../org.jkiss.dbeaver.ext.snowflake.core/META-INF/MANIFEST.MF    | 1 +
 plugins/org.jkiss.dbeaver.ext.snowflake.ui/META-INF/MANIFEST.MF  | 1 +
 plugins/org.jkiss.dbeaver.ext.spanner/META-INF/MANIFEST.MF       | 1 +
 plugins/org.jkiss.dbeaver.ext.sqlite/META-INF/MANIFEST.MF        | 1 +
 plugins/org.jkiss.dbeaver.ext.teradata/META-INF/MANIFEST.MF      | 1 +
 plugins/org.jkiss.dbeaver.ext.ui.locks/META-INF/MANIFEST.MF      | 1 +
 plugins/org.jkiss.dbeaver.ext.ui.svg/META-INF/MANIFEST.MF        | 1 +
 .../org.jkiss.dbeaver.ext.ui.tipoftheday/META-INF/MANIFEST.MF    | 1 +
 plugins/org.jkiss.dbeaver.ext.vertica.ui/META-INF/MANIFEST.MF    | 1 +
 plugins/org.jkiss.dbeaver.ext.vertica/META-INF/MANIFEST.MF       | 1 +
 plugins/org.jkiss.dbeaver.ext.wmi/META-INF/MANIFEST.MF           | 1 +
 plugins/org.jkiss.dbeaver.model.sql/META-INF/MANIFEST.MF         | 1 +
 plugins/org.jkiss.dbeaver.model/META-INF/MANIFEST.MF             | 1 +
 plugins/org.jkiss.dbeaver.net.ssh.jsch/META-INF/MANIFEST.MF      | 1 +
 plugins/org.jkiss.dbeaver.net.ssh.sshj/META-INF/MANIFEST.MF      | 1 +
 plugins/org.jkiss.dbeaver.net.ssh.ui/META-INF/MANIFEST.MF        | 1 +
 plugins/org.jkiss.dbeaver.net.ssh/META-INF/MANIFEST.MF           | 1 +
 plugins/org.jkiss.dbeaver.registry/META-INF/MANIFEST.MF          | 1 +
 plugins/org.jkiss.dbeaver.slf4j/META-INF/MANIFEST.MF             | 1 +
 plugins/org.jkiss.dbeaver.team.git.ui/META-INF/MANIFEST.MF       | 1 +
 plugins/org.jkiss.dbeaver.team.git/META-INF/MANIFEST.MF          | 1 +
 plugins/org.jkiss.dbeaver.ui.charts/META-INF/MANIFEST.MF         | 1 +
 plugins/org.jkiss.dbeaver.ui.dashboard/META-INF/MANIFEST.MF      | 1 +
 plugins/org.jkiss.dbeaver.ui.editors.acl/META-INF/MANIFEST.MF    | 1 +
 plugins/org.jkiss.dbeaver.ui.editors.base/META-INF/MANIFEST.MF   | 1 +
 .../org.jkiss.dbeaver.ui.editors.connection/META-INF/MANIFEST.MF | 1 +
 .../org.jkiss.dbeaver.ui.editors.content/META-INF/MANIFEST.MF    | 1 +
 plugins/org.jkiss.dbeaver.ui.editors.data/META-INF/MANIFEST.MF   | 1 +
 plugins/org.jkiss.dbeaver.ui.editors.entity/META-INF/MANIFEST.MF | 1 +
 plugins/org.jkiss.dbeaver.ui.editors.hex/META-INF/MANIFEST.MF    | 1 +
 plugins/org.jkiss.dbeaver.ui.editors.image/META-INF/MANIFEST.MF  | 1 +
 plugins/org.jkiss.dbeaver.ui.editors.sql/META-INF/MANIFEST.MF    | 1 +
 plugins/org.jkiss.dbeaver.ui.editors.xml/META-INF/MANIFEST.MF    | 1 +
 plugins/org.jkiss.dbeaver.ui.navigator/META-INF/MANIFEST.MF      | 1 +
 plugins/org.jkiss.dbeaver.ui.search/META-INF/MANIFEST.MF         | 1 +
 plugins/org.jkiss.dbeaver.ui/META-INF/MANIFEST.MF                | 1 +
 test/org.jkiss.dbeaver.ext.test/META-INF/MANIFEST.MF             | 1 +
 85 files changed, 85 insertions(+)

diff --git a/bundles/org.jkiss.utils/META-INF/MANIFEST.MF b/bundles/org.jkiss.utils/META-INF/MANIFEST.MF
index 090e12bb7d..c4c7e46e04 100644
--- a/bundles/org.jkiss.utils/META-INF/MANIFEST.MF
+++ b/bundles/org.jkiss.utils/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@ Export-Package: org.jkiss.code,
  org.jkiss.utils.time,
  org.jkiss.utils.xml
 Bundle-Vendor: %Bundle-Vendor
+Automatic-Module-Name: org.jkiss.utils
diff --git a/bundles/org.jkiss.wmi/META-INF/MANIFEST.MF b/bundles/org.jkiss.wmi/META-INF/MANIFEST.MF
index 37c069aa94..5c2770d43a 100644
--- a/bundles/org.jkiss.wmi/META-INF/MANIFEST.MF
+++ b/bundles/org.jkiss.wmi/META-INF/MANIFEST.MF
@@ -7,3 +7,4 @@ Bundle-Release-Date: 20190722
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.jkiss.wmi.service
+Automatic-Module-Name: org.jkiss.wmi
diff --git a/plugins/org.jkiss.dbeaver.cmp.simple.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.cmp.simple.ui/META-INF/MANIFEST.MF
index 20446d01ae..13811f8f08 100644
--- a/plugins/org.jkiss.dbeaver.cmp.simple.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.cmp.simple.ui/META-INF/MANIFEST.MF
@@ -25,3 +25,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.cmp.simple,
  org.jkiss.utils
 Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: org.jkiss.dbeaver.cmp.simple.ui
diff --git a/plugins/org.jkiss.dbeaver.cmp.simple/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.cmp.simple/META-INF/MANIFEST.MF
index 61fd926b07..cc63fa6762 100644
--- a/plugins/org.jkiss.dbeaver.cmp.simple/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.cmp.simple/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.registry;visibility:=reexport,
  org.jkiss.utils;visibility:=reexport
 Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: org.jkiss.dbeaver.cmp.simple
diff --git a/plugins/org.jkiss.dbeaver.core.application/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.core.application/META-INF/MANIFEST.MF
index bcaa28d2b8..4fde35380c 100644
--- a/plugins/org.jkiss.dbeaver.core.application/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.core.application/META-INF/MANIFEST.MF
@@ -31,3 +31,4 @@ Require-Bundle: org.eclipse.osgi,
  org.jkiss.dbeaver.model,
  org.jkiss.dbeaver.core,
  org.jkiss.dbeaver.ui
+Automatic-Module-Name: org.jkiss.dbeaver.core.application
diff --git a/plugins/org.jkiss.dbeaver.core.eclipse/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.core.eclipse/META-INF/MANIFEST.MF
index eb8b0fb43a..e6edae3062 100644
--- a/plugins/org.jkiss.dbeaver.core.eclipse/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.core.eclipse/META-INF/MANIFEST.MF
@@ -9,3 +9,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.ui,
  org.jkiss.dbeaver.core,
  org.jkiss.dbeaver.ui
+Automatic-Module-Name: org.jkiss.dbeaver.core.eclipse
diff --git a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
index 0f0769ef91..87f8128938 100644
--- a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
@@ -65,3 +65,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.cmp.simple.ui,
  org.jkiss.dbeaver.data.transfer
 Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: org.jkiss.dbeaver.core
diff --git a/plugins/org.jkiss.dbeaver.data.gis.view/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.data.gis.view/META-INF/MANIFEST.MF
index 6cc6b8f1fe..1ceecf8316 100644
--- a/plugins/org.jkiss.dbeaver.data.gis.view/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.data.gis.view/META-INF/MANIFEST.MF
@@ -22,3 +22,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.bundle.gis
 Bundle-ClassPath: .
 Export-Package: org.jkiss.dbeaver.ui.gis
+Automatic-Module-Name: org.jkiss.dbeaver.data.gis.view
diff --git a/plugins/org.jkiss.dbeaver.data.gis/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.data.gis/META-INF/MANIFEST.MF
index 2f984bb15c..db1a60a0a7 100644
--- a/plugins/org.jkiss.dbeaver.data.gis/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.data.gis/META-INF/MANIFEST.MF
@@ -12,3 +12,4 @@ Require-Bundle: org.jkiss.dbeaver.model,
 Bundle-ClassPath: .
 Export-Package: org.jkiss.dbeaver.data.gis.handlers,
  org.jkiss.dbeaver.model.gis
+Automatic-Module-Name: org.jkiss.dbeaver.data.gis
diff --git a/plugins/org.jkiss.dbeaver.data.office/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.data.office/META-INF/MANIFEST.MF
index 7a17071a6b..7a042f917c 100644
--- a/plugins/org.jkiss.dbeaver.data.office/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.data.office/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.core,
  org.jkiss.dbeaver.data.transfer
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.data.office
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.data.transfer/META-INF/MANIFEST.MF
index 8878d1609b..6b836d325b 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.data.transfer/META-INF/MANIFEST.MF
@@ -31,3 +31,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.ui,
  net.sf.opencsv
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.data.transfer
diff --git a/plugins/org.jkiss.dbeaver.debug.core/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.debug.core/META-INF/MANIFEST.MF
index f4addee7c1..634598049c 100644
--- a/plugins/org.jkiss.dbeaver.debug.core/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.debug.core/META-INF/MANIFEST.MF
@@ -19,3 +19,4 @@ Export-Package: org.jkiss.dbeaver.debug,
  org.jkiss.dbeaver.debug.core.model,
  org.jkiss.dbeaver.debug.jdbc
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.jkiss.dbeaver.debug.core
diff --git a/plugins/org.jkiss.dbeaver.debug.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.debug.ui/META-INF/MANIFEST.MF
index 5ea6b1c2b1..a4952a6255 100644
--- a/plugins/org.jkiss.dbeaver.debug.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.debug.ui/META-INF/MANIFEST.MF
@@ -23,3 +23,4 @@ Require-Bundle: org.eclipse.core.runtime,
 Export-Package: org.jkiss.dbeaver.debug.ui,
  org.jkiss.dbeaver.debug.ui.actions,
  org.jkiss.dbeaver.debug.ui.details
+Automatic-Module-Name: org.jkiss.dbeaver.debug.ui
diff --git a/plugins/org.jkiss.dbeaver.ext.athena/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.athena/META-INF/MANIFEST.MF
index fed9445853..112ec81af2 100644
--- a/plugins/org.jkiss.dbeaver.ext.athena/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.athena/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: DBeaver Corp
 Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: org.jkiss.dbeaver.ext.athena
diff --git a/plugins/org.jkiss.dbeaver.ext.bigquery/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.bigquery/META-INF/MANIFEST.MF
index 378c4d41da..345ed68e89 100644
--- a/plugins/org.jkiss.dbeaver.ext.bigquery/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.bigquery/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: DBeaver Corp
 Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: org.jkiss.dbeaver.ext.bigquery
diff --git a/plugins/org.jkiss.dbeaver.ext.clickhouse/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.clickhouse/META-INF/MANIFEST.MF
index b186a2be2b..a6dfce1dd5 100644
--- a/plugins/org.jkiss.dbeaver.ext.clickhouse/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.clickhouse/META-INF/MANIFEST.MF
@@ -11,3 +11,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ext.clickhouse
diff --git a/plugins/org.jkiss.dbeaver.ext.db2.i/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.db2.i/META-INF/MANIFEST.MF
index 4c29d17c43..7e2b9f0292 100644
--- a/plugins/org.jkiss.dbeaver.ext.db2.i/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.db2.i/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ext.db2.i
diff --git a/plugins/org.jkiss.dbeaver.ext.db2.zos/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.db2.zos/META-INF/MANIFEST.MF
index c4dd81fcef..4230b515be 100644
--- a/plugins/org.jkiss.dbeaver.ext.db2.zos/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.db2.zos/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ext.db2.zos
diff --git a/plugins/org.jkiss.dbeaver.ext.db2/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.db2/META-INF/MANIFEST.MF
index 6c2e346f0c..9bc0ee527d 100644
--- a/plugins/org.jkiss.dbeaver.ext.db2/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.db2/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui.workbench.texteditor,
  org.jkiss.dbeaver.core
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ext.db2
diff --git a/plugins/org.jkiss.dbeaver.ext.derby/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.derby/META-INF/MANIFEST.MF
index 72dea4332d..5d8d4f1cda 100644
--- a/plugins/org.jkiss.dbeaver.ext.derby/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.derby/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@ Bundle-ActivationPolicy: lazy
 Require-Bundle: org.jkiss.dbeaver.model,
  org.jkiss.dbeaver.ext.generic
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ext.derby
diff --git a/plugins/org.jkiss.dbeaver.ext.erd/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.erd/META-INF/MANIFEST.MF
index c8aacc2d89..59013afa06 100644
--- a/plugins/org.jkiss.dbeaver.ext.erd/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.erd/META-INF/MANIFEST.MF
@@ -26,3 +26,4 @@ Export-Package: org.jkiss.dbeaver.ext.erd,
  org.jkiss.dbeaver.ext.erd.model,
  org.jkiss.dbeaver.ext.erd.part,
  org.jkiss.dbeaver.ext.erd.policy
+Automatic-Module-Name: org.jkiss.dbeaver.ext.erd
diff --git a/plugins/org.jkiss.dbeaver.ext.es.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.es.ui/META-INF/MANIFEST.MF
index b2e4994276..316ff930c2 100644
--- a/plugins/org.jkiss.dbeaver.ext.es.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.es.ui/META-INF/MANIFEST.MF
@@ -11,3 +11,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: DBeaver Corp
 Bundle-Localization: plugin
+Automatic-Module-Name: org.jkiss.dbeaver.ext.es.ui
diff --git a/plugins/org.jkiss.dbeaver.ext.exasol/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.exasol/META-INF/MANIFEST.MF
index 5a9228d859..9503b32dcd 100644
--- a/plugins/org.jkiss.dbeaver.ext.exasol/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.exasol/META-INF/MANIFEST.MF
@@ -21,3 +21,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.ext.ui.locks,
  org.jkiss.dbeaver.data.gis
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ext.exasol
diff --git a/plugins/org.jkiss.dbeaver.ext.firebird/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.firebird/META-INF/MANIFEST.MF
index 2d40ed19dc..d0f03db453 100644
--- a/plugins/org.jkiss.dbeaver.ext.firebird/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.firebird/META-INF/MANIFEST.MF
@@ -11,3 +11,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ext.firebird
diff --git a/plugins/org.jkiss.dbeaver.ext.format.sqlworkbenchj/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.format.sqlworkbenchj/META-INF/MANIFEST.MF
index feeb64d2ca..98a525c8e9 100644
--- a/plugins/org.jkiss.dbeaver.ext.format.sqlworkbenchj/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.format.sqlworkbenchj/META-INF/MANIFEST.MF
@@ -16,3 +16,4 @@ Export-Package: org.jkiss.dbeaver.ext.format.sqlworkbenchj
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: JKISS
+Automatic-Module-Name: org.jkiss.dbeaver.ext.format.sqlworkbenchj
diff --git a/plugins/org.jkiss.dbeaver.ext.generic.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.generic.ui/META-INF/MANIFEST.MF
index c98159f18d..dd5fb094c7 100644
--- a/plugins/org.jkiss.dbeaver.ext.generic.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.generic.ui/META-INF/MANIFEST.MF
@@ -26,3 +26,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: JKISS
 Export-Package: org.jkiss.dbeaver.ext.generic.views
+Automatic-Module-Name: org.jkiss.dbeaver.ext.generic.ui
diff --git a/plugins/org.jkiss.dbeaver.ext.generic/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.generic/META-INF/MANIFEST.MF
index 62477342ce..c06f92be18 100644
--- a/plugins/org.jkiss.dbeaver.ext.generic/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.generic/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@ Export-Package: org.jkiss.dbeaver.ext.generic,
  org.jkiss.dbeaver.ext.generic.edit,
  org.jkiss.dbeaver.ext.generic.model,
  org.jkiss.dbeaver.ext.generic.model.meta
+Automatic-Module-Name: org.jkiss.dbeaver.ext.generic
diff --git a/plugins/org.jkiss.dbeaver.ext.greenplum/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.greenplum/META-INF/MANIFEST.MF
index 6ec875fa43..9a869a46fb 100644
--- a/plugins/org.jkiss.dbeaver.ext.greenplum/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.greenplum/META-INF/MANIFEST.MF
@@ -11,3 +11,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ext.greenplum
diff --git a/plugins/org.jkiss.dbeaver.ext.h2/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.h2/META-INF/MANIFEST.MF
index f90386df98..6400495185 100644
--- a/plugins/org.jkiss.dbeaver.ext.h2/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.h2/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ext.h2
diff --git a/plugins/org.jkiss.dbeaver.ext.hana/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.hana/META-INF/MANIFEST.MF
index 1e708d53f7..06d9e4a22c 100644
--- a/plugins/org.jkiss.dbeaver.ext.hana/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.hana/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ext.hana
diff --git a/plugins/org.jkiss.dbeaver.ext.hive/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.hive/META-INF/MANIFEST.MF
index d3e219e6b6..abd5ef885a 100644
--- a/plugins/org.jkiss.dbeaver.ext.hive/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.hive/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ext.hive
diff --git a/plugins/org.jkiss.dbeaver.ext.hsqldb/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.hsqldb/META-INF/MANIFEST.MF
index 4d25ab4782..efaf9a921f 100644
--- a/plugins/org.jkiss.dbeaver.ext.hsqldb/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.hsqldb/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ext.hsqldb
diff --git a/plugins/org.jkiss.dbeaver.ext.import_config/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.import_config/META-INF/MANIFEST.MF
index 303937df85..77407d990e 100644
--- a/plugins/org.jkiss.dbeaver.ext.import_config/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.import_config/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.jkiss.dbeaver.ext.import_config.wizards
+Automatic-Module-Name: org.jkiss.dbeaver.ext.import_config
diff --git a/plugins/org.jkiss.dbeaver.ext.informix/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.informix/META-INF/MANIFEST.MF
index 92298cca62..7176748951 100644
--- a/plugins/org.jkiss.dbeaver.ext.informix/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.informix/META-INF/MANIFEST.MF
@@ -11,3 +11,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: JKISS
 Bundle-Authors: Bert Herngreen
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ext.informix
diff --git a/plugins/org.jkiss.dbeaver.ext.mockdata/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.mockdata/META-INF/MANIFEST.MF
index 3eed8284b3..ced58578fd 100644
--- a/plugins/org.jkiss.dbeaver.ext.mockdata/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.mockdata/META-INF/MANIFEST.MF
@@ -21,3 +21,4 @@ Require-Bundle: org.eclipse.ui,
 Export-Package: org.jkiss.dbeaver.ext.mockdata,
  org.jkiss.dbeaver.ext.mockdata.generator,
  org.jkiss.dbeaver.ext.mockdata.model
+Automatic-Module-Name: org.jkiss.dbeaver.ext.mockdata
diff --git a/plugins/org.jkiss.dbeaver.ext.mssql.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.mssql.ui/META-INF/MANIFEST.MF
index 4f01178cbc..eaa86b7a75 100644
--- a/plugins/org.jkiss.dbeaver.ext.mssql.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.mssql.ui/META-INF/MANIFEST.MF
@@ -19,3 +19,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: JKISS
 Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: org.jkiss.dbeaver.ext.mssql.ui
diff --git a/plugins/org.jkiss.dbeaver.ext.mssql/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.mssql/META-INF/MANIFEST.MF
index 09f9b16ec9..fefc3c7d8d 100644
--- a/plugins/org.jkiss.dbeaver.ext.mssql/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.mssql/META-INF/MANIFEST.MF
@@ -17,3 +17,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
 Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: org.jkiss.dbeaver.ext.mssql
diff --git a/plugins/org.jkiss.dbeaver.ext.mysql.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.mysql.ui/META-INF/MANIFEST.MF
index 19dd091e85..101084ad04 100644
--- a/plugins/org.jkiss.dbeaver.ext.mysql.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.mysql.ui/META-INF/MANIFEST.MF
@@ -26,3 +26,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: JKISS
 Bundle-ClassPath: .
 Export-Package: org.jkiss.dbeaver.ext.mysql.edit
+Automatic-Module-Name: org.jkiss.dbeaver.ext.mysql.ui
diff --git a/plugins/org.jkiss.dbeaver.ext.mysql/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.mysql/META-INF/MANIFEST.MF
index 475951e3dc..95d02fe5e3 100644
--- a/plugins/org.jkiss.dbeaver.ext.mysql/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.mysql/META-INF/MANIFEST.MF
@@ -16,3 +16,4 @@ Bundle-ClassPath: .
 Export-Package: org.jkiss.dbeaver.ext.mysql,
  org.jkiss.dbeaver.ext.mysql.model,
  org.jkiss.dbeaver.ext.mysql.model.session
+Automatic-Module-Name: org.jkiss.dbeaver.ext.mysql
diff --git a/plugins/org.jkiss.dbeaver.ext.netezza/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.netezza/META-INF/MANIFEST.MF
index 541d243258..79af5ca90c 100644
--- a/plugins/org.jkiss.dbeaver.ext.netezza/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.netezza/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ext.netezza
diff --git a/plugins/org.jkiss.dbeaver.ext.oracle.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.oracle.ui/META-INF/MANIFEST.MF
index 986b00c73f..599b152ffb 100644
--- a/plugins/org.jkiss.dbeaver.ext.oracle.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.oracle.ui/META-INF/MANIFEST.MF
@@ -32,3 +32,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
 Import-Package: com.google.gson
+Automatic-Module-Name: org.jkiss.dbeaver.ext.oracle.ui
diff --git a/plugins/org.jkiss.dbeaver.ext.oracle/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.oracle/META-INF/MANIFEST.MF
index 5d0204f8ca..adb3ae0f49 100644
--- a/plugins/org.jkiss.dbeaver.ext.oracle/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.oracle/META-INF/MANIFEST.MF
@@ -32,3 +32,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
 Import-Package: com.google.gson
+Automatic-Module-Name: org.jkiss.dbeaver.ext.oracle
diff --git a/plugins/org.jkiss.dbeaver.ext.phoenix/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.phoenix/META-INF/MANIFEST.MF
index 433082788b..1261055790 100644
--- a/plugins/org.jkiss.dbeaver.ext.phoenix/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.phoenix/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ext.phoenix
diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/META-INF/MANIFEST.MF
index de51e38f5f..4543414516 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/META-INF/MANIFEST.MF
@@ -12,3 +12,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.debug.core
 Export-Package: org.jkiss.dbeaver.ext.postgresql.debug,
  org.jkiss.dbeaver.ext.postgresql.debug.core
+Automatic-Module-Name: org.jkiss.dbeaver.ext.postgresql.debug.core
diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/META-INF/MANIFEST.MF
index 5b58c5dc58..420944e370 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.ext.postgresql.ui,
  org.jkiss.dbeaver.ext.postgresql.debug.core,
  org.eclipse.ui
+Automatic-Module-Name: org.jkiss.dbeaver.ext.postgresql.debug.ui
diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.postgresql.ui/META-INF/MANIFEST.MF
index 27898c4662..1746959101 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.ui/META-INF/MANIFEST.MF
@@ -36,4 +36,5 @@ Export-Package: org.jkiss.dbeaver.ext.postgresql,
  org.jkiss.dbeaver.ext.postgresql.ui,
  org.jkiss.dbeaver.ext.postgresql.ui.editors
 Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: org.jkiss.dbeaver.ext.postgresql.ui
 
diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.postgresql/META-INF/MANIFEST.MF
index ae1f309090..319e34564e 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql/META-INF/MANIFEST.MF
@@ -27,4 +27,5 @@ Export-Package: org.jkiss.dbeaver.ext.postgresql,
  org.jkiss.dbeaver.ext.postgresql.model.plan,
  org.jkiss.dbeaver.ext.postgresql.model.session
 Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: org.jkiss.dbeaver.ext.postgresql
 
diff --git a/plugins/org.jkiss.dbeaver.ext.sample.database/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.sample.database/META-INF/MANIFEST.MF
index f7dbba7c4f..1dbb320282 100644
--- a/plugins/org.jkiss.dbeaver.ext.sample.database/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.sample.database/META-INF/MANIFEST.MF
@@ -13,3 +13,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.jkiss.dbeaver.ext.sample.database
+Automatic-Module-Name: org.jkiss.dbeaver.ext.sample.database
diff --git a/plugins/org.jkiss.dbeaver.ext.snowflake.core/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.snowflake.core/META-INF/MANIFEST.MF
index f1867dcb53..a0accad8ec 100644
--- a/plugins/org.jkiss.dbeaver.ext.snowflake.core/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.snowflake.core/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@ Require-Bundle: org.jkiss.dbeaver.model;visibility:=reexport,
  org.jkiss.dbeaver.ext.generic;visibility:=reexport
 Export-Package: org.jkiss.dbeaver.ext.snowflake,
  org.jkiss.dbeaver.ext.snowflake.model
+Automatic-Module-Name: org.jkiss.dbeaver.ext.snowflake.core
diff --git a/plugins/org.jkiss.dbeaver.ext.snowflake.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.snowflake.ui/META-INF/MANIFEST.MF
index d1381f2ed0..72b44e9759 100644
--- a/plugins/org.jkiss.dbeaver.ext.snowflake.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.snowflake.ui/META-INF/MANIFEST.MF
@@ -18,3 +18,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: JKISS
 Bundle-Localization: plugin
+Automatic-Module-Name: org.jkiss.dbeaver.ext.snowflake.ui
diff --git a/plugins/org.jkiss.dbeaver.ext.spanner/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.spanner/META-INF/MANIFEST.MF
index f8bc92aa85..1bebd6200e 100644
--- a/plugins/org.jkiss.dbeaver.ext.spanner/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.spanner/META-INF/MANIFEST.MF
@@ -14,3 +14,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: DBeaver Corp
 Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: org.jkiss.dbeaver.ext.spanner
diff --git a/plugins/org.jkiss.dbeaver.ext.sqlite/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.sqlite/META-INF/MANIFEST.MF
index b77dad42df..b220e87721 100644
--- a/plugins/org.jkiss.dbeaver.ext.sqlite/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.sqlite/META-INF/MANIFEST.MF
@@ -13,3 +13,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ext.sqlite
diff --git a/plugins/org.jkiss.dbeaver.ext.teradata/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.teradata/META-INF/MANIFEST.MF
index 4a60f55d06..fe4415122c 100644
--- a/plugins/org.jkiss.dbeaver.ext.teradata/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.teradata/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ext.teradata
diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.ui.locks/META-INF/MANIFEST.MF
index 702361dffc..88eb6d8e59 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.locks/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.ui.locks/META-INF/MANIFEST.MF
@@ -16,3 +16,4 @@ Require-Bundle: org.eclipse.core.runtime,
 Export-Package: org.jkiss.dbeaver.ext.ui.locks.edit,
  org.jkiss.dbeaver.ext.ui.locks.manage
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.jkiss.dbeaver.ext.ui.locks
diff --git a/plugins/org.jkiss.dbeaver.ext.ui.svg/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.ui.svg/META-INF/MANIFEST.MF
index 9a4eaf5d3f..9cc24125bc 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.svg/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.ui.svg/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.bundle.apache.batik
 Bundle-ActivationPolicy: lazy
 Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: org.jkiss.dbeaver.ext.ui.svg
diff --git a/plugins/org.jkiss.dbeaver.ext.ui.tipoftheday/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.ui.tipoftheday/META-INF/MANIFEST.MF
index 75a45a2f77..b2103c472c 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.tipoftheday/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.ui.tipoftheday/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@ Require-Bundle: org.eclipse.ui.forms,
  org.jkiss.dbeaver.core,
  org.jkiss.dbeaver.core.application,
  org.jkiss.dbeaver.model
+Automatic-Module-Name: org.jkiss.dbeaver.ext.ui.tipoftheday
diff --git a/plugins/org.jkiss.dbeaver.ext.vertica.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.vertica.ui/META-INF/MANIFEST.MF
index 51fa83abbf..873df1ec79 100644
--- a/plugins/org.jkiss.dbeaver.ext.vertica.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.vertica.ui/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ext.vertica.ui
diff --git a/plugins/org.jkiss.dbeaver.ext.vertica/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.vertica/META-INF/MANIFEST.MF
index 0efc46656e..3616d7cddf 100644
--- a/plugins/org.jkiss.dbeaver.ext.vertica/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.vertica/META-INF/MANIFEST.MF
@@ -11,3 +11,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ext.vertica
diff --git a/plugins/org.jkiss.dbeaver.ext.wmi/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ext.wmi/META-INF/MANIFEST.MF
index 0aedff517c..99ae6e6992 100644
--- a/plugins/org.jkiss.dbeaver.ext.wmi/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ext.wmi/META-INF/MANIFEST.MF
@@ -18,3 +18,4 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ext.wmi
diff --git a/plugins/org.jkiss.dbeaver.model.sql/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.model.sql/META-INF/MANIFEST.MF
index e004e855fe..56848cf914 100644
--- a/plugins/org.jkiss.dbeaver.model.sql/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.model.sql/META-INF/MANIFEST.MF
@@ -26,3 +26,4 @@ Require-Bundle: org.eclipse.equinox.security,
  org.jkiss.dbeaver.model;visibility:=reexport,
  org.jkiss.dbeaver.registry
 Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: org.jkiss.dbeaver.model.sql
diff --git a/plugins/org.jkiss.dbeaver.model/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.model/META-INF/MANIFEST.MF
index 0d75127e02..167dd286c2 100644
--- a/plugins/org.jkiss.dbeaver.model/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.model/META-INF/MANIFEST.MF
@@ -89,3 +89,4 @@ Require-Bundle: org.eclipse.equinox.security,
  com.google.gson,
  org.jkiss.bundle.bouncycastle;resolution:=optional
 Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: org.jkiss.dbeaver.model
diff --git a/plugins/org.jkiss.dbeaver.net.ssh.jsch/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.net.ssh.jsch/META-INF/MANIFEST.MF
index 52470a79a9..48fda37a71 100644
--- a/plugins/org.jkiss.dbeaver.net.ssh.jsch/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.net.ssh.jsch/META-INF/MANIFEST.MF
@@ -13,3 +13,4 @@ Require-Bundle: org.jkiss.dbeaver.model,
  com.jcraft.jsch,
  org.eclipse.jsch.ui
 Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: org.jkiss.dbeaver.net.ssh.jsch
diff --git a/plugins/org.jkiss.dbeaver.net.ssh.sshj/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.net.ssh.sshj/META-INF/MANIFEST.MF
index 58b3d69d21..250f3999bc 100644
--- a/plugins/org.jkiss.dbeaver.net.ssh.sshj/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.net.ssh.sshj/META-INF/MANIFEST.MF
@@ -13,3 +13,4 @@ Require-Bundle: org.jkiss.dbeaver.model,
  org.jkiss.bundle.sshj,
  org.jkiss.bundle.bouncycastle
 Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: org.jkiss.dbeaver.net.ssh.sshj
diff --git a/plugins/org.jkiss.dbeaver.net.ssh.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.net.ssh.ui/META-INF/MANIFEST.MF
index 58009b8467..228cce1cfe 100644
--- a/plugins/org.jkiss.dbeaver.net.ssh.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.net.ssh.ui/META-INF/MANIFEST.MF
@@ -19,3 +19,4 @@ Require-Bundle: org.eclipse.equinox.security,
  org.jkiss.dbeaver.core,
  org.jkiss.dbeaver.net.ssh
 Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: org.jkiss.dbeaver.net.ssh.ui
diff --git a/plugins/org.jkiss.dbeaver.net.ssh/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.net.ssh/META-INF/MANIFEST.MF
index 4060433383..77788fb786 100644
--- a/plugins/org.jkiss.dbeaver.net.ssh/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.net.ssh/META-INF/MANIFEST.MF
@@ -19,3 +19,4 @@ Require-Bundle: org.eclipse.equinox.security,
  org.jkiss.dbeaver.registry,
  com.jcraft.jsch
 Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: org.jkiss.dbeaver.net.ssh
diff --git a/plugins/org.jkiss.dbeaver.registry/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.registry/META-INF/MANIFEST.MF
index 315a4ab63b..6730d08be7 100644
--- a/plugins/org.jkiss.dbeaver.registry/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.registry/META-INF/MANIFEST.MF
@@ -25,3 +25,4 @@ Require-Bundle: org.eclipse.core.runtime,
  com.google.gson,
  org.jkiss.dbeaver.model;visibility:=reexport
 Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: org.jkiss.dbeaver.registry
diff --git a/plugins/org.jkiss.dbeaver.slf4j/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.slf4j/META-INF/MANIFEST.MF
index fc71b38b42..74b0628679 100644
--- a/plugins/org.jkiss.dbeaver.slf4j/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.slf4j/META-INF/MANIFEST.MF
@@ -10,3 +10,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: JKISS
 Export-Package: org.slf4j.impl
 Fragment-Host: org.slf4j.api
+Automatic-Module-Name: org.jkiss.dbeaver.slf4j
diff --git a/plugins/org.jkiss.dbeaver.team.git.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.team.git.ui/META-INF/MANIFEST.MF
index 34b66e4ad2..20f63d94c3 100644
--- a/plugins/org.jkiss.dbeaver.team.git.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.team.git.ui/META-INF/MANIFEST.MF
@@ -22,3 +22,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.ui.editors.base
 Bundle-Localization: OSGI-INF/l10n/bundle
 Bundle-Activator: org.jkiss.dbeaver.team.git.ui.Activator
+Automatic-Module-Name: org.jkiss.dbeaver.team.git.ui
diff --git a/plugins/org.jkiss.dbeaver.team.git/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.team.git/META-INF/MANIFEST.MF
index 259db32438..f50a7724f0 100644
--- a/plugins/org.jkiss.dbeaver.team.git/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.team.git/META-INF/MANIFEST.MF
@@ -15,3 +15,4 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.eclipse.core.expressions
 Bundle-Localization: OSGI-INF/l10n/bundle
+Automatic-Module-Name: org.jkiss.dbeaver.team.git
diff --git a/plugins/org.jkiss.dbeaver.ui.charts/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ui.charts/META-INF/MANIFEST.MF
index 09b1cff6cb..150172733b 100644
--- a/plugins/org.jkiss.dbeaver.ui.charts/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ui.charts/META-INF/MANIFEST.MF
@@ -22,3 +22,4 @@ Require-Bundle: org.eclipse.equinox.preferences,
  org.jkiss.bundle.jfreechart;visibility:=reexport
 Export-Package: org.jkiss.dbeaver.ui.charts,
  org.jkiss.dbeaver.ui.charts.internal
+Automatic-Module-Name: org.jkiss.dbeaver.ui.charts
diff --git a/plugins/org.jkiss.dbeaver.ui.dashboard/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ui.dashboard/META-INF/MANIFEST.MF
index bebb05b705..13cd13f791 100644
--- a/plugins/org.jkiss.dbeaver.ui.dashboard/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ui.dashboard/META-INF/MANIFEST.MF
@@ -29,3 +29,4 @@ Export-Package: org.jkiss.dbeaver.ui.dashboard.control,
  org.jkiss.dbeaver.ui.dashboard.model,
  org.jkiss.dbeaver.ui.dashboard.model.data,
  org.jkiss.dbeaver.ui.dashboard.view
+Automatic-Module-Name: org.jkiss.dbeaver.ui.dashboard
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.acl/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ui.editors.acl/META-INF/MANIFEST.MF
index d972ba5b57..90bbb68ae8 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.acl/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ui.editors.acl/META-INF/MANIFEST.MF
@@ -16,4 +16,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.ui.navigator,
  org.jkiss.dbeaver.ui.editors.base
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ui.editors.acl
 
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.base/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ui.editors.base/META-INF/MANIFEST.MF
index bbe6e589da..bf12ff8e49 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.base/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ui.editors.base/META-INF/MANIFEST.MF
@@ -26,3 +26,4 @@ Export-Package: org.jkiss.dbeaver.ui.controls,
  org.jkiss.dbeaver.ui.editors.object.struct,
  org.jkiss.dbeaver.ui.editors.text,
  org.jkiss.dbeaver.ui.editors.text.handlers
+Automatic-Module-Name: org.jkiss.dbeaver.ui.editors.base
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.connection/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ui.editors.connection/META-INF/MANIFEST.MF
index fa78c4d8c5..410f9a4542 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.connection/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ui.editors.connection/META-INF/MANIFEST.MF
@@ -24,3 +24,4 @@ Bundle-ClassPath: .
 Export-Package: org.jkiss.dbeaver.registry,
  org.jkiss.dbeaver.registry.configurator,
  org.jkiss.dbeaver.ui.dialogs.connection
+Automatic-Module-Name: org.jkiss.dbeaver.ui.editors.connection
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.content/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ui.editors.content/META-INF/MANIFEST.MF
index b71bb689eb..8c06337536 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.content/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ui.editors.content/META-INF/MANIFEST.MF
@@ -16,4 +16,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.ui,
  org.jkiss.dbeaver.ui.editors.base
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ui.editors.content
 
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ui.editors.data/META-INF/MANIFEST.MF
index 8e8be0b438..83b23aa09d 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/META-INF/MANIFEST.MF
@@ -40,4 +40,5 @@ Export-Package: org.jkiss.dbeaver.registry.functions,
  org.jkiss.dbeaver.ui.editors.content,
  org.jkiss.dbeaver.ui.editors.data,
  org.jkiss.dbeaver.ui.editors.data.preferences
+Automatic-Module-Name: org.jkiss.dbeaver.ui.editors.data
 
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.entity/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ui.editors.entity/META-INF/MANIFEST.MF
index 279a4239ad..9184816a64 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.entity/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ui.editors.entity/META-INF/MANIFEST.MF
@@ -16,4 +16,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.ui,
  org.jkiss.dbeaver.ui.editors.base
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ui.editors.entity
 
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.hex/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ui.editors.hex/META-INF/MANIFEST.MF
index c7bda2af1b..67aec66a21 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.hex/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ui.editors.hex/META-INF/MANIFEST.MF
@@ -22,3 +22,4 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-ClassPath: .
 Export-Package: org.jkiss.dbeaver.ui.editors.binary,
  org.jkiss.dbeaver.ui.editors.binary.pref
+Automatic-Module-Name: org.jkiss.dbeaver.ui.editors.hex
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.image/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ui.editors.image/META-INF/MANIFEST.MF
index 2d0e91303e..b324b1aa2f 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.image/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ui.editors.image/META-INF/MANIFEST.MF
@@ -16,4 +16,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.jkiss.dbeaver.ui.editors.base,
  org.jkiss.dbeaver.ui.editors.data
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ui.editors.image
 
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.sql/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ui.editors.sql/META-INF/MANIFEST.MF
index 329968b40f..fff4773820 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.sql/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ui.editors.sql/META-INF/MANIFEST.MF
@@ -48,4 +48,5 @@ Export-Package: org.jkiss.dbeaver.runtime.sql,
  org.jkiss.dbeaver.ui.editors.sql.plan,
  org.jkiss.dbeaver.ui.editors.sql.plan.simple
 Bundle-ClassPath: .
+Automatic-Module-Name: org.jkiss.dbeaver.ui.editors.sql
 
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.xml/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ui.editors.xml/META-INF/MANIFEST.MF
index 5906937045..2e162a882c 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.xml/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ui.editors.xml/META-INF/MANIFEST.MF
@@ -22,3 +22,4 @@ Require-Bundle: org.eclipse.core.runtime,
 Bundle-ClassPath: .
 Export-Package: org.jkiss.dbeaver.ui.editors.xml,
  org.jkiss.dbeaver.ui.data.managers.stream
+Automatic-Module-Name: org.jkiss.dbeaver.ui.editors.xml
diff --git a/plugins/org.jkiss.dbeaver.ui.navigator/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ui.navigator/META-INF/MANIFEST.MF
index aa7df05f1f..1b2864e3cd 100644
--- a/plugins/org.jkiss.dbeaver.ui.navigator/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ui.navigator/META-INF/MANIFEST.MF
@@ -45,3 +45,4 @@ Export-Package: org.jkiss.dbeaver.ui.controls,
  org.jkiss.dbeaver.ui.resources,
  org.jkiss.dbeaver.tools.project,
  org.jkiss.dbeaver.tools.registry
+Automatic-Module-Name: org.jkiss.dbeaver.ui.navigator
diff --git a/plugins/org.jkiss.dbeaver.ui.search/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ui.search/META-INF/MANIFEST.MF
index 6edbc906e1..6e950eb80f 100644
--- a/plugins/org.jkiss.dbeaver.ui.search/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ui.search/META-INF/MANIFEST.MF
@@ -25,4 +25,5 @@ Require-Bundle: org.eclipse.equinox.preferences,
 Export-Package: org.jkiss.dbeaver.ui.search,
   org.jkiss.dbeaver.ui.search.data,
   org.jkiss.dbeaver.ui.search.metadata
+Automatic-Module-Name: org.jkiss.dbeaver.ui.search
 
diff --git a/plugins/org.jkiss.dbeaver.ui/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.ui/META-INF/MANIFEST.MF
index ea878a4e4c..b783125876 100644
--- a/plugins/org.jkiss.dbeaver.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.ui/META-INF/MANIFEST.MF
@@ -36,4 +36,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.e4.ui.workbench.renderers.swt,
  org.jkiss.dbeaver.model,
  org.eclipse.ui.forms
+Automatic-Module-Name: org.jkiss.dbeaver.ui
 
diff --git a/test/org.jkiss.dbeaver.ext.test/META-INF/MANIFEST.MF b/test/org.jkiss.dbeaver.ext.test/META-INF/MANIFEST.MF
index debbbfbbc0..c1f0e4373b 100644
--- a/test/org.jkiss.dbeaver.ext.test/META-INF/MANIFEST.MF
+++ b/test/org.jkiss.dbeaver.ext.test/META-INF/MANIFEST.MF
@@ -12,3 +12,4 @@ Require-Bundle: org.eclipse.ui,
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: JKISS
+Automatic-Module-Name: org.jkiss.dbeaver.ext.test
-- 
GitLab