Merge remote-tracking branch 'origin/releases/5.2.x' into releases/6.0.x

8 files changed, 467 insertions, 30 deletions

diff --git a/org.eclipse.scout.sdk.s2e.releng/pom.xml b/org.eclipse.scout.sdk.s2e.releng/pom.xml
index b81f10f00..0b2c66802 100644
--- a/org.eclipse.scout.sdk.s2e.releng/pom.xml
+++ b/org.eclipse.scout.sdk.s2e.releng/pom.xml
@@ -33,7 +33,8 @@
     - In org.eclipse.scout.sdk.s2e.releng/, execute
     mvn clean deploy -DforgeSnapshotUrl=https://scout.bsiag.com/repository/org.eclipse.scout-snapshot-local -DforgeSnapshotId=bsi-tools-snapshot
     3b. For deploying releases (to be used by Tycho releases):
-    - Prerequisite: you need to have GPG properly set up, see https://docs.sonatype.org/display/Repository/How+To+Generate+PGP+Signatures+With+Maven
+    - Prerequisite: 1. you need to have GPG properly set up, see http://central.sonatype.org/pages/working-with-pgp-signatures.html
+                    2. if not already present: you need to add the server with id of property DforgeReleaseId into your settings.xml including the corresponding credentials (e.g. oss sonatype username/password)
     - Make sure that ${org.eclipse.jdt.core-maven}, ${org.eclipse.equinox.common-maven}, ${org.eclipse.osgi-maven},... in the parent POM don't have a '-SNAPSHOT' suffix
     - In org.eclipse.scout.sdk.s2e.releng/, execute
     mvn clean deploy -Pdeploy-releases -DforgeReleaseUrl=https://oss.sonatype.org/service/local/staging/deploy/maven2/ -DforgeReleaseId=forge-releases -Dgpg.passphrase=<your_passphrase>
@@ -72,6 +73,23 @@
       </plugins>
     </pluginManagement>
 
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>true</filtering>
+        <includes>
+          <include>*.pom</include>
+        </includes>
+      </resource>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>false</filtering>
+        <excludes>
+          <exclude>*.pom</exclude>
+        </excludes>
+      </resource>
+    </resources>
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -84,24 +102,6 @@
             </goals>
           </execution>
         </executions>
-        <configuration>
-          <resources>
-            <resource>
-              <directory>src/main/resources</directory>
-              <filtering>true</filtering>
-              <includes>
-                <include>*.pom</include>
-              </includes>
-            </resource>
-            <resource>
-              <directory>src/main/resources</directory>
-              <filtering>false</filtering>
-              <includes>
-                <include>*.jar</include>
-              </includes>
-            </resource>
-          </resources>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.eclipse.tycho.extras</groupId>
@@ -159,6 +159,14 @@
               <version>${org.eclipse.equinox.preferences}</version>
             </iu>
             <iu>
+              <id>org.eclipse.compare</id>
+              <version>${org.eclipse.compare}</version>
+            </iu>
+            <iu>
+              <id>org.eclipse.compare.source</id>
+              <version>${org.eclipse.compare}</version>
+            </iu>
+            <iu>
               <id>org.eclipse.core.resources</id>
               <version>${org.eclipse.core.resources}</version>
             </iu>
@@ -635,6 +643,18 @@
             <artifactId>maven-deploy-plugin</artifactId>
             <executions>
               <execution>
+                <id>deploy-compare</id>
+                <goals>
+                  <goal>deploy-file</goal>
+                </goals>
+                <phase>deploy</phase>
+                <configuration>
+                  <file>${downloaded}/org.eclipse.compare_${org.eclipse.compare}.jar</file>
+                  <sources>${downloaded}/org.eclipse.compare.source_${org.eclipse.compare}.jar</sources>
+                  <pomFile>${project.build.outputDirectory}/org.eclipse.compare.pom</pomFile>
+                </configuration>
+              </execution>
+              <execution>
                 <id>deploy-core-resources</id>
                 <goals>
                   <goal>deploy-file</goal>
@@ -1431,6 +1451,19 @@
                 </configuration>
               </execution>
               <execution>
+                <id>deploy-eclipse-compare</id>
+                <goals>
+                  <goal>sign-and-deploy-file</goal>
+                </goals>
+                <phase>deploy</phase>
+                <configuration>
+                  <file>${downloaded}/org.eclipse.compare_${org.eclipse.compare}.jar</file>
+                  <sources>${downloaded}/org.eclipse.compare.source_${org.eclipse.compare}.jar</sources>
+                  <pomFile>${project.build.outputDirectory}/org.eclipse.compare.pom</pomFile>
+                  <javadoc>${project.build.outputDirectory}/javadoc.jar</javadoc>
+                </configuration>
+              </execution>
+              <execution>
                 <id>deploy-core-resources</id>
                 <goals>
                   <goal>sign-and-deploy-file</goal>
@@ -1695,15 +1728,16 @@
             </configuration>
             <executions>
               <execution>
-                <id>deploy-core-variables</id>
+                <id>deploy-compare</id>
                 <goals>
                   <goal>sign-and-deploy-file</goal>
                 </goals>
                 <phase>deploy</phase>
+                <inherited>true</inherited>
                 <configuration>
-                  <file>${downloaded}/org.eclipse.core.variables_${org.eclipse.core.variables}.jar</file>
-                  <sources>${downloaded}/org.eclipse.core.variables.source_${org.eclipse.core.variables}.jar</sources>
-                  <pomFile>${project.build.outputDirectory}/org.eclipse.core.variables.pom</pomFile>
+                  <file>${downloaded}/org.eclipse.compare_${org.eclipse.compare}.jar</file>
+                  <sources>${downloaded}/org.eclipse.compare.source_${org.eclipse.compare}.jar</sources>
+                  <pomFile>${project.build.outputDirectory}/org.eclipse.compare.pom</pomFile>
                   <javadoc>${project.build.outputDirectory}/javadoc.jar</javadoc>
                 </configuration>
               </execution>
diff --git a/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.compare.pom b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.compare.pom
new file mode 100644
index 000000000..cedbad868
--- /dev/null
+++ b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.compare.pom
@@ -0,0 +1,100 @@
+<?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>
+
+  <groupId>org.eclipse.scout.sdk.deps</groupId>
+  <artifactId>org.eclipse.compare</artifactId>
+  <version>${org.eclipse.compare-maven}</version>
+
+  <name>Scout SDK org.eclipse.compare dependency (Incubation)</name>
+  <description>This is org.eclipse.compare jar used by Scout SDK</description>
+  <url>http://www.eclipse.org/scout/</url>
+
+  <licenses>
+    <license>
+      <name>Eclipse Public License</name>
+      <url>http://www.eclipse.org/legal/epl-v10.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <scm>
+    <url>http://git.eclipse.org/c/scout/org.eclipse.scout.sdk.git</url>
+  </scm>
+
+  <developers>
+    <developer>
+      <id>scout-dev@eclipse.org</id>
+      <name>Scout Development Team</name>
+    </developer>
+  </developers>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ui</artifactId>
+      <version>${org.eclipse.ui-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.resources</artifactId>
+      <version>${org.eclipse.core.resources-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.jface.text</artifactId>
+      <version>${org.eclipse.jface.text-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ui.ide</artifactId>
+      <version>${org.eclipse.ui.ide-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ui.views</artifactId>
+      <version>${org.eclipse.ui.views-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+      <version>${org.eclipse.ui.workbench.texteditor-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.runtime</artifactId>
+      <version>${org.eclipse.core.runtime-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.equinox.common</artifactId>
+      <version>${org.eclipse.equinox.common-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.equinox.registry</artifactId>
+      <version>${org.eclipse.equinox.registry-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+      <version>${org.eclipse.osgi-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.expressions</artifactId>
+      <version>${org.eclipse.core.expressions-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ui.editors</artifactId>
+      <version>${org.eclipse.ui.editors-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ui.forms</artifactId>
+      <version>${org.eclipse.ui.forms-range}</version>
+    </dependency>
+    <!-- org.eclipse.compare.core;bundle-version="[3.5.0,4.0.0)";visibility:=reexport -->
+  </dependencies>
+</project>
diff --git a/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.debug.core.pom b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.debug.core.pom
index 03e4f59b7..1e23862b6 100644
--- a/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.debug.core.pom
+++ b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.debug.core.pom
@@ -32,8 +32,58 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.resources</artifactId>
+      <version>${org.eclipse.core.resources-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.variables</artifactId>
+      <version>${org.eclipse.core.variables-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
       <artifactId>org.eclipse.core.runtime</artifactId>
       <version>${org.eclipse.core.runtime-range}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.filesystem</artifactId>
+      <version>${org.eclipse.core.filesystem-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.expressions</artifactId>
+      <version>${org.eclipse.core.expressions-range}</version>
+    </dependency>
+    <dependency><!-- org.eclipse.core.filesystem, org.eclipse.core.runtime -->
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.equinox.common</artifactId>
+      <version>${org.eclipse.equinox.common-range}</version>
+    </dependency>
+    <dependency><!-- org.eclipse.core.filesystem, org.eclipse.core.runtime -->
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.equinox.registry</artifactId>
+      <version>${org.eclipse.equinox.registry-range}</version>
+    </dependency>
+    <dependency><!-- org.eclipse.core.filesystem, org.eclipse.core.runtime -->
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+      <version>${org.eclipse.osgi-range}</version>
+    </dependency>
+    <dependency><!-- org.eclipse.core.runtime -->
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.jobs</artifactId>
+      <version>${org.eclipse.core.jobs-range}</version>
+    </dependency>
+    <dependency><!-- org.eclipse.core.runtime -->
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.equinox.preferences</artifactId>
+      <version>${org.eclipse.equinox.preferences-range}</version>
+    </dependency>
+    <dependency><!-- org.eclipse.core.runtime -->
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.contenttype</artifactId>
+      <version>${org.eclipse.core.contenttype-range}</version>
+    </dependency>
   </dependencies>
 </project>
diff --git a/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.debug.ui.pom b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.debug.ui.pom
index 93dd83e62..fe0f9219a 100644
--- a/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.debug.ui.pom
+++ b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.debug.ui.pom
@@ -32,8 +32,99 @@
   <dependencies>
     <dependency>
       <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.resources</artifactId>
+      <version>${org.eclipse.core.resources-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.variables</artifactId>
+      <version>${org.eclipse.core.variables-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
       <artifactId>org.eclipse.core.runtime</artifactId>
       <version>${org.eclipse.core.runtime-range}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.filesystem</artifactId>
+      <version>${org.eclipse.core.filesystem-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.expressions</artifactId>
+      <version>${org.eclipse.core.expressions-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.debug.core</artifactId>
+      <version>${org.eclipse.debug.core-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.equinox.common</artifactId>
+      <version>${org.eclipse.equinox.common-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.equinox.registry</artifactId>
+      <version>${org.eclipse.equinox.registry-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+      <version>${org.eclipse.osgi-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.jobs</artifactId>
+      <version>${org.eclipse.core.jobs-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.equinox.preferences</artifactId>
+      <version>${org.eclipse.equinox.preferences-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.contenttype</artifactId>
+      <version>${org.eclipse.core.contenttype-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
+      <version>${org.eclipse.swt.win32.win32.x86-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.jface.text</artifactId>
+      <version>${org.eclipse.jface.text-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+      <version>${org.eclipse.ui.workbench.texteditor-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ui</artifactId>
+      <version>${org.eclipse.ui-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ui.console</artifactId>
+      <version>${org.eclipse.ui.console-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ui.ide</artifactId>
+      <version>${org.eclipse.ui.ide-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ui.editors</artifactId>
+      <version>${org.eclipse.ui.editors-range}</version>
+    </dependency>
+    <!-- org.eclipse.help;bundle-version="[3.4.0,4.0.0) -->
   </dependencies>
 </project>
diff --git a/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.jdt.junit.pom b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.jdt.junit.pom
index a8948560d..3b84c085d 100644
--- a/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.jdt.junit.pom
+++ b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.jdt.junit.pom
@@ -35,5 +35,155 @@
       <artifactId>org.eclipse.core.runtime</artifactId>
       <version>${org.eclipse.core.runtime-range}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ui.ide</artifactId>
+      <version>${org.eclipse.ui.ide-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.filesystem</artifactId>
+      <version>${org.eclipse.core.filesystem-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ui.workbench</artifactId>
+      <version>${org.eclipse.ui.workbench-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.jface.text</artifactId>
+      <version>${org.eclipse.jface.text-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ui</artifactId>
+      <version>${org.eclipse.ui-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.variables</artifactId>
+      <version>${org.eclipse.core.variables-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.expressions</artifactId>
+      <version>${org.eclipse.core.expressions-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+      <version>${org.eclipse.osgi-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.resources</artifactId>
+      <version>${org.eclipse.core.resources-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.debug.core</artifactId>
+      <version>${org.eclipse.debug.core-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.equinox.common</artifactId>
+      <version>${org.eclipse.equinox.common-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.equinox.registry</artifactId>
+      <version>${org.eclipse.equinox.registry-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.jobs</artifactId>
+      <version>${org.eclipse.core.jobs-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.equinox.preferences</artifactId>
+      <version>${org.eclipse.equinox.preferences-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.core.contenttype</artifactId>
+      <version>${org.eclipse.core.contenttype-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.swt.win32.win32.x86</artifactId>
+      <version>${org.eclipse.swt.win32.win32.x86-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ui.workbench.texteditor</artifactId>
+      <version>${org.eclipse.ui.workbench.texteditor-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ui.console</artifactId>
+      <version>${org.eclipse.ui.console-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ui.ide</artifactId>
+      <version>${org.eclipse.ui.ide-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ui.editors</artifactId>
+      <version>${org.eclipse.ui.editors-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ui.views</artifactId>
+      <version>${org.eclipse.ui.views-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.jdt.core</artifactId>
+      <version>${org.eclipse.jdt.core-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.jdt.ui</artifactId>
+      <version>${org.eclipse.jdt.ui-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.jdt.launching</artifactId>
+      <version>${org.eclipse.jdt.launching-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.jdt.debug.ui</artifactId>
+      <version>${org.eclipse.jdt.debug.ui-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.compare</artifactId>
+      <version>${org.eclipse.compare-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ltk.core.refactoring</artifactId>
+      <version>${org.eclipse.ltk.core.refactoring-range}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.ltk.ui.refactoring</artifactId>
+      <version>${org.eclipse.ltk.ui.refactoring-range}</version>
+    </dependency>
+    <!-- org.eclipse.jdt.junit.core;bundle-version="[3.6.0,4.0.0)";visibility:=reexport, -->
+    <!-- org.eclipse.jdt.junit.runtime;bundle-version="[3.4.100,4.0.0) -->
+    <!-- org.eclipse.help;bundle-version="[3.2.0,4.0.0)" -->
+    <!-- org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)" -->
+    <!-- org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)" -->
+    <!-- org.eclipse.equinox.bidi;bundle-version="[0.10.0,2.0.0)" -->
+    <!-- org.eclipse.e4.core.services;bundle-version="2.0.0", -->
+    <!-- org.eclipse.e4.core.contexts;bundle-version="[1.3.100,2.0.0)", -->
+    <!-- org.eclipse.e4.ui.workbench;bundle-version="[1.3.0,2.0.0)" -->
+    <!-- com.ibm.icu;bundle-version="4.4.2" -->
   </dependencies>
 </project>
diff --git a/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.jdt.ui.pom b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.jdt.ui.pom
index f7f86a67b..a0602f5a8 100644
--- a/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.jdt.ui.pom
+++ b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.jdt.ui.pom
@@ -120,9 +120,13 @@
       <artifactId>org.eclipse.ui.console</artifactId>
       <version>${org.eclipse.ui.console-range}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.compare</artifactId>
+      <version>${org.eclipse.compare-range}</version>
+    </dependency>
 
     <!-- com.ibm.icu;bundle-version="4.4.2", -->
-    <!-- org.eclipse.compare;bundle-version="[3.5.0,4.0.0)", -->
     <!-- org.eclipse.core.variables;bundle-version="[3.2.200,4.0.0)", -->
     <!-- org.eclipse.debug.core;bundle-version="[3.10.0,4.0.0)", -->
     <!-- org.eclipse.debug.ui;bundle-version="[3.11.0,4.0.0)", -->
diff --git a/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.ltk.ui.refactoring.pom b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.ltk.ui.refactoring.pom
index ac00681ba..6b1390455 100644
--- a/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.ltk.ui.refactoring.pom
+++ b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.ltk.ui.refactoring.pom
@@ -65,11 +65,15 @@
       <artifactId>org.eclipse.ui</artifactId>
       <version>${org.eclipse.ui-range}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.compare</artifactId>
+      <version>${org.eclipse.compare-range}</version>
+    </dependency>
 
-<!-- org.eclipse.core.filebuffers;bundle-version="[3.5.0,4.0.0)", -->
-<!-- org.eclipse.ui.navigator;bundle-version="[3.3.200,4.0.0)", -->
-<!-- org.eclipse.compare;bundle-version="[3.5.0,4.0.0)", -->
-<!-- org.eclipse.team.core;bundle-version="[3.4.100,4.0.0)", -->
-<!-- org.eclipse.team.ui;bundle-version="[3.4.100,4.0.0)" -->
+    <!-- org.eclipse.core.filebuffers;bundle-version="[3.5.0,4.0.0)", -->
+    <!-- org.eclipse.ui.navigator;bundle-version="[3.3.200,4.0.0)", -->
+    <!-- org.eclipse.team.core;bundle-version="[3.4.100,4.0.0)", -->
+    <!-- org.eclipse.team.ui;bundle-version="[3.4.100,4.0.0)" -->
   </dependencies>
 </project>
diff --git a/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.pde.ui.pom b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.pde.ui.pom
index 5fd004459..da53f4c29 100644
--- a/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.pde.ui.pom
+++ b/org.eclipse.scout.sdk.s2e.releng/src/main/resources/org.eclipse.pde.ui.pom
@@ -125,6 +125,11 @@
       <artifactId>org.eclipse.ui.console</artifactId>
       <version>${org.eclipse.ui.console-range}</version>
     </dependency>
+    <dependency>
+      <groupId>org.eclipse.scout.sdk.deps</groupId>
+      <artifactId>org.eclipse.compare</artifactId>
+      <version>${org.eclipse.compare-range}</version>
+    </dependency>
 <!-- org.eclipse.debug.ui;bundle-version="[3.10.0,4.0.0)", -->
 <!-- org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)", -->
 <!-- org.eclipse.pde.build;bundle-version="[3.2.0,4.0.0)", -->
@@ -137,7 +142,6 @@
 <!-- org.eclipse.update.configurator;bundle-version="[3.1.0,4.0.0)", -->
 <!-- org.eclipse.ui.views.log;bundle-version="[1.0.0,2.0.0)", -->
 <!-- org.eclipse.core.variables;bundle-version="[3.1.0,4.0.0)", -->
-<!-- org.eclipse.compare;bundle-version="[3.2.0,4.0.0)", -->
 <!-- org.eclipse.ui.navigator.resources;bundle-version="[3.3.100,4.0.0)", -->
 <!-- org.eclipse.equinox.p2.ui;bundle-version="[2.0.0,3.0.0)", -->
 <!-- org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)", -->