Maven project fix

Former-commit-id: d69dd970

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>

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>

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>

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"/>
 
 

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>

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>

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,

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

tests/pom.xml

+<?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>