Skip to content
Snippets Groups Projects
Commit e2cfd1c3 authored by OZGCloud's avatar OZGCloud
Browse files

Merge branch 'master' of git.ozg-sh.de:ozgcloud-app/processor-manager

# Conflicts:
#	pom.xml
#	src/test/java/de/ozgcloud/processor/processor/ProcessorEventListenerITCase.java
parents 760e3396 b9944a8e
No related branches found
No related tags found
No related merge requests found
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
<properties> <properties>
<vorgang-manager.version>2.0.0-SNAPSHOT</vorgang-manager.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> <tyrus-standalone-client.version>2.1.3</tyrus-standalone-client.version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -44,14 +45,7 @@ ...@@ -44,14 +45,7 @@
<dependency> <dependency>
<groupId>de.ozgcloud.api-lib</groupId> <groupId>de.ozgcloud.api-lib</groupId>
<artifactId>ozg-cloud-spring-boot-starter</artifactId> <artifactId>ozg-cloud-spring-boot-starter</artifactId>
<version>0.3.0</version> <version>${api-lib.version}</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>
</dependency> </dependency>
<!-- spring --> <!-- spring -->
...@@ -65,6 +59,21 @@ ...@@ -65,6 +59,21 @@
</dependency> </dependency>
<!-- test --> <!-- 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> <dependency>
<groupId>org.glassfish.tyrus.bundles</groupId> <groupId>org.glassfish.tyrus.bundles</groupId>
<artifactId>tyrus-standalone-client</artifactId> <artifactId>tyrus-standalone-client</artifactId>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment