diff --git a/alfa-service/pom.xml b/alfa-service/pom.xml
index e70f2877152ef4f40579e1d81e0a277d366225c9..7e4f81cd52eb0791b9f9cea0e8b1f2c4aa6a7483 100644
--- a/alfa-service/pom.xml
+++ b/alfa-service/pom.xml
@@ -43,8 +43,9 @@
<properties>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
-
- <spring-security.version>5.8.7</spring-security.version>
+
+ <!-- TODO: die Version über kop-common ziehen -->
+ <jjwt.version>0.11.5</jjwt.version>
</properties>
<dependencies>
@@ -73,133 +74,17 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-security</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- <version>${spring-security.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>${spring-security.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-crypto</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-crypto</artifactId>
- <version>${spring-security.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- <version>${spring-security.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-resource-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-jose</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-resource-server</artifactId>
- <version>${spring-security.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-jose</artifactId>
- <version>${spring-security.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-core</artifactId>
- </exclusion>
- </exclusions>
+ <artifactId>spring-boot-starter-security</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-core</artifactId>
- <version>${spring-security.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-oauth2-resource-server</artifactId>
</dependency>
-
<dependency>
- <groupId>com.jayway.jsonpath</groupId>
- <artifactId>json-path</artifactId>
+ <groupId>com.jayway.jsonpath</groupId>
+ <artifactId>json-path</artifactId>
</dependency>
<!-- jwt -->
@@ -209,7 +94,18 @@
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
- <artifactId>jjwt</artifactId>
+ <artifactId>jjwt-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.jsonwebtoken</groupId>
+ <artifactId>jjwt-impl</artifactId>
+ <version>${jjwt.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.jsonwebtoken</groupId>
+ <artifactId>jjwt-jackson</artifactId>
+ <version>${jjwt.version}</version>
+ <scope>runtime</scope>
</dependency>
<!-- own projects -->
@@ -275,18 +171,7 @@
<dependency>
<groupId>org.springframework.security</groupId>
<artifactId>spring-security-test</artifactId>
- <version>5.8.7</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>de.itvsh.ozg.pluto</groupId>
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/GrpcConfiguration.java b/alfa-service/src/main/java/de/ozgcloud/alfa/GrpcConfiguration.java
new file mode 100644
index 0000000000000000000000000000000000000000..5938536e6e05c7f3593829e0586890d0164c8c3c
--- /dev/null
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/GrpcConfiguration.java
@@ -0,0 +1,19 @@
+package de.ozgcloud.alfa;
+
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@ImportAutoConfiguration({
+ net.devh.boot.grpc.client.autoconfigure.GrpcClientAutoConfiguration.class,
+ net.devh.boot.grpc.client.autoconfigure.GrpcClientMetricAutoConfiguration.class,
+ net.devh.boot.grpc.client.autoconfigure.GrpcClientHealthAutoConfiguration.class,
+ net.devh.boot.grpc.client.autoconfigure.GrpcClientSecurityAutoConfiguration.class,
+ net.devh.boot.grpc.client.autoconfigure.GrpcClientTraceAutoConfiguration.class,
+ net.devh.boot.grpc.client.autoconfigure.GrpcDiscoveryClientAutoConfiguration.class,
+
+ net.devh.boot.grpc.common.autoconfigure.GrpcCommonCodecAutoConfiguration.class,
+ net.devh.boot.grpc.common.autoconfigure.GrpcCommonTraceAutoConfiguration.class
+})
+public class GrpcConfiguration {
+}
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/RequestIdFilter.java b/alfa-service/src/main/java/de/ozgcloud/alfa/RequestIdFilter.java
index c99af4d374c060118ff2930849ef4eccf40d99dc..83b33e364ebd220e94962637bc6fedc545ad2efb 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/RequestIdFilter.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/RequestIdFilter.java
@@ -25,10 +25,10 @@ package de.ozgcloud.alfa;
import java.io.IOException;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.logging.log4j.CloseableThreadContext;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileMaxSizeConstraint.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileMaxSizeConstraint.java
index 0f252193a005ef714be422942761728f397165c5..4e2e344b837e957f0804d7cd7a48c2bdd607817e 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileMaxSizeConstraint.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileMaxSizeConstraint.java
@@ -30,8 +30,8 @@ import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
import de.ozgcloud.alfa.common.ValidationMessageCodes;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileService.java
index 74bfd67e7f22ec26d200d2c43e729a9c151cd54c..eebbd2caea67e481ca652f08743a50d023d09752 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/BinaryFileService.java
@@ -28,7 +28,7 @@ import java.util.List;
import java.util.concurrent.CompletableFuture;
import java.util.stream.Stream;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileSizeValidator.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileSizeValidator.java
index 6aa3dbce4860ce92368a052da6ecc0374b5ec821..1bef03838dd01d3f8da8b215395e119ea6d546a3 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileSizeValidator.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileSizeValidator.java
@@ -26,8 +26,8 @@ package de.ozgcloud.alfa.common.binaryfile;
import java.util.Map;
import java.util.Optional;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
import org.hibernate.validator.constraintvalidation.HibernateConstraintValidatorContext;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandService.java
index ea7534a4f95a24c47197ac3662ab60bd87362bb5..638a672caa20cd5268b4218db07f69e0e810182c 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CommandService.java
@@ -26,7 +26,7 @@ package de.ozgcloud.alfa.common.command;
import java.util.Optional;
import java.util.stream.Stream;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CreateCommand.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CreateCommand.java
index 3cb5adcf3fcfa15f82dbd6228eeb607714691a85..0f8887ca869483fc91e817df3e986669cf29c940 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CreateCommand.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/CreateCommand.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.alfa.common.command;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/RequiredOrder.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/RequiredOrder.java
index da13800709784f1a2c7906d3bfba20def3cd4a62..f998dfe648a4457c8247c56631934ea36eeed1ec 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/RequiredOrder.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/RequiredOrder.java
@@ -7,8 +7,8 @@ import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
@Constraint(validatedBy = { RequiredOrderValidator.class })
@Target({ FIELD, METHOD, PARAMETER, ANNOTATION_TYPE, TYPE_USE })
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/RequiredOrderValidator.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/RequiredOrderValidator.java
index 79c52429309481d71020d72bb26c3949e8bb0cc7..ef8a8897172582847e3cdc9377a5f5b4122a8342 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/RequiredOrderValidator.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/command/RequiredOrderValidator.java
@@ -1,7 +1,7 @@
package de.ozgcloud.alfa.common.command;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
public class RequiredOrderValidator implements ConstraintValidator<RequiredOrder, CreateCommand> {
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilter.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilter.java
index b8f3f00358092931c6b8a96bb8b1680879539ad9..e2824c6edfb29aababf2e32ef78a04364acdb468 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilter.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilter.java
@@ -25,10 +25,10 @@ package de.ozgcloud.alfa.common.downloadtoken;
import java.io.IOException;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenProperties.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenProperties.java
index 8e63cd4b96fe65a1ef4b937c301c0f6b1ffd782a..d07c0a7956c415e8c80adeadd5205aa634e32ec3 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenProperties.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenProperties.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.alfa.common.downloadtoken;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenService.java
index fa4276a91aebf8d0fae0b1ea4ae5c7aa14a08442..466881c91649dc8b37de5ec46057b33d5e717c89 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenService.java
@@ -27,7 +27,7 @@ import static de.ozgcloud.alfa.JwtTokenUtil.*;
import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -90,12 +90,12 @@ class DownloadTokenService {
Optional<Claims> claimsOptional = jwtTokenUtil.getAllClaimsFromToken(token);
var downloadUserBuilder = GoofyUserWithFileId.builder();
claimsOptional.ifPresent(claims -> downloadUserBuilder.user(
- UserProfile.builder()
- .id(UserId.from(claims.get(USERID_CLAIM, String.class)))
- .firstName(claims.get(FIRSTNAME_CLAIM, String.class))
- .lastName(claims.get(LASTNAME_CLAIM, String.class))
- .authorities(jwtTokenUtil.getRolesFromToken(token))
- .organisationseinheitIds(jwtTokenUtil.getOrganisationseinheitIdsFromToken(token)).build())
+ UserProfile.builder()
+ .id(UserId.from(claims.get(USERID_CLAIM, String.class)))
+ .firstName(claims.get(FIRSTNAME_CLAIM, String.class))
+ .lastName(claims.get(LASTNAME_CLAIM, String.class))
+ .authorities(jwtTokenUtil.getRolesFromToken(token))
+ .organisationseinheitIds(jwtTokenUtil.getOrganisationseinheitIdsFromToken(token)).build())
.fileId(FileId.from(claims.get(FILEID_CLAIM, String.class))));
return downloadUserBuilder.build();
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/ExceptionController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/ExceptionController.java
index 0772ce937792cb74d362034fea4ea1e4d58792c0..018624fea26e30f86f059b898038ce02efdf0059 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/ExceptionController.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/common/errorhandling/ExceptionController.java
@@ -33,10 +33,10 @@ import java.util.Set;
import java.util.UUID;
import java.util.stream.Stream;
-import javax.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
-import javax.validation.Path;
-import javax.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolationException;
+import jakarta.validation.Path;
+import jakarta.validation.metadata.ConstraintDescriptor;
import org.hibernate.validator.engine.HibernateConstraintViolation;
import org.springframework.core.annotation.Order;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/Kommentar.java b/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/Kommentar.java
index a522e29cf9e9fd05ca47cc1b663b835235d2a5b0..1dde8e3c04207e104bddf8f3a5986879e6dbc666 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/Kommentar.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/Kommentar.java
@@ -28,8 +28,8 @@ import static de.ozgcloud.alfa.common.ValidationMessageCodes.*;
import java.time.ZonedDateTime;
import java.util.List;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarCommand.java b/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarCommand.java
index a6945fac38dcd6aec6466cb2649f248a8e38801b..7f6e99db26f4255bc06827e0f0ccfd64545b77f4 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarCommand.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarCommand.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.alfa.kommentar;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarService.java
index 8edacd2a909f462b4bd23b20707318bb44acb1f0..4bd41879a07fffedf0e715c4d3adb65ca36575db 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/kommentar/KommentarService.java
@@ -26,7 +26,7 @@ package de.ozgcloud.alfa.kommentar;
import java.time.ZonedDateTime;
import java.util.stream.Stream;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungService.java
index d215118ece078659764cff242d4a87101a9bf4a1..d478b7f56b218436f5c30404ad132c4261b331ae 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungService.java
@@ -3,7 +3,7 @@ package de.ozgcloud.alfa.loeschanforderung;
import java.util.List;
import java.util.Optional;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
import org.apache.commons.collections.MapUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMail.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMail.java
index 722d7f5b9f2b4e96daa4f228ab42101371d04bb9..0b5a606b86e6ab51a6cd027b4e8caecf8f4320e0 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMail.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachMail.java
@@ -29,8 +29,8 @@ import java.time.ZonedDateTime;
import java.util.List;
import java.util.Map;
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.Size;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfModel.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfModel.java
index 011cfc7be512df6257e987a66cc80c8a0926e952..47457f9b4040d2c3a47f01843b797a1131e227d2 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfModel.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfModel.java
@@ -25,9 +25,9 @@ package de.ozgcloud.alfa.postfach;
import java.util.List;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
+import jakarta.xml.bind.annotation.XmlElement;
+import jakarta.xml.bind.annotation.XmlElementWrapper;
+import jakarta.xml.bind.annotation.XmlRootElement;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
@@ -76,7 +76,7 @@ class PostfachNachrichtPdfModel {
@Getter
@Builder
static class Nachricht {
-
+
@XmlElement
private boolean isFirst;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/system/SystemStatusService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/system/SystemStatusService.java
index 2659fe7ee8dfa9ae928f6d8b4ef645454b827c38..b188e77aade4147f71521677815a9c569c6bc5d1 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/system/SystemStatusService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/system/SystemStatusService.java
@@ -43,4 +43,5 @@ public class SystemStatusService {
return false;
}
}
-}
+
+}
\ No newline at end of file
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangController.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangController.java
index 71072fbadc071f5fad12a96dd85bf56556e14fa0..35062413fb4a816eaf0263aa284d2bc5b32b4e6a 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangController.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/VorgangController.java
@@ -25,7 +25,7 @@ package de.ozgcloud.alfa.vorgang;
import java.util.Optional;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingLandesnetzInfoService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingLandesnetzInfoService.java
index 2221f8b9ccb32f3a468b398151be6722d152a568..0f011886bd0a3faf917b2119476b283b8949e5e2 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingLandesnetzInfoService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingLandesnetzInfoService.java
@@ -27,7 +27,7 @@ import java.util.Collections;
import java.util.Objects;
import java.util.Set;
-import javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordSizeConstraint.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordSizeConstraint.java
index 7a09abea36f1a4233b26f4487885a884b56dbc26..5910b2d2754dead2289ec19ea5869df79d28ea31 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordSizeConstraint.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordSizeConstraint.java
@@ -30,8 +30,8 @@ import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
import java.lang.annotation.Target;
-import javax.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Constraint;
+import jakarta.validation.Payload;
import de.ozgcloud.alfa.common.ValidationMessageCodes;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordValidator.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordValidator.java
index 30ee0e6cb971cd815b9ab4aeba9a626cfe2572c9..38ffb406bb2bd60125442acfb55734510a99fd2e 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordValidator.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordValidator.java
@@ -23,8 +23,8 @@
*/
package de.ozgcloud.alfa.vorgang.forwarding;
-import javax.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidatorContext;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/RedirectRequest.java b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/RedirectRequest.java
index 832f4b088c63a02a1f7d8a3eb5a10ad1a0489d1a..8ffde941d1a0a2f2747f5eace6246448131c43b0 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/RedirectRequest.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/vorgang/forwarding/RedirectRequest.java
@@ -25,8 +25,8 @@ package de.ozgcloud.alfa.vorgang.forwarding;
import static de.ozgcloud.alfa.common.ValidationMessageCodes.*;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotEmpty;
import org.springframework.validation.annotation.Validated;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/Wiedervorlage.java b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/Wiedervorlage.java
index bcb6b368af74344e0d18efe48f7bdb20a12cb6e3..08871f86e4d81489b0589e0caba54435c6a6f263 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/Wiedervorlage.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/Wiedervorlage.java
@@ -29,9 +29,9 @@ import java.time.LocalDate;
import java.time.ZonedDateTime;
import java.util.List;
-import javax.validation.constraints.FutureOrPresent;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.FutureOrPresent;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommand.java b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommand.java
index f44964506366e8a82b60939dd1493db4393b0d79..398f2b6e0905fa5bcae4d27cc9a0703ab569a0dc 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommand.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommand.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.alfa.wiedervorlage;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
import com.fasterxml.jackson.annotation.JsonIgnore;
diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageService.java
index 9c496fa1f0b95ab94b73be62dec0d9a05a5f3fe2..660aeefbe8e6a5d1425fd04d4d3b9cedee1a6e8a 100644
--- a/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageService.java
+++ b/alfa-service/src/main/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageService.java
@@ -31,7 +31,7 @@ import java.util.Optional;
import java.util.function.Predicate;
import java.util.stream.Stream;
-import javax.validation.Valid;
+import jakarta.validation.Valid;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/JwtTokenUtilTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/JwtTokenUtilTest.java
index b9105b305f4a32c1ff3820116743cd3a478903ce..3f1cec61922fc4b62939c88a165ad734fe72a023 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/JwtTokenUtilTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/JwtTokenUtilTest.java
@@ -59,7 +59,7 @@ class JwtTokenUtilTest {
@Mock
private DownloadTokenProperties downloadTokenProperties;
- private static final String TOKEN_SECRET = "t0pS3cr3t";
+ private static final String TOKEN_SECRET = "t0pS3cr3t".repeat(8);
private static final int TOKEN_VALIDITY = 60000;
@BeforeEach
@@ -121,7 +121,7 @@ class JwtTokenUtilTest {
@Test
void shouldThrowExceptionOnInvalidToken() {
- var token = buildToken(UUID.randomUUID().toString(), "invalid_token", TOKEN_VALIDITY);
+ var token = buildToken(UUID.randomUUID().toString(), "invalid_token".repeat(5), TOKEN_VALIDITY);
assertThrows(JWTVerificationException.class, () -> jwtTokenUtil.verifyToken(token));
}
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/RequestIdFilterTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/RequestIdFilterTest.java
index bfaf794ff0962158e404c7af8d1f89720bc384a4..fbcb5735ea29412d836659128ecbcb8505f35fa5 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/RequestIdFilterTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/RequestIdFilterTest.java
@@ -29,10 +29,10 @@ import static org.mockito.Mockito.*;
import java.io.IOException;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileSizeValidatorTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileSizeValidatorTest.java
index 4ffb8a1e0758d81027e2160f48c8617b3d187a75..ad74b10d3b54551e3cf1171d5e1093f1148957e1 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileSizeValidatorTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/binaryfile/UploadBinaryFileSizeValidatorTest.java
@@ -30,7 +30,7 @@ import static org.mockito.Mockito.*;
import java.util.Collections;
import java.util.Map;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidatorContext;
import org.hibernate.validator.constraintvalidation.HibernateConstraintValidatorContext;
import org.junit.jupiter.api.BeforeEach;
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/RequiredOrderValidatorTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/RequiredOrderValidatorTest.java
index 58c1d44963fd8fa89d42943b42b601ae900550b5..6319e02a44ff12556ba1c5be98143fb13476d430 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/RequiredOrderValidatorTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/RequiredOrderValidatorTest.java
@@ -3,7 +3,7 @@ package de.ozgcloud.alfa.common.command;
import static org.assertj.core.api.Assertions.*;
import static org.mockito.Mockito.*;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidatorContext;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilterITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilterITCase.java
index d4754cd7b9f14b02c81f64b645509b9404e9f8d2..d2647b285fc74570cee9c0448eae40b7c37f13ab 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilterITCase.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilterITCase.java
@@ -81,7 +81,7 @@ class DownloadTokenAuthenticationFilterITCase {
@Test
void shouldReturnUnauthorised() throws Exception {
- String token = DownloadTokenTestFactory.createToken("badSecret", downloadTokenProperties.getValidity());
+ String token = DownloadTokenTestFactory.createToken("badSecret".repeat(8), downloadTokenProperties.getValidity());
performRequest(DownloadTokenController.DOWNLOAD_TOKEN_PATH + "?" + DownloadTokenController.PARAM_TOKEN + "=" + token)
.andExpect(status().isUnauthorized());
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilterTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilterTest.java
index 4a8a712a21b6fad31ecd2a78ca3b68042946ed02..1d3e7c76ea1c13c1364338baf4d0839c39b7c223 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilterTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenAuthenticationFilterTest.java
@@ -29,10 +29,10 @@ import static org.mockito.Mockito.*;
import java.io.IOException;
import java.util.UUID;
-import javax.servlet.FilterChain;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenServiceTest.java
index b8fa3484dac7c506414fc628c6682dffdddef280..24bf8ab7f626e0e52f8d6a89b164e3dccb2e7934 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenServiceTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenServiceTest.java
@@ -33,8 +33,8 @@ import java.util.Collection;
import java.util.List;
import java.util.Optional;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/ExceptionControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/ExceptionControllerTest.java
index 376bfbc299b60769cfe5231ce72b01ef67133d79..53fcd7d7e86047df2a8a4450c903de8c652bcb19 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/ExceptionControllerTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/ExceptionControllerTest.java
@@ -29,7 +29,7 @@ import static org.mockito.Mockito.*;
import java.util.Collections;
import java.util.Map;
-import javax.validation.ConstraintViolationException;
+import jakarta.validation.ConstraintViolationException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/ExceptionTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/ExceptionTestFactory.java
index 3f3af3bc7782ad9930753a12d7ab7c3a6d6c52e1..d96c42787390b1b99df6bd412efce278c3dd7335 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/ExceptionTestFactory.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/errorhandling/ExceptionTestFactory.java
@@ -29,9 +29,9 @@ import static org.mockito.Mockito.*;
import java.util.Map;
import java.util.UUID;
-import javax.validation.ConstraintViolation;
-import javax.validation.Path;
-import javax.validation.metadata.ConstraintDescriptor;
+import jakarta.validation.ConstraintViolation;
+import jakarta.validation.Path;
+import jakarta.validation.metadata.ConstraintDescriptor;
import org.hibernate.validator.engine.HibernateConstraintViolation;
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordValidatorTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordValidatorTest.java
index 1899552eb91bc8feb8b42996b09aacec84dbfa0b..1a5a0a2227b498f3c2360fcacaae5af12f7ac7f3 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordValidatorTest.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/ForwardingPasswordValidatorTest.java
@@ -27,8 +27,8 @@ import static org.assertj.core.api.Assertions.*;
import static org.mockito.ArgumentMatchers.*;
import static org.mockito.Mockito.*;
-import javax.validation.ConstraintValidatorContext;
-import javax.validation.ConstraintValidatorContext.ConstraintViolationBuilder;
+import jakarta.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidatorContext.ConstraintViolationBuilder;
import org.apache.commons.lang3.RandomStringUtils;
import org.apache.commons.lang3.StringUtils;
diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandITCase.java
index c24c253c8482c1904aa324a21f250904d8e163f9..42995f9fd0dbc13c6dfb7ff535672dbcfe2a7aca 100644
--- a/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandITCase.java
+++ b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandITCase.java
@@ -32,7 +32,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import java.time.LocalDate;
-import org.assertj.core.internal.bytebuddy.utility.RandomString;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
@@ -55,6 +54,7 @@ import de.ozgcloud.alfa.common.user.CurrentUserService;
import de.ozgcloud.alfa.common.user.UserProfileTestFactory;
import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory;
import de.ozgcloud.alfa.wiedervorlage.WiedervorlageCommandController.WiedervorlageCommandByVorgangController;
+import net.bytebuddy.utility.RandomString;
@AutoConfigureMockMvc
@SpringBootTest
@@ -269,9 +269,9 @@ class WiedervorlageCommandITCase {
private ResultActions doRequest(String content) throws Exception {
return mockMvc.perform(post(WiedervorlageCommandByVorgangController.WIEDERVORLAGE_COMMANDS_BY_VORGANG, VorgangHeaderTestFactory.ID,
RELATION_ID_ON_CREATE)
- .with(csrf())
- .contentType(MediaType.APPLICATION_JSON)
- .content(content));
+ .with(csrf())
+ .contentType(MediaType.APPLICATION_JSON)
+ .content(content));
}
}
}
\ No newline at end of file
diff --git a/alfa-service/src/test/resources/application.yml b/alfa-service/src/test/resources/application.yml
index 42e6021ddfe379e95ca021043d051775707ed18e..90b792d47554dae05fae77dd26ed00e58bf90ed2 100644
--- a/alfa-service/src/test/resources/application.yml
+++ b/alfa-service/src/test/resources/application.yml
@@ -82,7 +82,7 @@ grpc:
kop:
auth:
token:
- secret: XPPWagXn3rDwKG6Ywoir
+ secret: XPPWagXn3rDwKG6YwoirXPPWagXn3rDwKG6YwoirXPPWagXn3rDwKG6YwoirXPPWagXn3rDwKG6Ywoir
validity: 60000
upload:
maxFileSize:
diff --git a/alfa-xdomea/pom.xml b/alfa-xdomea/pom.xml
index 6585dd8d41ca869b1a299e3ff1d73c7f6ba7462f..61f04572ae58e69f87f3cb228c4682338f5942a0 100644
--- a/alfa-xdomea/pom.xml
+++ b/alfa-xdomea/pom.xml
@@ -43,8 +43,7 @@
<properties>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
- <jaxb2-maven-plugin.version>2.5.0</jaxb2-maven-plugin.version>
-
+ <jaxb2-maven-plugin.version>3.1.0</jaxb2-maven-plugin.version>
</properties>
<dependencies>
diff --git a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/XDomeaNamespacePrefixMapper.java b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/XDomeaNamespacePrefixMapper.java
index 4730cee16db3ad6c5819946deb8e87ebc5389672..81bb3fd6a3188265b05f3d731bd096a6a78ae8b8 100644
--- a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/XDomeaNamespacePrefixMapper.java
+++ b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/XDomeaNamespacePrefixMapper.java
@@ -2,10 +2,9 @@ package de.ozgcloud.alfa.export;
import java.util.Map;
+import org.glassfish.jaxb.runtime.marshaller.NamespacePrefixMapper;
import org.springframework.stereotype.Component;
-import com.sun.xml.bind.marshaller.NamespacePrefixMapper;
-
@Component
class XDomeaNamespacePrefixMapper extends NamespacePrefixMapper {
diff --git a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/XDomeaXmlMarshallerConfiguration.java b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/XDomeaXmlMarshallerConfiguration.java
index 964d431c324c4e4af2a063a8dce2d2b473cab7ad..b6b8bd1a0dd4ae9d91e6a8442cb1dc9828da3e4f 100644
--- a/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/XDomeaXmlMarshallerConfiguration.java
+++ b/alfa-xdomea/src/main/java/de/ozgcloud/alfa/export/XDomeaXmlMarshallerConfiguration.java
@@ -3,7 +3,7 @@ package de.ozgcloud.alfa.export;
import java.util.HashMap;
import java.util.Map;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.Marshaller;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
@@ -14,7 +14,7 @@ import org.springframework.oxm.jaxb.Jaxb2Marshaller;
class XDomeaXmlMarshallerConfiguration {
static final boolean JAXB_FORMATTED_OUTPUT = true;
- static final String PROPERTY_NAMESPACE_PREFIX_MAPPER = "com.sun.xml.bind.namespacePrefixMapper";
+ static final String PROPERTY_NAMESPACE_PREFIX_MAPPER = "org.glassfish.jaxb.namespacePrefixMapper";
static final String CONTEXT_PATH = "de.xoev.xdomea";
@Autowired
diff --git a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/XmlMarshallerConfigurationTest.java b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/XmlMarshallerConfigurationTest.java
index 91d53e4afc8c6f934d904c1bef9df3ea87adfb8c..46ddabac96c193f78b8ec3e8a448cbb68897c90f 100644
--- a/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/XmlMarshallerConfigurationTest.java
+++ b/alfa-xdomea/src/test/java/de/ozgcloud/alfa/export/XmlMarshallerConfigurationTest.java
@@ -5,7 +5,7 @@ import static org.mockito.Mockito.*;
import java.util.Map;
-import javax.xml.bind.Marshaller;
+import jakarta.xml.bind.Marshaller;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Nested;
diff --git a/goofy-client/apps/goofy-e2e/docker-compose.yml b/goofy-client/apps/goofy-e2e/docker-compose.yml
index 31c7707a16771124d617049f524badcd5f0914f4..3b0a0ea591d1afed116ba0810a7b3cd6e49ecdc6 100644
--- a/goofy-client/apps/goofy-e2e/docker-compose.yml
+++ b/goofy-client/apps/goofy-e2e/docker-compose.yml
@@ -39,10 +39,11 @@ services:
- SPRING_DATA_MONGODB_HOST=ozg-mongodb
- SPRING_PROFILES_ACTIVE=${SPRING_PROFILE:-dev,e2e}
- logging_level_org_springframework_security=${LOGGING_LEVEL:-WARN}
- - SPRING_ELASTICSEARCH_URIS=http://ozg-elastic:9200
- - SPRING_ELASTICSEARCH_USERNAME=elastic
- - SPRING_ELASTICSEARCH_PASSWORD=password
- - KOP_ELASTICSEARCH_INDEX=e2e-test-index
+ - OZGCLOUD_ELASTICSEARCH_ADDRESS=ozg-elastic:9200
+ - OZGCLOUD_ELASTICSEARCH_USERNAME=elastic
+ - OZGCLOUD_ELASTICSEARCH_PASSWORD=password
+ - OZGCLOUD_ELASTICSEARCH_INDEX=e2e-test-index
+ - OZGCLOUD_ELASTICSEARCH_USESSL=false
- GRPC_CLIENT_USER_MANAGER_ADDRESS=static://ozg-usermanager:9000
- GRPC_CLIENT_USER_MANAGER_NEGOTIATION_TYPE=PLAINTEXT
- KOP_USERMANAGER_URL=http://localhost:9092/migration/user
@@ -98,12 +99,14 @@ services:
interval: 10s
timeout: 10s
retries: 5
+
ozg-usermanager:
image: docker.ozg-sh.de/user-manager:${USERMANAGER_DOCKER_IMAGE:-snapshot-latest}
platform: linux/amd64
environment:
- QUARKUS_HTTP_CORS_ORIGINS=http://localhost:4300,http://127.0.0.1:4300,https://e2e.dev.by.ozg-cloud.de
- QUARKUS_OIDC_AUTH_SERVER_URL=https://sso.dev.by.ozg-cloud.de/realms/by-e2e-local-dev
+ - QUARKUS_LOG_CONSOLE_JSON=false
- QUARKUS_OIDC_CLIENT_ID=alfa
- KOP_KEYCLOAK_API_USER=usermanagerapiuser
- KOP_KEYCLOAK_API_PASSWORD=
diff --git a/goofy-client/apps/goofy-e2e/src/integration/main-tests/accessibility/vorgang-list.spec-e2e.ts b/goofy-client/apps/goofy-e2e/src/integration/main-tests/accessibility/vorgang-list.spec-e2e.ts
index 3d241ea57ab838b9e1bd955a9130238c568a932f..bd2b8e3c53a8746ad9a91182fc7083e82f4288b9 100644
--- a/goofy-client/apps/goofy-e2e/src/integration/main-tests/accessibility/vorgang-list.spec-e2e.ts
+++ b/goofy-client/apps/goofy-e2e/src/integration/main-tests/accessibility/vorgang-list.spec-e2e.ts
@@ -4,7 +4,7 @@ import { VorgangSearchE2EComponent } from 'apps/goofy-e2e/src/components/vorgang
import { VorgangViewsE2EComponent } from 'apps/goofy-e2e/src/components/vorgang/vorgang-views.e2e.component';
import { HeaderE2EComponent } from 'apps/goofy-e2e/src/page-objects/header.po';
import { MainPage, waitForSpinnerToDisappear } from 'apps/goofy-e2e/src/page-objects/main.po';
-import { getFormField, isKeyboardFocused, isMatFocused } from 'apps/goofy-e2e/src/support/angular.util';
+import { isKeyboardFocused } from 'apps/goofy-e2e/src/support/angular.util';
import { dropCollections, pressTab } from 'apps/goofy-e2e/src/support/cypress-helper';
import { exist } from 'apps/goofy-e2e/src/support/cypress.util';
import { getUserManagerUserSabine, initUsermanagerUsers, loginAsSabine } from 'apps/goofy-e2e/src/support/user-util';
@@ -54,7 +54,7 @@ describe('VorgangList Page', () => {
it('should focus search field', () => {
pressTab();
- isMatFocused(getFormField(vorgangSearch.getForm()));
+ vorgangSearch.getInput().should('have.focus');
})
it('should focus help menu icon', () => {
diff --git a/goofy-server/pom.xml b/goofy-server/pom.xml
index c6daa3897681d1e35cbbc4bac645e694162675f8..28fe2d2e897585e351e34b1582aa06d4ded23936 100644
--- a/goofy-server/pom.xml
+++ b/goofy-server/pom.xml
@@ -16,7 +16,6 @@
<maven.compiler.target>${java.version}</maven.compiler.target>
<spring-boot.build-image.imageName>docker.ozg-sh.de/goofy:build-latest</spring-boot.build-image.imageName>
- <spring-security.version>5.8.7</spring-security.version>
</properties>
<dependencies>
@@ -24,120 +23,7 @@
<groupId>de.itvsh.ozg</groupId>
<artifactId>alfa-service</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-crypto</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-resource-server</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-jose</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-config</artifactId>
- <version>${spring-security.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- <version>${spring-security.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-crypto</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-crypto</artifactId>
- <version>${spring-security.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- <version>${spring-security.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-resource-server</artifactId>
- <version>${spring-security.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-web</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-jose</artifactId>
- <version>${spring-security.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-oauth2-core</artifactId>
- <version>${spring-security.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.springframework.security</groupId>
- <artifactId>spring-security-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
<dependency>
<groupId>de.itvsh.ozg</groupId>
diff --git a/goofy-server/src/main/resources/application-e2e.yml b/goofy-server/src/main/resources/application-e2e.yml
index 0d5f6596111cea18677543d2da36ab9f6d496ba3..50cac7fbb8d11fe5c5ad23487bcdaed4b72a05d0 100644
--- a/goofy-server/src/main/resources/application-e2e.yml
+++ b/goofy-server/src/main/resources/application-e2e.yml
@@ -5,7 +5,7 @@ kop:
lninfo:
url: classpath:files/LandesnetzInfo.html
user-manager:
- url: http://localhost:9091
+ url: http://localhost:9092
ozgcloud:
feature:
diff --git a/goofy-server/src/main/resources/application.yml b/goofy-server/src/main/resources/application.yml
index e856ad5811e4e5330a8f78c9ace529535d5c7deb..711b24897872a68bff0743da9e7f7092de0aaa5d 100644
--- a/goofy-server/src/main/resources/application.yml
+++ b/goofy-server/src/main/resources/application.yml
@@ -69,7 +69,7 @@ grpc:
kop:
auth:
token:
- secret: XPPWagXn3rDwKG6Ywoir
+ secret: XPPWagXn3rDwKG6YwoirXPPWagXn3rDwKG6YwoirXPPWagXn3rDwKG6YwoirXPPWagXn3rDwKG6Ywoir
validity: 60000
upload:
maxFileSize:
diff --git a/pom.xml b/pom.xml
index 017b9317d5ba0189e2e7e2318a91f63fbd95c8d5..f638626967522113a0fffbb5740fd92d5264d580 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
-
+
<groupId>de.itvsh.ozg</groupId>
<artifactId>goofy</artifactId>
<version>1.16.0-SNAPSHOT</version>
@@ -37,7 +37,7 @@
<parent>
<groupId>de.itvsh.kop.common</groupId>
<artifactId>kop-common-parent</artifactId>
- <version>1.9.0-SNAPSHOT</version>
+ <version>2.3.1</version>
</parent>
<modules>
@@ -52,7 +52,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<pluto.version>1.13.0</pluto.version>
- <kop-common-pdf.version>1.6.4</kop-common-pdf.version>
+ <kop-common-pdf.version>2.3.1</kop-common-pdf.version>
<user-manager.version>1.6.0</user-manager.version>
</properties>