eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-13 22:15:26 +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 committed 2019-01-28 09:58:30 +01:00
2 parents f0cb402863 777949afa5
commit 42ea70f2aa
73 files changed
+249 -133
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.selenium.test/META-INF/MANIFEST.MF
+1 -1
View File
@@ -13,7 +13,7 @@ Require-Bundle: org.hamcrest;bundle-version="1.1.0",
com.sap.sse.common,
jcl.over.slf4j;bundle-version="1.6.4";resolution:=optional,
slf4j.api;bundle-version="1.6.4";resolution:=optional,
org.eclipse.orbit.mongodb;bundle-version="3.2.2"
org.mongodb.mongo-java-driver;bundle-version="3.6.4"
Bundle-ClassPath: lib/cglib-nodep-2.2.3.jar,
.
Automatic-Module-Name: com.sap.sailing.selenium.test