diff --git a/java/com.sap.sailing.dashboards.gwt/META-INF/MANIFEST.MF b/java/com.sap.sailing.dashboards.gwt/META-INF/MANIFEST.MF
index f99c1c6e2c3..c7220337ed7 100644
--- a/java/com.sap.sailing.dashboards.gwt/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.dashboards.gwt/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.sap.sailing.domain,
  com.sap.sailing.server.interface,
- com.google.gwt.dev;bundle-version="2.10.0";resolution:=optional,
  com.google.gwt.user;bundle-version="2.10.0";resolution:=optional,
  com.google.gwt.servlet;bundle-version="2.10.0",
  com.sap.sse.common,
diff --git a/java/com.sap.sailing.datamining.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.datamining.test/META-INF/MANIFEST.MF
index e9307ffedd9..fd142e34e3d 100644
--- a/java/com.sap.sailing.datamining.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.datamining.test/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Import-Package: junit.framework;version="4.8.2",
  org.junit;version="4.8.2",
  org.junit.runner;version="4.8.2"
 Require-Bundle: org.mockito.mockito-core;bundle-version="1.9.5",
- org.hamcrest;bundle-version="1.1.0",
+ org.hamcrest;bundle-version="2.2.0",
  com.sap.sse.common,
  org.objenesis;bundle-version="2.1.0"
 Automatic-Module-Name: com.sap.sailing.datamining.test
diff --git a/java/com.sap.sailing.domain.igtimiadapter.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.igtimiadapter.test/META-INF/MANIFEST.MF
index 50dcf15136a..2c0638a0798 100644
--- a/java/com.sap.sailing.domain.igtimiadapter.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.domain.igtimiadapter.test/META-INF/MANIFEST.MF
@@ -13,5 +13,5 @@ Require-Bundle: org.junit;bundle-version="4.8.2",
  com.sap.sse.common,
  com.sap.sse.security.testsupport,
  org.mockito.mockito-core;bundle-version="1.10.14",
- org.hamcrest;bundle-version="1.1.0",
+ org.hamcrest;bundle-version="2.2.0",
  org.objenesis;bundle-version="2.1.0"
diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.racelogtrackingadapter.test/META-INF/MANIFEST.MF
index b21cb529e9c..a9fb1a517cd 100644
--- a/java/com.sap.sailing.domain.racelogtrackingadapter.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.domain.racelogtrackingadapter.test/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Require-Bundle: org.junit;bundle-version="4.8.2",
  com.sap.sailing.domain.racelogtrackingadapter.testsupport,
  org.mockito.mockito-core;bundle-version="1.9.5",
  org.objenesis;bundle-version="1.3.0",
- org.hamcrest;bundle-version="1.1.0",
+ org.hamcrest;bundle-version="2.2.0",
  com.sap.sse.common,
  com.sap.sailing.domain,
  com.sap.sse.mongodb
diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/META-INF/MANIFEST.MF
index 91460e6bf4d..3645790dc4b 100644
--- a/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.domain.racelogtrackingadapter.testsupport/META-INF/MANIFEST.MF
@@ -13,14 +13,14 @@ Require-Bundle: com.sap.sailing.domain.shared.android,
  com.sap.sailing.server.gateway.serialization;bundle-version="1.0.0",
  org.json.simple;bundle-version="1.1.0",
  org.mockito.mockito-core;bundle-version="1.9.5",
- org.hamcrest;bundle-version="1.1.0",
  org.junit;bundle-version="4.8.2",
  com.sap.sse.common,
  com.sap.sailing.server.gateway.serialization.shared.android,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
- com.sap.sse.shared.android
+ com.sap.sse.shared.android,
+ org.hamcrest;bundle-version="2.2.0"
 Export-Package: com.sap.sailing.domain.racelog.tracking.test.mock
 Automatic-Module-Name: com.sap.sailing.domain.racelogtrackingadapter.testsupport
 Import-Package: com.sap.sailing.shared.persistence.device
diff --git a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/RaceLogFixTrackerManager.java b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/RaceLogFixTrackerManager.java
index f93653c14d3..7927ce34dc4 100644
--- a/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/RaceLogFixTrackerManager.java
+++ b/java/com.sap.sailing.domain.racelogtrackingadapter/src/com/sap/sailing/domain/racelogtracking/impl/fixtracker/RaceLogFixTrackerManager.java
@@ -1,6 +1,5 @@
 package com.sap.sailing.domain.racelogtracking.impl.fixtracker;
 
-import java.security.acl.Owner;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.logging.Logger;
@@ -23,7 +22,7 @@ import com.sap.sailing.domain.tracking.impl.AbstractRaceChangeListener;
  * This class manages the lifecycle of the {@link FixLoaderAndTracker} by listening to
  * {@link RaceLogDenoteForTrackingEvent}, race log attached and stop tracking race changes.<p>
  * 
- * Once the race is stopped, it notifies its own {@link Owner} so that all reference to this instance can be cleanly
+ * Once the race is stopped, it notifies its own owner so that all reference to this instance can be cleanly
  * removed to prevent memory leaks.
  */
 public class RaceLogFixTrackerManager implements TrackingDataLoader {
diff --git a/java/com.sap.sailing.domain.shared.android.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.shared.android.test/META-INF/MANIFEST.MF
index 62845da87dd..b63fcd54389 100644
--- a/java/com.sap.sailing.domain.shared.android.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.domain.shared.android.test/META-INF/MANIFEST.MF
@@ -7,9 +7,9 @@ Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.sap.sailing.domain.common;bundle-version="1.0.0",
  com.sap.sailing.domain.shared.android;bundle-version="1.0.0",
- org.hamcrest;bundle-version="1.1.0",
  org.junit;bundle-version="4.8.2",
  org.objenesis;bundle-version="1.3.0",
+ org.hamcrest;bundle-version="2.2.0",
  org.mockito.mockito-core;bundle-version="1.9.5",
  com.sap.sailing.domain.test,
  com.sap.sailing.domain.racelogtrackingadapter.testsupport;bundle-version="1.0.0",
diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF
index 6b0b0789d2a..9c6499b090b 100644
--- a/java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: com.sap.sailing.domain,
  com.sap.sailing.domain.tractracadapter,
  com.sap.sailing.domain.swisstimingadapter.persistence;bundle-version="1.0.0",
  org.junit;bundle-version="4.8.2",
- org.hamcrest.core;bundle-version="1.1.0",
+ org.hamcrest;bundle-version="2.2.0",
  com.sap.sse,
  com.sap.sse.common,
  org.mongodb.bson;bundle-version="4.3.1",
diff --git a/java/com.sap.sailing.domain.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.test/META-INF/MANIFEST.MF
index 1a895254327..3e8a91e935b 100644
--- a/java/com.sap.sailing.domain.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.domain.test/META-INF/MANIFEST.MF
@@ -13,7 +13,6 @@ Require-Bundle: com.sap.sailing.domain,
  com.sap.sailing.domain.shared.android,
  org.mockito.mockito-core;bundle-version="1.9.5",
  com.sap.sailing.domain.test,
- org.hamcrest;bundle-version="1.1.0",
  org.objenesis;bundle-version="1.3.0",
  org.junit;bundle-version="4.8.2",
  org.json.simple;bundle-version="1.1.0",
@@ -35,7 +34,8 @@ Require-Bundle: com.sap.sailing.domain,
  org.mongodb.driver-core;bundle-version="4.3.1",
  org.mongodb.driver-sync;bundle-version="4.3.1",
  org.apache.commons.math3;bundle-version="3.5.0",
- org.apache.shiro.core;bundle-version="1.2.2"
+ org.apache.shiro.core;bundle-version="1.2.2",
+ org.hamcrest;bundle-version="2.2.0"
 Export-Package: com.sap.sailing.domain.test,
  com.sap.sailing.domain.test.mock
 Import-Package: org.apache.commons.math;version="2.1.0",
diff --git a/java/com.sap.sailing.domain.windfinderadapter.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.windfinderadapter.test/META-INF/MANIFEST.MF
index c77b9500155..2e294f592f8 100644
--- a/java/com.sap.sailing.domain.windfinderadapter.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.domain.windfinderadapter.test/META-INF/MANIFEST.MF
@@ -8,6 +8,6 @@ Bundle-Vendor: SAP
 Fragment-Host: com.sap.sailing.domain.windfinderadapter
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit,
- org.mockito.mockito-core;bundle-version="1.10.14",
  org.objenesis;bundle-version="2.1.0",
- org.hamcrest;bundle-version="1.1.0"
+ org.hamcrest;bundle-version="2.2.0",
+ org.mockito.mockito-core;bundle-version="1.10.14"
diff --git a/java/com.sap.sailing.domain/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain/META-INF/MANIFEST.MF
index 479f8bf95b8..38611141cd3 100755
--- a/java/com.sap.sailing.domain/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.domain/META-INF/MANIFEST.MF
@@ -68,5 +68,6 @@ Import-Package: com.sap.sse.security,
  org.apache.http.client.entity;version="4.5.5",
  org.apache.http.client.methods;version="4.5.5",
  org.apache.http.impl.client;version="4.5.5",
- org.apache.http.message;version="4.4.9"
+ org.apache.http.message;version="4.4.9",
+ javax.xml.bind
 Automatic-Module-Name: com.sap.sailing.domain
diff --git a/java/com.sap.sailing.gwt.ui/GWT Sailing SDM.launch b/java/com.sap.sailing.gwt.ui/GWT Sailing SDM.launch
index 2309104e893..381f7a36651 100755
--- a/java/com.sap.sailing.gwt.ui/GWT Sailing SDM.launch	
+++ b/java/com.sap.sailing.gwt.ui/GWT Sailing SDM.launch	
@@ -121,7 +121,7 @@
     <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="false"/>
     <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="com.google.gwt.dev.DevMode"/>
     <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="com.sap.sailing.gwt.ui"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-style PRETTY -incremental -war &quot;${project_loc:com.sap.sailing.gwt.ui}&quot; -noserver -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort 9876 -startupUrl /gwt/Home.html -startupUrl /gwt/AdminConsole.html -startupUrl /gwt/PairingList.html -startupUrl /gwt/LeaderboardEditing.html -startupUrl /gwt/Leaderboard.html -startupUrl /gwt/Spectator.html -startupUrl /gwt/EmbeddedMapAndWindChart -startupUrl /gwt/RaceBoard.html -startupUrl /gwt/RegattaOverview.html -startupUrl /gwt/DataMining.html -startupUrl /gwt/Simulator.html -startupUrl /gwt/VideoPopup.html -startupUrl /gwt/AutoPlay.html -startupUrl /gwt/YoutubePopup.html com.sap.sailing.gwt.home.Home com.sap.sailing.gwt.ui.AdminConsole com.sap.sailing.gwt.ui.PairingList com.sap.sailing.gwt.ui.LeaderboardEditing com.sap.sailing.gwt.ui.Leaderboard com.sap.sailing.gwt.ui.Spectator com.sap.sailing.gwt.ui.EmbeddedMapAndWindChart com.sap.sailing.gwt.ui.RaceBoard com.sap.sailing.gwt.regattaoverview.RegattaOverview com.sap.sailing.gwt.ui.DataMining com.sap.sailing.gwt.ui.Simulator com.sap.sailing.gwt.ui.VideoPopup com.sap.sailing.gwt.ui.YoutubePopup com.sap.sailing.gwt.autoplay.AutoPlay"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-nosuperDevMode -style PRETTY -incremental -war &quot;${project_loc:com.sap.sailing.gwt.ui}&quot; -noserver -remoteUI &quot;${gwt_remote_ui_server_port}:${unique_id}&quot; -logLevel INFO -codeServerPort 9876 -startupUrl /gwt/Home.html -startupUrl /gwt/AdminConsole.html -startupUrl /gwt/PairingList.html -startupUrl /gwt/LeaderboardEditing.html -startupUrl /gwt/Leaderboard.html -startupUrl /gwt/Spectator.html -startupUrl /gwt/EmbeddedMapAndWindChart -startupUrl /gwt/RaceBoard.html -startupUrl /gwt/RegattaOverview.html -startupUrl /gwt/DataMining.html -startupUrl /gwt/Simulator.html -startupUrl /gwt/VideoPopup.html -startupUrl /gwt/AutoPlay.html -startupUrl /gwt/YoutubePopup.html com.sap.sailing.gwt.home.Home com.sap.sailing.gwt.ui.AdminConsole com.sap.sailing.gwt.ui.PairingList com.sap.sailing.gwt.ui.LeaderboardEditing com.sap.sailing.gwt.ui.Leaderboard com.sap.sailing.gwt.ui.Spectator com.sap.sailing.gwt.ui.EmbeddedMapAndWindChart com.sap.sailing.gwt.ui.RaceBoard com.sap.sailing.gwt.regattaoverview.RegattaOverview com.sap.sailing.gwt.ui.DataMining com.sap.sailing.gwt.ui.Simulator com.sap.sailing.gwt.ui.VideoPopup com.sap.sailing.gwt.ui.YoutubePopup com.sap.sailing.gwt.autoplay.AutoPlay"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.sap.sailing.gwt.ui"/>
     <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-XX:+UseG1GC -XX:-UseStringDeduplication -Dgwt.watchFileChanges=false -Xmx2048m -Dgwt-usearchives=false -Dgwt.persistentunitcache=false -Xmx4096m"/>
     <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${project_loc:com.sap.sailing.gwt.ui}/.tmp/gwt-work"/>
diff --git a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
index fa67fa4b290..46ec09606e7 100644
--- a/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.gwt.ui/META-INF/MANIFEST.MF
@@ -83,6 +83,7 @@ Import-Package: javax.servlet;version="3.1.0",
  javax.servlet.http;version="3.1.0",
  javax.ws.rs;version="1.1.1",
  javax.ws.rs.core;version="1.1.1",
+ javax.xml.bind,
  org.json.simple,
  org.json.simple.parser,
  org.osgi.framework,
diff --git a/java/com.sap.sailing.landscape.test/pom.xml b/java/com.sap.sailing.landscape.test/pom.xml
index 0fe1e29dd8f..5b5e1dd1eff 100755
--- a/java/com.sap.sailing.landscape.test/pom.xml
+++ b/java/com.sap.sailing.landscape.test/pom.xml
@@ -15,4 +15,30 @@
   <packaging>eclipse-test-plugin</packaging>
 -->
   <packaging>eclipse-plugin</packaging>
+  <properties>
+    <tycho.plugin-test.skip>false</tycho.plugin-test.skip>
+  </properties>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes>
+            <exclude>**/*.java</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-surefire-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <configuration>
+          <excludes>
+            <test>**/*</test>
+          </excludes>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/java/com.sap.sailing.manage2sail.resultimport.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.manage2sail.resultimport.test/META-INF/MANIFEST.MF
index 12243c3a5ad..3efd6b49aa8 100644
--- a/java/com.sap.sailing.manage2sail.resultimport.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.manage2sail.resultimport.test/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.junit;bundle-version="4.8.2",
  com.sap.sse.common,
  org.mockito.mockito-core;bundle-version="1.9.5",
  org.objenesis;bundle-version="1.3.0",
- org.hamcrest;bundle-version="1.1.0",
+ org.hamcrest;bundle-version="2.2.0",
  com.sap.sse,
  com.sap.sse.replication.interfaces
 Automatic-Module-Name: com.sap.sailing.manage2sail.resultimport.test
diff --git a/java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF
index 4e924ad46a9..a284fdb56e7 100644
--- a/java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.media.persistence.test/META-INF/MANIFEST.MF
@@ -7,12 +7,11 @@ Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.sap.sse.mongodb,
  org.json.simple;bundle-version="1.1.0",
- org.hamcrest.core;bundle-version="1.1.0",
+ org.hamcrest;bundle-version="2.2.0",
  org.junit;bundle-version="4.8.2",
  com.sap.sailing.domain.persistence;bundle-version="1.0.0",
  com.sap.sailing.gwt.ui;bundle-version="1.0.0",
  com.sap.sailing.domain.common;bundle-version="1.0.0",
- org.hamcrest;bundle-version="1.1.0",
  com.sap.sse.common,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
diff --git a/java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
index 177f00001db..9c88eca0691 100644
--- a/java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.mongodb.test/META-INF/MANIFEST.MF
@@ -19,7 +19,7 @@ Require-Bundle: com.sap.sailing.domain,
  com.sap.sailing.domain.swisstimingadapter,
  org.objenesis;bundle-version="1.3.0",
  org.junit;bundle-version="4.8.2",
- org.hamcrest;bundle-version="1.1.0",
+ org.hamcrest;bundle-version="2.2.0",
  org.mockito.mockito-core;bundle-version="1.9.5",
  com.sap.sailing.polars,
  com.sap.sailing.domain.racelogtrackingadapter.testsupport,
diff --git a/java/com.sap.sailing.polars.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.polars.test/META-INF/MANIFEST.MF
index 05ef204dca9..ce3d6cfd7af 100644
--- a/java/com.sap.sailing.polars.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.polars.test/META-INF/MANIFEST.MF
@@ -6,8 +6,7 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Fragment-Host: com.sap.sailing.polars
-Require-Bundle: org.hamcrest;bundle-version="1.1.0",
- org.hamcrest.core;bundle-version="1.1.0",
+Require-Bundle: org.hamcrest;bundle-version="2.2.0",
  org.mockito.mockito-core;bundle-version="1.10.14",
  org.junit;bundle-version="4.8.2",
  com.sap.sailing.domain.test,
diff --git a/java/com.sap.sailing.routeconverterjava11extension/META-INF/MANIFEST.MF b/java/com.sap.sailing.routeconverterjava11extension/META-INF/MANIFEST.MF
index 5adb69d24a1..e0782abcc10 100755
--- a/java/com.sap.sailing.routeconverterjava11extension/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.routeconverterjava11extension/META-INF/MANIFEST.MF
@@ -18,3 +18,6 @@ Import-Package: com.sun.istack,
  javax.xml.bind.helpers,
  javax.xml.bind.util,
  javax.xml.datatype
+Require-Bundle: com.sun.istack.commons-runtime;bundle-version="3.0.7",
+ com.sun.xml.bind.jaxb-impl;bundle-version="2.3.1",
+ jaxb-api;bundle-version="2.3.1"
diff --git a/java/com.sap.sailing.sailti.resultimport.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.sailti.resultimport.test/META-INF/MANIFEST.MF
index f1a67dcaaef..ad7636d27f6 100644
--- a/java/com.sap.sailing.sailti.resultimport.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.sailti.resultimport.test/META-INF/MANIFEST.MF
@@ -11,4 +11,4 @@ Require-Bundle: org.junit;bundle-version="4.12.0",
  org.mockito.mockito-core;bundle-version="1.10.14",
  com.sap.sailing.domain.persistence,
  org.objenesis;bundle-version="2.1.0",
- org.hamcrest;bundle-version="1.1.0"
+ org.hamcrest;bundle-version="2.2.0"
diff --git a/java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF
index 70f214850be..e4ba1d77f55 100644
--- a/java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Bundle-SymbolicName: com.sap.sailing.selenium.test
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.hamcrest;bundle-version="1.1.0",
+Require-Bundle: org.hamcrest;bundle-version="2.2.0",
  org.junit;bundle-version="4.8.2",
  org.openqa.selenium.osgi;bundle-version="3.13.0",
  com.sap.sse.mongodb;bundle-version="1.0.0",
@@ -24,4 +24,5 @@ Automatic-Module-Name: com.sap.sailing.selenium.test
 Import-Package: javax.ws.rs.core;version="1.1.1",
  org.apache.http.client;version="4.5.5",
  org.json.simple,
- org.json.simple.parser
+ org.json.simple.parser,
+ javax.xml.bind
diff --git a/java/com.sap.sailing.selenium.test/pom.xml b/java/com.sap.sailing.selenium.test/pom.xml
index d739a34b12f..f4068b04d94 100755
--- a/java/com.sap.sailing.selenium.test/pom.xml
+++ b/java/com.sap.sailing.selenium.test/pom.xml
@@ -65,6 +65,11 @@
                 <id>com.sap.sse.jersey.jaxbdependencyfragment</id>
                 <versionRange>0.0.0</versionRange>
               </requirement>
+              <requirement>
+                <type>eclipse-plugin</type>
+                <id>com.sap.sse.apacheservicemixfragment</id>
+                <versionRange>0.0.0</versionRange>
+              </requirement>
             </extraRequirements>
           </dependency-resolution>
         </configuration>
diff --git a/java/com.sap.sailing.server.gateway.serialization.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.gateway.serialization.test/META-INF/MANIFEST.MF
index 7c9b1151406..4878ff39c99 100644
--- a/java/com.sap.sailing.server.gateway.serialization.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.server.gateway.serialization.test/META-INF/MANIFEST.MF
@@ -13,8 +13,8 @@ Require-Bundle: com.sap.sailing.domain;bundle-version="1.0.0",
  com.sap.sailing.domain.shared.android,
  org.json.simple,
  org.mockito.mockito-core;bundle-version="1.9.5",
- org.hamcrest;bundle-version="1.1.0",
  org.objenesis;bundle-version="1.3.0",
  com.sap.sse.common,
  com.sap.sse.shared.android,
- com.sap.sse.security.common
+ com.sap.sse.security.common,
+ org.hamcrest;bundle-version="2.2.0"
diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/FlatSmartphoneUuidAndGPSFixMovingJsonDeserializerTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/FlatSmartphoneUuidAndGPSFixMovingJsonDeserializerTest.java
index a71495f435b..392ef34859a 100644
--- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/FlatSmartphoneUuidAndGPSFixMovingJsonDeserializerTest.java
+++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/FlatSmartphoneUuidAndGPSFixMovingJsonDeserializerTest.java
@@ -20,7 +20,6 @@ import com.sap.sse.common.Util.Pair;
 import com.sap.sse.shared.json.JsonDeserializationException;
 import com.sap.sse.shared.json.JsonDeserializer;
 
-
 public class FlatSmartphoneUuidAndGPSFixMovingJsonDeserializerTest {
     @Test
     public void deserialize() throws JsonDeserializationException, ParseException {
diff --git a/java/com.sap.sailing.server.gateway.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.gateway.test/META-INF/MANIFEST.MF
index 74ca5313b70..8e1388631a4 100644
--- a/java/com.sap.sailing.server.gateway.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.server.gateway.test/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Fragment-Host: com.sap.sailing.server.gateway
 Require-Bundle: org.mockito.mockito-core;bundle-version="1.9.5",
  com.sap.sailing.domain.test,
- org.hamcrest;bundle-version="1.1.0",
+ org.hamcrest;bundle-version="2.2.0",
  org.objenesis;bundle-version="1.3.0",
  org.junit;bundle-version="4.8.2",
  com.sap.sailing.domain.racelogtrackingadapter.testsupport,
diff --git a/java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
index 8bc3ac17f6a..de82f728046 100644
--- a/java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
@@ -20,7 +20,7 @@ Require-Bundle: com.sap.sailing.server,
  com.sap.sailing.domain.swisstimingadapter,
  org.json.simple;bundle-version="1.1.0",
  org.junit;bundle-version="4.8.2",
- org.hamcrest;bundle-version="1.1.0",
+ org.hamcrest;bundle-version="2.2.0",
  com.sap.sailing.polars,
  com.sap.sse.common,
  org.mockito.mockito-core;bundle-version="1.9.5",
diff --git a/java/com.sap.sailing.server.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.test/META-INF/MANIFEST.MF
index eee41f7283b..f0c1578c595 100644
--- a/java/com.sap.sailing.server.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.server.test/META-INF/MANIFEST.MF
@@ -15,7 +15,7 @@ Require-Bundle: com.sap.sailing.domain,
  com.sap.sse.operationaltransformation,
  com.sap.sse.mongodb,
  com.tractrac.clientmodule;bundle-version="2.0.0",
- org.hamcrest;bundle-version="1.1.0",
+ org.hamcrest;bundle-version="2.2.0",
  org.junit;bundle-version="4.8.2",
  com.sap.sailing.domain.test,
  org.mockito.mockito-core;bundle-version="1.10.14",
diff --git a/java/com.sap.sailing.server.trackfiles.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.trackfiles.test/META-INF/MANIFEST.MF
index a3abbd9efe4..1fa6b53e5d6 100755
--- a/java/com.sap.sailing.server.trackfiles.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.server.trackfiles.test/META-INF/MANIFEST.MF
@@ -19,10 +19,11 @@ Require-Bundle: com.tractrac.clientmodule;bundle-version="2.0.0",
  com.sap.sse.common,
  com.sap.sse.security.common,
  com.sap.sailing.domain.shared.android
-Import-Package:  javax.xml.bind,
- com.sun.istack,
+Import-Package: com.sun.istack,
  com.sun.istack.localization,
  com.sun.istack.logging,
+ javax.activation;version="1.2.0",
+ javax.xml.bind,
  org.json.simple,
  org.json.simple.parser
 Automatic-Module-Name: com.sap.sailing.server.trackfiles.test
diff --git a/java/com.sap.sailing.server.trackfiles.test/pom.xml b/java/com.sap.sailing.server.trackfiles.test/pom.xml
index d34d14bb3e3..65cb08fe92d 100644
--- a/java/com.sap.sailing.server.trackfiles.test/pom.xml
+++ b/java/com.sap.sailing.server.trackfiles.test/pom.xml
@@ -9,4 +9,23 @@
   </parent>
   <artifactId>com.sap.sailing.server.trackfiles.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
+  <build>
+    <plugins>
+      <plugin>
+       <groupId>org.eclipse.tycho</groupId>
+       <artifactId>target-platform-configuration</artifactId>
+       <configuration>
+         <dependency-resolution>
+           <extraRequirements>
+               <requirement>
+                   <type>eclipse-plugin</type>
+                    <id>com.sap.sailing.routeconverterjava11extension</id>
+                    <versionRange>0.0.0</versionRange>
+               </requirement>
+           </extraRequirements>
+         </dependency-resolution>
+       </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/java/com.sap.sailing.server.trackfiles/META-INF/MANIFEST.MF b/java/com.sap.sailing.server.trackfiles/META-INF/MANIFEST.MF
index f9b9c5018b9..b7f8cd11977 100644
--- a/java/com.sap.sailing.server.trackfiles/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.server.trackfiles/META-INF/MANIFEST.MF
@@ -15,13 +15,20 @@ Require-Bundle:
  routeconverter,
  com.sap.sse.common,
  com.sap.sse,
- com.sun.xml.bind.jaxb-impl;bundle-version="2.3.0"
+ com.sun.xml.bind.jaxb-impl;bundle-version="2.3.1",
+ jaxb-api;bundle-version="2.3.1"
 Import-Package: com.sap.sailing.domain.abstractlog,
  com.sap.sailing.domain.abstractlog.regatta.events,
  com.sap.sailing.domain.abstractlog.regatta.events.impl,
  com.sap.sailing.domain.common.sensordata,
  com.sap.sailing.domain.racelogtracking,
  com.sap.sse.security.shared,
+ javax.xml.bind;version="2.3.0",
+ javax.xml.bind.annotation;version="2.3.0",
+ javax.xml.bind.annotation.adapters;version="2.3.0",
+ javax.xml.bind.attachment;version="2.3.0",
+ javax.xml.bind.helpers;version="2.3.0",
+ javax.xml.bind.util;version="2.3.0",
  org.osgi.framework;version="1.7.0"
 Bundle-Activator: com.sap.sailing.server.trackfiles.impl.Activator
 Automatic-Module-Name: com.sap.sailing.server.trackfiles
diff --git a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
index eff9d1f7ad7..b527a4f2c0d 100755
--- a/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
+++ b/java/com.sap.sailing.targetplatform/definitions/race-analysis-p2-remote.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="Race Analysis Target" sequenceNumber="199">
+<target name="Race Analysis Target" sequenceNumber="210">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="javax.ws.rs" version="1.1.1.v20130318-1750"/>
@@ -31,15 +31,13 @@
 <unit id="com.google.gson.source" version="2.8.9.v20220111-1409"/>
 <unit id="org.junit" version="4.13.2.v20211018-1956"/>
 <unit id="org.junit.source" version="4.13.2.v20211018-1956"/>
+<unit id="org.hamcrest" version="2.2.0.v20210711-0821"/>
+<unit id="org.hamcrest.source" version="2.2.0.v20210711-0821"/>
+<unit id="org.objenesis" version="2.6.0.v20180420-1519"/>
+<unit id="org.objenesis.source" version="2.6.0.v20180420-1519"/>
 <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220531185310/repository"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
-<unit id="org.hamcrest.core" version="1.3.0.v20180420-1519"/>
-<unit id="org.hamcrest.generator" version="1.3.0.v201305210900"/>
-<unit id="org.hamcrest.integration" version="1.3.0.v201305210900"/>
-<unit id="org.hamcrest.library" version="1.3.0.v20180524-2246"/>
-<unit id="org.hamcrest.text" version="1.1.0.v20090501071000"/>
 <unit id="com.sun.jersey" version="1.17.0.v201503170330"/>
 <unit id="com.sun.jersey.source" version="1.17.0.v201503170330"/>
 <unit id="javax.validation" version="1.0.0.GA_v201205091237"/>
@@ -49,6 +47,7 @@
 <unit id="javax.xml.bind.source" version="2.2.0.v201105210648"/>
 <unit id="javax.xml.stream" version="1.0.1.v201004272200"/>
 <unit id="javax.xml.ws" version="2.1.0.v200902101523"/>
+<unit id="javax.xml.soap" version="1.2.0.v201005080501"/>
 <unit id="org.apache.commons.codec" version="1.10.0.v20180409-1845"/>
 <unit id="org.apache.commons.codec.source" version="1.10.0.v20180409-1845"/>
 <unit id="org.apache.commons.collections" version="3.2.2.v201511171945"/>
@@ -171,6 +170,7 @@
 <plugin id="jaxb-api"/>
 <plugin id="javax.xml.stream"/>
 <plugin id="javax.xml.ws"/>
+<plugin id="javax.xml.soap"/>
 <plugin id="jcl.over.slf4j"/>
 <plugin id="jul.to.slf4j"/>
 <plugin id="lz4-java"/>
@@ -283,10 +283,7 @@
 <plugin id="org.eclipse.osgi.services"/>
 <plugin id="org.eclipse.osgi.services.source"/>
 <plugin id="org.hamcrest"/>
-<plugin id="org.hamcrest.core"/>
-<plugin id="org.hamcrest.integration"/>
-<plugin id="org.hamcrest.library"/>
-<plugin id="org.hamcrest.text"/>
+<plugin id="org.hamcrest.source"/>
 <plugin id="org.hyperic.sigar"/>
 <plugin id="org.junit"/>
 <plugin id="org.junit.source"/>
@@ -299,6 +296,7 @@
 <plugin id="org.mongodb.driver-sync"/>
 <plugin id="org.mongodb.driver-sync.source"/>
 <plugin id="org.objenesis"/>
+<plugin id="org.objenesis.source"/>
 <plugin id="routeconverter"/>
 <plugin id="slf4j.api"/>
 <plugin id="com.chargebee.chargebee-java"/>
diff --git a/java/com.sap.sailing.yachtscoring.resultimport.test/META-INF/MANIFEST.MF b/java/com.sap.sailing.yachtscoring.resultimport.test/META-INF/MANIFEST.MF
index f325ab37772..ba49fea792f 100644
--- a/java/com.sap.sailing.yachtscoring.resultimport.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.yachtscoring.resultimport.test/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.junit;bundle-version="4.8.2",
  com.sap.sse.common,
  org.mockito.mockito-core;bundle-version="1.9.5",
  org.objenesis;bundle-version="1.3.0",
- org.hamcrest;bundle-version="1.1.0",
+ org.hamcrest;bundle-version="2.2.0",
  com.sap.sse,
  com.sap.sailing.server,
  com.sap.sailing.server.interface,
diff --git a/java/com.sap.sse.apacheservicemixfragment/.classpath b/java/com.sap.sse.apacheservicemixfragment/.classpath
new file mode 100644
index 00000000000..bc3587db485
--- /dev/null
+++ b/java/com.sap.sse.apacheservicemixfragment/.classpath
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/java/com.sap.sse.apacheservicemixfragment/.project b/java/com.sap.sse.apacheservicemixfragment/.project
new file mode 100644
index 00000000000..3d180c0be1f
--- /dev/null
+++ b/java/com.sap.sse.apacheservicemixfragment/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.sap.sse.apacheservicemixfragment</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/java/com.sap.sse.apacheservicemixfragment/.settings/org.eclipse.core.resources.prefs b/java/com.sap.sse.apacheservicemixfragment/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..99f26c0203a
--- /dev/null
+++ b/java/com.sap.sse.apacheservicemixfragment/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/java/com.sap.sse.apacheservicemixfragment/.settings/org.eclipse.jdt.core.prefs b/java/com.sap.sse.apacheservicemixfragment/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..01b22191a18
--- /dev/null
+++ b/java/com.sap.sse.apacheservicemixfragment/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,10 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/java/com.sap.sse.apacheservicemixfragment/META-INF/MANIFEST.MF b/java/com.sap.sse.apacheservicemixfragment/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..5f4fad3b005
--- /dev/null
+++ b/java/com.sap.sse.apacheservicemixfragment/META-INF/MANIFEST.MF
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Apacheservicemixfragment
+Bundle-SymbolicName: com.sap.sse.apacheservicemixfragment
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: SAP
+Fragment-Host: org.apache.servicemix.bundles.zxing;bundle-version="3.1.0"
+Automatic-Module-Name: com.sap.sse.apacheservicemixfragment
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Require-Bundle: com.sun.xml.bind.jaxb-impl;bundle-version="2.3.1",
+ jaxb-api;bundle-version="2.3.1"
diff --git a/java/com.sap.sse.apacheservicemixfragment/build.properties b/java/com.sap.sse.apacheservicemixfragment/build.properties
new file mode 100644
index 00000000000..7594fab8d59
--- /dev/null
+++ b/java/com.sap.sse.apacheservicemixfragment/build.properties
@@ -0,0 +1,2 @@
+bin.includes = META-INF/,\
+               .
diff --git a/java/com.sap.sse.apacheservicemixfragment/pom.xml b/java/com.sap.sse.apacheservicemixfragment/pom.xml
new file mode 100644
index 00000000000..9de18786e0d
--- /dev/null
+++ b/java/com.sap.sse.apacheservicemixfragment/pom.xml
@@ -0,0 +1,13 @@
+<?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>
+        <artifactId>root</artifactId>
+        <groupId>com.sap.sailing</groupId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+    <artifactId>com.sap.sse.apacheservicemixfragment</artifactId>
+    <packaging>eclipse-plugin</packaging>
+</project>
diff --git a/java/com.sap.sse.common.test/META-INF/MANIFEST.MF b/java/com.sap.sse.common.test/META-INF/MANIFEST.MF
index d22960efac4..81cc1b8054d 100644
--- a/java/com.sap.sse.common.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.common.test/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Vendor: SAP
 Fragment-Host: com.sap.sse.common
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.mockito.mockito-core;bundle-version="1.9.5",
- org.hamcrest;bundle-version="1.1.0",
+ org.hamcrest;bundle-version="2.2.0",
  org.objenesis;bundle-version="1.3.0",
  org.junit;bundle-version="4.8.2"
 Export-Package: com.sap.sse.common.test
diff --git a/java/com.sap.sse.datamining.test/META-INF/MANIFEST.MF b/java/com.sap.sse.datamining.test/META-INF/MANIFEST.MF
index b597167e46f..b78df2cf24a 100644
--- a/java/com.sap.sse.datamining.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.datamining.test/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Fragment-Host: com.sap.sse.datamining
-Require-Bundle: org.hamcrest;bundle-version="1.1.0",
+Require-Bundle: org.hamcrest;bundle-version="2.2.0",
  org.mockito.mockito-core;bundle-version="1.9.5",
  com.sap.sse.datamining.annotations;bundle-version="1.0.0",
  com.sap.sailing.datamining
diff --git a/java/com.sap.sse.datamining.ui/pom.xml b/java/com.sap.sse.datamining.ui/pom.xml
index dc2e4f67b75..e7b6140b13c 100644
--- a/java/com.sap.sse.datamining.ui/pom.xml
+++ b/java/com.sap.sse.datamining.ui/pom.xml
@@ -58,10 +58,13 @@
 			<artifactId>gwt-user</artifactId>
 			<version>${gwt.version}</version>
 		</dependency>
+		<!-- try without gwt-dev dependency; it hurts on Java 11 because it bundles org.xml.sax and javax.xml.parsers
+		     which are part of the JDK
 		<dependency>
 			<groupId>org.gwtproject</groupId>
 			<artifactId>gwt-dev</artifactId>
 			<version>${gwt.version}</version>
 		</dependency>
+		-->
 	</dependencies>
 </project>
diff --git a/java/com.sap.sse.feature.runtime/feature.xml b/java/com.sap.sse.feature.runtime/feature.xml
index 554054e52d1..eb43a4c9c95 100644
--- a/java/com.sap.sse.feature.runtime/feature.xml
+++ b/java/com.sap.sse.feature.runtime/feature.xml
@@ -688,6 +688,13 @@
          version="2.1.0.v200902101523"
          unpack="false"/>
 
+   <plugin
+         id="javax.xml.soap"
+         download-size="0"
+         install-size="0"
+         version="1.2.0.v201005080501"
+         unpack="false"/>
+
    <plugin
          id="org.eclipse.osgi.util"
          download-size="0"
diff --git a/java/com.sap.sse.feature/feature.xml b/java/com.sap.sse.feature/feature.xml
index d323feed9d1..40ef3d68f8c 100755
--- a/java/com.sap.sse.feature/feature.xml
+++ b/java/com.sap.sse.feature/feature.xml
@@ -276,4 +276,12 @@ Computes leaderboard information for sailing races and offers RESTful APIs to al
          version="0.0.0"
          unpack="false"/>
 
+   <plugin
+         id="com.sap.sse.apacheservicemixfragment"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
 </feature>
diff --git a/java/com.sap.sse.filestorage.test/META-INF/MANIFEST.MF b/java/com.sap.sse.filestorage.test/META-INF/MANIFEST.MF
index 68c41aa2f5a..d79ee7b516d 100644
--- a/java/com.sap.sse.filestorage.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.filestorage.test/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Fragment-Host: com.sap.sse.filestorage
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.hamcrest;bundle-version="1.1.0",
+Require-Bundle: org.hamcrest;bundle-version="2.2.0",
  org.junit;bundle-version="4.8.2",
  org.apache.commons.io;bundle-version="2.2.0",
  com.sap.sse.replication.testsupport,
diff --git a/java/com.sap.sse.filestorage/META-INF/MANIFEST.MF b/java/com.sap.sse.filestorage/META-INF/MANIFEST.MF
index 86958b47671..fc7d7442c95 100644
--- a/java/com.sap.sse.filestorage/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.filestorage/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@ Import-Package: com.sap.sse.security.shared,
  org.osgi.framework;version="1.8.0",
  org.osgi.util.tracker;version="1.5.1"
 Bundle-Activator: com.sap.sse.filestorage.impl.Activator
-Require-Bundle: com.amazon.aws.aws-java-api,
+Require-Bundle: com.amazon.aws.aws-java-api;bundle-version="2.18.8",
  com.sap.sse.common,
  com.sap.sse.mongodb,
  com.sap.sse.replication.interfaces,
diff --git a/java/com.sap.sse.gwt.test/pom.xml b/java/com.sap.sse.gwt.test/pom.xml
index 8c7446fb42e..b4769bca323 100644
--- a/java/com.sap.sse.gwt.test/pom.xml
+++ b/java/com.sap.sse.gwt.test/pom.xml
@@ -9,6 +9,8 @@
   </parent>
   <artifactId>com.sap.sse.gwt.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
+  <!-- try without gwt-dev dependency because it contains packages offered by the JDK, such
+       as javax.xml.parser and org.xml.sax
   <dependencies>
     <dependency>
       <groupId>org.gwtproject</groupId>
@@ -16,4 +18,5 @@
       <version>${gwt.version}</version>
     </dependency>
   </dependencies>
+  -->
 </project>
diff --git a/java/com.sap.sse.gwt/META-INF/MANIFEST.MF b/java/com.sap.sse.gwt/META-INF/MANIFEST.MF
index 1367330dcf9..b29b005235c 100644
--- a/java/com.sap.sse.gwt/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.gwt/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.google.gwt.user;bundle-version="2.10.0";resolution:=optional,
- com.google.gwt.dev;bundle-version="2.10.0";resolution:=optional,
  com.google.gwt.servlet;bundle-version="2.10.0",
  com.sap.sse.common,
  com.sap.sse.filestorage,
diff --git a/java/com.sap.sse.gwt/pom.xml b/java/com.sap.sse.gwt/pom.xml
index 778386355c7..ac21e8a579b 100644
--- a/java/com.sap.sse.gwt/pom.xml
+++ b/java/com.sap.sse.gwt/pom.xml
@@ -16,14 +16,6 @@
       <version>${project.version}</version>
       <classifier>sources</classifier>
     </dependency>
-<!--
-    <dependency>
-      <groupId>com.sap.sailing</groupId>
-      <artifactId>elemental2</artifactId>
-      <version>1.1.0-SNAPSHOT</version>
-      <classifier>sources</classifier>
-    </dependency>
--->
     <dependency>
       <groupId>com.google.elemental2</groupId>
       <artifactId>elemental2-core</artifactId>
@@ -45,6 +37,24 @@
   </dependencies>
   <build>
     <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-compiler-plugin</artifactId>
+        <version>${tycho-version}</version>
+        <configuration>
+          <excludes>
+            <exclude>**/jre/**/*.java</exclude>
+          </excludes>
+          <extraClasspathElements>
+            <!-- gwt-dev is required during build-time for building and using the special manifest linker -->
+            <dependency>
+              <groupId>org.gwtproject</groupId>
+              <artifactId>gwt-dev</artifactId>
+              <version>${gwt.version}</version>
+            </dependency>
+          </extraClasspathElements>
+        </configuration>
+      </plugin>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
         <artifactId>tycho-source-plugin</artifactId>
diff --git a/java/com.sap.sse.jersey.jaxbdependencyfragment/META-INF/MANIFEST.MF b/java/com.sap.sse.jersey.jaxbdependencyfragment/META-INF/MANIFEST.MF
index d9288b17682..01412121662 100755
--- a/java/com.sap.sse.jersey.jaxbdependencyfragment/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.jersey.jaxbdependencyfragment/META-INF/MANIFEST.MF
@@ -7,4 +7,5 @@ Bundle-Vendor: SAP
 Fragment-Host: com.sun.jersey
 Automatic-Module-Name: com.sap.sse.jersey.jaxbdependencyfragment
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: com.sun.xml.bind.jaxb-impl;bundle-version="2.3.0"
+Require-Bundle: com.sun.xml.bind.jaxb-impl;bundle-version="2.3.1",
+ jaxb-api;bundle-version="2.3.1"
diff --git a/java/com.sap.sse.landscape.aws.test/META-INF/MANIFEST.MF b/java/com.sap.sse.landscape.aws.test/META-INF/MANIFEST.MF
index c291da2e37b..842425a9b6d 100755
--- a/java/com.sap.sse.landscape.aws.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.landscape.aws.test/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Vendor: SAP
 Fragment-Host: com.sap.sse.landscape.aws
 Automatic-Module-Name: com.sap.sse.landscape.aws.test
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.hamcrest;bundle-version="1.1.0",
+Require-Bundle: org.hamcrest;bundle-version="2.2.0",
  org.junit;bundle-version="4.8.2",
  org.objenesis;bundle-version="2.1.0",
  com.sap.sailing.landscape,
diff --git a/java/com.sap.sse.landscape.aws.test/pom.xml b/java/com.sap.sse.landscape.aws.test/pom.xml
index 45f527dacee..9ef6186b243 100755
--- a/java/com.sap.sse.landscape.aws.test/pom.xml
+++ b/java/com.sap.sse.landscape.aws.test/pom.xml
@@ -12,4 +12,7 @@
   <packaging>eclipse-test-plugin</packaging>
 -->
   <packaging>eclipse-plugin</packaging>
+  <properties>
+    <tycho.plugin-test.skip>true</tycho.plugin-test.skip>
+  </properties>
 </project>
diff --git a/java/com.sap.sse.mail.replication.test/META-INF/MANIFEST.MF b/java/com.sap.sse.mail.replication.test/META-INF/MANIFEST.MF
index 3eadecea3ab..66bda7b2966 100644
--- a/java/com.sap.sse.mail.replication.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.mail.replication.test/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Fragment-Host: com.sap.sse.mail
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.hamcrest;bundle-version="1.1.0",
+Require-Bundle: org.hamcrest;bundle-version="2.2.0",
  org.junit;bundle-version="4.8.2",
  com.rabbitmq.client,
  com.sap.sse.replication.testsupport,
diff --git a/java/com.sap.sse.mail.replication.test/pom.xml b/java/com.sap.sse.mail.replication.test/pom.xml
index eb287b53335..1a99f7d57d0 100755
--- a/java/com.sap.sse.mail.replication.test/pom.xml
+++ b/java/com.sap.sse.mail.replication.test/pom.xml
@@ -9,5 +9,5 @@
 		<version>1.0.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>com.sap.sse.mail.replication.test</artifactId>
-	<packaging>eclipse-plugin</packaging>
+	<packaging>eclipse-test-plugin</packaging>
 </project>
diff --git a/java/com.sap.sse.mail.replication.testsupport/META-INF/MANIFEST.MF b/java/com.sap.sse.mail.replication.testsupport/META-INF/MANIFEST.MF
index 8c148057521..015eabde56b 100644
--- a/java/com.sap.sse.mail.replication.testsupport/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.mail.replication.testsupport/META-INF/MANIFEST.MF
@@ -10,10 +10,10 @@ Require-Bundle: com.sap.sse.replication,
  com.sap.sse.mail,
  com.sap.sse,
  com.sap.sse.common,
- org.hamcrest;bundle-version="1.1.0",
  org.junit;bundle-version="4.8.2",
  org.mockito.mockito-core;bundle-version="1.10.14",
  com.sun.mail.javax.mail;bundle-version="1.4.5",
  com.sap.sse.replication.interfaces;bundle-version="1.0.0"
 Export-Package: com.sap.sse.mail.replication.testsupport
+Import-Package: org.hamcrest;version="2.2.0"
 Automatic-Module-Name: com.sap.sse.mail.replication.testsupport
diff --git a/java/com.sap.sse.replication.testsupport/META-INF/MANIFEST.MF b/java/com.sap.sse.replication.testsupport/META-INF/MANIFEST.MF
index ca1313aa931..a358a72fb27 100644
--- a/java/com.sap.sse.replication.testsupport/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.replication.testsupport/META-INF/MANIFEST.MF
@@ -5,19 +5,18 @@ Bundle-SymbolicName: com.sap.sse.replication.testsupport
 Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.junit;bundle-version="4.8.2",
+Require-Bundle: org.junit;bundle-version="4.13.2",
  com.sap.sse.replication,
  com.sap.sse.common,
  com.rabbitmq.client;bundle-version="2.8.4",
  lz4-java;bundle-version="1.3.0",
  com.sap.sse.replication.interfaces;bundle-version="1.0.0",
- org.apache.shiro.core
+ org.apache.shiro.core,
+ org.hamcrest;bundle-version="2.2.0",
+ org.mockito.mockito-core;bundle-version="1.10.14"
 Export-Package: com.sap.sse.replication.testsupport
 Automatic-Module-Name: com.sap.sse.replication.testsupport
 Import-Package: javax.servlet;version="3.1.0",
  javax.servlet.http;version="3.1.0",
- org.mockito;version="1.10.14",
- org.mockito.invocation;version="1.10.14",
- org.mockito.mock;version="1.10.14",
- org.mockito.stubbing;version="1.10.14",
+ org.objenesis;version="2.6.0",
  org.osgi.util.tracker;version="1.5.1"
diff --git a/java/com.sap.sse.security.persistence.test/META-INF/MANIFEST.MF b/java/com.sap.sse.security.persistence.test/META-INF/MANIFEST.MF
index fbc90beb310..7fe55251eec 100755
--- a/java/com.sap.sse.security.persistence.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.security.persistence.test/META-INF/MANIFEST.MF
@@ -11,5 +11,5 @@ Import-Package: org.apache.shiro.session;version="1.2.2",
  org.apache.shiro.session.mgt;version="1.2.2",
  org.apache.shiro.subject;version="1.2.2",
  org.junit
-Require-Bundle: org.hamcrest;bundle-version="1.1.0",
+Require-Bundle: org.hamcrest;bundle-version="2.2.0",
  slf4j.api;bundle-version="1.6.4"
diff --git a/java/com.sap.sse.security.replication.test/META-INF/MANIFEST.MF b/java/com.sap.sse.security.replication.test/META-INF/MANIFEST.MF
index d6cd0dfe775..6d2de18c1fe 100644
--- a/java/com.sap.sse.security.replication.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.security.replication.test/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Fragment-Host: com.sap.sse.security
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.hamcrest;bundle-version="1.1.0",
+Require-Bundle: org.hamcrest;bundle-version="2.2.0",
  org.junit;bundle-version="4.8.2",
  com.sap.sse.security.userstore.mongodb,
  com.sap.sse.mongodb,
diff --git a/java/com.sap.sse.security.test/META-INF/MANIFEST.MF b/java/com.sap.sse.security.test/META-INF/MANIFEST.MF
index c8a26ee97f3..d3ee52d5b62 100755
--- a/java/com.sap.sse.security.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.security.test/META-INF/MANIFEST.MF
@@ -16,7 +16,7 @@ Require-Bundle: org.junit;bundle-version="4.8.2",
  jcl.over.slf4j;bundle-version="1.6.4",
  org.mockito.mockito-core;bundle-version="1.10.14",
  org.objenesis;bundle-version="2.1.0",
- org.hamcrest;bundle-version="1.1.0",
+ org.hamcrest;bundle-version="2.2.0",
  com.sap.sailing.domain.common,
  org.mongodb.bson;bundle-version="4.3.1",
  org.mongodb.driver-core;bundle-version="4.3.1",
diff --git a/java/com.sap.sse.security.testsupport/META-INF/MANIFEST.MF b/java/com.sap.sse.security.testsupport/META-INF/MANIFEST.MF
index 2f2d4e5d18f..4f6eee94d31 100755
--- a/java/com.sap.sse.security.testsupport/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.security.testsupport/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@ Bundle-Vendor: SAP
 Automatic-Module-Name: com.sap.sse.security.testsupport
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: com.sap.sse.security,
+ org.hamcrest;bundle-version="2.2.0",
  org.mockito.mockito-core;bundle-version="1.10.14",
  com.sap.sse.common
 Export-Package: com.sap.sse.security.testsupport
diff --git a/java/com.sap.sse.shared.android.test/META-INF/MANIFEST.MF b/java/com.sap.sse.shared.android.test/META-INF/MANIFEST.MF
index 9e855fb198a..bfec78c6484 100644
--- a/java/com.sap.sse.shared.android.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.shared.android.test/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Vendor: SAP
 Fragment-Host: com.sap.sse.shared.android
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.mockito.mockito-core;bundle-version="1.9.5",
- org.hamcrest;bundle-version="1.1.0",
+ org.hamcrest;bundle-version="2.2.0",
  org.objenesis;bundle-version="1.3.0",
  org.junit;bundle-version="4.8.2"
 Export-Package: com.sap.sse.shared.android.test
diff --git a/java/com.sap.sse.test/META-INF/MANIFEST.MF b/java/com.sap.sse.test/META-INF/MANIFEST.MF
index e2e493dd913..d104c040ee0 100644
--- a/java/com.sap.sse.test/META-INF/MANIFEST.MF
+++ b/java/com.sap.sse.test/META-INF/MANIFEST.MF
@@ -8,3 +8,4 @@ Fragment-Host: com.sap.sse
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.8.2"
 Automatic-Module-Name: com.sap.sse.test
+Import-Package: javax.xml.bind
diff --git a/java/com.sap.sse.test/pom.xml b/java/com.sap.sse.test/pom.xml
index 26c8a069929..93fbdbbcfb3 100644
--- a/java/com.sap.sse.test/pom.xml
+++ b/java/com.sap.sse.test/pom.xml
@@ -9,4 +9,24 @@
   </parent>
   <artifactId>com.sap.sse.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>target-platform-configuration</artifactId>
+        <version>${tycho-version}</version>
+        <configuration>
+          <dependency-resolution>
+            <extraRequirements>
+              <requirement>
+                <type>eclipse-plugin</type>
+                <id>com.sap.sse.apacheservicemixfragment</id>
+                <versionRange>0.0.0</versionRange>
+              </requirement>
+            </extraRequirements>
+          </dependency-resolution>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>
diff --git a/java/com.tractrac.clientmodule/META-INF/MANIFEST.MF b/java/com.tractrac.clientmodule/META-INF/MANIFEST.MF
index 950dce3bfd9..8d53cefe19e 100644
--- a/java/com.tractrac.clientmodule/META-INF/MANIFEST.MF
+++ b/java/com.tractrac.clientmodule/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: TracTrac Client module
 Bundle-SymbolicName: com.tractrac.clientmodule
 Bundle-Version: 3.14.2
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ClassPath: .,
  lib/TracAPI.jar
 Export-Package: com.tractrac.asio.lib.api,
@@ -41,6 +41,7 @@ Export-Package: com.tractrac.asio.lib.api,
  com.tractrac.dataflow.lib.prov.stored.tcp.put,
  com.tractrac.dataflow.lib.spi,
  com.tractrac.dataflow.lib.spi.authentication,
+ com.tractrac.datatypes.lib.api,
  com.tractrac.datatypes.lib.api.sensor,
  com.tractrac.model.lib.api,
  com.tractrac.model.lib.api.attachment,
@@ -57,6 +58,7 @@ Export-Package: com.tractrac.asio.lib.api,
  com.tractrac.model.lib.impl.event.json,
  com.tractrac.model.lib.impl.metadata,
  com.tractrac.model.lib.impl.route,
+ com.tractrac.model.lib.impl.sensor,
  com.tractrac.model.lib.impl.spatial,
  com.tractrac.model.server.lib.api,
  com.tractrac.model.server.lib.api.cache,
@@ -64,7 +66,10 @@ Export-Package: com.tractrac.asio.lib.api,
  com.tractrac.model.server.lib.api.controlpassing,
  com.tractrac.model.server.lib.api.devices,
  com.tractrac.model.server.lib.api.gms,
+ com.tractrac.model.server.lib.api.group,
+ com.tractrac.model.server.lib.api.incidents,
  com.tractrac.model.server.lib.api.loype,
+ com.tractrac.model.server.lib.api.maneuver,
  com.tractrac.model.server.lib.api.notifier,
  com.tractrac.model.server.lib.api.position,
  com.tractrac.model.server.lib.api.raceobject,
@@ -87,6 +92,7 @@ Export-Package: com.tractrac.asio.lib.api,
  com.tractrac.subscription.lib.impl.io,
  com.tractrac.subscription.lib.impl.io.controllers,
  com.tractrac.subscription.lib.impl.io.receivers,
+ com.tractrac.subscription.lib.impl.mtb,
  com.tractrac.subscription.lib.impl.race,
  com.tractrac.subscription.lib.impl.ws,
  com.tractrac.util.lib.api,
@@ -108,8 +114,17 @@ Export-Package: com.tractrac.asio.lib.api,
  com.tractrac.util.lib.impl.autolog.multiple,
  com.tractrac.util.lib.impl.autolog.println,
  com.tractrac.util.lib.impl.classloader,
+ com.tractrac.util.lib.impl.collection,
  com.tractrac.util.lib.impl.http,
- com.tractrac.util.lib.impl.programparameters
+ com.tractrac.util.lib.impl.programparameters,
+ com.tractrac.util.lib.impl.search,
+ com.tractrac.util.lib.impl.selector,
+ com.tractrac.util.lib.impl.serialize,
+ com.tractrac.util.server.lib,
+ com.tractrac.util.server.lib.incidents,
+ com.tractrac.util.server.lib.incidents.alarm,
+ com.tractrac.util.server.lib.monitor,
+ com.tractrac.util.server.lib.parser
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: TracTrac
 Import-Package: org.osgi.framework
diff --git a/java/org.hamcrest.core/.classpath b/java/org.hamcrest.core/.classpath
new file mode 100644
index 00000000000..e801ebfb468
--- /dev/null
+++ b/java/org.hamcrest.core/.classpath
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/java/org.hamcrest.core/.project b/java/org.hamcrest.core/.project
new file mode 100644
index 00000000000..144281e1ae3
--- /dev/null
+++ b/java/org.hamcrest.core/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.hamcrest.core</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/java/org.hamcrest.core/.settings/org.eclipse.core.resources.prefs b/java/org.hamcrest.core/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 00000000000..99f26c0203a
--- /dev/null
+++ b/java/org.hamcrest.core/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/java/org.hamcrest.core/.settings/org.eclipse.jdt.core.prefs b/java/org.hamcrest.core/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..c9545f06a41
--- /dev/null
+++ b/java/org.hamcrest.core/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,9 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
+org.eclipse.jdt.core.compiler.compliance=11
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
diff --git a/java/org.hamcrest.core/META-INF/MANIFEST.MF b/java/org.hamcrest.core/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..110e49cb072
--- /dev/null
+++ b/java/org.hamcrest.core/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.hamcrest.core
+Bundle-SymbolicName: org.hamcrest.core
+Bundle-Version: 2.2.0
+Require-Bundle: org.hamcrest;bundle-version="2.2.0";visibility:=reexport
+Automatic-Module-Name: org.hamcrest.core
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/java/org.hamcrest.core/README b/java/org.hamcrest.core/README
new file mode 100644
index 00000000000..0ebac163923
--- /dev/null
+++ b/java/org.hamcrest.core/README
@@ -0,0 +1,15 @@
+This project is our answer to the set of org.hamcrest problems with junit-4.13.2 and the split package
+"org.hamcrest" to which two bundles, org.hamcrest.core-1.3.0 and org.hamcrest.library-1.3.0, both make
+contributions in the pre-2.x Hamcrest version. This leads to problems with Tycho 2.7.x which seems to
+be unable to handle split packages properly.
+
+But using the bundle org.hamcrest-2.2.0 does not work out of the box for junit-4.13.2 because the junit
+manifest requires the *bundle* org.hamcrest.core in version 1.3.0 or newer.
+
+If we put both, org.hamcrest-2.2.0 and org.hamcrest.[core|library]-1.3.0, into the target platform
+then junit will get the 1.3.0 version from org.hamcrest.core but everything else will obtain the Hamcrest
+Matcher classes etc. from hamcrest-2.2.0, leading to incompatible classes.
+
+This bundle requires the org.hamcrest-2.2.0 bundle and uses visibility:=reexport so that all packages
+exported by org.hamcrest-2.2.0 are also exported by this bundle. This now satisfies junit-4.13.2's
+Require-Bundle: org.hamcrest.core through this "shim" bundle.
\ No newline at end of file
diff --git a/java/org.hamcrest.core/build.properties b/java/org.hamcrest.core/build.properties
new file mode 100644
index 00000000000..34d2e4d2dad
--- /dev/null
+++ b/java/org.hamcrest.core/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+               .
diff --git a/java/org.hamcrest.core/pom.xml b/java/org.hamcrest.core/pom.xml
new file mode 100644
index 00000000000..ad803edb4de
--- /dev/null
+++ b/java/org.hamcrest.core/pom.xml
@@ -0,0 +1,16 @@
+<?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>
+		<artifactId>root</artifactId>
+		<groupId>com.sap.sailing</groupId>
+		<version>1.0.0-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>org.hamcrest.core</artifactId>
+	<packaging>eclipse-plugin</packaging>
+	<version>2.2.0</version>
+</project>
diff --git a/java/org.hamcrest.core/src/.dummy b/java/org.hamcrest.core/src/.dummy
new file mode 100644
index 00000000000..967e3a595c5
--- /dev/null
+++ b/java/org.hamcrest.core/src/.dummy
@@ -0,0 +1 @@
+Used to force the src/ folder to exist after cloning git
\ No newline at end of file
diff --git a/java/org.moxieapps.gwt.highcharts/META-INF/MANIFEST.MF b/java/org.moxieapps.gwt.highcharts/META-INF/MANIFEST.MF
index 0546fd3805f..97995408557 100644
--- a/java/org.moxieapps.gwt.highcharts/META-INF/MANIFEST.MF
+++ b/java/org.moxieapps.gwt.highcharts/META-INF/MANIFEST.MF
@@ -20,6 +20,5 @@ Export-Package: org.moxieapps.gwt.highcharts.client.plotOptions;uses:="o
  "
 Bundle-ActivationPolicy: lazy
 Require-Bundle: com.google.gwt.user;bundle-version="2.10.0";resolution:=optional,
- com.google.gwt.dev;bundle-version="2.10.0";resolution:=optional,
  com.google.gwt.servlet;bundle-version="2.10.0"
 Automatic-Module-Name: org.moxieapps.gwt.highcharts
diff --git a/java/pom.xml b/java/pom.xml
index 91226e8fecb..91bb8180053 100755
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -31,7 +31,7 @@
          Due to ECJ/JDT bugs it may fail depending on the Eclipse version tycho is based on 
          (see Bugzilla: https://bugzilla.sapsailing.com/bugzilla/show_bug.cgi?id=3859). -->
     <!-- Most likely, serialization/replication will fail with tycho versions based on Eclipse Neon R (4.6.0). -->
-    <tycho-version>1.6.0</tycho-version>
+    <tycho-version>2.7.5</tycho-version>
     <gwt.version>2.11.0</gwt.version>
     <!-- gwt-maven-plugin is typically in sync with the GWT version. But sometimes versions need extra time after a new GWT release. -->
     <gwt.plugin.version>2.11.0</gwt.plugin.version>
@@ -78,7 +78,9 @@
       </activation>
       <modules>
         <module>elemental2</module>
+	    <module>org.hamcrest.core</module>
         <module>com.sap.sse</module>
+        <module>com.sap.sse.apacheservicemixfragment</module>
         <module>com.sap.sse.test</module>
         <module>com.sap.sse.landscape.common</module>
         <module>com.sap.sse.landscape</module>
@@ -275,6 +277,54 @@
       </plugins>
     </build>
   </profile>
+  <profile>
+      <!-- This profile activates the addition of those JavaEE bundles to the target platform
+           for Tycho that have been removed from JavaSE-11 if not building for Android -->
+    <id>with-java11-non-android-relevant</id>
+    <activation>
+      <jdk>[11.0,18.0)</jdk>
+      <!-- TODO find out if this dependency on a property set by yet another profile works properly
+	  <property>
+	    <name>with.not.android.relevant</name>
+	    <value>true</value>
+      </property>
+      -->
+    </activation>
+    <build>
+      <plugins>
+        <plugin>
+          <groupId>org.eclipse.tycho</groupId>
+          <artifactId>target-platform-configuration</artifactId>
+          <version>${tycho-version}</version>
+          <configuration>
+            <dependency-resolution>
+              <extraRequirements>
+                <!-- The bundles that provide those package dropped in JavaSE-11 will be
+                     required by the following fragments -->
+                <requirement>
+                  <type>eclipse-plugin</type>
+                  <id>com.sap.sailing.routeconverterjava11extension</id>
+                  <versionRange>0.0.0</versionRange>
+                </requirement>
+                <!-- For some reason there is a cyclic dependency created by the following:
+                <requirement>
+                  <type>eclipse-plugin</type>
+                  <id>com.sap.sse.jersey.jaxbdependencyfragment</id>
+                  <versionRange>0.0.0</versionRange>
+                </requirement>
+                <requirement>
+                  <type>eclipse-plugin</type>
+                  <id>com.sap.sse.apacheservicemixfragment</id>
+                  <versionRange>0.0.0</versionRange>
+                </requirement>
+                -->
+              </extraRequirements>
+            </dependency-resolution>
+          </configuration>
+        </plugin>
+      </plugins>
+    </build>
+  </profile>
   <profile>
     <id>no-debug.with-proxy</id>
     <activation>