fix(deps): update dependency org.springframework.boot:spring-boot-sta…

…rter-parent to v3.4.0 (#282) * fix(deps): update dependency org.springframework.boot:spring-boot-starter-parent to v3.4.0 * ➖ rm spring-cloud-stream * ⬆️ use new spring actuator properties * ➖ rm okhttp * 🗑️ mail use jakarta.validation-api spring-parent version * 🐛 mail fix api mock add missing jakarta-servlet * 🔥 s3 rm spring-cloud in logback * ♻️ integrations central wiremock-version 3.10 * 🔥 Removed unnecessary graceful shutdown property due to being default * 🦺 Added validation to nested configuration properties --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Simon Hirtreiter <[email protected]> Co-authored-by: devtobi <[email protected]>
it-at-m · Dec 5, 2024 · ce7cff0 · ce7cff0
1 parent 74b3752
commit ce7cff0
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 45 deletions.
diff --git a/refarch-integrations/pom.xml b/refarch-integrations/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.6</version>
+        <version>3.4.0</version>
         <relativePath />
     </parent>
 
@@ -32,9 +32,6 @@
         <maven.compiler.target>${java.version}</maven.compiler.target>
         <maven.compiler.release>${java.version}</maven.compiler.release>
 
-        <!-- Core Frameworks -->
-        <spring-cloud-dependencies.version>2023.0.4</spring-cloud-dependencies.version>
-
         <!-- Logging -->
         <logstash-logback-encoder.version>8.0</logstash-logback-encoder.version>
 
@@ -62,14 +59,6 @@
 
     <dependencyManagement>
         <dependencies>
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-dependencies</artifactId>
-                <version>${spring-cloud-dependencies.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-
             <!-- Open API -->
             <dependency>
                 <groupId>org.springdoc</groupId>
@@ -88,6 +77,13 @@
                 <artifactId>logstash-logback-encoder</artifactId>
                 <version>${logstash-logback-encoder.version}</version>
             </dependency>
+
+            <!-- Testing -->
+            <dependency>
+                <groupId>org.wiremock</groupId>
+                <artifactId>wiremock-standalone</artifactId>
+                <version>3.10.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

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
@@ -30,12 +30,6 @@
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-            <version>${okhttp.version}</version>
-        </dependency>
     </dependencies>
 
 </project>
diff --git a/...er/src/main/java/de/muenchen/refarch/integration/cosys/configuration/CosysProperties.java b/...er/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/...ation/refarch-dms-integration-fabasoft-soap/refarch-dms-integration-fabasoft-mock/pom.xml b/...ation/refarch-dms-integration-fabasoft-soap/refarch-dms-integration-fabasoft-mock/pom.xml
@@ -9,10 +9,6 @@
 
     <artifactId>refarch-dms-integration-fabasoft-mock</artifactId>
 
-    <properties>
-        <wiremock-standalone.version>3.10.0</wiremock-standalone.version>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>de.muenchen.refarch</groupId>
@@ -23,7 +19,6 @@
         <dependency>
             <groupId>org.wiremock</groupId>
             <artifactId>wiremock-standalone</artifactId>
-            <version>${wiremock-standalone.version}</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

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
@@ -21,7 +21,10 @@
         <dependency>
             <groupId>jakarta.validation</groupId>
             <artifactId>jakarta.validation-api</artifactId>
-            <version>3.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
         <dependency>
             <groupId>com.googlecode.owasp-java-html-sanitizer</groupId>

diff --git a/...ch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/pom.xml b/...ch-s3-integration/refarch-s3-integration-rest/refarch-s3-integration-rest-service/pom.xml
@@ -78,21 +78,11 @@
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
-        <!-- Streaming -->
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-stream-binder-kafka</artifactId>
-        </dependency>
-
         <!-- Other -->
         <dependency>
             <groupId>org.apache.httpcomponents.client5</groupId>
             <artifactId>httpclient5</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.squareup.okhttp3</groupId>
-            <artifactId>okhttp</artifactId>
-        </dependency>
 
         <!-- json etc. -->
         <dependency>

diff --git a/...3-integration-rest/refarch-s3-integration-rest-service/src/main/resources/application.yml b/...3-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/...ntegration-rest/refarch-s3-integration-rest-service/src/main/resources/logback-spring.xml b/...ntegration-rest/refarch-s3-integration-rest-service/src/main/resources/logback-spring.xml
@@ -34,12 +34,6 @@
             <appender-ref ref="STDOUT"/>
         </logger>
 
-        <logger name="org.springframework.cloud.gateway"
-                level="debug"
-                additivity="false">
-            <appender-ref ref="STDOUT"/>
-        </logger>
-
         <logger name="org.springframework.security"
                 level="debug"
                 additivity="false">