diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40acb61..bd74c61 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,13 +8,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
NA
-## [2.0.0] - 2023-03-07
+## [2.0.0] - 2023-03-16
### Changed
-- upgrade Spring Boot to 3.0.3
-- upgrade Snakeyaml to 2.0 as 1.33 has security issue
+- Upgrade Spring Boot to 3.0.3
+- Upgrade Snakeyaml to 2.0 as 1.33 has security issue
- New application.properties changes
-- sprint boot upgrade, keycloak upgrade
+- Spring boot upgrade, keycloak upgrade
+- Changed base image
## [1.0.6] - 2023-02-22
diff --git a/DEPENDENCIES b/DEPENDENCIES
index cd32535..be40983 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -1,12 +1,13 @@
-maven/mavencentral/ch.qos.logback/logback-classic/1.2.11, EPL-1.0, approved, CQ13636
-maven/mavencentral/ch.qos.logback/logback-core/1.2.11, EPL-1.0, approved, CQ13635
-maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.13.4, Apache-2.0, approved, CQ24135
-maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.13.4, Apache-2.0, approved, CQ24134
-maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.13.4.2, Apache-2.0, approved, CQ24136
-maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.13.4, Apache-2.0, approved, #2566
-maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.13.4, Apache-2.0, approved, CQ24138
-maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.13.4, Apache-2.0, approved, clearlydefined
-maven/mavencentral/com.fasterxml.jackson.module/jackson-module-parameter-names/2.13.4, Apache-2.0, approved, clearlydefined
+maven/mavencentral/ch.qos.logback/logback-classic/1.4.5, EPL-1.0 OR LGPL-2.1-only, approved, #3435
+maven/mavencentral/ch.qos.logback/logback-core/1.4.5, EPL-1.0 OR LGPL-2.1-only, approved, #3373
+maven/mavencentral/com.fasterxml.jackson.core/jackson-annotations/2.14.2, Apache-2.0, approved, #5303
+maven/mavencentral/com.fasterxml.jackson.core/jackson-core/2.14.2, Apache-2.0 AND MIT, approved, #4303
+maven/mavencentral/com.fasterxml.jackson.core/jackson-databind/2.14.2, Apache-2.0, approved, #4105
+maven/mavencentral/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml/2.14.2, Apache-2.0, approved, #5933
+maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jdk8/2.14.2, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.fasterxml.jackson.datatype/jackson-datatype-jsr310/2.14.2, Apache-2.0, approved, #4699
+maven/mavencentral/com.fasterxml.jackson.module/jackson-module-parameter-names/2.14.2, Apache-2.0, approved, #5938
+maven/mavencentral/com.fasterxml/classmate/1.5.1, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.github.docker-java/docker-java-api/3.2.13, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.github.docker-java/docker-java-transport-zerodep/3.2.13, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause), approved, #3059
maven/mavencentral/com.github.docker-java/docker-java-transport/3.2.13, Apache-2.0, approved, clearlydefined
@@ -14,89 +15,74 @@ maven/mavencentral/com.github.stephenc.jcip/jcip-annotations/1.0-1, Apache-2.0,
maven/mavencentral/com.google.code.findbugs/jsr305/3.0.2, Apache-2.0, approved, #20
maven/mavencentral/com.google.errorprone/error_prone_annotations/2.11.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.google.guava/failureaccess/1.0.1, Apache-2.0, approved, CQ22654
-maven/mavencentral/com.google.guava/guava/31.1-jre, Apache-2.0 AND CC0-1.0 AND LicenseRef-Public-Domain, approved, CQ24046
-maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, LicenseRef-NONE, approved, #803
+maven/mavencentral/com.google.guava/guava/31.1-jre, Apache-2.0, approved, clearlydefined
+maven/mavencentral/com.google.guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava, Apache-2.0, approved, CQ22657
maven/mavencentral/com.google.j2objc/j2objc-annotations/1.3, Apache-2.0, approved, CQ21195
maven/mavencentral/com.jayway.jsonpath/json-path/2.7.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.22, Apache-2.0, approved, clearlydefined
-maven/mavencentral/com.sun.activation/jakarta.activation/1.2.2, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf
+maven/mavencentral/com.nimbusds/nimbus-jose-jwt/9.24.4, Apache-2.0, approved, clearlydefined
maven/mavencentral/com.vaadin.external.google/android-json/0.0.20131108.vaadin1, Apache-2.0, approved, CQ21310
-maven/mavencentral/commons-codec/commons-codec/1.15, Apache-2.0 AND BSD-3-Clause AND LicenseRef-Public-Domain, approved, CQ22641
maven/mavencentral/io.github.classgraph/classgraph/4.8.149, MIT, approved, CQ22530
-maven/mavencentral/io.netty/netty-buffer/4.1.82.Final, Apache-2.0, approved, CQ21842
-maven/mavencentral/io.netty/netty-codec-dns/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-codec-http/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-codec-http2/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-codec-socks/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-codec/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-common/4.1.82.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843
-maven/mavencentral/io.netty/netty-handler-proxy/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-handler/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-resolver-dns-classes-macos/4.1.82.Final, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.netty/netty-resolver-dns-native-macos/4.1.82.Final, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.netty/netty-resolver-dns/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-resolver/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-transport-classes-epoll/4.1.82.Final, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.netty/netty-transport-native-epoll/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.netty/netty-transport/4.1.82.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
-maven/mavencentral/io.projectreactor.netty/reactor-netty-core/1.0.23, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.projectreactor.netty/reactor-netty-http/1.0.23, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.projectreactor/reactor-core/3.4.23, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.swagger.core.v3/swagger-annotations/2.2.2, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.swagger.core.v3/swagger-core/2.2.2, Apache-2.0, approved, clearlydefined
-maven/mavencentral/io.swagger.core.v3/swagger-models/2.2.2, Apache-2.0, approved, clearlydefined
-maven/mavencentral/jakarta.activation/jakarta.activation-api/1.2.2, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf
-maven/mavencentral/jakarta.annotation/jakarta.annotation-api/1.3.5, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca
-maven/mavencentral/jakarta.validation/jakarta.validation-api/2.0.2, Apache-2.0, approved, ee4j.bean-validation
-maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/2.3.3, BSD-3-Clause, approved, ee4j.jaxb
+maven/mavencentral/io.micrometer/micrometer-commons/1.10.4, Apache-2.0 AND (Apache-2.0 AND MIT), approved, #7333
+maven/mavencentral/io.micrometer/micrometer-observation/1.10.4, Apache-2.0, approved, #7331
+maven/mavencentral/io.netty/netty-buffer/4.1.89.Final, Apache-2.0, approved, CQ21842
+maven/mavencentral/io.netty/netty-codec-dns/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec-http/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec-http2/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec-socks/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-codec/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-common/4.1.89.Final, Apache-2.0 AND MIT AND CC0-1.0, approved, CQ21843
+maven/mavencentral/io.netty/netty-handler-proxy/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-handler/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-resolver-dns-classes-macos/4.1.89.Final, Apache-2.0, approved, #6367
+maven/mavencentral/io.netty/netty-resolver-dns-native-macos/4.1.89.Final, Apache-2.0, approved, #7004
+maven/mavencentral/io.netty/netty-resolver-dns/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-resolver/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-transport-classes-epoll/4.1.89.Final, Apache-2.0, approved, #6366
+maven/mavencentral/io.netty/netty-transport-native-epoll/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-transport-native-unix-common/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.netty/netty-transport/4.1.89.Final, Apache-2.0 AND BSD-3-Clause AND MIT, approved, CQ20926
+maven/mavencentral/io.projectreactor.netty/reactor-netty-core/1.1.3, Apache-2.0, approved, #5946
+maven/mavencentral/io.projectreactor.netty/reactor-netty-http/1.1.3, Apache-2.0, approved, #6999
+maven/mavencentral/io.projectreactor/reactor-core/3.5.3, Apache-2.0, approved, #5934
+maven/mavencentral/io.swagger.core.v3/swagger-annotations-jakarta/2.2.7, Apache-2.0, approved, #5947
+maven/mavencentral/io.swagger.core.v3/swagger-core-jakarta/2.2.7, Apache-2.0, approved, #5929
+maven/mavencentral/io.swagger.core.v3/swagger-models-jakarta/2.2.7, Apache-2.0, approved, #5919
+maven/mavencentral/jakarta.activation/jakarta.activation-api/2.1.1, EPL-2.0 OR BSD-3-Clause OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.jaf
+maven/mavencentral/jakarta.annotation/jakarta.annotation-api/2.1.1, EPL-2.0 OR GPL-2.0-only with Classpath-exception-2.0, approved, ee4j.ca
+maven/mavencentral/jakarta.validation/jakarta.validation-api/3.0.2, Apache-2.0, approved, ee4j.bean-validation
+maven/mavencentral/jakarta.xml.bind/jakarta.xml.bind-api/4.0.0, BSD-3-Clause, approved, ee4j.jaxb
maven/mavencentral/junit/junit/4.13.2, EPL-2.0, approved, CQ23636
-maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.12.17, Apache-2.0, approved, #1810
-maven/mavencentral/net.bytebuddy/byte-buddy/1.12.17, Apache-2.0 AND BSD-3-Clause, approved, #1811
+maven/mavencentral/net.bytebuddy/byte-buddy-agent/1.12.23, Apache-2.0, approved, #1810
+maven/mavencentral/net.bytebuddy/byte-buddy/1.12.23, Apache-2.0 AND BSD-3-Clause, approved, #1811
maven/mavencentral/net.java.dev.jna/jna/5.8.0, Apache-2.0 OR LGPL-2.1-or-later, approved, CQ23217
maven/mavencentral/net.minidev/accessors-smart/2.4.8, Apache-2.0, approved, clearlydefined
maven/mavencentral/net.minidev/json-smart/2.4.8, Apache-2.0, approved, #3288
maven/mavencentral/org.apache.commons/commons-compress/1.21, Apache-2.0 AND BSD-3-Clause AND bzip2-1.0.6 AND LicenseRef-Public-Domain, approved, CQ23710
maven/mavencentral/org.apache.commons/commons-lang3/3.12.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.apache.httpcomponents/httpclient/4.5.13, EPL-1.0, approved, rt.ebr
-maven/mavencentral/org.apache.httpcomponents/httpcore/4.4.15, Apache-2.0, approved, CQ23528
-maven/mavencentral/org.apache.logging.log4j/log4j-api/2.17.2, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.apache.logging.log4j/log4j-to-slf4j/2.17.2, Apache-2.0, approved, #2163
-maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/9.0.65, , approved, CQ20188
-maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/9.0.65, Apache-2.0, approved, CQ20193
-maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-websocket/9.0.65, Apache-2.0, approved, CQ20194
-maven/mavencentral/org.apache.tomcat/tomcat-annotations-api/9.0.65, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.apache.logging.log4j/log4j-api/2.19.0, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.apache.logging.log4j/log4j-to-slf4j/2.19.0, Apache-2.0, approved, #5941
+maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-core/10.1.5, Apache-2.0 AND (EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND (CDDL-1.0 OR GPL-2.0-only WITH Classpath-exception-2.0) AND W3C AND CC0-1.0, approved, #5949
+maven/mavencentral/org.apache.tomcat.embed/tomcat-embed-el/10.1.5, Apache-2.0, approved, #6997
+maven/mavencentral/org.apache.tomcat/tomcat-annotations-api/10.1.5, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.apiguardian/apiguardian-api/1.1.2, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.assertj/assertj-core/3.22.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.bouncycastle/bcpkix-jdk15on/1.68, MIT, approved, clearlydefined
+maven/mavencentral/org.assertj/assertj-core/3.23.1, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.bouncycastle/bcpkix-jdk18on/1.72, MIT, approved, #3789
-maven/mavencentral/org.bouncycastle/bcprov-jdk15on/1.68, MIT, approved, CQ23714
maven/mavencentral/org.bouncycastle/bcprov-jdk18on/1.72, MIT AND CC0-1.0, approved, #3538
maven/mavencentral/org.bouncycastle/bcutil-jdk18on/1.72, MIT, approved, #3790
maven/mavencentral/org.checkerframework/checker-qual/3.12.0, MIT, approved, clearlydefined
maven/mavencentral/org.hamcrest/hamcrest-core/2.2, BSD-3-Clause, approved, clearlydefined
-maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, CQ23997
-maven/mavencentral/org.jboss.logging/jboss-logging/3.4.3.Final, Apache-2.0, approved, CQ21255
+maven/mavencentral/org.hamcrest/hamcrest/2.2, BSD-3-Clause, approved, clearlydefined
+maven/mavencentral/org.hibernate.validator/hibernate-validator/8.0.0.Final, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.jboss.logging/jboss-logging/3.5.0.Final, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.jetbrains/annotations/17.0.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.8.2, EPL-2.0, approved, #1291
-maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.8.2, EPL-2.0, approved, #1292
-maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.8.2, EPL-2.0, approved, #1488
-maven/mavencentral/org.junit.jupiter/junit-jupiter/5.8.2, EPL-2.0, approved, clearlydefined
-maven/mavencentral/org.junit.platform/junit-platform-commons/1.8.2, EPL-2.0, approved, #1288
-maven/mavencentral/org.junit.platform/junit-platform-engine/1.8.2, EPL-2.0, approved, #1289
-maven/mavencentral/org.keycloak/keycloak-adapter-core/19.0.3, Apache-2.0, approved, #4099
-maven/mavencentral/org.keycloak/keycloak-adapter-spi/19.0.3, Apache-2.0, approved, #4102
-maven/mavencentral/org.keycloak/keycloak-authz-client/19.0.3, Apache-2.0, approved, #4097
-maven/mavencentral/org.keycloak/keycloak-common/19.0.3, Apache-2.0, approved, #4101
-maven/mavencentral/org.keycloak/keycloak-core/19.0.3, Apache-2.0, approved, #4096
-maven/mavencentral/org.keycloak/keycloak-crypto-default/19.0.3, Apache-2.0, approved, #4094
-maven/mavencentral/org.keycloak/keycloak-spring-boot-2-adapter/19.0.3, Apache-2.0, approved, #4104
-maven/mavencentral/org.keycloak/keycloak-spring-boot-adapter-core/19.0.3, Apache-2.0, approved, #4098
-maven/mavencentral/org.keycloak/keycloak-spring-boot-starter/19.0.3, Apache-2.0, approved, #3340
-maven/mavencentral/org.keycloak/keycloak-spring-security-adapter/19.0.3, Apache-2.0, approved, #4092
-maven/mavencentral/org.keycloak/spring-boot-container-bundle/19.0.3, Apache-2.0, approved, #4103
-maven/mavencentral/org.mockito/mockito-core/4.5.1, MIT AND Apache-2.0, approved, CQ24117
-maven/mavencentral/org.mockito/mockito-junit-jupiter/4.5.1, MIT, approved, clearlydefined
+maven/mavencentral/org.junit.jupiter/junit-jupiter-api/5.9.2, EPL-2.0, approved, #3133
+maven/mavencentral/org.junit.jupiter/junit-jupiter-engine/5.9.2, EPL-2.0, approved, #3125
+maven/mavencentral/org.junit.jupiter/junit-jupiter-params/5.9.2, EPL-2.0, approved, #3134
+maven/mavencentral/org.junit.jupiter/junit-jupiter/5.9.2, EPL-2.0, approved, #6972
+maven/mavencentral/org.junit.platform/junit-platform-commons/1.9.2, EPL-2.0, approved, #3130
+maven/mavencentral/org.junit.platform/junit-platform-engine/1.9.2, EPL-2.0, approved, #3128
+maven/mavencentral/org.mockito/mockito-core/4.8.1, MIT, approved, clearlydefined
+maven/mavencentral/org.mockito/mockito-junit-jupiter/4.8.1, MIT, approved, clearlydefined
maven/mavencentral/org.objenesis/objenesis/3.2, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.opentest4j/opentest4j/1.2.0, Apache-2.0, approved, clearlydefined
maven/mavencentral/org.ow2.asm/asm/9.1, BSD-3-Clause, approved, CQ23029
@@ -104,47 +90,46 @@ maven/mavencentral/org.projectlombok/lombok/1.18.24, MIT AND LicenseRef-Public-D
maven/mavencentral/org.reactivestreams/reactive-streams/1.0.4, CC0-1.0, approved, CQ16332
maven/mavencentral/org.rnorth.duct-tape/duct-tape/1.0.8, MIT, approved, clearlydefined
maven/mavencentral/org.skyscreamer/jsonassert/1.5.1, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.slf4j/jul-to-slf4j/1.7.36, MIT, approved, CQ12842
-maven/mavencentral/org.slf4j/slf4j-api/1.7.36, MIT, approved, CQ13368
-maven/mavencentral/org.springdoc/springdoc-openapi-common/1.6.11, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springdoc/springdoc-openapi-ui/1.6.11, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springdoc/springdoc-openapi-webmvc-core/1.6.11, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/2.7.4, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.boot/spring-boot-configuration-processor/2.7.4, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.boot/spring-boot-starter-json/2.7.4, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/2.7.4, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-resource-server/2.7.4, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.boot/spring-boot-starter-reactor-netty/2.7.4, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.boot/spring-boot-starter-security/2.7.4, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.boot/spring-boot-starter-test/2.7.4, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.boot/spring-boot-starter-tomcat/2.7.4, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.boot/spring-boot-starter-web/2.7.4, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.boot/spring-boot-starter-webflux/2.7.4, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.boot/spring-boot-starter/2.7.4, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.boot/spring-boot-test-autoconfigure/2.7.4, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.boot/spring-boot-test/2.7.4, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.boot/spring-boot/2.7.4, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.security/spring-security-config/5.7.3, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.security/spring-security-core/5.7.3, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.security/spring-security-crypto/5.7.3, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.security/spring-security-oauth2-core/5.7.3, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.security/spring-security-oauth2-jose/5.7.3, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.security/spring-security-oauth2-resource-server/5.7.3, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.security/spring-security-test/5.7.3, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework.security/spring-security-web/5.7.3, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.springframework/spring-aop/5.3.23, Apache-2.0, approved, CQ24237
-maven/mavencentral/org.springframework/spring-beans/5.3.23, Apache-2.0, approved, CQ24234
-maven/mavencentral/org.springframework/spring-context/5.3.23, Apache-2.0, approved, CQ24233
-maven/mavencentral/org.springframework/spring-core/5.3.23, Apache-2.0 AND BSD-3-Clause, approved, CQ24026
-maven/mavencentral/org.springframework/spring-expression/5.3.23, Apache-2.0, approved, CQ23155
-maven/mavencentral/org.springframework/spring-jcl/5.3.23, Apache-2.0, approved, CQ23156
-maven/mavencentral/org.springframework/spring-test/5.3.23, Apache-2.0, approved, CQ23054
-maven/mavencentral/org.springframework/spring-web/5.3.23, Apache-2.0 AND LicenseRef-Public-Domain, approved, CQ24028
-maven/mavencentral/org.springframework/spring-webflux/5.3.23, Apache-2.0, approved, #2758
-maven/mavencentral/org.springframework/spring-webmvc/5.3.23, Apache-2.0, approved, CQ23158
-maven/mavencentral/org.testcontainers/junit-jupiter/1.17.4, MIT, approved, clearlydefined
-maven/mavencentral/org.testcontainers/testcontainers/1.17.4, MIT, approved, #3074
-maven/mavencentral/org.webjars/swagger-ui/4.14.0, Apache-2.0 AND MIT, approved, #4093
-maven/mavencentral/org.webjars/webjars-locator-core/0.50, MIT, approved, clearlydefined
-maven/mavencentral/org.xmlunit/xmlunit-core/2.9.0, Apache-2.0, approved, clearlydefined
-maven/mavencentral/org.yaml/snakeyaml/1.33, Apache-2.0, approved, clearlydefined
+maven/mavencentral/org.slf4j/jul-to-slf4j/2.0.6, MIT, approved, clearlydefined
+maven/mavencentral/org.slf4j/slf4j-api/2.0.6, MIT, approved, #5915
+maven/mavencentral/org.springdoc/springdoc-openapi-starter-common/2.0.2, Apache-2.0, approved, #5920
+maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-api/2.0.2, Apache-2.0, approved, #5950
+maven/mavencentral/org.springdoc/springdoc-openapi-starter-webmvc-ui/2.0.2, Apache-2.0, approved, #5923
+maven/mavencentral/org.springframework.boot/spring-boot-autoconfigure/3.0.3, Apache-2.0, approved, #6981
+maven/mavencentral/org.springframework.boot/spring-boot-configuration-processor/3.0.3, Apache-2.0, approved, #6973
+maven/mavencentral/org.springframework.boot/spring-boot-starter-json/3.0.3, Apache-2.0, approved, #7006
+maven/mavencentral/org.springframework.boot/spring-boot-starter-logging/3.0.3, Apache-2.0, approved, #6982
+maven/mavencentral/org.springframework.boot/spring-boot-starter-oauth2-resource-server/3.0.3, Apache-2.0, approved, #6967
+maven/mavencentral/org.springframework.boot/spring-boot-starter-reactor-netty/3.0.3, Apache-2.0, approved, #6989
+maven/mavencentral/org.springframework.boot/spring-boot-starter-security/3.0.3, Apache-2.0, approved, #7329
+maven/mavencentral/org.springframework.boot/spring-boot-starter-test/3.0.3, Apache-2.0, approved, #7001
+maven/mavencentral/org.springframework.boot/spring-boot-starter-validation/3.0.3, Apache-2.0, approved, #6971
+maven/mavencentral/org.springframework.boot/spring-boot-starter-webflux/3.0.3, Apache-2.0, approved, #6986
+maven/mavencentral/org.springframework.boot/spring-boot-starter/3.0.3, Apache-2.0, approved, #7330
+maven/mavencentral/org.springframework.boot/spring-boot-test-autoconfigure/3.0.3, Apache-2.0, approved, #6966
+maven/mavencentral/org.springframework.boot/spring-boot-test/3.0.3, Apache-2.0, approved, #6976
+maven/mavencentral/org.springframework.boot/spring-boot/3.0.3, Apache-2.0, approved, #7327
+maven/mavencentral/org.springframework.security/spring-security-config/6.0.2, Apache-2.0, approved, #7338
+maven/mavencentral/org.springframework.security/spring-security-core/6.0.2, Apache-2.0, approved, #7325
+maven/mavencentral/org.springframework.security/spring-security-crypto/6.0.2, Apache-2.0 AND ISC, approved, #7326
+maven/mavencentral/org.springframework.security/spring-security-oauth2-core/6.0.2, Apache-2.0, approved, #7324
+maven/mavencentral/org.springframework.security/spring-security-oauth2-jose/6.0.2, Apache-2.0, approved, #7337
+maven/mavencentral/org.springframework.security/spring-security-oauth2-resource-server/6.0.2, Apache-2.0, approved, #7335
+maven/mavencentral/org.springframework.security/spring-security-test/6.0.2, Apache-2.0, approved, #7402
+maven/mavencentral/org.springframework.security/spring-security-web/6.0.2, Apache-2.0, approved, #7328
+maven/mavencentral/org.springframework/spring-aop/6.0.5, Apache-2.0, approved, #5940
+maven/mavencentral/org.springframework/spring-beans/6.0.5, Apache-2.0, approved, #5937
+maven/mavencentral/org.springframework/spring-context/6.0.5, Apache-2.0, approved, #5936
+maven/mavencentral/org.springframework/spring-core/6.0.5, Apache-2.0 AND BSD-3-Clause, approved, #5948
+maven/mavencentral/org.springframework/spring-expression/6.0.5, Apache-2.0, approved, #3284
+maven/mavencentral/org.springframework/spring-jcl/6.0.5, Apache-2.0, approved, #3283
+maven/mavencentral/org.springframework/spring-test/6.0.5, Apache-2.0, approved, #7003
+maven/mavencentral/org.springframework/spring-web/6.0.5, Apache-2.0, approved, #5942
+maven/mavencentral/org.springframework/spring-webflux/6.0.5, Apache-2.0, approved, #6964
+maven/mavencentral/org.springframework/spring-webmvc/6.0.5, Apache-2.0, approved, #5944
+maven/mavencentral/org.testcontainers/junit-jupiter/1.17.5, MIT, approved, clearlydefined
+maven/mavencentral/org.testcontainers/testcontainers/1.17.5, MIT, approved, #3074
+maven/mavencentral/org.webjars/swagger-ui/4.15.5, Apache-2.0 AND MIT, approved, #5921
+maven/mavencentral/org.webjars/webjars-locator-core/0.52, MIT, approved, clearlydefined
+maven/mavencentral/org.xmlunit/xmlunit-core/2.9.1, Apache-2.0, approved, #6272
+maven/mavencentral/org.yaml/snakeyaml/2.0, Apache-2.0 AND (Apache-2.0 AND BSD-3-Clause AND EPL-1.0 AND GPL-2.0-or-later AND LGPL-2.1-or-later), restricted, #7275
diff --git a/DEPENDENCIES-ext b/DEPENDENCIES-ext
deleted file mode 100644
index a18447f..0000000
--- a/DEPENDENCIES-ext
+++ /dev/null
@@ -1,11 +0,0 @@
-openjdk:17
-bellsoft/liberica-openjdk-alpine:17.0.3.1-2
-https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.1/apache-maven-3.8.1-bin.zip
-https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.1/maven-wrapper-3.1.1.jar
-actions/checkout@v2
-docker/metadata-action@v4
-docker/login-action@v1
-docker/build-push-action@v3
-docker/metadata-action@v4
-dos2unix;7.4.0-3.el8;x86_64;ol8_baseos_latest
-https://repo.maven.apache.org/maven2/
diff --git a/Dockerfile b/Dockerfile
index a7e312b..4b6081a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,31 +1,27 @@
-#FROM openjdk:17 as build
-FROM maven:3.8.5-openjdk-18-slim as build
+FROM maven:3.9.0-eclipse-temurin-19 as build
COPY . /drs/
WORKDIR /drs
-#RUN microdnf install dos2unix && microdnf clean all
-#RUN dos2unix mvnw
-#RUN chmod +x mvnw
-#RUN dos2unix .mvn/wrapper/maven-wrapper.properties
-
-#RUN ./mvnw clean install -Dmaven.test.skip=true
-
RUN mvn clean install -Dmaven.test.skip=true
RUN mkdir -p target/dependency && (cd target/dependency; jar -xf ../*.jar)
-FROM bellsoft/liberica-openjdk-alpine:17.0.4.1-1
+FROM eclipse-temurin:17.0.6_10-jdk-alpine
+
RUN apk update && apk upgrade
ARG DEPENDENCY=/drs/target/dependency
COPY --from=build ${DEPENDENCY}/BOOT-INF/lib /app/lib
COPY --from=build ${DEPENDENCY}/META-INF /app/META-INF
COPY --from=build ${DEPENDENCY}/BOOT-INF/classes /app
+
RUN adduser -DH drs && addgroup drs drs
USER drs
ENTRYPOINT ["java", "-cp", "app:app/lib/*", "org.eclipse.tractusx.dapsreg.DapsregApplication"]
+
EXPOSE 8080
+HEALTHCHECK CMD curl --fail http://localhost:8080 || exit 1
diff --git a/INSTALL.md b/INSTALL.md
index c96e8ff..0289e76 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -2,9 +2,7 @@
Helm charts are provided inside https://github.com/eclipse-tractusx/daps-registration-service
-1.) Using helm commands:-
-
-How to install application using helm:-
+1.) Using helm:
helm install ReleaseName ChartName
a.) Add helm repository in tractusx:-
@@ -18,18 +16,17 @@ How to install application using helm:-
2.) Local installation:
a.) git clone https://github.com/eclipse-tractusx/daps-registration-service.git
- b.) Modify values file according to your requirement.
- c.) You need to define the secrets as well in values.yaml
- secret:
+ b.) Modify values file according to your requirement.
+ c.) You need to define the secrets as well in values.yaml
+ secret:
clientId: -> Client id for DAPS.
- clientSecret: -> Client Secret for DAPS
- authServerUrl: -> Auth URL for keycloak.
- realm: -> Realm for portal keycloak
- resource: -> Resource for portal keycloak.
- apiUri: -> DAPS API URL.
- tokenUri: -> DAPS token URL.
-
- d.) These secrets should be defined in Hashicorp vault.
- e.) Deploy in a kubernetes cluster
- helm install daps-reg-svc charts/daps-reg-service/ -n NameSpace
-
+ clientSecret: -> Client Secret for DAPS
+ authServerUrl: -> Auth URL for keycloak
+ realm: -> Realm for portal keycloak
+ resource: -> Resource for portal keycloak
+ apiUri: -> DAPS API URL
+ tokenUri: -> DAPS token URL
+
+ d.) These secrets should be defined in Hashicorp vault
+ e.) Deploy in a kubernetes cluster
+ helm install daps-reg-svc charts/daps-reg-service/ -n NameSpace
diff --git a/README.md b/README.md
index f496a55..365b7f1 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ Other parameters are optional:
- referringConnector: url of the Connector. By convention, we add BPN number at the
end of the URL to keep reference to the BPN inside of DAT token
-## Example:#
+## Example:
```http request
POST api/v1/daps?clientName=MyCompany HTTP/1.1
Content-Type: multipart/form-data; boundary=---------------------------9051914041544843365972754266
diff --git a/charts/daps-reg-service/values-beta.yaml b/charts/daps-reg-service/values-beta.yaml
index b07145b..b4f8c5d 100644
--- a/charts/daps-reg-service/values-beta.yaml
+++ b/charts/daps-reg-service/values-beta.yaml
@@ -45,8 +45,8 @@ ingress:
# -- Pod resources requests and limits configuration
resources:
limits:
- cpu: 200m
- memory: 300Mi
+ cpu: 500m
+ memory: 400Mi
requests:
cpu: 200m
memory: 300Mi
diff --git a/charts/daps-reg-service/values-dev.yaml b/charts/daps-reg-service/values-dev.yaml
index ff6c1c5..7579ad6 100644
--- a/charts/daps-reg-service/values-dev.yaml
+++ b/charts/daps-reg-service/values-dev.yaml
@@ -40,8 +40,8 @@ ingress:
# -- Pod resources requests and limits configuration
resources:
limits:
- cpu: 200m
- memory: 300Mi
+ cpu: 500m
+ memory: 400Mi
requests:
cpu: 200m
memory: 300Mi
diff --git a/charts/daps-reg-service/values-int.yaml b/charts/daps-reg-service/values-int.yaml
index 3cb2b87..310ea97 100644
--- a/charts/daps-reg-service/values-int.yaml
+++ b/charts/daps-reg-service/values-int.yaml
@@ -41,8 +41,8 @@ ingress:
# -- Pod resources requests and limits configuration
resources:
limits:
- cpu: 200m
- memory: 300Mi
+ cpu: 500m
+ memory: 400Mi
requests:
cpu: 200m
memory: 300Mi
diff --git a/charts/daps-reg-service/values-pen.yaml b/charts/daps-reg-service/values-pen.yaml
index cd0b377..0c786d3 100644
--- a/charts/daps-reg-service/values-pen.yaml
+++ b/charts/daps-reg-service/values-pen.yaml
@@ -40,10 +40,11 @@ ingress:
# -- Pod resources requests and limits configuration
+resources:
resources:
limits:
- cpu: 200m
- memory: 300Mi
+ cpu: 500m
+ memory: 400Mi
requests:
cpu: 200m
memory: 300Mi
diff --git a/charts/daps-reg-service/values.yaml b/charts/daps-reg-service/values.yaml
index 538d7a3..80c63c2 100644
--- a/charts/daps-reg-service/values.yaml
+++ b/charts/daps-reg-service/values.yaml
@@ -1,6 +1,6 @@
#################################################################################
-# Copyright (c) 2021,2022 T-Systems International GmbH
-# Copyright (c) 2021,2022 Contributors to the Eclipse Foundation
+# Copyright (c) 2022,2023 T-Systems International GmbH
+# Copyright (c) 2022,2023 Contributors to the Eclipse Foundation
#
# See the NOTICE file(s) distributed with this work for additional
# information regarding copyright ownership.
@@ -112,11 +112,12 @@ drs:
resources:
limits:
- cpu: 200m
- memory: 300Mi
+ cpu: 500m
+ memory: 400Mi
requests:
cpu: 200m
memory: 300Mi
+
# We usually recommend not to specify default resources and to leave this as a conscious
# choice for the user. This also increases chances charts run on environments with little
# resources, such as Minikube. If you do want to specify resources, uncomment the following