diff --git a/common/src/main/java/de/ozgcloud/eingang/Application.java b/common/src/main/java/de/ozgcloud/eingang/Application.java
index 164da65a2a41320484d988faa3edd42bfd75dc05..f03fc325e5c9db727db8020425efdd1e7d2ea0f3 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 d7109f66a1eb810812c82c2e795559c0a6f99e7a..2f2bd49ab930c0d22c1fb50987e48e81bdb7078e 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 15adca7f079115e02699c267f5fcc7d9392fa86c..c5e9b9dba3a8af2feadf60499e0ed301dbc9c294 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 b7b7515b27ad056e865630a26e923d3f863c8f59..253b1496782d16771db34ae53cdc28612ee93779 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 4366c6af56444611ad331662ed50560253d36b1d..40e803fe1c1a89f4937d00453d574ebb09df7c67 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 d1d4e3f9c4467aac99cf52838c164f3f1e26f49c..3705dd85e4444cfea85beae8cf3b4954b0eb6df6 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 17bd6cd4c8a19bf43d320a8e0e2afc96fd71f31c..026a2dba306f8d22f02b5bf4ede8c5ab64322e4b 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 7086aee89422861a125508b3f5a619f87e8d00d5..6e3bcb26596a888594f0560cf7bc5cea7c963ba2 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 120c99e5cd5d5c5edc9efd7b911203ae81877c18..de9426a23d153faf8c7c33ea35ae3087fcb16fdc 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 b467456464ff81be104e520df101cb4597cf09bc..b79d3a951c53f0853ff0cdde4dbfef9c0966f56c 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 1bff6a9a2293de3d9db9a68f9892e4a3388514fc..b26262f97fa6f805b875ea187021b24d5f6d636e 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 72ac82bf10facc35fe6f6f9c223461a97e13bb74..e25ac53a1168a14b152d7ec4bab8bc4694ff11ac 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 d429e218a88c39a0f31044ceee687627dc617444..194937da4c1bed21bdcc90396bf047a510d259c6 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 f1435d7d329a02aef288ae67c7bf4f2a7a38cfc9..aa8b6462bfc72c3d2c872cf9f48883b9621fddee 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 e882017c5e80ac1900ef638ebd25b1d73db7076a..16e4a43119a366e482974b1e1783122e99be18bf 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 a34d992d4028a248b839a9f66db2f8763a1ba9da..476f5f3e7d6581999883ca804861392b13b328b7 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 faee3e09be87b831e3b6b1f8abdeeaaf3506e942..1141d70ac1715e130543f5f9b152833c96e989a5 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 f9658310e79f3c8363492f489eb0a37ec3eb02e7..74385763e98b5f9b6f2850055d867f3c4f3922a5 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 43b597780ead9d74b951d83542f78c7a3f727a23..3996c20101b170aa632159011ac7d0647bff898c 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 a15b9ad987b3e5ba1dccb134e2960c8a226f1f63..3610ca6df42aa74792df1d458c0088c88289ae56 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 d50edb99351d8905a2783ff14e924b4dfb4d8b5c..01ea26c58bd8f407da8a5ea7e9fd9cbb72aa6dcf 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 20597a99b5031e30adf53e4231b008d157525c83..9fc2cf6e70befa088c7ad001c6a68ae76b7b5398 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 bb82419f589585bf8cf754bcde85ab15ded866bc..a77c02ad903a5d8f5df904033a731db9f74277ec 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 01500fdea452c71a4cc3fee2c713711cf5b20f8b..7b67864879542ece32feb100b2b26b30e182bce2 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 0e2aeddf0ecd927043271ebdd6c0e0976d634ca0..ce0ebc98e684dc3cac7c5a501ecd24bb16ff8fc5 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 a0adc3e835096566b016d5b4d2b81f16dae2f133..db6bc571cea5ba0c9897dfef2bd7ded128ca9c35 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 695fb93fc6ad430683d972ab8c59298ba93cb1e1..fa8c516f641b18f518ec3d19323a01d81a7287c4 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 b1e45b0235fe381e4a0db7d1ae99edc18bd3ddcf..c6c9381d3ca42453ede63033b277c7e1d00261ef 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 fb4a1c99336319deb4206a5cf41327d0c7954870..05d11ea152de2367bb23d51555764a15083103d9 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 85433a0f91040651b64d29de729da4f3e85f1e39..e32bfa9c633fa6e36169d7b0674f59ab0c4ca59f 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 b8144af9f7929cfc2d9edc9ad046e5b8e2a5e165..ea6f5149f2aaba2246891aaefede93950f120a7d 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 fada1f64db27c37aa60d695685261b27eaac5b86..f33bd5811f81007d89de71c2d2738f2b649b5f50 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 34cf7ef3f60797d491286d234b46a6bbf3914150..1049ab850898fa920cf792e6d75ea474c8a79bf4 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 c2f5f07a74c15c114fdc158001adee3884582e29..54ee2075fe8827984a34b0dfec99c4a9cbec410f 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 eb49a09ea04e8f0979f8616c0c0a9c80b7eb178b..60206de34962325a9a4b66061f7f65617233cec3 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 505d274ea5627e3634cf349943b301d70de2857b..4b417bd36dc8421632a5e26447d1b7b669f249dd 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 673a641bf935f1662e54d5812845c20a2f41be8f..7ae3363c94933a5ea0f5b1a73ddcdacf5ddc22b7 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 87ef66bd071f86e7c70ed6e928e3bde86fbcf453..f6e1fa7e07c716a5b00a059ea8e46c1c35d16116 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 d1ff2336639729b40f08a08a6b663e8841a6d931..7de876ff2d2493fc16c4bbc4e98ba9bfe60b36c7 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 2402efcd42c548b0c6388b6158f62dd28c469023..cc186d6b99d8f020ff07374682eb34f7b751b407 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 a751ce2816769d6bf1a4c4055afdf3cbe6f5cfaf..2b5f2ddb6438a02872383a3cefb5936165f21a08 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 bad73448cf676aaf81023b7cba7d41d15b92061e..e247f5f4f60123063810d7b6417671496adcb1e4 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 3f6525b5134515108a8b290cdd8f8ae03ba37f9e..67ebd3899bdfa6000446a450440f93f78e4c5114 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;