diff --git a/alfa-server/pom.xml b/alfa-server/pom.xml index 76af5fdd23e92412e4e5353805ab7fa9cd8dd643..2c47d00f114c27eecc621ded19a977e0fd197d84 100644 --- a/alfa-server/pom.xml +++ b/alfa-server/pom.xml @@ -121,7 +121,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-jar-plugin</artifactId> - <version>3.3.0</version> <executions> <execution> <id>Jar Tests Package</id> diff --git a/alfa-server/src/main/java/de/ozgcloud/alfa/AlfaServerApplication.java b/alfa-server/src/main/java/de/ozgcloud/alfa/AlfaServerApplication.java index 54525b45e9a5b1363132efdcbad4ae8269df23f7..a068f09f0db31da0cb405d2b11e181a4b63edbdf 100644 --- a/alfa-server/src/main/java/de/ozgcloud/alfa/AlfaServerApplication.java +++ b/alfa-server/src/main/java/de/ozgcloud/alfa/AlfaServerApplication.java @@ -40,7 +40,7 @@ import org.springframework.web.filter.ForwardedHeaderFilter; @SpringBootApplication @EnableAsync @EnableAspectJAutoProxy(proxyTargetClass = true) -@ComponentScan({ "de.ozgcloud.*", "de.itvsh.*" }) +@ComponentScan({ "de.ozgcloud.*" }) public class AlfaServerApplication { public static void main(String[] args) { diff --git a/alfa-server/src/main/java/de/ozgcloud/alfa/logging/AlfaAspectPointcuts.java b/alfa-server/src/main/java/de/ozgcloud/alfa/logging/AlfaAspectPointcuts.java deleted file mode 100644 index 7f72dd6b7afa91fc5466381f258ddba7a6440003..0000000000000000000000000000000000000000 --- a/alfa-server/src/main/java/de/ozgcloud/alfa/logging/AlfaAspectPointcuts.java +++ /dev/null @@ -1,31 +0,0 @@ -package de.ozgcloud.alfa.logging; - -import org.aspectj.lang.annotation.Pointcut; - -public class AlfaAspectPointcuts { - - @Pointcut("execution(public * *(..))") - void anyPublicMethods() { - // aspect pointcut - no implementation needed - } - - @Pointcut("within(de.ozgcloud..*)") - void anythingInOzgCloud() { - // aspect pointcut - no implementation needed - } - - @Pointcut("anyPublicMethods() && anythingInOzgCloud()") - void anyPublicMethodInOzgCloud() { - // aspect pointcut - no implementation needed - } - - @Pointcut("anyPublicMethodInOzgCloud() && @target(org.springframework.stereotype.Service)") - void anyPublicServiceMethod() { - // aspect pointcut - no implementation needed - } - - @Pointcut("anyPublicMethodInOzgCloud() && @target(org.springframework.web.bind.annotation.RestController)") - void anyPublicRestControllerMethod() { - // aspect pointcut - no implementation needed - } -} diff --git a/alfa-server/src/main/java/de/ozgcloud/alfa/logging/AlfaLoggingAspect.java b/alfa-server/src/main/java/de/ozgcloud/alfa/logging/AlfaLoggingAspect.java deleted file mode 100644 index 2a422d1b4b3eebaea5b90f1fa9d01aab438f6a12..0000000000000000000000000000000000000000 --- a/alfa-server/src/main/java/de/ozgcloud/alfa/logging/AlfaLoggingAspect.java +++ /dev/null @@ -1,31 +0,0 @@ -package de.ozgcloud.alfa.logging; - -import org.aspectj.lang.JoinPoint; -import org.aspectj.lang.annotation.AfterReturning; -import org.aspectj.lang.annotation.AfterThrowing; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Before; -import org.springframework.stereotype.Component; - -import de.itvsh.kop.common.logging.AspectLoggingUtils; - -@Aspect -@Component -public class AlfaLoggingAspect extends AlfaAspectPointcuts { - - @Before("anyPublicServiceMethod() || anyPublicRestControllerMethod()") - public void onLoggedMethod(JoinPoint joinPoint) { - AspectLoggingUtils.log(joinPoint); - } - - @AfterThrowing(pointcut = "anyPublicServiceMethod() || anyPublicRestControllerMethod()", throwing = "ex") - public void afterExceptionInLoggedMethod(JoinPoint joinPoint, Exception ex) { - AspectLoggingUtils.logException(joinPoint, ex); - } - - @AfterReturning(pointcut = "anyPublicServiceMethod() || anyPublicRestControllerMethod()", returning = "returnValue") - public void afterLoggedMethod(JoinPoint joinPoint, Object returnValue) { - AspectLoggingUtils.logReturnValue(joinPoint, returnValue); - } - -} diff --git a/alfa-service/pom.xml b/alfa-service/pom.xml index 5bf9f39638b4bd7f8a87d6036abc691a7599b236..969f51b9360819090c812d74e208d759eb8a02d0 100644 --- a/alfa-service/pom.xml +++ b/alfa-service/pom.xml @@ -42,8 +42,8 @@ <properties> <maven.compiler.source>${java.version}</maven.compiler.source> <maven.compiler.target>${java.version}</maven.compiler.target> - - <!-- TODO: die Version über kop-common ziehen --> + + <!-- TODO: die Version über ozgcloud-common ziehen --> <jjwt.version>0.11.5</jjwt.version> </properties> @@ -94,6 +94,7 @@ <dependency> <groupId>io.jsonwebtoken</groupId> <artifactId>jjwt-api</artifactId> + <version>${jjwt.version}</version> </dependency> <dependency> <groupId>io.jsonwebtoken</groupId> @@ -117,8 +118,8 @@ <artifactId>vorgang-manager-utils</artifactId> </dependency> <dependency> - <groupId>de.itvsh.kop.common</groupId> - <artifactId>kop-common-pdf</artifactId> + <groupId>de.ozgcloud.common</groupId> + <artifactId>ozgcloud-common-pdf</artifactId> </dependency> <dependency> <groupId>de.ozgcloud.user</groupId> diff --git a/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfService.java b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfService.java index 1ab1d3efdd79fd8b6e2790f6329efcda55278dff..5ee89e4be31909149a6af5e4f868ee3f8b225fe9 100644 --- a/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfService.java +++ b/alfa-service/src/main/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfService.java @@ -36,14 +36,14 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.core.io.Resource; import org.springframework.stereotype.Service; -import de.itvsh.kop.common.errorhandling.TechnicalException; -import de.itvsh.kop.common.pdf.PdfService; import de.ozgcloud.alfa.common.GermanDateTimeFormatter; import de.ozgcloud.alfa.common.user.UserManagerUrlProvider; import de.ozgcloud.alfa.common.user.UserProfile; import de.ozgcloud.alfa.postfach.PostfachMail.Direction; import de.ozgcloud.alfa.vorgang.Antragsteller; import de.ozgcloud.alfa.vorgang.VorgangWithEingang; +import de.ozgcloud.common.errorhandling.TechnicalException; +import de.ozgcloud.common.pdf.PdfService; @Service class PostfachNachrichtPdfService { diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandByRelationControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandByRelationControllerTest.java index 76cfb712140497d67e155945a676d94b4d8266da..2583c28c72e74b143a21a0a9f21cad9602e97954 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandByRelationControllerTest.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandByRelationControllerTest.java @@ -46,9 +46,9 @@ 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.alfa.common.command.CommandController.CommandByRelationController; import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory; +import de.ozgcloud.common.test.TestUtils; @DisplayName("Command by relation controller") class CommandByRelationControllerTest { diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandControllerTest.java index 53cedebd5e257110487d702a946243d2930f2c3e..53f6ec125efb2914bb7754ff51211c646f904bbc 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandControllerTest.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandControllerTest.java @@ -42,9 +42,9 @@ 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.alfa.common.errorhandling.ExceptionController; import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory; +import de.ozgcloud.common.test.TestUtils; class CommandControllerTest { diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandITCase.java index 301aa043ce57a76ace03a859b7e79b7c3be90f8a..38bcfb3ea39aaa6bed30d27089e6b557076e5a40 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandITCase.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandITCase.java @@ -47,7 +47,6 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.ResultActions; -import de.itvsh.kop.common.test.TestUtils; import de.ozgcloud.alfa.common.ValidationMessageCodes; import de.ozgcloud.alfa.common.user.UserProfileTestFactory; import de.ozgcloud.alfa.postfach.PostfachMailTestFactory; @@ -56,6 +55,7 @@ import de.ozgcloud.alfa.vorgang.VorgangController; import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory; import de.ozgcloud.alfa.vorgang.VorgangWithEingangTestFactory; import de.ozgcloud.alfa.vorgang.forwarding.RedirectRequest; +import de.ozgcloud.common.test.TestUtils; @AutoConfigureMockMvc @SpringBootTest diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandTestFactory.java index 653918b8ec82927a7bfcd3cf9df3aaecd5743e92..f0b608d73e33551e1f6ac87db6200a0d275ae6e7 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandTestFactory.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/command/CommandTestFactory.java @@ -27,9 +27,9 @@ import java.util.UUID; import org.apache.commons.lang3.RandomUtils; -import de.itvsh.kop.common.test.TestUtils; import de.ozgcloud.alfa.common.user.UserProfileTestFactory; import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory; +import de.ozgcloud.common.test.TestUtils; public class CommandTestFactory { diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenControllerTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenControllerTest.java index 9937bc65f9499fd6e48dc186ed974b076461c386..41d533420f4e543112c2c6d55c9897fe63f5d5f4 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenControllerTest.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/downloadtoken/DownloadTokenControllerTest.java @@ -40,8 +40,8 @@ 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.alfa.common.binaryfile.BinaryFileTestFactory; +import de.ozgcloud.common.test.TestUtils; class DownloadTokenControllerTest { diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/CurrentUserServiceITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/CurrentUserServiceITCase.java index c72f6610f3529b697db4498eba1eb376f480e061..518c5a8c976e80d0e8f158b02eb50e163ca1e8a6 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/CurrentUserServiceITCase.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/common/user/CurrentUserServiceITCase.java @@ -7,7 +7,7 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.test.context.support.WithMockUser; -import de.itvsh.kop.common.test.ITCase; +import de.ozgcloud.common.test.ITCase; @ITCase class CurrentUserServiceITCase { diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarCommandTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarCommandTestFactory.java index 369e26e46b17f10d65bc56f8c65e791c435ad9b1..47516006c978369fc94808c46fcd10220ce6e751 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarCommandTestFactory.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/kommentar/KommentarCommandTestFactory.java @@ -25,9 +25,9 @@ package de.ozgcloud.alfa.kommentar; import java.util.Objects; -import de.itvsh.kop.common.test.TestUtils; import de.ozgcloud.alfa.common.command.CommandOrder; import de.ozgcloud.alfa.common.command.CommandTestFactory; +import de.ozgcloud.common.test.TestUtils; public class KommentarCommandTestFactory { diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandControllerITCase.java b/alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandControllerITCase.java index ad33e02b65e595b745d94a65b9f1ede29f7449fe..f30aa8666f25395af800b5946344aa773738226c 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandControllerITCase.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/loeschanforderung/LoeschAnforderungCommandControllerITCase.java @@ -21,7 +21,6 @@ import org.springframework.security.test.context.support.WithMockUser; import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.ResultActions; -import de.itvsh.kop.common.test.TestUtils; import de.ozgcloud.alfa.common.attacheditem.VorgangAttachedItemService; import de.ozgcloud.alfa.common.attacheditem.VorgangAttachedItemTestFactory; import de.ozgcloud.alfa.common.command.CommandOrder; @@ -29,6 +28,7 @@ import de.ozgcloud.alfa.common.command.CommandTestFactory; import de.ozgcloud.alfa.common.user.UserRole; import de.ozgcloud.alfa.vorgang.VorgangController; import de.ozgcloud.alfa.vorgang.VorgangWithEingangTestFactory; +import de.ozgcloud.common.test.TestUtils; @WithMockUser @AutoConfigureMockMvc diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailTestFactory.java index 333818a67d0e9ee04598ccd2e5c3e5a3aff24cb3..cd7b4ecdc14bbe650f2e49642233fffab1fc1a31 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailTestFactory.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachMailTestFactory.java @@ -31,7 +31,6 @@ import org.apache.commons.lang3.RandomStringUtils; import com.thedeanda.lorem.LoremIpsum; -import de.itvsh.kop.common.test.TestUtils; import de.ozgcloud.alfa.common.binaryfile.BinaryFileTestFactory; import de.ozgcloud.alfa.common.binaryfile.FileId; import de.ozgcloud.alfa.common.command.CommandOrder; @@ -39,6 +38,7 @@ import de.ozgcloud.alfa.common.user.UserId; import de.ozgcloud.alfa.common.user.UserProfileTestFactory; import de.ozgcloud.alfa.postfach.PostfachMail.Direction; import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory; +import de.ozgcloud.common.test.TestUtils; public class PostfachMailTestFactory { diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfServiceTest.java index e470d8adc1fdde352d4baaf6e11e2a7bec5ed3b5..edefa93ac4f191f6ab069c0ca483bb2bb5570314 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfServiceTest.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/postfach/PostfachNachrichtPdfServiceTest.java @@ -43,8 +43,6 @@ import org.mockito.Spy; import org.springframework.core.io.Resource; import org.springframework.test.util.ReflectionTestUtils; -import de.itvsh.kop.common.errorhandling.TechnicalException; -import de.itvsh.kop.common.pdf.PdfService; import de.ozgcloud.alfa.common.GermanDateTimeFormatter; import de.ozgcloud.alfa.common.binaryfile.BinaryFileTestFactory; import de.ozgcloud.alfa.common.user.UserProfileTestFactory; @@ -53,6 +51,8 @@ import de.ozgcloud.alfa.postfach.PostfachNachrichtPdfModel.Nachricht; import de.ozgcloud.alfa.vorgang.AntragstellerTestFactory; import de.ozgcloud.alfa.vorgang.VorgangHeaderTestFactory; import de.ozgcloud.alfa.vorgang.VorgangWithEingangTestFactory; +import de.ozgcloud.common.errorhandling.TechnicalException; +import de.ozgcloud.common.pdf.PdfService; import lombok.SneakyThrows; class PostfachNachrichtPdfServiceTest { diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/RedirectRequestTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/RedirectRequestTestFactory.java index 86a707bb0fc5eb4490622cb61d2c361cdc3abcd8..0eae73b4e44c992779285e664fd6c4717f6e580f 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/RedirectRequestTestFactory.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/RedirectRequestTestFactory.java @@ -23,9 +23,9 @@ */ package de.ozgcloud.alfa.vorgang; -import de.itvsh.kop.common.test.TestUtils; import de.ozgcloud.alfa.common.command.CreateCommand; import de.ozgcloud.alfa.vorgang.forwarding.RedirectRequest; +import de.ozgcloud.common.test.TestUtils; public class RedirectRequestTestFactory { diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeaderTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeaderTestFactory.java index 2eb1d65bc814907ccc77bbf9e645c64e69f9b005..0eb3965d43096354221b50cee86449ac1ea4a644 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeaderTestFactory.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/VorgangHeaderTestFactory.java @@ -28,9 +28,9 @@ import java.util.UUID; import com.thedeanda.lorem.LoremIpsum; -import de.itvsh.kop.common.test.TestUtils; import de.ozgcloud.alfa.common.user.UserProfileTestFactory; import de.ozgcloud.alfa.vorgang.Vorgang.VorgangStatus; +import de.ozgcloud.common.test.TestUtils; public class VorgangHeaderTestFactory { diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadServiceTest.java b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadServiceTest.java index 03e68970366ad3466078dfde94d00e8b7479f36f..9abac84b05d5495e1f22a601e4f6cf7c6eefe2c5 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadServiceTest.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/vorgang/forwarding/LandesnetzInfoReadServiceTest.java @@ -24,6 +24,7 @@ package de.ozgcloud.alfa.vorgang.forwarding; import static org.assertj.core.api.Assertions.*; +import static org.mockito.ArgumentMatchers.*; import static org.mockito.Mockito.*; import java.io.InputStream; @@ -38,7 +39,7 @@ import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.ValueSource; import org.mockito.Spy; -import de.itvsh.kop.common.test.TestUtils; +import de.ozgcloud.common.test.TestUtils; class LandesnetzInfoReadServiceTest { diff --git a/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandTestFactory.java b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandTestFactory.java index b31aa2d565f38fa53956372884f039611e535bc2..845ed4d8afecba70f1481564b5ef35240ae713a8 100644 --- a/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandTestFactory.java +++ b/alfa-service/src/test/java/de/ozgcloud/alfa/wiedervorlage/WiedervorlageCommandTestFactory.java @@ -28,10 +28,10 @@ import java.util.Optional; import org.apache.commons.lang3.StringUtils; -import de.itvsh.kop.common.test.TestUtils; import de.ozgcloud.alfa.common.binaryfile.BinaryFileTestFactory; import de.ozgcloud.alfa.common.command.CommandOrder; import de.ozgcloud.alfa.common.command.CommandTestFactory; +import de.ozgcloud.common.test.TestUtils; public class WiedervorlageCommandTestFactory { diff --git a/pom.xml b/pom.xml index 1b009d5407066c3fba08ae433f8e7a09a61cc52a..ecee0cbab84316c2fde0435a2c373a1e2650a7e0 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.1</version> + <groupId>de.ozgcloud.common</groupId> + <artifactId>ozgcloud-common-parent</artifactId> + <version>3.0.0-SNAPSHOT</version> </parent> <groupId>de.ozgcloud.alfa</groupId> @@ -52,7 +52,7 @@ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <vorgang-manager.version>2.0.0-SNAPSHOT</vorgang-manager.version> - <kop-common-pdf.version>2.3.1</kop-common-pdf.version> + <ozgcloud-common-pdf.version>3.0.0-SNAPSHOT</ozgcloud-common-pdf.version> <user-manager.version>2.0.0-SNAPSHOT</user-manager.version> </properties> @@ -83,9 +83,9 @@ </configuration> <dependencies> <dependency> - <groupId>de.itvsh.kop.common</groupId> - <artifactId>kop-common-license</artifactId> - <version>${kop.license.version}</version> + <groupId>de.ozgcloud.common</groupId> + <artifactId>ozgcloud-common-license</artifactId> + <version>${ozgcloud.license.version}</version> </dependency> </dependencies> </plugin> @@ -106,9 +106,9 @@ <version>${vorgang-manager.version}</version> </dependency> <dependency> - <groupId>de.itvsh.kop.common</groupId> - <artifactId>kop-common-pdf</artifactId> - <version>${kop-common-pdf.version}</version> + <groupId>de.ozgcloud.common</groupId> + <artifactId>ozgcloud-common-pdf</artifactId> + <version>${ozgcloud-common-pdf.version}</version> </dependency> <dependency> <groupId>de.ozgcloud.user</groupId>