diff --git a/pom.xml b/pom.xml index f220c5f58502a289218b028eda26aaa8f4d608cb..b669638d6637e63e2c61a2392cc235532f1485fc 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 eafc17cd8b69b2b38513fac7e4d46c0ba28fac25..30b4a9f8f655b5de2ef24884a9dc6afe40f8a270 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 55427c7cbeb6d99a01d95826aadd37f64cda624e..a13a83c178e0ff2f5b6e3702d27709627819e907 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 4653353b3d0a5fdd51968da0a3488c7ed8a76c33..cddd72d0e7a590100b6d30cd17d47711fa1a906e 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 ae70a1bf68fa31bed6ea820c76d93b33725bda7d..1374e74ca8d109a96753059340d85840981230a3 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;