Merge branch 'master' into bug5510

Conflicts:
	java/com.sap.sailing.server/SailingServer (No Proxy).launch
This commit is contained in:
Dennis Aulenbacher
2022-03-08 00:35:22 +01:00
229 changed files with 3991 additions and 1171 deletions
@@ -33,6 +33,5 @@ Export-Package: com.sap.sailing.domain.common,
com.sap.sailing.domain.common.windfinder
Require-Bundle: com.sap.sse.common,
com.sap.sse.security.common,
com.sap.sse.datamining.annotations;bundle-version="1.0.0",
org.json.simple;bundle-version="1.1.0"
com.sap.sse.datamining.annotations;bundle-version="1.0.0"
Automatic-Module-Name: com.sap.sailing.domain.common