This is an automated email from the ASF dual-hosted git repository.
bhliva pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 3dc952de16d7fc94f59d7af5e2997ff85cd704c2
Author: bhliva <bohdan_hl...@epam.com>
AuthorDate: Fri Nov 1 14:23:26 2019 +0200
Merge branch 'develop' of /Users/bohdan.hliva/IdeaProjects/incubator-dlab
with conflicts.
---
pom.xml | 5 -----
services/provisioning-service/provisioning.yml | 9 +++++----
services/self-service/pom.xml | 6 +++---
.../java/com/epam/dlab/backendapi/SelfServiceApplication.java | 6 ++++++
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/pom.xml b/pom.xml
index d24b10b..853ef15 100644
--- a/pom.xml
+++ b/pom.xml
@@ -129,11 +129,6 @@
<artifactId>dropwizard-util</artifactId>
<version>${io.dropwizard.version}</version>
</dependency>
- <dependency>
- <groupId>com.smoketurner</groupId>
- <artifactId>dropwizard-swagger</artifactId>
- <version>${dropwizard.swagger.version}</version>
- </dependency>
</dependencies>
diff --git a/services/provisioning-service/provisioning.yml
b/services/provisioning-service/provisioning.yml
index 3e34454..d96969b 100644
--- a/services/provisioning-service/provisioning.yml
+++ b/services/provisioning-service/provisioning.yml
@@ -87,16 +87,17 @@ logging:
archivedLogFilenamePattern:
${LOG_ROOT_DIR}/ssn/provisioning-%d{yyyy-MM-dd}.log.gz
archivedFileCount: 10
+
keycloakConfiguration:
- realm: KEYCLOAK_REALM_NAME
+ realm: DLAB_bhliva
bearer-only: true
- auth-server-url: KEYCLOAK_AUTH_SERVER_URL
+ auth-server-url: http://52.11.45.11:8080/auth
ssl-required: none
register-node-at-startup: true
register-node-period: 600
- resource: KEYCLOAK_CLIENT_NAME
+ resource: sss
credentials:
- secret: KEYCLOAK_CLIENT_SECRET
+ secret: 37338cc5-77f9-47f9-9d95-5cb716b91118
cloudProperties:
os: CONF_OS
diff --git a/services/self-service/pom.xml b/services/self-service/pom.xml
index b529842..2b446a4 100644
--- a/services/self-service/pom.xml
+++ b/services/self-service/pom.xml
@@ -162,10 +162,10 @@
<version>1.1</version>
</dependency>
-
<dependency>
- <groupId>com.smoketurner</groupId>
- <artifactId>dropwizard-swagger</artifactId>
+ <groupId>com.fashiontrade</groupId>
+ <artifactId>dropwizard-swagger-v3</artifactId>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.glassfish.jersey.test-framework.providers</groupId>
diff --git
a/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java
b/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java
index 6dbe88c..3b4e21a 100644
---
a/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java
+++
b/services/self-service/src/main/java/com/epam/dlab/backendapi/SelfServiceApplication.java
@@ -94,6 +94,12 @@ public class SelfServiceApplication extends
Application<SelfServiceApplicationCo
));
bootstrap.addBundle(new DlabKeycloakBundle());
+ bootstrap.addBundle(new
SwaggerBundle<SelfServiceApplicationConfiguration>() {
+ @Override
+ protected SwaggerBundleConfiguration
getSwaggerBundleConfiguration(SelfServiceApplicationConfiguration
configuration) {
+ return configuration.getSwaggerConfiguration();
+ }
+ });
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
