From 07e792868be9ac2a88399f7f16350b42a72367fe Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 4 Dec 2023 12:59:12 +0100
Subject: [PATCH] OZG-4589 OZG-4644 use ozgcloud common 3.0.0-SNAPSHOT; remove
specific alfa logging
---
alfa-server/pom.xml | 1 -
.../ozgcloud/alfa/AlfaServerApplication.java | 2 +-
.../alfa/logging/AlfaAspectPointcuts.java | 31 -------------------
.../alfa/logging/AlfaLoggingAspect.java | 31 -------------------
alfa-service/pom.xml | 9 +++---
.../postfach/PostfachNachrichtPdfService.java | 4 +--
.../CommandByRelationControllerTest.java | 2 +-
.../common/command/CommandControllerTest.java | 2 +-
.../alfa/common/command/CommandITCase.java | 2 +-
.../common/command/CommandTestFactory.java | 2 +-
.../DownloadTokenControllerTest.java | 2 +-
.../common/user/CurrentUserServiceITCase.java | 2 +-
.../KommentarCommandTestFactory.java | 2 +-
...schAnforderungCommandControllerITCase.java | 2 +-
.../postfach/PostfachMailTestFactory.java | 2 +-
.../PostfachNachrichtPdfServiceTest.java | 4 +--
.../vorgang/RedirectRequestTestFactory.java | 2 +-
.../vorgang/VorgangHeaderTestFactory.java | 2 +-
.../LandesnetzInfoReadServiceTest.java | 3 +-
.../WiedervorlageCommandTestFactory.java | 2 +-
pom.xml | 20 ++++++------
21 files changed, 34 insertions(+), 95 deletions(-)
delete mode 100644 alfa-server/src/main/java/de/ozgcloud/alfa/logging/AlfaAspectPointcuts.java
delete mode 100644 alfa-server/src/main/java/de/ozgcloud/alfa/logging/AlfaLoggingAspect.java
diff --git a/alfa-server/pom.xml b/alfa-server/pom.xml
index 76af5fdd23..2c47d00f11 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 54525b45e9..a068f09f0d 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 7f72dd6b7a..0000000000
--- 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 2a422d1b4b..0000000000
--- 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 5bf9f39638..969f51b936 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 1ab1d3efdd..5ee89e4be3 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 76cfb71214..2583c28c72 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 53cedebd5e..53f6ec125e 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 301aa043ce..38bcfb3ea3 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 653918b8ec..f0b608d73e 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 9937bc65f9..41d533420f 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 c72f6610f3..518c5a8c97 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 369e26e46b..47516006c9 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 ad33e02b65..f30aa8666f 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 333818a67d..cd7b4ecdc1 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 e470d8adc1..edefa93ac4 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 86a707bb0f..0eae73b4e4 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 2eb1d65bc8..0eb3965d43 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 03e6897036..9abac84b05 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 b31aa2d565..845ed4d8af 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 1b009d5407..ecee0cbab8 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>
--
GitLab