From 1e48c5fb8fc4b50b96222f75c70759dc8086892c Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Tue, 30 Oct 2018 23:37:08 +0300
Subject: [PATCH] Maven project fix

Former-commit-id: d69dd970881eb7dd459f8acaee6551c6fb343c51
---
 bundles/org.jkiss.utils/pom.xml               |   4 +-
 bundles/org.jkiss.wmi/pom.xml                 |   4 +-
 .../feature.xml                               | 153 +++---------------
 .../feature.xml                               |  16 +-
 .../pom.xml                                   |   4 +-
 .../org.jkiss.dbeaver.core.eclipse/pom.xml    |   4 +-
 .../META-INF/MANIFEST.MF                      |   1 +
 plugins/org.jkiss.dbeaver.core/pom.xml        |   4 +-
 plugins/org.jkiss.dbeaver.data.gis/pom.xml    |   4 +-
 plugins/org.jkiss.dbeaver.data.office/pom.xml |   4 +-
 .../org.jkiss.dbeaver.data.transfer/pom.xml   |   4 +-
 plugins/org.jkiss.dbeaver.debug.core/pom.xml  |   4 +-
 plugins/org.jkiss.dbeaver.debug.ui/pom.xml    |   4 +-
 plugins/org.jkiss.dbeaver.ext.athena/pom.xml  |   4 +-
 .../org.jkiss.dbeaver.ext.bigquery/pom.xml    |   4 +-
 .../org.jkiss.dbeaver.ext.clickhouse/pom.xml  |   4 +-
 plugins/org.jkiss.dbeaver.ext.db2/pom.xml     |   4 +-
 plugins/org.jkiss.dbeaver.ext.derby/pom.xml   |   4 +-
 plugins/org.jkiss.dbeaver.ext.erd/pom.xml     |   4 +-
 plugins/org.jkiss.dbeaver.ext.es.ui/pom.xml   |   4 +-
 plugins/org.jkiss.dbeaver.ext.exasol/pom.xml  |   4 +-
 .../org.jkiss.dbeaver.ext.firebird/pom.xml    |   4 +-
 .../pom.xml                                   |   4 +-
 plugins/org.jkiss.dbeaver.ext.generic/pom.xml |   4 +-
 plugins/org.jkiss.dbeaver.ext.h2/pom.xml      |   4 +-
 plugins/org.jkiss.dbeaver.ext.hana/pom.xml    |   4 +-
 plugins/org.jkiss.dbeaver.ext.hive/pom.xml    |   4 +-
 plugins/org.jkiss.dbeaver.ext.hsqldb/pom.xml  |   4 +-
 .../pom.xml                                   |   4 +-
 .../org.jkiss.dbeaver.ext.informix/pom.xml    |   4 +-
 .../org.jkiss.dbeaver.ext.mockdata/pom.xml    |   4 +-
 plugins/org.jkiss.dbeaver.ext.mssql/pom.xml   |   4 +-
 plugins/org.jkiss.dbeaver.ext.mysql/pom.xml   |   4 +-
 plugins/org.jkiss.dbeaver.ext.netezza/pom.xml |   4 +-
 plugins/org.jkiss.dbeaver.ext.oracle/pom.xml  |   4 +-
 plugins/org.jkiss.dbeaver.ext.phoenix/pom.xml |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../org.jkiss.dbeaver.ext.postgresql/pom.xml  |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 .../pom.xml                                   |   4 +-
 plugins/org.jkiss.dbeaver.ext.sqlite/pom.xml  |   4 +-
 .../org.jkiss.dbeaver.ext.teradata/pom.xml    |   4 +-
 .../pom.xml                                   |   4 +-
 .../org.jkiss.dbeaver.ext.ui.locks/pom.xml    |   4 +-
 plugins/org.jkiss.dbeaver.ext.ui.svg/pom.xml  |   4 +-
 .../pom.xml                                   |   4 +-
 plugins/org.jkiss.dbeaver.ext.vertica/pom.xml |   4 +-
 plugins/org.jkiss.dbeaver.ext.wmi/pom.xml     |   4 +-
 plugins/org.jkiss.dbeaver.intro/pom.xml       |   4 +-
 plugins/org.jkiss.dbeaver.lang/pom.xml        |   4 +-
 plugins/org.jkiss.dbeaver.model/pom.xml       |   4 +-
 .../org.jkiss.dbeaver.net.ssh.jsch/pom.xml    |   4 +-
 .../org.jkiss.dbeaver.net.ssh.sshj/pom.xml    |   4 +-
 plugins/org.jkiss.dbeaver.net.ssh.ui/pom.xml  |   4 +-
 plugins/org.jkiss.dbeaver.net.ssh/pom.xml     |   4 +-
 plugins/org.jkiss.dbeaver.ui/pom.xml          |   4 +-
 tests/org.jkiss.dbeaver.test/.classpath       |   6 +-
 tests/pom.xml                                 |  21 +++
 60 files changed, 163 insertions(+), 254 deletions(-)
 create mode 100644 tests/pom.xml

diff --git a/bundles/org.jkiss.utils/pom.xml b/bundles/org.jkiss.utils/pom.xml
index db8de60673..7874a3d30a 100644
--- a/bundles/org.jkiss.utils/pom.xml
+++ b/bundles/org.jkiss.utils/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>bundles</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+    <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.utils</artifactId>
   <version>2.1.79-SNAPSHOT</version>
diff --git a/bundles/org.jkiss.wmi/pom.xml b/bundles/org.jkiss.wmi/pom.xml
index 24194a4d60..6d883bcdcf 100644
--- a/bundles/org.jkiss.wmi/pom.xml
+++ b/bundles/org.jkiss.wmi/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>bundles</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+    <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.wmi</artifactId>
   <version>2.0.89-SNAPSHOT</version>
diff --git a/features/org.jkiss.dbeaver.core.feature/feature.xml b/features/org.jkiss.dbeaver.core.feature/feature.xml
index 3c72c7925b..9b746a11cc 100644
--- a/features/org.jkiss.dbeaver.core.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.core.feature/feature.xml
@@ -36,137 +36,26 @@
       <import plugin="org.eclipse.debug.ui" version="0.0.0" match="greaterOrEqual"/>
    </requires>
 
-   <plugin
-         id="com.github.jsqlparser"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.apache.commons.jexl"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="net.sf.opencsv"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.jkiss.dbeaver.model"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.jkiss.dbeaver.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.jkiss.dbeaver.net.ssh"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.jkiss.dbeaver.net.ssh.jsch"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.jkiss.dbeaver.net.ssh.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.jkiss.dbeaver.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.jkiss.dbeaver.ext.erd"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.jkiss.dbeaver.ext.ui.colortheme"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.jkiss.dbeaver.ext.ui.locks"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.jkiss.utils"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.jkiss.dbeaver.ext.mockdata"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.jkiss.dbeaver.data.transfer"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.jkiss.dbeaver.ext.import_config"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.jkiss.dbeaver.ext.format.sqlworkbenchj"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="com.vividsolutions.jts"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.jkiss.dbeaver.data.gis"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
+   <plugin id="com.github.jsqlparser" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin id="org.apache.commons.jexl" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin id="net.sf.opencsv" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin id="org.eclipse.nebula.widgets.gallery" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+   <plugin id="org.jkiss.dbeaver.model" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin id="org.jkiss.dbeaver.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin id="org.jkiss.dbeaver.net.ssh" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin id="org.jkiss.dbeaver.net.ssh.jsch" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin id="org.jkiss.dbeaver.net.ssh.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin id="org.jkiss.dbeaver.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin id="org.jkiss.dbeaver.ext.erd" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin id="org.jkiss.dbeaver.ext.ui.colortheme" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin id="org.jkiss.dbeaver.ext.ui.locks" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin id="org.jkiss.utils" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin id="org.jkiss.dbeaver.ext.mockdata" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin id="org.jkiss.dbeaver.data.transfer" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin id="org.jkiss.dbeaver.ext.import_config" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin id="org.jkiss.dbeaver.ext.format.sqlworkbenchj" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin id="com.vividsolutions.jts" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+   <plugin id="org.jkiss.dbeaver.data.gis" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 
 </feature>
diff --git a/features/org.jkiss.dbeaver.standalone.feature/feature.xml b/features/org.jkiss.dbeaver.standalone.feature/feature.xml
index 41272813a7..c874a9de45 100644
--- a/features/org.jkiss.dbeaver.standalone.feature/feature.xml
+++ b/features/org.jkiss.dbeaver.standalone.feature/feature.xml
@@ -22,6 +22,12 @@
         <update label="DBeaver Universal Database Manager" url="https://dbeaver.io/"/>
     </url>
 
+    <requires>
+        <import plugin="org.apache.commons.logging" match="greaterOrEqual"/>
+        <import plugin="com.jcraft.jsch" match="greaterOrEqual"/>
+        <import plugin="org.objectweb.asm" match="greaterOrEqual"/>
+    </requires>
+
     <includes id="org.jkiss.dbeaver.rcp.feature" version="0.0.0"/>
     <includes id="org.jkiss.dbeaver.core.feature" version="0.0.0"/>
     <includes id="org.jkiss.dbeaver.ext.generic.feature" version="0.0.0"/>
@@ -37,12 +43,6 @@
     <includes id="org.eclipse.equinox.p2.discovery.feature" version="0.0.0"/>
     <includes id="org.eclipse.equinox.p2.extras.feature" version="0.0.0"/>
 
-    <requires>
-        <import plugin="org.apache.commons.logging" match="greaterOrEqual"/>
-        <import plugin="com.jcraft.jsch" match="greaterOrEqual"/>
-        <import plugin="org.objectweb.asm" match="greaterOrEqual"/>
-    </requires>
-
     <plugin id="org.eclipse.ui.ide.application" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 
     <!-- EGit and other requirements -->
@@ -50,7 +50,7 @@
     <plugin id="org.eclipse.jsch.core" download-size="0" install-size="0" version="0.0.0"/>
     <plugin id="org.eclipse.jsch.ui" download-size="0" install-size="0" version="0.0.0"/>
     <plugin id="org.eclipse.core.variables" download-size="0" install-size="0" version="0.0.0"/>
-    <plugin id="org.eclipse.ui.cheatsheets" download-size="0" install-size="0" version="0.0.0"/>
+    <!--<plugin id="org.eclipse.ui.cheatsheets" download-size="0" install-size="0" version="0.0.0"/>-->
 
     <!-- Include org.eclipse.ui.themes because it was added only in 4.4 -->
     <plugin id="org.eclipse.ui.themes" download-size="0" install-size="0" version="0.0.0"/>
@@ -60,6 +60,8 @@
 
     <plugin id="org.jkiss.dbeaver.core.application" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.sample.database" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+
+    <plugin id="org.eclipse.nebula.widgets.opal.tipoftheday" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
     <plugin id="org.jkiss.dbeaver.ext.ui.tipoftheday" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
 
 
diff --git a/plugins/org.jkiss.dbeaver.core.application/pom.xml b/plugins/org.jkiss.dbeaver.core.application/pom.xml
index c45e61b0a7..048b79d453 100644
--- a/plugins/org.jkiss.dbeaver.core.application/pom.xml
+++ b/plugins/org.jkiss.dbeaver.core.application/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.core.application</artifactId>
   <version>5.2.4-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.core.eclipse/pom.xml b/plugins/org.jkiss.dbeaver.core.eclipse/pom.xml
index 1457e1a421..41eac8f728 100644
--- a/plugins/org.jkiss.dbeaver.core.eclipse/pom.xml
+++ b/plugins/org.jkiss.dbeaver.core.eclipse/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.core.eclipse</artifactId>
   <version>5.2.4-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
index d83f3ec217..5e7d300991 100644
--- a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
+++ b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF
@@ -123,6 +123,7 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.e4.ui.workbench.renderers.swt,
  org.eclipse.e4.ui.css.core,
  org.eclipse.e4.ui.css.swt,
+ org.eclipse.nebula.widgets.gallery,
  org.jkiss.dbeaver.model;visibility:=reexport,
  org.jkiss.dbeaver.ui;visibility:=reexport,
  org.jkiss.utils;visibility:=reexport,
diff --git a/plugins/org.jkiss.dbeaver.core/pom.xml b/plugins/org.jkiss.dbeaver.core/pom.xml
index efb79f1053..c56810e221 100644
--- a/plugins/org.jkiss.dbeaver.core/pom.xml
+++ b/plugins/org.jkiss.dbeaver.core/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.core</artifactId>
   <version>5.2.4-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.data.gis/pom.xml b/plugins/org.jkiss.dbeaver.data.gis/pom.xml
index cfbff810a1..853b1915bf 100644
--- a/plugins/org.jkiss.dbeaver.data.gis/pom.xml
+++ b/plugins/org.jkiss.dbeaver.data.gis/pom.xml
@@ -5,9 +5,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.jkiss.dbeaver</groupId>
-        <artifactId>dbeaver</artifactId>
+        <artifactId>plugins</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
+         <relativePath>../</relativePath>
     </parent>
     <artifactId>org.jkiss.dbeaver.data.gis</artifactId>
     <version>1.0.20-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.data.office/pom.xml b/plugins/org.jkiss.dbeaver.data.office/pom.xml
index 53133d3afd..22e962c7e2 100644
--- a/plugins/org.jkiss.dbeaver.data.office/pom.xml
+++ b/plugins/org.jkiss.dbeaver.data.office/pom.xml
@@ -5,9 +5,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.jkiss.dbeaver</groupId>
-        <artifactId>dbeaver</artifactId>
+        <artifactId>plugins</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
+         <relativePath>../</relativePath>
     </parent>
     <artifactId>org.jkiss.dbeaver.data.office</artifactId>
     <version>1.1.33-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.data.transfer/pom.xml b/plugins/org.jkiss.dbeaver.data.transfer/pom.xml
index d3e6bc4a21..afa3590d9b 100644
--- a/plugins/org.jkiss.dbeaver.data.transfer/pom.xml
+++ b/plugins/org.jkiss.dbeaver.data.transfer/pom.xml
@@ -5,9 +5,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.jkiss.dbeaver</groupId>
-        <artifactId>dbeaver</artifactId>
+        <artifactId>plugins</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
+         <relativePath>../</relativePath>
     </parent>
     <artifactId>org.jkiss.dbeaver.data.transfer</artifactId>
     <version>1.0.6-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.debug.core/pom.xml b/plugins/org.jkiss.dbeaver.debug.core/pom.xml
index 1227b5c91c..6f4e4e6256 100644
--- a/plugins/org.jkiss.dbeaver.debug.core/pom.xml
+++ b/plugins/org.jkiss.dbeaver.debug.core/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.debug.core</artifactId>
   <version>1.0.25-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.debug.ui/pom.xml b/plugins/org.jkiss.dbeaver.debug.ui/pom.xml
index 361713bc5c..523e4738cb 100644
--- a/plugins/org.jkiss.dbeaver.debug.ui/pom.xml
+++ b/plugins/org.jkiss.dbeaver.debug.ui/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.debug.ui</artifactId>
   <version>1.0.25-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.athena/pom.xml b/plugins/org.jkiss.dbeaver.ext.athena/pom.xml
index d42189fd66..f23029f74c 100644
--- a/plugins/org.jkiss.dbeaver.ext.athena/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.athena/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.athena</artifactId>
   <version>1.0.2-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.bigquery/pom.xml b/plugins/org.jkiss.dbeaver.ext.bigquery/pom.xml
index 5f16fb2ed2..a7f8dac6b5 100644
--- a/plugins/org.jkiss.dbeaver.ext.bigquery/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.bigquery/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.bigquery</artifactId>
   <version>1.0.2-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.clickhouse/pom.xml b/plugins/org.jkiss.dbeaver.ext.clickhouse/pom.xml
index 924ebf676e..3cac7f9399 100644
--- a/plugins/org.jkiss.dbeaver.ext.clickhouse/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.clickhouse/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.clickhouse</artifactId>
   <version>1.0.1-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.db2/pom.xml b/plugins/org.jkiss.dbeaver.ext.db2/pom.xml
index ceddbc0ab2..ed3ff27d90 100644
--- a/plugins/org.jkiss.dbeaver.ext.db2/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.db2/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.db2</artifactId>
   <version>2.1.81-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.derby/pom.xml b/plugins/org.jkiss.dbeaver.ext.derby/pom.xml
index 8c9d7035cb..e1d671a6ef 100644
--- a/plugins/org.jkiss.dbeaver.ext.derby/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.derby/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.derby</artifactId>
   <version>1.1.81-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.erd/pom.xml b/plugins/org.jkiss.dbeaver.ext.erd/pom.xml
index 1cafb34374..a3d2768f39 100644
--- a/plugins/org.jkiss.dbeaver.ext.erd/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.erd/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.erd</artifactId>
   <version>2.0.98-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.es.ui/pom.xml b/plugins/org.jkiss.dbeaver.ext.es.ui/pom.xml
index cf2502b82f..9a2ae3fef2 100644
--- a/plugins/org.jkiss.dbeaver.ext.es.ui/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.es.ui/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.es.ui</artifactId>
   <version>1.0.7-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.exasol/pom.xml b/plugins/org.jkiss.dbeaver.ext.exasol/pom.xml
index 5d99a3ed8f..60375b6843 100644
--- a/plugins/org.jkiss.dbeaver.ext.exasol/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.exasol/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.exasol</artifactId>
   <version>1.0.54-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.firebird/pom.xml b/plugins/org.jkiss.dbeaver.ext.firebird/pom.xml
index f57332d96f..0aaf364d3c 100644
--- a/plugins/org.jkiss.dbeaver.ext.firebird/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.firebird/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.firebird</artifactId>
   <version>1.0.97-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.format.sqlworkbenchj/pom.xml b/plugins/org.jkiss.dbeaver.ext.format.sqlworkbenchj/pom.xml
index eb8b44d650..267b64ae31 100644
--- a/plugins/org.jkiss.dbeaver.ext.format.sqlworkbenchj/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.format.sqlworkbenchj/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <groupId>org.jkiss.dbeaver</groupId>
   <artifactId>org.jkiss.dbeaver.ext.format.sqlworkbenchj</artifactId>
diff --git a/plugins/org.jkiss.dbeaver.ext.generic/pom.xml b/plugins/org.jkiss.dbeaver.ext.generic/pom.xml
index 2c0e9bc5ee..ff13e05000 100644
--- a/plugins/org.jkiss.dbeaver.ext.generic/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.generic/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.generic</artifactId>
   <version>2.3.82-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.h2/pom.xml b/plugins/org.jkiss.dbeaver.ext.h2/pom.xml
index 3005275dc8..e8b00af353 100644
--- a/plugins/org.jkiss.dbeaver.ext.h2/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.h2/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.h2</artifactId>
   <version>1.0.51-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.hana/pom.xml b/plugins/org.jkiss.dbeaver.ext.hana/pom.xml
index b5307a716f..c3ee035e7b 100644
--- a/plugins/org.jkiss.dbeaver.ext.hana/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.hana/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.hana</artifactId>
   <version>1.0.25-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.hive/pom.xml b/plugins/org.jkiss.dbeaver.ext.hive/pom.xml
index fe3c6daa95..1c84b4ffb4 100644
--- a/plugins/org.jkiss.dbeaver.ext.hive/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.hive/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.hive</artifactId>
   <version>1.0.2-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.hsqldb/pom.xml b/plugins/org.jkiss.dbeaver.ext.hsqldb/pom.xml
index 2ae4aadd7b..b5f2a4efb2 100644
--- a/plugins/org.jkiss.dbeaver.ext.hsqldb/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.hsqldb/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.hsqldb</artifactId>
   <version>1.0.43-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.import_config/pom.xml b/plugins/org.jkiss.dbeaver.ext.import_config/pom.xml
index 9c7dceac7c..62b9e3ba00 100644
--- a/plugins/org.jkiss.dbeaver.ext.import_config/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.import_config/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.import_config</artifactId>
   <version>2.1.59-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.informix/pom.xml b/plugins/org.jkiss.dbeaver.ext.informix/pom.xml
index 59ebfc29bb..b5f620ced9 100644
--- a/plugins/org.jkiss.dbeaver.ext.informix/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.informix/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.informix</artifactId>
   <version>1.0.87-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.mockdata/pom.xml b/plugins/org.jkiss.dbeaver.ext.mockdata/pom.xml
index 5e9e015110..df96647e25 100644
--- a/plugins/org.jkiss.dbeaver.ext.mockdata/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.mockdata/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.mockdata</artifactId>
   <version>1.0.22-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.mssql/pom.xml b/plugins/org.jkiss.dbeaver.ext.mssql/pom.xml
index e20e33ae88..7ea4325991 100644
--- a/plugins/org.jkiss.dbeaver.ext.mssql/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.mssql/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.mssql</artifactId>
   <version>1.0.90-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.mysql/pom.xml b/plugins/org.jkiss.dbeaver.ext.mysql/pom.xml
index 41c1f077b5..4dc66b60aa 100644
--- a/plugins/org.jkiss.dbeaver.ext.mysql/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.mysql/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.mysql</artifactId>
   <version>2.1.81-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.netezza/pom.xml b/plugins/org.jkiss.dbeaver.ext.netezza/pom.xml
index 358960fb77..76aff95786 100644
--- a/plugins/org.jkiss.dbeaver.ext.netezza/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.netezza/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.netezza</artifactId>
   <version>1.0.61-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.oracle/pom.xml b/plugins/org.jkiss.dbeaver.ext.oracle/pom.xml
index 4f2c322fc8..c8f7b3360a 100644
--- a/plugins/org.jkiss.dbeaver.ext.oracle/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.oracle/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.oracle</artifactId>
   <version>2.1.81-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.phoenix/pom.xml b/plugins/org.jkiss.dbeaver.ext.phoenix/pom.xml
index 18d9759ed2..0ec769b219 100644
--- a/plugins/org.jkiss.dbeaver.ext.phoenix/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.phoenix/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.phoenix</artifactId>
   <version>1.0.65-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/pom.xml b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/pom.xml
index 86f6634816..9ce0854de4 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.core/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.postgresql.debug.core</artifactId>
   <version>1.0.25-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/pom.xml b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/pom.xml
index 6e4f0be0de..0b837a1ef3 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql.debug.ui/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.postgresql.debug.ui</artifactId>
   <version>1.0.25-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.postgresql/pom.xml b/plugins/org.jkiss.dbeaver.ext.postgresql/pom.xml
index 36bc60a9ef..b423557016 100644
--- a/plugins/org.jkiss.dbeaver.ext.postgresql/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.postgresql/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.postgresql</artifactId>
   <version>2.1.69-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.sample.database/pom.xml b/plugins/org.jkiss.dbeaver.ext.sample.database/pom.xml
index 1296a14add..fe6378f4aa 100644
--- a/plugins/org.jkiss.dbeaver.ext.sample.database/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.sample.database/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.sample.database</artifactId>
   <version>1.0.33-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.snowflake.core/pom.xml b/plugins/org.jkiss.dbeaver.ext.snowflake.core/pom.xml
index 79c0f7465f..e4ad7184cc 100644
--- a/plugins/org.jkiss.dbeaver.ext.snowflake.core/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.snowflake.core/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.snowflake.core</artifactId>
   <version>1.0.16-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.snowflake.ui/pom.xml b/plugins/org.jkiss.dbeaver.ext.snowflake.ui/pom.xml
index a37bda3181..63c2f13796 100644
--- a/plugins/org.jkiss.dbeaver.ext.snowflake.ui/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.snowflake.ui/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.snowflake.ui</artifactId>
   <version>1.0.16-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.sqlite/pom.xml b/plugins/org.jkiss.dbeaver.ext.sqlite/pom.xml
index ce951156cb..7f1901cd64 100644
--- a/plugins/org.jkiss.dbeaver.ext.sqlite/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.sqlite/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.sqlite</artifactId>
   <version>1.0.45-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.teradata/pom.xml b/plugins/org.jkiss.dbeaver.ext.teradata/pom.xml
index 68b8582fdf..bbfff6a5c9 100644
--- a/plugins/org.jkiss.dbeaver.ext.teradata/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.teradata/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.teradata</artifactId>
   <version>1.0.64-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.ui.colortheme/pom.xml b/plugins/org.jkiss.dbeaver.ext.ui.colortheme/pom.xml
index 599a03db49..524294ae92 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.colortheme/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.ui.colortheme/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.ui.colortheme</artifactId>
   <version>1.0.3-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.ui.locks/pom.xml b/plugins/org.jkiss.dbeaver.ext.ui.locks/pom.xml
index 8aecf67d94..382fa43615 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.locks/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.ui.locks/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.ui.locks</artifactId>
   <version>1.0.41-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.ui.svg/pom.xml b/plugins/org.jkiss.dbeaver.ext.ui.svg/pom.xml
index be48bc72c9..a128b6ca50 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.svg/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.ui.svg/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.ui.svg</artifactId>
   <version>1.0.32-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.ui.tipoftheday/pom.xml b/plugins/org.jkiss.dbeaver.ext.ui.tipoftheday/pom.xml
index 2b1f36b2a9..f0c15d806b 100644
--- a/plugins/org.jkiss.dbeaver.ext.ui.tipoftheday/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.ui.tipoftheday/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.ui.tipoftheday</artifactId>
   <version>1.0.2-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.vertica/pom.xml b/plugins/org.jkiss.dbeaver.ext.vertica/pom.xml
index 5c86f8937f..9058a6fca0 100644
--- a/plugins/org.jkiss.dbeaver.ext.vertica/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.vertica/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.vertica</artifactId>
   <version>2.0.26-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ext.wmi/pom.xml b/plugins/org.jkiss.dbeaver.ext.wmi/pom.xml
index c34fcbfa7d..272cbe49ce 100644
--- a/plugins/org.jkiss.dbeaver.ext.wmi/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ext.wmi/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ext.wmi</artifactId>
   <version>2.0.98-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.intro/pom.xml b/plugins/org.jkiss.dbeaver.intro/pom.xml
index 97173845bc..ebdfc448b3 100644
--- a/plugins/org.jkiss.dbeaver.intro/pom.xml
+++ b/plugins/org.jkiss.dbeaver.intro/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.intro</artifactId>
   <version>1.0.0-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.lang/pom.xml b/plugins/org.jkiss.dbeaver.lang/pom.xml
index b7fd894238..cdb444f6ee 100644
--- a/plugins/org.jkiss.dbeaver.lang/pom.xml
+++ b/plugins/org.jkiss.dbeaver.lang/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <groupId>org.jkiss.dbeaver</groupId>
   <artifactId>org.jkiss.dbeaver.ext.lang</artifactId>
diff --git a/plugins/org.jkiss.dbeaver.model/pom.xml b/plugins/org.jkiss.dbeaver.model/pom.xml
index caf00d691d..0ad9d7273c 100644
--- a/plugins/org.jkiss.dbeaver.model/pom.xml
+++ b/plugins/org.jkiss.dbeaver.model/pom.xml
@@ -5,9 +5,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.jkiss.dbeaver</groupId>
-        <artifactId>dbeaver</artifactId>
+        <artifactId>plugins</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
+         <relativePath>../</relativePath>
     </parent>
     <artifactId>org.jkiss.dbeaver.model</artifactId>
     <version>1.0.85-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.net.ssh.jsch/pom.xml b/plugins/org.jkiss.dbeaver.net.ssh.jsch/pom.xml
index 24109b9a89..8f79e774df 100644
--- a/plugins/org.jkiss.dbeaver.net.ssh.jsch/pom.xml
+++ b/plugins/org.jkiss.dbeaver.net.ssh.jsch/pom.xml
@@ -5,9 +5,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.jkiss.dbeaver</groupId>
-        <artifactId>dbeaver</artifactId>
+        <artifactId>plugins</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
+         <relativePath>../</relativePath>
     </parent>
     <artifactId>org.jkiss.dbeaver.net.ssh.jsch</artifactId>
     <version>1.1.6-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.net.ssh.sshj/pom.xml b/plugins/org.jkiss.dbeaver.net.ssh.sshj/pom.xml
index abf8844437..78a1df410c 100644
--- a/plugins/org.jkiss.dbeaver.net.ssh.sshj/pom.xml
+++ b/plugins/org.jkiss.dbeaver.net.ssh.sshj/pom.xml
@@ -5,9 +5,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.jkiss.dbeaver</groupId>
-        <artifactId>dbeaver</artifactId>
+        <artifactId>plugins</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
+         <relativePath>../</relativePath>
     </parent>
     <artifactId>org.jkiss.dbeaver.net.ssh.sshj</artifactId>
     <version>1.0.17-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.net.ssh.ui/pom.xml b/plugins/org.jkiss.dbeaver.net.ssh.ui/pom.xml
index ac42c49e68..47370c7ef3 100644
--- a/plugins/org.jkiss.dbeaver.net.ssh.ui/pom.xml
+++ b/plugins/org.jkiss.dbeaver.net.ssh.ui/pom.xml
@@ -5,9 +5,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.jkiss.dbeaver</groupId>
-        <artifactId>dbeaver</artifactId>
+        <artifactId>plugins</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
+         <relativePath>../</relativePath>
     </parent>
     <artifactId>org.jkiss.dbeaver.net.ssh.ui</artifactId>
     <version>1.0.17-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.net.ssh/pom.xml b/plugins/org.jkiss.dbeaver.net.ssh/pom.xml
index 9561f65bb3..6b3507e319 100644
--- a/plugins/org.jkiss.dbeaver.net.ssh/pom.xml
+++ b/plugins/org.jkiss.dbeaver.net.ssh/pom.xml
@@ -5,9 +5,9 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.jkiss.dbeaver</groupId>
-        <artifactId>dbeaver</artifactId>
+        <artifactId>plugins</artifactId>
         <version>1.0.0-SNAPSHOT</version>
-        <relativePath>../../</relativePath>
+         <relativePath>../</relativePath>
     </parent>
     <artifactId>org.jkiss.dbeaver.net.ssh</artifactId>
     <version>1.0.17-SNAPSHOT</version>
diff --git a/plugins/org.jkiss.dbeaver.ui/pom.xml b/plugins/org.jkiss.dbeaver.ui/pom.xml
index 480ff545d5..98e3fa8812 100644
--- a/plugins/org.jkiss.dbeaver.ui/pom.xml
+++ b/plugins/org.jkiss.dbeaver.ui/pom.xml
@@ -4,9 +4,9 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.jkiss.dbeaver</groupId>
-    <artifactId>dbeaver</artifactId>
+    <artifactId>plugins</artifactId>
     <version>1.0.0-SNAPSHOT</version>
-    <relativePath>../../</relativePath>
+     <relativePath>../</relativePath>
   </parent>
   <artifactId>org.jkiss.dbeaver.ui</artifactId>
   <version>5.1.11-SNAPSHOT</version>
diff --git a/tests/org.jkiss.dbeaver.test/.classpath b/tests/org.jkiss.dbeaver.test/.classpath
index edf6f848c9..64da08a353 100644
--- a/tests/org.jkiss.dbeaver.test/.classpath
+++ b/tests/org.jkiss.dbeaver.test/.classpath
@@ -2,10 +2,6 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src/">
-		<attributes>
-			<attribute name="test" value="true"/>
-		</attributes>
-	</classpathentry>
+	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes/"/>
 </classpath>
diff --git a/tests/pom.xml b/tests/pom.xml
new file mode 100644
index 0000000000..6b857d25f8
--- /dev/null
+++ b/tests/pom.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+         xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.jkiss.dbeaver</groupId>
+        <artifactId>dbeaver</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+        <relativePath>../</relativePath>
+    </parent>
+    <artifactId>tests</artifactId>
+    <version>1.0.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>org.jkiss.dbeaver.test</module>
+
+    </modules>
+
+</project>
-- 
GitLab