diff --git a/java/com.sap.sailing.domain.igtimiadapter/META-INF/MANIFEST.MF b/java/com.sap.sailing.domain.igtimiadapter/META-INF/MANIFEST.MF
index 6becd144924..a381adff808 100644
--- a/java/com.sap.sailing.domain.igtimiadapter/META-INF/MANIFEST.MF
+++ b/java/com.sap.sailing.domain.igtimiadapter/META-INF/MANIFEST.MF
@@ -17,7 +17,8 @@ Require-Bundle: org.json.simple;bundle-version="1.1.0",
  com.sap.sailing.declination,
  com.sap.sse.common,
  com.sap.sse,
- com.sap.sse.security
+ com.sap.sse.security,
+ javax.xml.bind;bundle-version="2.2.0"
 Import-Package: javax.ws.rs;version="1.1.1",
  javax.ws.rs.core;version="1.1.1",
  javax.ws.rs.ext;version="1.1.1",
diff --git a/java/com.sap.sailing.server/SailingServer (No Proxy, Java11).launch b/java/com.sap.sailing.server/SailingServer (No Proxy, Java11).launch
index f6e4dc2b576..c2c7538634f 100755
--- a/java/com.sap.sailing.server/SailingServer (No Proxy, Java11).launch	
+++ b/java/com.sap.sailing.server/SailingServer (No Proxy, Java11).launch	
@@ -22,7 +22,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk-11.0.1"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console -clean"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea --add-modules=ALL-SYSTEM -Dorg.osgi.framework.system.capabilities=&quot;osgi.ee; osgi.ee=\&quot;JavaSE\&quot;;version:List=\&quot;1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,1.9,1.10,1.11\&quot;&quot; -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dfile.encoding=cp1252 -Dexpedition.udp.port=5010 -Xmx6000m -XX:+UseG1GC -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty -Djava.util.logging.config.file=${project_loc:com.sap.sailing.server}/../target/configuration/logging_debug.properties -Dkiwo.results=${project_loc:com.sap.sailing.kiworesultimport.test}/resources -Dpersistentcompetitors.clear=false -XX:+UseMembar -Dpolardata.source.url=https://www.sapsailing.com -Drestore.tracked.races=true"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea --add-modules=ALL-SYSTEM,java.sql,java.se -Dorg.osgi.framework.system.capabilities=&quot;osgi.ee; osgi.ee=\&quot;JavaSE\&quot;;version:List=\&quot;1.0,1.1,1.2,1.3,1.4,1.5,1.6,1.7,1.8,1.9,1.10,1.11\&quot;&quot; -Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dfile.encoding=cp1252 -Dexpedition.udp.port=5010 -Xmx6000m -XX:+UseG1GC -Djetty.home=${project_loc:com.sap.sailing.server}/../target/configuration/jetty -Djava.util.logging.config.file=${project_loc:com.sap.sailing.server}/../target/configuration/logging_debug.properties -Dkiwo.results=${project_loc:com.sap.sailing.kiworesultimport.test}/resources -Dpersistentcompetitors.clear=false -XX:+UseMembar -Dpolardata.source.url=https://www.sapsailing.com -Drestore.tracked.races=false"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc}"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="profilingTraceType-ALLOCATION_TRACE" value="KEY_APPLICATION_FILTER%CTX_KEY%*%CTX_ENTRY%INCREASE_COUNT%CTX_KEY%8192%CTX_ENTRY%KEY_MIN_SIZE%CTX_KEY%32%CTX_ENTRY%KEY_MAX_SIZE%CTX_KEY%65536%CTX_ENTRY%KEY_INC_LINE_NRS%CTX_KEY%true%CTX_ENTRY%KEY_SESSION_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ENABLEMENT%CTX_KEY%false%CTX_ENTRY%CLASS_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_USER_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_REQUEST_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_TENANT_FILTER%CTX_KEY%*%CTX_ENTRY%KEY_ADAPTIVE%CTX_KEY%false%CTX_ENTRY%"/>
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
old mode 100644
new mode 100755
index 6b95b48bc01..4dda9d17751
--- 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,36 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Race Analysis Target" sequenceNumber="130">
+<?pde version="3.8"?><target name="Race Analysis Target" sequenceNumber="144">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="com.sap.sailing.target.base.feature.group" version="1.0.0"/>
-<unit id="com.sap.sailing.target.jackson.feature.group" version="1.0.0"/>
-<unit id="com.sap.sailing.target.jms.feature.group" version="1.0.0"/>
-<unit id="com.sap.sailing.target.shiro.feature.group" version="1.0.0"/>
-<unit id="com.sap.sailing.target.test.feature.group" version="1.0.0"/>
-<repository location="https://p2.sapsailing.com/p2/sailing/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.felix.gogo.command" version="0.10.0.v201209301215"/>
-<unit id="org.apache.felix.gogo.command.source" version="0.10.0.v201209301215"/>
-<unit id="org.apache.felix.gogo.runtime" version="0.10.0.v201209301036"/>
-<unit id="org.apache.felix.gogo.runtime.source" version="0.10.0.v201209301036"/>
-<unit id="org.apache.felix.gogo.shell" version="0.10.0.v201212101605"/>
-<unit id="org.apache.felix.gogo.shell.source" version="0.10.0.v201212101605"/>
-<unit id="org.eclipse.equinox.common" version="3.6.200.v20130402-1505"/>
-<unit id="org.eclipse.equinox.common.source" version="3.6.200.v20130402-1505"/>
-<unit id="org.eclipse.equinox.console" version="1.1.0.v20140131-1639"/>
-<unit id="org.eclipse.equinox.console.source" version="1.1.0.v20140131-1639"/>
-<unit id="org.eclipse.equinox.launcher" version="1.3.0.v20140415-2008"/>
-<unit id="org.eclipse.equinox.launcher.source" version="1.3.0.v20140415-2008"/>
-<unit id="org.eclipse.equinox.simpleconfigurator" version="1.1.0.v20131217-1203"/>
-<unit id="org.eclipse.equinox.simpleconfigurator.source" version="1.1.0.v20131217-1203"/>
-<unit id="org.eclipse.equinox.util" version="1.0.500.v20130404-1337"/>
-<unit id="org.eclipse.equinox.util.source" version="1.0.500.v20130404-1337"/>
-<unit id="org.eclipse.osgi" version="3.10.2.v20150203-1939"/>
-<unit id="org.eclipse.osgi.services" version="3.4.0.v20140312-2051"/>
-<unit id="org.eclipse.osgi.services.source" version="3.4.0.v20140312-2051"/>
-<unit id="org.eclipse.osgi.source" version="3.10.2.v20150203-1939"/>
-<repository location="http://download.eclipse.org/releases/luna"/>
+<unit id="javax.ws.rs" version="1.1.1.v20130318-1750"/>
+<unit id="javax.ws.rs.source" version="1.1.1.v20130318-1750"/>
+<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="org.hamcrest" version="1.1.0.v20090501071000"/>
@@ -44,9 +18,57 @@
 <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20140114142710/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="javax.ws.rs" version="1.1.1.v20130318-1750"/>
-<unit id="javax.ws.rs.source" version="1.1.1.v20130318-1750"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
+<unit id="org.eclipse.jetty.bundles.f.feature.group" version="9.4.8.201802270002"/>
+<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/"/>
+</location>
+<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.13.4.v20180322-2228"/>
+<unit id="org.eclipse.libra.framework.feature.feature.group" version="0.3.1.201609011955"/>
+
+
+<unit id="org.eclipse.equinox.app" version="1.3.400.v20150715-1528"/>
+<unit id="org.eclipse.equinox.cm" version="1.2.0.v20170105-1446"/>
+<unit id="org.eclipse.equinox.common" version="3.9.0.v20170207-1454"/>
+<unit id="org.eclipse.equinox.device" version="1.0.400.v20130327-1442"/>
+<unit id="org.eclipse.equinox.ds" version="1.5.0.v20170307-1429"/>
+<unit id="org.eclipse.equinox.event" version="1.4.0.v20170105-1446"/>
+<unit id="org.eclipse.equinox.console" version="1.1.300.v20170512-2111"/>
+<unit id="org.eclipse.equinox.io" version="1.1.100.v20150430-1834"/>
+<unit id="org.eclipse.equinox.ip" version="1.1.400.v20161007-1324"/>
+<unit id="org.eclipse.equinox.launcher" version="1.4.0.v20161219-1356"/>
+<unit id="org.eclipse.equinox.jsp.jasper" version="1.0.500.v20150119-1358"/>
+<unit id="org.eclipse.equinox.jsp.jasper.registry" version="1.0.300.v20130327-1442"/>
+<unit id="org.eclipse.equinox.metatype" version="1.4.300.v20170105-1446"/>
+<unit id="org.eclipse.equinox.preferences" version="3.7.0.v20170126-2132"/>
+<unit id="org.eclipse.equinox.registry" version="3.7.0.v20170222-1344"/>
+<unit id="org.eclipse.osgi.services" version="3.6.0.v20170228-1906"/>
+<unit id="org.eclipse.equinox.supplement" version="1.7.0.v20170329-1416"/>
+<unit id="org.eclipse.equinox.transforms.xslt" version="1.0.300.v20130327-1442"/>
+<unit id="org.eclipse.equinox.transforms.hook" version="1.2.0.v20170105-1446"/>
+<unit id="org.eclipse.equinox.util" version="1.0.500.v20130404-1337"/>
+<unit id="org.eclipse.equinox.useradmin" version="1.1.400.v20130327-1442"/>
+<unit id="org.eclipse.osgi.util" version="3.4.0.v20170111-1608"/>
+<unit id="org.eclipse.equinox.servletbridge" version="1.3.200.v20160128-1435"/>
+<unit id="org.eclipse.equinox.http.servletbridge" version="1.0.300.v20130327-1442"/>
+<unit id="org.eclipse.equinox.http.jetty" version="3.4.0.v20170503-2025"/>
+<unit id="org.eclipse.equinox.http.registry" version="1.1.400.v20150715-1528"/>
+<unit id="org.eclipse.equinox.http.servletbridge" version="1.0.300.v20130327-1442"/>
+<unit id="org.eclipse.equinox.http.servletbridge" version="1.0.300.v20130327-1442"/>
+<unit id="org.eclipse.equinox.wireadmin" version="1.0.600.v20150715-1528"/>
+<unit id="org.eclipse.equinox.simpleconfigurator" version="1.2.1.v20180131-1435"/>
+<unit id="org.eclipse.equinox.concurrent" version="1.1.0.v20130327-1442"/>
+<unit id="org.eclipse.equinox.coordinator" version="1.3.300.v20170512-2111"/>
+<unit id="org.eclipse.equinox.region" version="1.4.0.v20170117-1425"/>
+<unit id="org.eclipse.jetty.continuation" version="9.4.8.v20171121"/>
+<unit id="org.eclipse.jetty.security" version="9.4.8.v20171121"/>
+<unit id="org.eclipse.jetty.util" version="9.4.8.v20171121"/>
+<unit id="org.eclipse.jetty.http" version="9.4.8.v20171121"/>
+<unit id="org.eclipse.jetty.server" version="9.4.8.v20171121"/>
+<unit id="org.eclipse.jetty.io" version="9.4.8.v20171121"/>
+<unit id="org.eclipse.jetty.servlet" version="9.4.8.v20171121"/>
+
+
+<repository location="http://download.eclipse.org/releases/oxygen/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
 <unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.5.0.v201504151636"/>
@@ -93,8 +115,12 @@
 <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.jetty.bundles.f.feature.group" version="9.4.8.201802270002"/>
-<repository location="http://download.eclipse.org/jetty/updates/jetty-bundles-9.x/"/>
+<unit id="com.sap.sailing.target.base.feature.group" version="1.0.0"/>
+<unit id="com.sap.sailing.target.jackson.feature.group" version="1.0.0"/>
+<unit id="com.sap.sailing.target.jms.feature.group" version="1.0.0"/>
+<unit id="com.sap.sailing.target.shiro.feature.group" version="1.0.0"/>
+<unit id="com.sap.sailing.target.test.feature.group" version="1.0.0"/>
+<repository location="https://p2.sapsailing.com/p2/sailing/"/>
 </location>
 </locations>
 <includeBundles>
@@ -113,8 +139,8 @@
 <plugin id="javax.activation.source"/>
 <plugin id="javax.security.auth.message"/>
 <plugin id="javax.security.auth.message.source"/>
-<plugin id="javax.servlet"/>
-<plugin id="javax.servlet.source"/>
+<plugin id="javax.servlet" version="3.1.0.v201410161800"/>
+<plugin id="javax.servlet.source" version="3.1.0.v201410161800"/>
 <plugin id="javax.validation"/>
 <plugin id="javax.validation.source"/>
 <plugin id="javax.ws.rs"/>
@@ -179,10 +205,10 @@
 <plugin id="org.eclipse.jetty.client.source"/>
 <plugin id="org.eclipse.jetty.deploy"/>
 <plugin id="org.eclipse.jetty.deploy.source"/>
-<plugin id="org.eclipse.jetty.http"/>
-<plugin id="org.eclipse.jetty.http.source"/>
-<plugin id="org.eclipse.jetty.io"/>
-<plugin id="org.eclipse.jetty.io.source"/>
+<plugin id="org.eclipse.jetty.http" version="9.4.8.v20171121"/>
+<plugin id="org.eclipse.jetty.http.source" version="9.4.8.v20171121"/>
+<plugin id="org.eclipse.jetty.io" version="9.4.8.v20171121"/>
+<plugin id="org.eclipse.jetty.io.source" version="9.4.8.v20171121"/>
 <plugin id="org.eclipse.jetty.jaas"/>
 <plugin id="org.eclipse.jetty.jmx"/>
 <plugin id="org.eclipse.jetty.jmx.source"/>
@@ -193,17 +219,17 @@
 <plugin id="org.eclipse.jetty.proxy"/>
 <plugin id="org.eclipse.jetty.rewrite"/>
 <plugin id="org.eclipse.jetty.rewrite.source"/>
-<plugin id="org.eclipse.jetty.security"/>
-<plugin id="org.eclipse.jetty.security.source"/>
-<plugin id="org.eclipse.jetty.server"/>
-<plugin id="org.eclipse.jetty.server.source"/>
-<plugin id="org.eclipse.jetty.servlet"/>
-<plugin id="org.eclipse.jetty.servlet.source"/>
+<plugin id="org.eclipse.jetty.security" version="9.4.8.v20171121"/>
+<plugin id="org.eclipse.jetty.security.source" version="9.4.8.v20171121"/>
+<plugin id="org.eclipse.jetty.server" version="9.4.8.v20171121"/>
+<plugin id="org.eclipse.jetty.server.source" version="9.4.8.v20171121"/>
+<plugin id="org.eclipse.jetty.servlet" version="9.4.8.v20171121"/>
+<plugin id="org.eclipse.jetty.servlet.source" version="9.4.8.v20171121"/>
 <plugin id="org.eclipse.jetty.servlets.source"/>
-<plugin id="org.eclipse.jetty.util"/>
+<plugin id="org.eclipse.jetty.util" version="9.4.8.v20171121"/>
 <plugin id="org.eclipse.jetty.util.ajax"/>
 <plugin id="org.eclipse.jetty.util.ajax.source"/>
-<plugin id="org.eclipse.jetty.util.source"/>
+<plugin id="org.eclipse.jetty.util.source" version="9.4.8.v20171121"/>
 <plugin id="org.eclipse.jetty.webapp"/>
 <plugin id="org.eclipse.jetty.webapp.source"/>
 <plugin id="org.eclipse.jetty.websocket.api"/>
@@ -218,6 +244,8 @@
 <plugin id="org.eclipse.osgi.services"/>
 <plugin id="org.eclipse.osgi.services.source"/>
 <plugin id="org.eclipse.osgi.source"/>
+<plugin id="org.eclipse.osgi.util"/>
+<plugin id="org.eclipse.osgi.util.source"/>
 <plugin id="org.hamcrest"/>
 <plugin id="org.hamcrest.core"/>
 <plugin id="org.hamcrest.integration"/>
diff --git a/java/com.sap.sse.feature.runtime/feature.xml b/java/com.sap.sse.feature.runtime/feature.xml
index 07bc7015b44..221f54dc2f4 100644
--- a/java/com.sap.sse.feature.runtime/feature.xml
+++ b/java/com.sap.sse.feature.runtime/feature.xml
@@ -32,34 +32,6 @@
          fragment="true"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.equinox.common"
-         download-size="0"
-         install-size="0"
-         version="3.6.200.v20130402-1505"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.simpleconfigurator"
-         download-size="0"
-         install-size="0"
-         version="1.1.0.v20131217-1203"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.launcher"
-         download-size="0"
-         install-size="0"
-         version="1.3.0.v20140415-2008"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.equinox.console"
-         download-size="0"
-         install-size="0"
-         version="1.1.0.v20140131-1639"
-         unpack="false"/>
-
    <plugin
          id="org.apache.felix.shell"
          download-size="0"
@@ -200,20 +172,6 @@
          version="9.4.8.v20171121"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.osgi"
-         download-size="0"
-         install-size="0"
-         version="3.10.2.v20150203-1939"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.osgi.services"
-         download-size="0"
-         install-size="0"
-         version="3.4.0.v20140312-2051"
-         unpack="false"/>
-
    <plugin
          id="slf4j.api"
          download-size="0"
@@ -417,4 +375,46 @@
          version="1.1.0.v201211130549"
          unpack="false"/>
 
+   <plugin
+         id="org.eclipse.equinox.common"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.console"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.launcher"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.equinox.simpleconfigurator"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.osgi"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.osgi.services"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
 </feature>