From 76e498707a5f9f12a43eb5a475c2bb46d69a1b4c Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 4 Dec 2023 13:36:45 +0100
Subject: [PATCH] OZG-4589 OZG-4642 Use ozgcloud-common v3
---
.../src/main/java/de/ozgcloud/eingang/Application.java | 2 +-
.../common/formdata/DeleteOnCloseInputStream.java | 2 +-
.../ozgcloud/eingang/common/formdata/IncomingFile.java | 2 +-
.../common/formdata/DeleteOnCloseInputStreamTest.java | 2 +-
.../eingang/common/formdata/IncomingFileTestFactory.java | 2 +-
.../enterprise/entry/ReadingRequestException.java | 2 +-
.../eingang/enterprise/entry/EnterpriseEntryITCase.java | 4 ++--
.../eingang/enterprise/entry/EntryControllerTest.java | 2 +-
.../eingang/enterprise/entry/EntryDataMapperTest.java | 2 +-
.../ozgcloud/eingang/formcycle/FormDataController.java | 2 +-
.../common/protobuf/ProtobufMessageConverter.java | 2 +-
.../eingang/formcycle/FormDataControllerITCase.java | 2 +-
.../formcycle/FormcycleAdapterApplicationTest.java | 2 +-
.../common/protobuf/ProtobufMessageConverterTest.java | 2 +-
formcycle-adapter/formcycle-adapter-interface/pom.xml | 6 +++---
formsolutions-adapter/pom.xml | 9 ++-------
.../eingang/formsolutions/FormSolutionsEingang.java | 2 +-
.../formsolutions/FormSolutionsFileMapperUtils.java | 4 ++--
.../formsolutions/FormSolutionsRequestMapper.java | 2 +-
.../ozgcloud/eingang/formsolutions/SendFormEndpoint.java | 2 +-
.../FormSolutionsAttachmentsMapperTest.java | 4 ++--
.../formsolutions/FormSolutionsFileMapperUtilsTest.java | 2 +-
.../formsolutions/FormSolutionsRequestMapperITCase.java | 4 ++--
.../formsolutions/FormSolutionsRequestMapperTest.java | 4 ++--
.../eingang/formsolutions/FormsolutionsITCase.java | 2 +-
.../intelliform/DepositRequestIncomingFileMapper.java | 2 +-
.../de/ozgcloud/eingang/intelliform/JsonService.java | 2 +-
.../eingang/intelliform/FormDataEndpointTest.java | 2 +-
.../intelliform/FormDataIncomingFileMapperTest.java | 2 +-
.../de/ozgcloud/eingang/intelliform/JsonServiceTest.java | 2 +-
.../eingang/intelliform/XmlToJavaMapsMapperTest.java | 2 +-
pom.xml | 6 +++---
.../java/de/ozgcloud/eingang/router/FileIdMapper.java | 2 +-
.../de/ozgcloud/eingang/router/VorgangRemoteService.java | 6 +++---
.../eingang/router/VorgangRemoteServiceTest.java | 4 ++--
.../enginebased/afm/ZustaendigeStelleMetadataMapper.java | 2 +-
.../ozgcloud/eingang/semantik/formbased/AnliegenId.java | 2 +-
.../eingang/semantik/common/ZipAttachmentReaderTest.java | 2 +-
.../afm/ZustaendigeStelleMetadataMapperITCase.java | 4 ++--
.../FormSolutionsEngineBasedAdapterITCase.java | 4 ++--
.../formbased/DFoerdermittelFormBasedMapperTest.java | 4 ++--
.../main/java/de/ozgcloud/eingang/xta/XtaMessageId.java | 2 +-
.../src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java | 2 +-
43 files changed, 59 insertions(+), 64 deletions(-)
diff --git a/common/src/main/java/de/ozgcloud/eingang/Application.java b/common/src/main/java/de/ozgcloud/eingang/Application.java
index 164da65a2..f03fc325e 100644
--- a/common/src/main/java/de/ozgcloud/eingang/Application.java
+++ b/common/src/main/java/de/ozgcloud/eingang/Application.java
@@ -29,7 +29,7 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.scheduling.annotation.EnableScheduling;
-@SpringBootApplication(scanBasePackages = { "de.itvsh.kop", "de.ozgcloud" })
+@SpringBootApplication(scanBasePackages = { "de.ozgcloud" })
@EnableScheduling
public class Application {
diff --git a/common/src/main/java/de/ozgcloud/eingang/common/formdata/DeleteOnCloseInputStream.java b/common/src/main/java/de/ozgcloud/eingang/common/formdata/DeleteOnCloseInputStream.java
index d7109f66a..2f2bd49ab 100644
--- a/common/src/main/java/de/ozgcloud/eingang/common/formdata/DeleteOnCloseInputStream.java
+++ b/common/src/main/java/de/ozgcloud/eingang/common/formdata/DeleteOnCloseInputStream.java
@@ -29,7 +29,7 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.nio.file.Files;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
public class DeleteOnCloseInputStream extends FileInputStream {
diff --git a/common/src/main/java/de/ozgcloud/eingang/common/formdata/IncomingFile.java b/common/src/main/java/de/ozgcloud/eingang/common/formdata/IncomingFile.java
index 15adca7f0..c5e9b9dba 100644
--- a/common/src/main/java/de/ozgcloud/eingang/common/formdata/IncomingFile.java
+++ b/common/src/main/java/de/ozgcloud/eingang/common/formdata/IncomingFile.java
@@ -28,7 +28,7 @@ import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import lombok.Builder;
import lombok.Getter;
import lombok.ToString;
diff --git a/common/src/test/java/de/ozgcloud/eingang/common/formdata/DeleteOnCloseInputStreamTest.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/DeleteOnCloseInputStreamTest.java
index b7b7515b2..253b14967 100644
--- a/common/src/test/java/de/ozgcloud/eingang/common/formdata/DeleteOnCloseInputStreamTest.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/DeleteOnCloseInputStreamTest.java
@@ -7,7 +7,7 @@ import java.io.IOException;
import org.junit.jupiter.api.Test;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
class DeleteOnCloseInputStreamTest {
diff --git a/common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileTestFactory.java b/common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileTestFactory.java
index 4366c6af5..40e803fe1 100644
--- a/common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileTestFactory.java
+++ b/common/src/test/java/de/ozgcloud/eingang/common/formdata/IncomingFileTestFactory.java
@@ -28,7 +28,7 @@ import java.util.UUID;
import org.springframework.http.MediaType;
import org.springframework.mock.web.MockMultipartFile;
-import de.itvsh.kop.common.binaryfile.TempFileUtils;
+import de.ozgcloud.common.binaryfile.TempFileUtils;
import de.ozgcloud.eingang.common.formdata.IncomingFile.IncomingFileBuilder;
import lombok.SneakyThrows;
diff --git a/enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/ReadingRequestException.java b/enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/ReadingRequestException.java
index d1d4e3f9c..3705dd85e 100644
--- a/enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/ReadingRequestException.java
+++ b/enterprise-adapter/src/main/java/de/ozgcloud/eingang/enterprise/entry/ReadingRequestException.java
@@ -1,6 +1,6 @@
package de.ozgcloud.eingang.enterprise.entry;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
public class ReadingRequestException extends TechnicalException {
diff --git a/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EnterpriseEntryITCase.java b/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EnterpriseEntryITCase.java
index 17bd6cd4c..026a2dba3 100644
--- a/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EnterpriseEntryITCase.java
+++ b/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EnterpriseEntryITCase.java
@@ -14,8 +14,8 @@ import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.ResultActions;
-import de.itvsh.kop.common.test.ITCase;
-import de.itvsh.kop.common.test.TestUtils;
+import de.ozgcloud.common.test.ITCase;
+import de.ozgcloud.common.test.TestUtils;
import de.ozgcloud.eingang.router.VorgangService;
import lombok.SneakyThrows;
diff --git a/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EntryControllerTest.java b/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EntryControllerTest.java
index 7086aee89..6e3bcb265 100644
--- a/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EntryControllerTest.java
+++ b/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EntryControllerTest.java
@@ -23,7 +23,7 @@ import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.ResultActions;
import org.springframework.test.web.servlet.setup.MockMvcBuilders;
-import de.itvsh.kop.common.test.TestUtils;
+import de.ozgcloud.common.test.TestUtils;
import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
import de.ozgcloud.eingang.common.formdata.FormHeader;
diff --git a/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EntryDataMapperTest.java b/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EntryDataMapperTest.java
index 120c99e5c..de9426a23 100644
--- a/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EntryDataMapperTest.java
+++ b/enterprise-adapter/src/test/java/de/ozgcloud/eingang/enterprise/entry/EntryDataMapperTest.java
@@ -17,7 +17,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import de.itvsh.kop.common.test.TestUtils;
+import de.ozgcloud.common.test.TestUtils;
import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
import lombok.SneakyThrows;
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormDataController.java b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormDataController.java
index b46745646..b79d3a951 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormDataController.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/FormDataController.java
@@ -39,7 +39,7 @@ import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
-import de.itvsh.kop.common.binaryfile.TempFileUtils;
+import de.ozgcloud.common.binaryfile.TempFileUtils;
import de.ozgcloud.eingang.common.errorhandling.TechnicalException;
import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.IncomingFile;
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/common/protobuf/ProtobufMessageConverter.java b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/common/protobuf/ProtobufMessageConverter.java
index 1bff6a9a2..b26262f97 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/common/protobuf/ProtobufMessageConverter.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/main/java/de/ozgcloud/eingang/formcycle/common/protobuf/ProtobufMessageConverter.java
@@ -38,7 +38,7 @@ import org.springframework.stereotype.Component;
import com.google.protobuf.CodedOutputStream;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import lombok.extern.log4j.Log4j2;
@Component
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerITCase.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerITCase.java
index 72ac82bf1..e25ac53a1 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerITCase.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormDataControllerITCase.java
@@ -36,7 +36,7 @@ import org.springframework.mock.web.MockMultipartFile;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.ResultActions;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
import de.ozgcloud.eingang.semantik.SemantikAdapter;
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormcycleAdapterApplicationTest.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormcycleAdapterApplicationTest.java
index d429e218a..194937da4 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormcycleAdapterApplicationTest.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/FormcycleAdapterApplicationTest.java
@@ -25,7 +25,7 @@ package de.ozgcloud.eingang.formcycle;
import org.junit.jupiter.api.Test;
-import de.itvsh.kop.common.test.ITCase;
+import de.ozgcloud.common.test.ITCase;
@ITCase
class FormcycleAdapterApplicationTest {
diff --git a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/common/protobuf/ProtobufMessageConverterTest.java b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/common/protobuf/ProtobufMessageConverterTest.java
index f1435d7d3..aa8b6462b 100644
--- a/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/common/protobuf/ProtobufMessageConverterTest.java
+++ b/formcycle-adapter/formcycle-adapter-impl/src/test/java/de/ozgcloud/eingang/formcycle/common/protobuf/ProtobufMessageConverterTest.java
@@ -36,7 +36,7 @@ import org.mockito.Spy;
import org.springframework.http.HttpInputMessage;
import org.springframework.http.HttpOutputMessage;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.eingang.formcycle.common.protobuf.ProtobufMessageConverter;
import lombok.SneakyThrows;
diff --git a/formcycle-adapter/formcycle-adapter-interface/pom.xml b/formcycle-adapter/formcycle-adapter-interface/pom.xml
index e882017c5..16e4a4311 100644
--- a/formcycle-adapter/formcycle-adapter-interface/pom.xml
+++ b/formcycle-adapter/formcycle-adapter-interface/pom.xml
@@ -27,9 +27,9 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" 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>
<parent>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-dependencies</artifactId>
- <version>2.1.0</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-dependencies</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath/>
</parent>
diff --git a/formsolutions-adapter/pom.xml b/formsolutions-adapter/pom.xml
index a34d992d4..476f5f3e7 100644
--- a/formsolutions-adapter/pom.xml
+++ b/formsolutions-adapter/pom.xml
@@ -103,13 +103,8 @@
<!-- Test -->
<dependency>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-test</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-test</artifactId>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/formsolutions-adapter/src/main/java/de/ozgcloud/eingang/formsolutions/FormSolutionsEingang.java b/formsolutions-adapter/src/main/java/de/ozgcloud/eingang/formsolutions/FormSolutionsEingang.java
index faee3e09b..1141d70ac 100644
--- a/formsolutions-adapter/src/main/java/de/ozgcloud/eingang/formsolutions/FormSolutionsEingang.java
+++ b/formsolutions-adapter/src/main/java/de/ozgcloud/eingang/formsolutions/FormSolutionsEingang.java
@@ -6,7 +6,7 @@ import java.util.Map;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import de.itvsh.kop.common.binaryfile.FileDataDeserializer;
+import de.ozgcloud.common.binaryfile.FileDataDeserializer;
import lombok.Builder;
import lombok.Getter;
import lombok.extern.jackson.Jacksonized;
diff --git a/formsolutions-adapter/src/main/java/de/ozgcloud/eingang/formsolutions/FormSolutionsFileMapperUtils.java b/formsolutions-adapter/src/main/java/de/ozgcloud/eingang/formsolutions/FormSolutionsFileMapperUtils.java
index f9658310e..74385763e 100644
--- a/formsolutions-adapter/src/main/java/de/ozgcloud/eingang/formsolutions/FormSolutionsFileMapperUtils.java
+++ b/formsolutions-adapter/src/main/java/de/ozgcloud/eingang/formsolutions/FormSolutionsFileMapperUtils.java
@@ -33,8 +33,8 @@ import java.util.Base64;
import org.apache.commons.io.IOUtils;
-import de.itvsh.kop.common.binaryfile.TempFileUtils;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.binaryfile.TempFileUtils;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
diff --git a/formsolutions-adapter/src/main/java/de/ozgcloud/eingang/formsolutions/FormSolutionsRequestMapper.java b/formsolutions-adapter/src/main/java/de/ozgcloud/eingang/formsolutions/FormSolutionsRequestMapper.java
index 43b597780..3996c2010 100644
--- a/formsolutions-adapter/src/main/java/de/ozgcloud/eingang/formsolutions/FormSolutionsRequestMapper.java
+++ b/formsolutions-adapter/src/main/java/de/ozgcloud/eingang/formsolutions/FormSolutionsRequestMapper.java
@@ -38,7 +38,7 @@ import org.springframework.stereotype.Component;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.IncomingFile;
diff --git a/formsolutions-adapter/src/main/java/de/ozgcloud/eingang/formsolutions/SendFormEndpoint.java b/formsolutions-adapter/src/main/java/de/ozgcloud/eingang/formsolutions/SendFormEndpoint.java
index a15b9ad98..3610ca6df 100644
--- a/formsolutions-adapter/src/main/java/de/ozgcloud/eingang/formsolutions/SendFormEndpoint.java
+++ b/formsolutions-adapter/src/main/java/de/ozgcloud/eingang/formsolutions/SendFormEndpoint.java
@@ -35,7 +35,7 @@ import org.springframework.ws.server.endpoint.annotation.PayloadRoot;
import org.springframework.ws.server.endpoint.annotation.RequestPayload;
import org.springframework.ws.server.endpoint.annotation.ResponsePayload;
-import de.itvsh.kop.common.binaryfile.TempFileUtils;
+import de.ozgcloud.common.binaryfile.TempFileUtils;
import de.ozgcloud.eingang.semantik.SemantikAdapter;
import lombok.extern.log4j.Log4j2;
diff --git a/formsolutions-adapter/src/test/java/de/ozgcloud/eingang/formsolutions/FormSolutionsAttachmentsMapperTest.java b/formsolutions-adapter/src/test/java/de/ozgcloud/eingang/formsolutions/FormSolutionsAttachmentsMapperTest.java
index d50edb993..01ea26c58 100644
--- a/formsolutions-adapter/src/test/java/de/ozgcloud/eingang/formsolutions/FormSolutionsAttachmentsMapperTest.java
+++ b/formsolutions-adapter/src/test/java/de/ozgcloud/eingang/formsolutions/FormSolutionsAttachmentsMapperTest.java
@@ -36,8 +36,8 @@ import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
import org.mockito.InjectMocks;
-import de.itvsh.kop.common.binaryfile.TempFileUtils;
-import de.itvsh.kop.common.test.TestUtils;
+import de.ozgcloud.common.binaryfile.TempFileUtils;
+import de.ozgcloud.common.test.TestUtils;
import de.ozgcloud.eingang.common.formdata.IncomingFile;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
import lombok.SneakyThrows;
diff --git a/formsolutions-adapter/src/test/java/de/ozgcloud/eingang/formsolutions/FormSolutionsFileMapperUtilsTest.java b/formsolutions-adapter/src/test/java/de/ozgcloud/eingang/formsolutions/FormSolutionsFileMapperUtilsTest.java
index 20597a99b..9fc2cf6e7 100644
--- a/formsolutions-adapter/src/test/java/de/ozgcloud/eingang/formsolutions/FormSolutionsFileMapperUtilsTest.java
+++ b/formsolutions-adapter/src/test/java/de/ozgcloud/eingang/formsolutions/FormSolutionsFileMapperUtilsTest.java
@@ -31,7 +31,7 @@ import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Nested;
import org.junit.jupiter.api.Test;
-import de.itvsh.kop.common.test.TestUtils;
+import de.ozgcloud.common.test.TestUtils;
import lombok.SneakyThrows;
class FormSolutionsFileMapperUtilsTest {
diff --git a/formsolutions-adapter/src/test/java/de/ozgcloud/eingang/formsolutions/FormSolutionsRequestMapperITCase.java b/formsolutions-adapter/src/test/java/de/ozgcloud/eingang/formsolutions/FormSolutionsRequestMapperITCase.java
index bb82419f5..a77c02ad9 100644
--- a/formsolutions-adapter/src/test/java/de/ozgcloud/eingang/formsolutions/FormSolutionsRequestMapperITCase.java
+++ b/formsolutions-adapter/src/test/java/de/ozgcloud/eingang/formsolutions/FormSolutionsRequestMapperITCase.java
@@ -37,8 +37,8 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.SpyBean;
import org.springframework.test.context.ActiveProfiles;
-import de.itvsh.kop.common.binaryfile.TempFileUtils;
-import de.itvsh.kop.common.test.TestUtils;
+import de.ozgcloud.common.binaryfile.TempFileUtils;
+import de.ozgcloud.common.test.TestUtils;
import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.IncomingFile;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
diff --git a/formsolutions-adapter/src/test/java/de/ozgcloud/eingang/formsolutions/FormSolutionsRequestMapperTest.java b/formsolutions-adapter/src/test/java/de/ozgcloud/eingang/formsolutions/FormSolutionsRequestMapperTest.java
index 01500fdea..7b6786487 100644
--- a/formsolutions-adapter/src/test/java/de/ozgcloud/eingang/formsolutions/FormSolutionsRequestMapperTest.java
+++ b/formsolutions-adapter/src/test/java/de/ozgcloud/eingang/formsolutions/FormSolutionsRequestMapperTest.java
@@ -51,8 +51,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonMappingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import de.itvsh.kop.common.binaryfile.TempFileUtils;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.binaryfile.TempFileUtils;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroupTestFactory;
import lombok.SneakyThrows;
diff --git a/formsolutions-adapter/src/test/java/de/ozgcloud/eingang/formsolutions/FormsolutionsITCase.java b/formsolutions-adapter/src/test/java/de/ozgcloud/eingang/formsolutions/FormsolutionsITCase.java
index 0e2aeddf0..ce0ebc98e 100644
--- a/formsolutions-adapter/src/test/java/de/ozgcloud/eingang/formsolutions/FormsolutionsITCase.java
+++ b/formsolutions-adapter/src/test/java/de/ozgcloud/eingang/formsolutions/FormsolutionsITCase.java
@@ -20,7 +20,7 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.util.ReflectionTestUtils;
-import de.itvsh.kop.common.test.TestUtils;
+import de.ozgcloud.common.test.TestUtils;
import de.ozgcloud.eingang.router.VorgangManagerServerResolver;
import de.ozgcloud.vorgang.grpc.binaryFile.BinaryFileServiceGrpc.BinaryFileServiceStub;
import de.ozgcloud.vorgang.grpc.binaryFile.GrpcUploadBinaryFileRequest;
diff --git a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositRequestIncomingFileMapper.java b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositRequestIncomingFileMapper.java
index a0adc3e83..db6bc571c 100644
--- a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositRequestIncomingFileMapper.java
+++ b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/DepositRequestIncomingFileMapper.java
@@ -28,7 +28,7 @@ import java.util.UUID;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.common.binaryfile.TempFileUtils;
+import de.ozgcloud.common.binaryfile.TempFileUtils;
import de.ozgcloud.eingang.common.formdata.IncomingFile;
@Component
diff --git a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/JsonService.java b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/JsonService.java
index 695fb93fc..fa8c516f6 100644
--- a/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/JsonService.java
+++ b/intelliform-adapter/src/main/java/de/ozgcloud/eingang/intelliform/JsonService.java
@@ -10,7 +10,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
@Component
class JsonService {
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointTest.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointTest.java
index b1e45b023..c6c9381d3 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointTest.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataEndpointTest.java
@@ -38,7 +38,7 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.xml.sax.SAXException;
-import de.itvsh.kop.common.test.TestUtils;
+import de.ozgcloud.common.test.TestUtils;
import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
import de.ozgcloud.eingang.semantik.SemantikAdapter;
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataIncomingFileMapperTest.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataIncomingFileMapperTest.java
index fb4a1c993..05d11ea15 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataIncomingFileMapperTest.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/FormDataIncomingFileMapperTest.java
@@ -39,7 +39,7 @@ import org.junit.jupiter.api.Test;
import org.w3c.dom.Document;
import org.xml.sax.SAXException;
-import de.itvsh.kop.common.test.TestUtils;
+import de.ozgcloud.common.test.TestUtils;
import de.ozgcloud.eingang.common.formdata.IncomingFile;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/JsonServiceTest.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/JsonServiceTest.java
index 85433a0f9..e32bfa9c6 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/JsonServiceTest.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/JsonServiceTest.java
@@ -20,7 +20,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import lombok.SneakyThrows;
class JsonServiceTest {
diff --git a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/XmlToJavaMapsMapperTest.java b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/XmlToJavaMapsMapperTest.java
index b8144af9f..ea6f5149f 100644
--- a/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/XmlToJavaMapsMapperTest.java
+++ b/intelliform-adapter/src/test/java/de/ozgcloud/eingang/intelliform/XmlToJavaMapsMapperTest.java
@@ -41,7 +41,7 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.w3c.dom.Document;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
class XmlToJavaMapsMapperTest {
diff --git a/pom.xml b/pom.xml
index fada1f64d..f33bd5811 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,9 +29,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-parent</artifactId>
- <version>2.3.2-SNAPSHOT</version>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-parent</artifactId>
+ <version>3.0.0-SNAPSHOT</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
diff --git a/router/src/main/java/de/ozgcloud/eingang/router/FileIdMapper.java b/router/src/main/java/de/ozgcloud/eingang/router/FileIdMapper.java
index 34cf7ef3f..1049ab850 100644
--- a/router/src/main/java/de/ozgcloud/eingang/router/FileIdMapper.java
+++ b/router/src/main/java/de/ozgcloud/eingang/router/FileIdMapper.java
@@ -25,7 +25,7 @@ package de.ozgcloud.eingang.router;
import org.mapstruct.Mapper;
-import de.itvsh.kop.common.binaryfile.FileId;
+import de.ozgcloud.common.binaryfile.FileId;
@Mapper
interface FileIdMapper {
diff --git a/router/src/main/java/de/ozgcloud/eingang/router/VorgangRemoteService.java b/router/src/main/java/de/ozgcloud/eingang/router/VorgangRemoteService.java
index c2f5f07a7..54ee2075f 100644
--- a/router/src/main/java/de/ozgcloud/eingang/router/VorgangRemoteService.java
+++ b/router/src/main/java/de/ozgcloud/eingang/router/VorgangRemoteService.java
@@ -36,9 +36,9 @@ import org.springframework.stereotype.Service;
import com.google.protobuf.ByteString;
-import de.itvsh.kop.common.binaryfile.GrpcFileUploadUtils;
-import de.itvsh.kop.common.binaryfile.GrpcFileUploadUtils.FileSender;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.binaryfile.GrpcFileUploadUtils;
+import de.ozgcloud.common.binaryfile.GrpcFileUploadUtils.FileSender;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.IncomingFile;
import de.ozgcloud.eingang.common.formdata.IncomingFileGroup;
diff --git a/router/src/test/java/de/ozgcloud/eingang/router/VorgangRemoteServiceTest.java b/router/src/test/java/de/ozgcloud/eingang/router/VorgangRemoteServiceTest.java
index eb49a09ea..60206de34 100644
--- a/router/src/test/java/de/ozgcloud/eingang/router/VorgangRemoteServiceTest.java
+++ b/router/src/test/java/de/ozgcloud/eingang/router/VorgangRemoteServiceTest.java
@@ -46,8 +46,8 @@ import org.mockito.Captor;
import org.mockito.InjectMocks;
import org.mockito.Mock;
-import de.itvsh.kop.common.binaryfile.GrpcFileUploadUtils.FileSender;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.binaryfile.GrpcFileUploadUtils.FileSender;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
import de.ozgcloud.eingang.common.formdata.IncomingFile;
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapper.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapper.java
index 505d274ea..4b417bd36 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapper.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapper.java
@@ -14,7 +14,7 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import de.itvsh.kop.common.errorhandling.TechnicalException;
+import de.ozgcloud.common.errorhandling.TechnicalException;
import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.IncomingFile;
import de.ozgcloud.eingang.common.formdata.ZustaendigeStelle;
diff --git a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/AnliegenId.java b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/AnliegenId.java
index 673a641bf..7ae3363c9 100644
--- a/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/AnliegenId.java
+++ b/semantik-adapter/src/main/java/de/ozgcloud/eingang/semantik/formbased/AnliegenId.java
@@ -23,7 +23,7 @@
*/
package de.ozgcloud.eingang.semantik.formbased;
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
class AnliegenId extends StringBasedValue {
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/common/ZipAttachmentReaderTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/common/ZipAttachmentReaderTest.java
index 87ef66bd0..f6e1fa7e0 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/common/ZipAttachmentReaderTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/common/ZipAttachmentReaderTest.java
@@ -45,7 +45,7 @@ import org.junit.jupiter.api.Test;
import org.mockito.Spy;
import org.springframework.util.MimeTypeUtils;
-import de.itvsh.kop.common.test.TestUtils;
+import de.ozgcloud.common.test.TestUtils;
import de.ozgcloud.eingang.common.formdata.IncomingFile;
import de.ozgcloud.eingang.semantik.common.ReadZipException;
import de.ozgcloud.eingang.semantik.common.ZipAttachmentReader;
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapperITCase.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapperITCase.java
index d1ff23366..7de876ff2 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapperITCase.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/afm/ZustaendigeStelleMetadataMapperITCase.java
@@ -9,8 +9,8 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
-import de.itvsh.kop.common.test.ITCase;
-import de.itvsh.kop.common.test.TestUtils;
+import de.ozgcloud.common.test.ITCase;
+import de.ozgcloud.common.test.TestUtils;
import de.ozgcloud.eingang.common.formdata.IncomingFile;
import de.ozgcloud.eingang.common.formdata.IncomingFileTestFactory;
import lombok.SneakyThrows;
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterITCase.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterITCase.java
index 2402efcd4..cc186d6b9 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterITCase.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/enginebased/formsolutions/FormSolutionsEngineBasedAdapterITCase.java
@@ -43,8 +43,8 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
-import de.itvsh.kop.common.binaryfile.TempFileUtils;
-import de.itvsh.kop.common.test.TestUtils;
+import de.ozgcloud.common.binaryfile.TempFileUtils;
+import de.ozgcloud.common.test.TestUtils;
import de.ozgcloud.eingang.common.errorhandling.TechnicalException;
import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
diff --git a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/DFoerdermittelFormBasedMapperTest.java b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/DFoerdermittelFormBasedMapperTest.java
index a751ce281..2b5f2ddb6 100644
--- a/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/DFoerdermittelFormBasedMapperTest.java
+++ b/semantik-adapter/src/test/java/de/ozgcloud/eingang/semantik/formbased/DFoerdermittelFormBasedMapperTest.java
@@ -17,8 +17,8 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
-import de.itvsh.kop.common.binaryfile.TempFileUtils;
-import de.itvsh.kop.common.test.TestUtils;
+import de.ozgcloud.common.binaryfile.TempFileUtils;
+import de.ozgcloud.common.test.TestUtils;
import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.FormDataTestFactory;
import de.ozgcloud.eingang.common.formdata.IncomingFile;
diff --git a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageId.java b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageId.java
index bad73448c..e247f5f4f 100644
--- a/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageId.java
+++ b/xta-adapter/src/main/java/de/ozgcloud/eingang/xta/XtaMessageId.java
@@ -1,6 +1,6 @@
package de.ozgcloud.eingang.xta;
-import de.itvsh.kop.common.datatype.StringBasedValue;
+import de.ozgcloud.common.datatype.StringBasedValue;
public class XtaMessageId extends StringBasedValue {
diff --git a/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java b/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java
index 3f6525b51..67ebd3899 100644
--- a/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java
+++ b/xta-adapter/src/test/java/de/ozgcloud/eingang/xta/XtaITCase.java
@@ -15,7 +15,7 @@ import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Bean;
import org.springframework.test.context.ActiveProfiles;
-import de.itvsh.kop.common.test.TestUtils;
+import de.ozgcloud.common.test.TestUtils;
import de.ozgcloud.eingang.Application;
import de.ozgcloud.eingang.common.formdata.FormData;
import de.ozgcloud.eingang.common.formdata.ServiceKonto;
--
GitLab