Merge branch 'master' into docker

Change-Id: I670ed4b220e48790ab71bf6cb96b1701cf32ca4b
This commit is contained in:
Axel Uhl committed 2018-12-14 13:19:53 +01:00
commit 550f8771a5
11 files changed
+177 -40

No files matched your search

@@ -77,13 +77,6 @@
version="2.1.0.v201105210652"
unpack="false"/>
<plugin
id="com.googlecode.java-diff-utils"
download-size="0"
install-size="0"
version="1.3.0.qualifier"
unpack="false"/>
<plugin
id="org.apache.httpcomponents.httpclient"
download-size="0"
@@ -147,25 +140,4 @@
version="1.9.4"
unpack="false"/>
<plugin
id="net.sf.marineapi"
download-size="0"
install-size="0"
version="0.5.0.qualifier"
unpack="false"/>
<plugin
id="org.mp4parser.isoparser"
download-size="0"
install-size="0"
version="1.9.37"/>
<plugin
id="com.sap.sailing.routeconverterjava11extension"
download-size="0"
install-size="0"
version="0.0.0"
fragment="true"
unpack="false"/>
</feature>