Commit 08ba1647 authored by Marco Descher's avatar Marco Descher
Browse files

[11180] Fix OpenId for mysql 8, small updates

parent 9dbdb613
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -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");
+1 −0
Original line number Diff line number Diff line
@@ -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)
+1 −1
Original line number Diff line number Diff line
@@ -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",
+3 −0
Original line number Diff line number Diff line
@@ -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
+730 KiB (36.3 MiB)

File changed.

No diff preview for this file type.

Loading