[11180] Fix OpenId for mysql 8, small updates

bundles/es.core/src/info/elexis/server/core/internal/SwaggerConfigurator.java

@@ -35,13 +35,13 @@ public class SwaggerConfigurator {
 			Configuration config = configAdmin.getConfiguration(SERVICE_PID, null);
 			Dictionary<String, Object> properties = config.getProperties();
 			if (properties == null) {
-				properties = new Hashtable<String, Object>();
+				properties = new Hashtable<>();
 				properties.put(Constants.SERVICE_PID, SERVICE_PID);
 			}
 
 			properties.put("swagger.basePath", "/services");
 			properties.put("swagger.info.title", "Elexis-Server");
-			properties.put("swagger.info.version", "1.7");
+			properties.put("swagger.info.version", "1.8");
 			properties.put("swagger.scheme.https", "");
 
 			properties.put("swagger.securityDefinition.type.esoauth", "oauth2");

bundles/es.core/src/info/elexis/server/core/rest/v1/RestResource.java

@@ -14,6 +14,7 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Authorization;
 import io.swagger.annotations.AuthorizationScope;
 
+@Deprecated
 @Api(value = "/system", tags = { "system" })
 @Path("system/v1")
 @Component(service = RestResource.class, immediate = true)

bundles/es.openid/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: OpenID Connect for Elexis Server
 Bundle-SymbolicName: info.elexis.server.openid;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 1.3.4.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.apache.commons.lang,
  org.eclipse.jetty.apache-jsp;bundle-version="9.4.8",

bundles/es.openid/README.md

@@ -3,3 +3,6 @@
 
 See https://github.com/elexis/elexis-openid-connect-overlay for further details. 
 
+## Remark
+
+Locally compiled master version (1.3.4-SNAPSHOT), with Mysql 8.0.13 patch (submitted as PR https://github.com/mitreid-connect/OpenID-Connect-Java-Spring-Server/pull/1495)
\ No newline at end of file

targets/es.target/prepare/elexis-server-prepare.target

 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde?>
 <!-- generated with https://github.com/eclipse-cbi/targetplatform-dsl -->
-<target name="Elexis-Server" sequenceNumber="1562184145">
+<target name="Elexis-Server" sequenceNumber="1562678662">
   <locations>
     <location includeMode="slicer" includeAllPlatforms="true" includeSource="true" includeConfigurePhase="false" type="InstallableUnit">
       <unit id="org.osgi.framework.system.packages.extra" version="1.0.0.20190124-1239"/>
       <unit id="jaxb-api-impl-import-java9" version="1.0.0.20190124-1239"/>
       <unit id="ch.rgw.utility" version="3.8.0.20190425-1427"/>
-      <unit id="ch.elexis.core" version="3.8.0.20190703-1422"/>
+      <unit id="ch.elexis.core" version="3.8.0.20190704-0852"/>
       <unit id="ch.elexis.core.l10n" version="3.8.0.20190703-1208"/>
       <unit id="ch.elexis.core.importer.div" version="3.2.0.20190703-1208"/>
       <unit id="ch.elexis.core.hl7.v2x" version="3.2.0.20190416-1216"/>