Merge branch 'master' into permission-vertical

Change-Id: I43c8ce9b07daa50251a27c939f3ec3733c337b27
This commit is contained in:
Axel Uhl committed 2018-02-19 11:35:52 +01:00
commit 805fffc0c9
2 files changed
+1 -7

No files matched your search

@@ -31,10 +31,7 @@ Require-Bundle:
javax.servlet;bundle-version="2.6.0",
org.apache.shiro.core;bundle-version="1.2.2",
org.apache.shiro.web;bundle-version="1.2.2",
org.apache.shiro.ehcache;bundle-version="1.2.3",
org.eclipse.jetty.websocket.api;bundle-version="9.4.8",
org.eclipse.jetty.websocket.client;bundle-version="9.4.8",
org.eclipse.jetty.websocket.common;bundle-version="9.4.8"
org.apache.shiro.ehcache;bundle-version="1.2.3"
Import-Package:
com.sap.sailing.util,
javax.ws.rs;version="1.1.1",
@@ -30,9 +30,6 @@ Require-Bundle: com.sap.sailing.domain,
com.sap.sailing.server.gateway.serialization,
com.sap.sailing.domain.shared.android,
com.sap.sailing.server.trackfiles,
org.eclipse.jetty.websocket.api;bundle-version="9.4.8",
org.eclipse.jetty.websocket.client;bundle-version="9.4.8",
org.eclipse.jetty.websocket.common;bundle-version="9.4.8",
javax.validation;bundle-version="1.0.0",
com.sun.jersey;bundle-version="1.17.0",
org.objectweb.asm;bundle-version="3.3.1",