From af3ff852222750e4df78efec728619c8cac89703 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 23 Nov 2023 10:33:00 +0100
Subject: [PATCH] OZG-3530 bump vorgang-manager and api-lib
---
pom.xml | 48 ++++++++++---------
.../processor/ProcessorEventListener.java | 8 ++--
.../processor/VorgangProcessedEvent.java | 4 +-
.../ProcessorEventListenerITCase.java | 6 +--
.../processor/ProcessorEventListenerTest.java | 10 ++--
5 files changed, 39 insertions(+), 37 deletions(-)
diff --git a/pom.xml b/pom.xml
index f220c5f..b669638 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,41 +17,28 @@
<description>OZG-Cloud Processor Manager</description>
<properties>
- <pluto.version>1.16.0</pluto.version>
+ <vorgang-manager.version>2.0.0-SNAPSHOT</vorgang-manager.version>
+ <api-lib.version>0.4.0-SNAPSHOT</api-lib.version>
<tyrus-standalone-client.version>2.1.3</tyrus-standalone-client.version>
</properties>
<dependencies>
<!-- OZG-Cloud -->
<dependency>
- <groupId>de.itvsh.ozg.pluto</groupId>
- <artifactId>pluto-utils</artifactId>
- <version>${pluto.version}</version>
+ <groupId>de.ozgcloud.vorgang</groupId>
+ <artifactId>vorgang-manager-utils</artifactId>
+ <version>${vorgang-manager.version}</version>
</dependency>
<dependency>
- <groupId>de.itvsh.ozg.pluto</groupId>
- <artifactId>pluto-command</artifactId>
- <version>${pluto.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>de.itvsh.ozg.pluto</groupId>
- <artifactId>pluto-command</artifactId>
- <version>${pluto.version}</version>
+ <groupId>de.ozgcloud.command</groupId>
+ <artifactId>command-manager</artifactId>
+ <version>${vorgang-manager.version}</version>
</dependency>
<dependency>
<groupId>de.ozgcloud.api-lib</groupId>
<artifactId>ozg-cloud-spring-boot-starter</artifactId>
- <version>0.3.0</version>
- </dependency>
- <dependency>
- <groupId>de.ozgcloud.api-lib</groupId>
- <artifactId>api-lib-core</artifactId>
- <version>0.3.0</version>
- <type>test-jar</type>
- <scope>test</scope>
+ <version>${api-lib.version}</version>
</dependency>
-
+
<!-- spring -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -63,6 +50,21 @@
</dependency>
<!-- test -->
+ <dependency>
+ <groupId>de.ozgcloud.command</groupId>
+ <artifactId>command-manager</artifactId>
+ <version>${vorgang-manager.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>de.ozgcloud.api-lib</groupId>
+ <artifactId>api-lib-core</artifactId>
+ <version>${api-lib.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+
<dependency>
<groupId>org.glassfish.tyrus.bundles</groupId>
<artifactId>tyrus-standalone-client</artifactId>
diff --git a/src/main/java/de/ozgcloud/processor/processor/ProcessorEventListener.java b/src/main/java/de/ozgcloud/processor/processor/ProcessorEventListener.java
index eafc17c..30b4a9f 100644
--- a/src/main/java/de/ozgcloud/processor/processor/ProcessorEventListener.java
+++ b/src/main/java/de/ozgcloud/processor/processor/ProcessorEventListener.java
@@ -10,10 +10,10 @@ import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
-import de.itvsh.ozg.pluto.command.Command;
-import de.itvsh.ozg.pluto.command.CommandCreatedEvent;
-import de.itvsh.ozg.pluto.command.CommandFailedEvent;
-import de.itvsh.ozg.pluto.command.VorgangCreatedEvent;
+import de.ozgcloud.command.Command;
+import de.ozgcloud.command.CommandCreatedEvent;
+import de.ozgcloud.command.CommandFailedEvent;
+import de.ozgcloud.command.VorgangCreatedEvent;
import de.ozgcloud.processor.result.ResultService;
import de.ozgcloud.processor.vorgang.Vorgang;
import de.ozgcloud.processor.vorgang.VorgangId;
diff --git a/src/main/java/de/ozgcloud/processor/processor/VorgangProcessedEvent.java b/src/main/java/de/ozgcloud/processor/processor/VorgangProcessedEvent.java
index 55427c7..a13a83c 100644
--- a/src/main/java/de/ozgcloud/processor/processor/VorgangProcessedEvent.java
+++ b/src/main/java/de/ozgcloud/processor/processor/VorgangProcessedEvent.java
@@ -1,7 +1,7 @@
package de.ozgcloud.processor.processor;
-import de.itvsh.ozg.pluto.command.Command;
-import de.itvsh.ozg.pluto.command.CommandExecutedEvent;
+import de.ozgcloud.command.Command;
+import de.ozgcloud.command.CommandExecutedEvent;
class VorgangProcessedEvent extends CommandExecutedEvent {
diff --git a/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerITCase.java b/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerITCase.java
index 4653353..cddd72d 100644
--- a/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerITCase.java
+++ b/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerITCase.java
@@ -11,10 +11,10 @@ import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.ApplicationEventPublisher;
import de.itvsh.kop.common.test.ITCase;
-import de.itvsh.ozg.pluto.command.CommandCreatedEvent;
-import de.itvsh.ozg.pluto.command.CommandTestFactory;
-import de.itvsh.ozg.pluto.command.VorgangCreatedEvent;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory;
+import de.ozgcloud.command.CommandCreatedEvent;
+import de.ozgcloud.command.CommandTestFactory;
+import de.ozgcloud.command.VorgangCreatedEvent;
import de.ozgcloud.processor.result.ResultService;
import de.ozgcloud.processor.vorgang.VorgangId;
import de.ozgcloud.processor.vorgang.VorgangService;
diff --git a/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerTest.java b/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerTest.java
index ae70a1b..1374e74 100644
--- a/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerTest.java
+++ b/src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerTest.java
@@ -22,12 +22,12 @@ import org.mockito.Mock;
import org.mockito.Spy;
import org.springframework.context.ApplicationEventPublisher;
-import de.itvsh.ozg.pluto.command.Command;
-import de.itvsh.ozg.pluto.command.CommandCreatedEvent;
-import de.itvsh.ozg.pluto.command.CommandFailedEvent;
-import de.itvsh.ozg.pluto.command.CommandTestFactory;
-import de.itvsh.ozg.pluto.command.VorgangCreatedEvent;
import de.ozgcloud.apilib.vorgang.OzgCloudVorgangTestFactory;
+import de.ozgcloud.command.Command;
+import de.ozgcloud.command.CommandCreatedEvent;
+import de.ozgcloud.command.CommandFailedEvent;
+import de.ozgcloud.command.CommandTestFactory;
+import de.ozgcloud.command.VorgangCreatedEvent;
import de.ozgcloud.processor.result.ProcessorTechnicalException;
import de.ozgcloud.processor.result.ResultService;
import de.ozgcloud.processor.vorgang.Vorgang;
--
GitLab