Merge remote-tracking branch 'origin/devel' into devel

.travis.yml

 language: java
-script: mvn verify
+script: mvn clean verify
 dist: precise
 jdk:
   - oraclejdk8
@@ -12,4 +12,6 @@ cache:
   directories:
   - $HOME/.m2
 
-before_install: echo "MAVEN_OPTS='-Xmx2048m -XX:MaxPermSize=512m'" > ~/.mavenrc
\ No newline at end of file
+before_install: echo "MAVEN_OPTS='-Xmx2048m -XX:MaxPermSize=512m'" > ~/.mavenrc
+
+install: true
\ No newline at end of file

features/org.jkiss.dbeaver.debug.feature/feature.properties

+#Properties file for org.jkiss.dbeaver.debug.core
+
+# DBeaver - Universal Database Manager
+# Copyright (C) 2010-2017 Serge Rider (serge@jkiss.org)
+# Copyright (C) 2017 Alexander Fedorov (alexander.fedorov@jkiss.org)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 featureName=DBeaver Debug
 providerName=JKISS
 description=Database debugger functionality.

features/org.jkiss.dbeaver.debug.feature/feature.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-        id="org.jkiss.dbeaver.debug.feature"
-        label="%featureName"
-        version="1.0.0"
-        provider-name="%providerName">
-
-    <description>
-        %description
-    </description>
-
-    <copyright>
-        %copyright
-    </copyright>
-
-    <license url="%licenseURL">
-        %license
-    </license>
-
-    <plugin id="org.jkiss.dbeaver.debug.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.debug.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.postgresql.debug.core" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
-    <plugin id="org.jkiss.dbeaver.ext.postgresql.debug.ui" download-size="0" install-size="0" version="0.0.0" unpack="false"/>
+      id="org.jkiss.dbeaver.debug.feature"
+      label="%featureName"
+      version="1.0.0"
+      provider-name="%providerName">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="%licenseURL">
+      %license
+   </license>
+
+   <requires>
+      <import plugin="org.eclipse.debug.core"/>
+      <import plugin="org.eclipse.debug.ui"/>
+   </requires>
+
+   <plugin
+         id="org.jkiss.dbeaver.debug.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.jkiss.dbeaver.debug.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.jkiss.dbeaver.ext.postgresql.debug.core"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.jkiss.dbeaver.ext.postgresql.debug.ui"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>

pom.xml

@@ -63,7 +63,6 @@
         <module>plugins/org.jkiss.dbeaver.ext.ui.svg</module>
         <module>plugins/org.jkiss.dbeaver.data.office</module>
         <module>plugins/org.jkiss.dbeaver.model</module>
-        <module>plugins/org.jkiss.dbeaver.test</module>
 
         <module>features/org.jkiss.dbeaver.core.feature</module>
         <module>features/org.jkiss.dbeaver.debug.feature</module>
@@ -144,9 +143,10 @@
         <module>nls/features/org.jkiss.dbeaver.ext.ui.svg.nls.feature</module>
 
         <!-- Product -->
-
         <module>product/standalone</module>
 
+        <!-- Test -->
+        <module>plugins/org.jkiss.dbeaver.test</module>
         <module>tests/org.jkiss.dbeaver.runtime.ide.core.tests</module>
 
     </modules>