#768: code fixed in different places

it-at-m · Nov 7, 2023 · 997b60f · 997b60f
1 parent 3d244a9
commit 997b60f
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 12 deletions.
diff --git a/digiwf-integrations/digiwf-address-integration/pom.xml b/digiwf-integrations/digiwf-address-integration/pom.xml
@@ -17,7 +17,7 @@
     </parent>
 
     <properties>
-        <!--        <spring.cloud.version>2021.0.3</spring.cloud.version>-->
+        <!--todo: remove after the successfully spring boot version upgrade of all migrations-->
         <spring-boot.version>3.1.5</spring-boot.version>
         <spring.cloud.version>2022.0.4</spring.cloud.version>
         <digiwf.spring.cloudstream.utils.version>1.0.0</digiwf.spring.cloudstream.utils.version>
@@ -34,7 +34,7 @@
     </modules>
 
     <dependencies>
-<!--        TODO could be removed after migrate all migrations to spring 3-->
+        <!--        TODO could be removed after migrate all migrations to spring 3-->
         <dependency>
             <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-message-starter</artifactId>

diff --git a/digiwf-integrations/digiwf-integration-parent/pom.xml b/digiwf-integrations/digiwf-integration-parent/pom.xml
@@ -17,6 +17,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring-boot.version>2.7.17</spring-boot.version>
         <spring.cloud.version>2021.0.8</spring.cloud.version>
+<!--        TODO after migrate all integrations, we can set the spring boot version here: -->
 <!--        <spring-boot.version>3.1.5</spring-boot.version>-->
 <!--        <spring.cloud.version>2022.0.4</spring.cloud.version>-->
         <okhttp.version>4.12.0</okhttp.version>

diff --git a/...n/oss/digiwf/spring/security/postprocessor/DefaultPropertiesEnvironmentPostProcessor.java b/...n/oss/digiwf/spring/security/postprocessor/DefaultPropertiesEnvironmentPostProcessor.java
@@ -20,7 +20,7 @@
 public final class DefaultPropertiesEnvironmentPostProcessor implements EnvironmentPostProcessor {
 
     private static final String DEFAULT_PROPERTY_SOURCE_NAME = "defaultProperties";
-    private static final String DEFAULT_PROPERTY_SOURCE_LOCATION = "classpath:application-spring-security-starter.yaml";
+    private static final String DEFAULT_PROPERTY_SOURCE_LOCATION = "application-spring-security-starter.yaml";
 
     @Override
     public void postProcessEnvironment(ConfigurableEnvironment environment, SpringApplication application) {

diff --git a/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/...esources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
@@ -1 +1,2 @@
 de.muenchen.oss.digiwf.spring.security.autoconfiguration.SpringSecurityAutoConfiguration
+de.muenchen.oss.digiwf.spring.security.postprocessor.DefaultPropertiesEnvironmentPostProcessor
diff --git a/digiwf-parent/pom.xml b/digiwf-parent/pom.xml
@@ -15,6 +15,7 @@
         <java.version>17</java.version>
         <maven.version>3.6.0</maven.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+<!--        todo: upgrade version after the successfully spring boot version upgrade-->
         <spring-boot.version>2.7.17</spring-boot.version>
         <spring.cloud.version>2021.0.8</spring.cloud.version>
         <okhttp.version>4.12.0</okhttp.version>

diff --git a/digiwf-process/digiwf-process-api/pom.xml b/digiwf-process/digiwf-process-api/pom.xml
@@ -13,10 +13,11 @@
 
     <dependencies>
         <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
+            <groupId>jakarta.validation</groupId>
+            <artifactId>jakarta.validation-api</artifactId>
         </dependency>
 
+
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot</artifactId>
@@ -39,7 +40,7 @@
         <dependency>
             <groupId>de.muenchen.oss.digiwf</groupId>
             <artifactId>digiwf-spring-security-starter</artifactId>
-            <version>${digiwf.version}</version>
+            <version>${project.version}</version>
         </dependency>
 
         <!-- Testing -->

diff --git a/...ss-api/src/main/java/de/muenchen/oss/digiwf/process/api/config/api/dto/ConfigEntryTO.java b/...ss-api/src/main/java/de/muenchen/oss/digiwf/process/api/config/api/dto/ConfigEntryTO.java
@@ -1,12 +1,11 @@
 package de.muenchen.oss.digiwf.process.api.config.api.dto;
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-
 
 @Data
 @Builder

diff --git a/...-api/src/main/java/de/muenchen/oss/digiwf/process/api/config/api/dto/ProcessConfigTO.java b/...-api/src/main/java/de/muenchen/oss/digiwf/process/api/config/api/dto/ProcessConfigTO.java
@@ -5,7 +5,7 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/...s-api/src/main/java/de/muenchen/oss/digiwf/process/api/config/api/dto/StatusConfigTO.java b/...s-api/src/main/java/de/muenchen/oss/digiwf/process/api/config/api/dto/StatusConfigTO.java
@@ -5,8 +5,8 @@
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 
 
 @Data

diff --git a/...process-api/src/main/java/de/muenchen/oss/digiwf/process/api/start/StartProcessEvent.java b/...process-api/src/main/java/de/muenchen/oss/digiwf/process/api/start/StartProcessEvent.java
@@ -2,7 +2,7 @@
 
 import lombok.*;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import java.util.Map;
 
 /**

diff --git a/digiwf-process/pom.xml b/digiwf-process/pom.xml
@@ -15,6 +15,11 @@
         <version>1.2.0-SNAPSHOT</version>
     </parent>
 
+    <properties>
+        <spring-boot.version>3.1.5</spring-boot.version>
+        <spring.cloud.version>2022.0.4</spring.cloud.version>
+    </properties>
+
     <modules>
         <module>digiwf-process-api</module>
         <module>digiwf-process-starter</module>