diff --git a/module-server/server.gradle.kts b/module-server/server.gradle.kts index 6c06d84..4837a18 100644 --- a/module-server/server.gradle.kts +++ b/module-server/server.gradle.kts @@ -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) } diff --git a/module-server/src/main/resources/application-dev.yaml b/module-server/src/main/resources/application-dev.yaml deleted file mode 100644 index d329a09..0000000 --- a/module-server/src/main/resources/application-dev.yaml +++ /dev/null @@ -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}" diff --git a/module-server/src/main/resources/application-prod.yaml b/module-server/src/main/resources/application-prod.yaml deleted file mode 100644 index 9d93705..0000000 --- a/module-server/src/main/resources/application-prod.yaml +++ /dev/null @@ -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}" diff --git a/module-server/src/main/resources/application.yaml b/module-server/src/main/resources/application.yaml index 6b32144..6d67880 100644 --- a/module-server/src/main/resources/application.yaml +++ b/module-server/src/main/resources/application.yaml @@ -24,9 +24,6 @@ management: http.server.requests: true spring: - cloud: - config: - name: wahlrecht main: banner-mode: off profiles: @@ -86,4 +83,13 @@ resttemplate: readTimeoutRestHealthIndicatorInMillis: 5000 connectionRestHealthIndicatorTimeoutInMillis: 5000 readTimeoutRestTemplateInMillis: 5000 - connectionRestTemplateTimeoutInMillis: 5000 \ No newline at end of file + connectionRestTemplateTimeoutInMillis: 5000 + +de.twomartens.wahlrecht: + defaultTimeZone: Europe/Berlin + greeting: "Hello %s, on millenium" + statusprobe: + scheduleDuration: 60 + maxKafkaFailureDuration: 5 + maxBlobFailureCount: 5 + maxFailurePercent: 50 \ No newline at end of file diff --git a/module-server/src/main/resources/config/wahlrecht-prod.yaml b/module-server/src/main/resources/config/wahlrecht-prod.yaml deleted file mode 100644 index bf3b3e1..0000000 --- a/module-server/src/main/resources/config/wahlrecht-prod.yaml +++ /dev/null @@ -1,2 +0,0 @@ -de.twomartens.wahlrecht: - greeting: "Moin %s, you are test" diff --git a/module-server/src/main/resources/config/wahlrecht.yaml b/module-server/src/main/resources/config/wahlrecht.yaml deleted file mode 100644 index 92a4074..0000000 --- a/module-server/src/main/resources/config/wahlrecht.yaml +++ /dev/null @@ -1,8 +0,0 @@ -de.twomartens.wahlrecht: - defaultTimeZone: Europe/Berlin - greeting: "Hello %s, on millenium" - statusprobe: - scheduleDuration: 60 - maxKafkaFailureDuration: 5 - maxBlobFailureCount: 5 - maxFailurePercent: 50 \ No newline at end of file