eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-20 04:35:32 +00:00
Code Activity

Merge branch 'master' into permission-vertical

Browse Source 
Conflicts:
	java/com.sap.sailing.domain.persistence/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain.swisstimingadapter.persistence/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain.swisstimingadapter.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.domain.tractracadapter.persistence/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.replication.test/META-INF/MANIFEST.MF
	java/com.sap.sailing.server.testsupport/META-INF/MANIFEST.MF
	java/com.sap.sailing.server/META-INF/MANIFEST.MF
	java/com.sap.sse.security.persistence/META-INF/MANIFEST.MF
	java/com.sap.sse.security.test/META-INF/MANIFEST.MF
	java/com.sap.sse.security.userstore.mongodb/META-INF/MANIFEST.MF
This commit is contained in:
Steffen Schaefer
2019-01-28 09:58:30 +01:00
parent f0cb402863 777949afa5
commit 42ea70f2aa
73 changed files with 249 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.testsupport/META-INF/MANIFEST.MF
+1 -1
View File
@@ -34,8 +34,8 @@ Require-Bundle: com.sap.sailing.server,
org.apache.shiro.web;bundle-version="1.2.2",
org.apache.shiro.core;bundle-version="1.2.2",
javax.servlet;bundle-version="3.1.0",
org.eclipse.orbit.mongodb;bundle-version="3.2.2",
com.sap.sailing.server.interface,
org.mongodb.mongo-java-driver;bundle-version="3.6.4",
com.sap.sse.security.common
Automatic-Module-Name: com.sap.sailing.server.testsupport
Import-Package: com.sap.sse.security.userstore.mongodb,