Compare commits

..
4 Commits
Author SHA1 Message Date
2martens 6fb144ef43 fix: Remove config server and kafka
continuous-integration/drone/tag Build is passing
2025-07-26 13:31:34 +02:00
2martens 04bec53671 fix: Change ServiceProperties to open class
continuous-integration/drone/tag Build is passing
2025-07-26 13:24:13 +02:00
2martens 40ed9b8fba maintenance: Update versions
continuous-integration/drone/tag Build is passing
2025-07-26 12:59:46 +02:00
2martens a8d2aaef09 fix: Change realm to twomartens 2025-07-26 12:23:47 +02:00
8 changed files with 27 additions and 44 deletions
+15 -14
View File
@@ -1,21 +1,22 @@
[versions]
spring-boot = "3.2.3"
spring-doc = "2.3.0"
spring-cloud = "2023.0.0"
spring-boot = "3.5.4"
spring-doc = "2.8.9"
spring-cloud = "2025.0.0"
spring-grpc = "2.14.0.RELEASE"
grpc = "1.57.0"
tomcat-annotations = "6.0.53"
httpclient = "5.3.1"
slf4j = "2.0.12"
log4j = "2.23.0"
log4j-ecs = "1.6.0"
mapstruct = "1.5.5.Final"
junit = "5.10.2"
assertj = "3.25.3"
mockito = "5.11.0"
keycloak = "24.0.1"
httpclient = "5.5"
slf4j = "2.0.17"
log4j = "2.25.1"
log4j-ecs = "1.7.0"
mapstruct = "1.6.3"
junit = "5.13.4"
assertj = "3.27.3"
mockito = "5.18.0"
keycloak = "26.3.2"
keycloak-policy-enforcer = "26.0.6"
kotlin-logging = "3.0.5"
kotlin-reflect = "1.9.22"
kotlin-reflect = "2.2.0"
kotlin-lombok = "1.9.0"
plugin-nebula-release = "17.2.2"
plugin-lombok = "8.0.1"
@@ -47,7 +48,7 @@ spring-ui = { module = "org.springdoc:springdoc-openapi-starter-webmvc-ui", vers
spring-sec = { module = "org.springdoc:springdoc-openapi-starter-common", version.ref = "spring-doc" }
spring-openapi = { module = "org.springdoc:springdoc-openapi-starter-webmvc-api", version.ref = "spring-doc" }
keycloak-core = { module = "org.keycloak:keycloak-core", version.ref = "keycloak" }
keycloak-policy-enforcer = { module = "org.keycloak:keycloak-policy-enforcer", version.ref = "keycloak" }
keycloak-policy-enforcer = { module = "org.keycloak:keycloak-policy-enforcer", version.ref = "keycloak-policy-enforcer" }
grpc-api = { module = "io.grpc:grpc-api", version.ref = "grpc" }
grpc-context = { module = "io.grpc:grpc-context", version.ref = "grpc" }
grpc-core = { module = "io.grpc:grpc-core", version.ref = "grpc" }
-2
View File
@@ -9,6 +9,4 @@ dependencies {
implementation(libs.bundles.spring.boot.security)
annotationProcessor(libs.mapstruct.processor)
kapt(libs.mapstruct.processor)
implementation(libs.spring.cloud.starter.config)
implementation(libs.spring.cloud.starter.bus.kafka)
}
@@ -8,7 +8,7 @@ import java.time.ZoneId
@RefreshScope
@ConfigurationProperties(prefix = "de.twomartens.wahlrecht")
@Schema(description = "Properties, to configure this Application")
class ServiceProperties {
open class ServiceProperties {
lateinit var defaultTimeZone: ZoneId
lateinit var greeting: String
}
@@ -1,5 +0,0 @@
spring:
config:
import:
- "classpath:config/wahlrecht.yaml"
- "optional:configserver:${CONFIGSERVER_SCHEME:http}://${CONFIGSERVER_HOST:configserver}:${CONFIGSERVER_PORT:8888}${CONFIGSERVER_PREFIX:/config}"
@@ -1,7 +0,0 @@
spring:
config:
import:
- "configserver:${CONFIGSERVER_SCHEME:http}://${CONFIGSERVER_HOST:configserver}:${CONFIGSERVER_PORT:8888}${CONFIGSERVER_PREFIX:/config}"
kafka:
bootstrap-servers:
- "${KAFKA_HOST:kafka}:${KAFKA_PORT:9092}"
@@ -24,9 +24,6 @@ management:
http.server.requests: true
spring:
cloud:
config:
name: wahlrecht
main:
banner-mode: off
profiles:
@@ -38,7 +35,7 @@ spring:
oauth2:
resourceserver:
jwt:
jwk-set-uri: ${KEYCLOAK_URL:https://id.2martens.de}/realms/${KEYCLOAK_REALM:2martens}/protocol/openid-connect/certs
jwk-set-uri: ${KEYCLOAK_URL:https://id.2martens.de}/realms/${KEYCLOAK_REALM:twomartens}/protocol/openid-connect/certs
application:
name: wahlrecht
@@ -87,3 +84,12 @@ resttemplate:
connectionRestHealthIndicatorTimeoutInMillis: 5000
readTimeoutRestTemplateInMillis: 5000
connectionRestTemplateTimeoutInMillis: 5000
de.twomartens.wahlrecht:
defaultTimeZone: Europe/Berlin
greeting: "Hello %s, on millenium"
statusprobe:
scheduleDuration: 60
maxKafkaFailureDuration: 5
maxBlobFailureCount: 5
maxFailurePercent: 50
@@ -1,2 +0,0 @@
de.twomartens.wahlrecht:
greeting: "Moin %s, you are test"
@@ -1,8 +0,0 @@
de.twomartens.wahlrecht:
defaultTimeZone: Europe/Berlin
greeting: "Hello %s, on millenium"
statusprobe:
scheduleDuration: 60
maxKafkaFailureDuration: 5
maxBlobFailureCount: 5
maxFailurePercent: 50