From 14f3f8283f386be0aff1d9a819b7dcdbfe2fb27b Mon Sep 17 00:00:00 2001 From: Jon Eubank Date: Thu, 26 Nov 2020 16:37:32 -0500 Subject: [PATCH 1/3] 4.5.0-SNAPSHOT Versioning --- pom.xml | 2 +- song-client/pom.xml | 6 +++--- song-core/pom.xml | 2 +- song-java-sdk/pom.xml | 2 +- song-server/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 6dc2a107c..fc804cd05 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ bio.overture song pom - 4.4.0 + 4.5.0-SNAPSHOT song-core song-java-sdk diff --git a/song-client/pom.xml b/song-client/pom.xml index 98a86d462..fc0f37a93 100644 --- a/song-client/pom.xml +++ b/song-client/pom.xml @@ -18,7 +18,7 @@ song bio.overture - 4.4.0 + 4.5.0-SNAPSHOT 4.0.0 @@ -35,12 +35,12 @@ bio.overture song-java-sdk - 4.4.0 + 4.5.0-SNAPSHOT bio.overture song-core - 4.4.0 + 4.5.0-SNAPSHOT diff --git a/song-core/pom.xml b/song-core/pom.xml index be0c2ebf6..befc08b84 100644 --- a/song-core/pom.xml +++ b/song-core/pom.xml @@ -19,7 +19,7 @@ song bio.overture - 4.4.0 + 4.5.0-SNAPSHOT 4.0.0 diff --git a/song-java-sdk/pom.xml b/song-java-sdk/pom.xml index b04bc0902..3aad2bba2 100644 --- a/song-java-sdk/pom.xml +++ b/song-java-sdk/pom.xml @@ -18,7 +18,7 @@ song bio.overture - 4.4.0 + 4.5.0-SNAPSHOT 4.0.0 diff --git a/song-server/pom.xml b/song-server/pom.xml index af41598e8..0ebb4b1c2 100644 --- a/song-server/pom.xml +++ b/song-server/pom.xml @@ -19,7 +19,7 @@ song bio.overture - 4.4.0 + 4.5.0-SNAPSHOT 4.0.0 @@ -37,7 +37,7 @@ bio.overture song-core - 4.4.0 + 4.5.0-SNAPSHOT From c62f29bbe7e9c6133c9214012fcd399f6727d2c8 Mon Sep 17 00:00:00 2001 From: blabadi Date: Thu, 4 Mar 2021 11:49:29 -0500 Subject: [PATCH 2/3] make swagger ui run behind reverse proxy --- .../song/server/config/SwaggerConfig.java | 20 +++++++++++++++++-- .../src/main/resources/application.yml | 5 +++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/song-server/src/main/java/bio/overture/song/server/config/SwaggerConfig.java b/song-server/src/main/java/bio/overture/song/server/config/SwaggerConfig.java index 60dd1ded9..f41d284b4 100644 --- a/song-server/src/main/java/bio/overture/song/server/config/SwaggerConfig.java +++ b/song-server/src/main/java/bio/overture/song/server/config/SwaggerConfig.java @@ -27,6 +27,7 @@ import springfox.documentation.builders.ApiInfoBuilder; import springfox.documentation.service.ApiInfo; import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.paths.RelativePathProvider; import springfox.documentation.spring.web.plugins.Docket; import springfox.documentation.swagger.web.UiConfiguration; import springfox.documentation.swagger2.annotations.EnableSwagger2; @@ -42,15 +43,30 @@ public class SwaggerConfig { @Getter private String alternateSwaggerUrl; + // default is empty + @Value("${swagger.host:}") + private String swaggerHost; + + // default is empty + @Value("${swagger.basePath:}") + private String basePath; + @Bean public Docket api() { return new Docket(DocumentationType.SWAGGER_2) .apiInfo(apiInfo()) .select() .apis(basePackage("bio.overture.song.server.controller")) - .paths(any()) .build() - .pathMapping("/"); + .host(swaggerHost) + .pathProvider( + new RelativePathProvider(null) { + @Override + public String getApplicationBasePath() { + return basePath; + } + } + ); } @Bean diff --git a/song-server/src/main/resources/application.yml b/song-server/src/main/resources/application.yml index c8c4fd82b..1b079eb60 100644 --- a/song-server/src/main/resources/application.yml +++ b/song-server/src/main/resources/application.yml @@ -80,6 +80,11 @@ management: swagger: alternateUrl: "/api-docs" + # host and base url are needed if you run song behind a reverse proxy + # and rewrite the url eg: http://mydomain.com/song/swagger-ui.html + # in this case host = mydomain.com, baseUrl = /song + host: "" + basePath: "" security.basic.enabled: false From 295e8f6edb2bbdc460a433677ad805164ec47344 Mon Sep 17 00:00:00 2001 From: blabadi Date: Tue, 23 Mar 2021 14:11:48 -0400 Subject: [PATCH 3/3] bump versions --- pom.xml | 2 +- song-client/pom.xml | 6 +++--- song-core/pom.xml | 2 +- song-java-sdk/pom.xml | 2 +- song-server/pom.xml | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index fc804cd05..709862cbe 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ bio.overture song pom - 4.5.0-SNAPSHOT + 4.5.0 song-core song-java-sdk diff --git a/song-client/pom.xml b/song-client/pom.xml index fc0f37a93..f90f4c1ee 100644 --- a/song-client/pom.xml +++ b/song-client/pom.xml @@ -18,7 +18,7 @@ song bio.overture - 4.5.0-SNAPSHOT + 4.5.0 4.0.0 @@ -35,12 +35,12 @@ bio.overture song-java-sdk - 4.5.0-SNAPSHOT + 4.5.0 bio.overture song-core - 4.5.0-SNAPSHOT + 4.5.0 diff --git a/song-core/pom.xml b/song-core/pom.xml index befc08b84..a14700b9e 100644 --- a/song-core/pom.xml +++ b/song-core/pom.xml @@ -19,7 +19,7 @@ song bio.overture - 4.5.0-SNAPSHOT + 4.5.0 4.0.0 diff --git a/song-java-sdk/pom.xml b/song-java-sdk/pom.xml index 3aad2bba2..0eab6b6be 100644 --- a/song-java-sdk/pom.xml +++ b/song-java-sdk/pom.xml @@ -18,7 +18,7 @@ song bio.overture - 4.5.0-SNAPSHOT + 4.5.0 4.0.0 diff --git a/song-server/pom.xml b/song-server/pom.xml index 0ebb4b1c2..0a5474a81 100644 --- a/song-server/pom.xml +++ b/song-server/pom.xml @@ -19,7 +19,7 @@ song bio.overture - 4.5.0-SNAPSHOT + 4.5.0 4.0.0 @@ -37,7 +37,7 @@ bio.overture song-core - 4.5.0-SNAPSHOT + 4.5.0