diff --git a/refarch-integrations/pom.xml b/refarch-integrations/pom.xml index 6db221ae..e54e1949 100644 --- a/refarch-integrations/pom.xml +++ b/refarch-integrations/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.6 + 3.4.0 @@ -32,9 +32,6 @@ ${java.version} ${java.version} - - 2023.0.4 - 8.0 @@ -62,14 +59,6 @@ - - org.springframework.cloud - spring-cloud-dependencies - ${spring-cloud-dependencies.version} - pom - import - - org.springdoc @@ -88,6 +77,13 @@ logstash-logback-encoder ${logstash-logback-encoder.version} + + + + org.wiremock + wiremock-standalone + 3.10.0 + diff --git a/refarch-integrations/refarch-cosys-integration/refarch-cosys-integration-example/pom.xml b/refarch-integrations/refarch-cosys-integration/refarch-cosys-integration-example/pom.xml index 36003fc1..ad33b958 100644 --- a/refarch-integrations/refarch-cosys-integration/refarch-cosys-integration-example/pom.xml +++ b/refarch-integrations/refarch-cosys-integration/refarch-cosys-integration-example/pom.xml @@ -30,12 +30,6 @@ org.apache.httpcomponents.client5 httpclient5 - - - com.squareup.okhttp3 - okhttp - ${okhttp.version} - diff --git a/refarch-integrations/refarch-cosys-integration/refarch-cosys-integration-starter/src/main/java/de/muenchen/refarch/integration/cosys/configuration/CosysProperties.java b/refarch-integrations/refarch-cosys-integration/refarch-cosys-integration-starter/src/main/java/de/muenchen/refarch/integration/cosys/configuration/CosysProperties.java index d2600822..9fd3469e 100644 --- a/refarch-integrations/refarch-cosys-integration/refarch-cosys-integration-starter/src/main/java/de/muenchen/refarch/integration/cosys/configuration/CosysProperties.java +++ b/refarch-integrations/refarch-cosys-integration/refarch-cosys-integration-starter/src/main/java/de/muenchen/refarch/integration/cosys/configuration/CosysProperties.java @@ -1,5 +1,6 @@ package de.muenchen.refarch.integration.cosys.configuration; +import jakarta.validation.Valid; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import lombok.Getter; @@ -15,6 +16,7 @@ public class CosysProperties { @NotNull + @Valid @NestedConfigurationProperty private MergeProperties merge; diff --git a/refarch-integrations/refarch-dms-integration/refarch-dms-integration-fabasoft-soap/refarch-dms-integration-fabasoft-mock/pom.xml b/refarch-integrations/refarch-dms-integration/refarch-dms-integration-fabasoft-soap/refarch-dms-integration-fabasoft-mock/pom.xml index b062bf81..47c80d81 100644 --- a/refarch-integrations/refarch-dms-integration/refarch-dms-integration-fabasoft-soap/refarch-dms-integration-fabasoft-mock/pom.xml +++ b/refarch-integrations/refarch-dms-integration/refarch-dms-integration-fabasoft-soap/refarch-dms-integration-fabasoft-mock/pom.xml @@ -9,10 +9,6 @@ refarch-dms-integration-fabasoft-mock - - 3.10.0 - - de.muenchen.refarch @@ -23,7 +19,6 @@ org.wiremock wiremock-standalone - ${wiremock-standalone.version} compile diff --git a/refarch-integrations/refarch-email-integration/refarch-email/refarch-email-api/pom.xml b/refarch-integrations/refarch-email-integration/refarch-email/refarch-email-api/pom.xml index 2000d659..d346bc50 100644 --- a/refarch-integrations/refarch-email-integration/refarch-email/refarch-email-api/pom.xml +++ b/refarch-integrations/refarch-email-integration/refarch-email/refarch-email-api/pom.xml @@ -21,7 +21,10 @@ jakarta.validation jakarta.validation-api - 3.1.0 + + + jakarta.servlet + jakarta.servlet-api com.googlecode.owasp-java-html-sanitizer diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/pom.xml b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/pom.xml index 0a950e23..841e55d6 100644 --- a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/pom.xml +++ b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/pom.xml @@ -78,21 +78,11 @@ spring-boot-starter-validation - - - org.springframework.cloud - spring-cloud-stream-binder-kafka - - org.apache.httpcomponents.client5 httpclient5 - - com.squareup.okhttp3 - okhttp - diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/resources/application.yml b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/resources/application.yml index 70de1fb7..e5592233 100644 --- a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/resources/application.yml +++ b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/resources/application.yml @@ -16,21 +16,24 @@ server: include-stacktrace: never whitelabel: enabled: false - shutdown: graceful # Config for spring actuator endpoints management: endpoints: - enabled-by-default: false + access: + default: none web: exposure: include: health, info, prometheus, livenessstate, readinessstate path-mapping: prometheus: metrics endpoint: - health.enabled: true - info.enabled: true - prometheus.enabled: true + health: + access: read_only + info: + access: read_only + prometheus: + access: read_only info: env: enabled: true diff --git a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/resources/logback-spring.xml b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/resources/logback-spring.xml index 663c70eb..f3fdafc5 100644 --- a/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/resources/logback-spring.xml +++ b/refarch-integrations/refarch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/src/main/resources/logback-spring.xml @@ -34,12 +34,6 @@ - - - -