OZG-3284 move command code to own module

96587c8f · OZGCloud · c3db3d99 · 96587c8f · 96587c8f · 96587c8f
Commit 96587c8f authored 2 years ago by OZGCloud
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -74,30 +74,6 @@ pipeline {
            }
        }

-	stage('Build protobuf sources') {
-	    when {
-                anyOf {
-                    branch 'master'
-                    branch 'release'
-                }
-            }
-            steps {
-                dir('pluto-interface') {
-                    script {
-                    	FAILED_STAGE = env.STAGE_NAME
-                	}
-                	configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
-                    	sh 'mvn -s $MAVEN_SETTINGS -P proto-sources -DskipTests clean deploy -Dmaven.wagon.http.retryHandler.count=3'
-                	}
-                }
-
-            }
-
-	                          
-	                          
-      }
-
-       
 	   stage('Build Docker image') {
          steps {
                script {

--- a/mail-service/pom.xml
+++ b/mail-service/pom.xml
@@ -36,7 +36,7 @@

 	<groupId>de.itvsh.ozg.mail</groupId>
 	<artifactId>mail-service</artifactId>
-	<version>1.3.0</version>
+	<version>1.3.1-SNAPSHOT</version>
 	<name>KOP Vorgang Manager Mail Service</name>

 	<properties>
@@ -53,6 +53,11 @@
 			<artifactId>pluto-interface</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>de.itvsh.ozg.pluto</groupId>
+			<artifactId>pluto-command</artifactId>
+			<version>${project.version}</version>
+		</dependency>

 		<dependency>
 			<groupId>org.springframework.boot</groupId>

--- a/notification-manager/pom.xml
+++ b/notification-manager/pom.xml
@@ -37,7 +37,7 @@
 	<artifactId>notification-manager</artifactId>

 	<name>KOP Notification Manager</name>
-	<version>1.3.0</version>
+	<version>1.3.1-SNAPSHOT</version>

 	<properties>
 		<user-manager-interface.version>1.1.0</user-manager-interface.version>
@@ -55,6 +55,12 @@
 			<artifactId>pluto-utils</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>de.itvsh.ozg.pluto</groupId>
+			<artifactId>pluto-command</artifactId>
+			<version>${project.version}</version>
+		</dependency>
+		
 		<dependency>
 			<groupId>de.itvsh.kop.user</groupId>
 			<artifactId>user-manager-interface</artifactId>

--- a/pluto-interface/lombok.config
+++ b/pluto-interface/lombok.config
--- a/pluto-command/pom.xml
+++ b/pluto-command/pom.xml
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>de.itvsh.kop.common</groupId>
+		<artifactId>kop-common-dependencies</artifactId>
+		<version>1.4.1</version>
+		<relativePath/>
+	</parent>
+	
+	<groupId>de.itvsh.ozg.pluto</groupId>
+	<artifactId>pluto-command</artifactId>
+	<name>Command Manager</name>
+	<version>1.3.1-SNAPSHOT</version>
+	
+	<dependencies>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-context</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>de.itvsh.kop.common</groupId>
+			<artifactId>kop-common-lib</artifactId>
+		</dependency>
+
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+			<optional>true</optional>
+		</dependency>
+	</dependencies>
+</project>
\ No newline at end of file
--- a/pluto-interface/src/main/java/de/itvsh/ozg/pluto/command/Command.java
+++ b/pluto-interface/src/main/java/de/itvsh/ozg/pluto/command/Command.java
--- a/pluto-interface/src/main/java/de/itvsh/ozg/pluto/command/CommandCreatedEvent.java
+++ b/pluto-interface/src/main/java/de/itvsh/ozg/pluto/command/CommandCreatedEvent.java
--- a/pluto-interface/src/main/java/de/itvsh/ozg/pluto/command/CommandExecutedEvent.java
+++ b/pluto-interface/src/main/java/de/itvsh/ozg/pluto/command/CommandExecutedEvent.java
--- a/pluto-interface/src/main/java/de/itvsh/ozg/pluto/command/CommandFailedEvent.java
+++ b/pluto-interface/src/main/java/de/itvsh/ozg/pluto/command/CommandFailedEvent.java
--- a/pluto-interface/src/main/java/de/itvsh/ozg/pluto/command/CommandStatus.java
+++ b/pluto-interface/src/main/java/de/itvsh/ozg/pluto/command/CommandStatus.java
--- a/pluto-interface/src/main/java/de/itvsh/ozg/pluto/command/VorgangCreatedEvent.java
+++ b/pluto-interface/src/main/java/de/itvsh/ozg/pluto/command/VorgangCreatedEvent.java
--- a/pluto-interface/pom.xml
+++ b/pluto-interface/pom.xml
@@ -30,13 +30,13 @@
 	<parent>
 		<groupId>de.itvsh.kop.common</groupId>
 		<artifactId>kop-common-dependencies</artifactId>
-		<version>1.3.0</version>
+		<version>1.4.1</version>
 		<relativePath />
 	</parent>

 	<groupId>de.itvsh.ozg.pluto</groupId>
 	<artifactId>pluto-interface</artifactId>
-	<version>1.3.0</version>
+	<version>1.3.1-SNAPSHOT</version>

 	<name>KOP Vorgang Manager gRPC Interface</name>
 	<description>Interface (gRPC) for Pluto Server</description>
@@ -50,8 +50,6 @@
 		<maven.compiler.target>${java.version}</maven.compiler.target>

 		<kop.license.version>1.3.0</kop.license.version>
-
-		<src.dir>src/main/java</src.dir>
 	</properties>

 	<dependencyManagement>
@@ -67,22 +65,6 @@
 	</dependencyManagement>

 	<dependencies>
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>de.itvsh.kop.common</groupId>
-			<artifactId>kop-common-lib</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<optional>true</optional>
-		</dependency>
-
 		<!-- GRPC -->
 		<dependency>
 			<groupId>io.grpc</groupId>
@@ -103,7 +85,7 @@
 	</dependencies>

 	<build>
-		<sourceDirectory>${src.dir}</sourceDirectory>
+		<sourceDirectory>src/main/protobuf</sourceDirectory>

 		<extensions>
 			<extension>
@@ -141,7 +123,6 @@
 			<plugin>
 				<groupId>com.mycila</groupId>
 				<artifactId>license-maven-plugin</artifactId>
-				<version>4.1</version>
 				<configuration>
 					<mapping>
 						<proto>SLASHSTAR_STYLE</proto>
@@ -167,28 +148,6 @@
 				</dependencies>
 			</plugin>

-
-		</plugins>
-	</build>
-
-	<profiles>
-		<profile>
-			<id>proto-sources</id>
-			<properties>
-				<src.dir>src/main/protobuf</src.dir>
-			</properties>
-			<build>
-				<plugins>
-					<plugin>
-						<groupId>org.apache.maven.plugins</groupId>
-						<artifactId>maven-jar-plugin</artifactId>
-						<executions>
-							<execution>
-								<id>default-jar</id>
-								<phase>none</phase>
-							</execution>
-						</executions>
-					</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-source-plugin</artifactId>
@@ -201,16 +160,9 @@
 						</goals>
 					</execution>
 				</executions>
-
-						<configuration>
-							<includes>*.proto</includes>
-							<finalName>pluto-protobuf-interface-${project.version}</finalName>
-						</configuration>
 			</plugin>
 		</plugins>
 	</build>
-		</profile>
-	</profiles>

 	<distributionManagement>
 		<repository>

--- a/pluto-server/pom.xml
+++ b/pluto-server/pom.xml
@@ -36,7 +36,7 @@

 	<groupId>de.itvsh.ozg.pluto</groupId>
 	<artifactId>pluto-server</artifactId>
-	<version>1.3.0</version>
+	<version>1.3.1-SNAPSHOT</version>

 	<name>KOP Vorgang Manager (Pluto) Server</name>
 	<description>Server Implementierung des VorgangManagers (Pluto)</description>

--- a/pluto-utils/pom.xml
+++ b/pluto-utils/pom.xml
@@ -37,6 +37,7 @@
 	<groupId>de.itvsh.ozg.pluto</groupId>
 	<artifactId>pluto-utils</artifactId>
 	<name>KOP Vorgang Manager (Pluto) Utils</name>
+	<version>1.3.1-SNAPSHOT</version>

 	<properties>
 		<pluto.version>1.3.0</pluto.version>

--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>de.itvsh.ozg</groupId>
 	<artifactId>pluto</artifactId>
-	<version>1.3.0</version>
+	<version>1.3.1-SNAPSHOT</version>

 	<name>Pluto Parent</name>
 	<packaging>pom</packaging>
@@ -44,6 +44,7 @@
 		<module>mail-service</module>
 		<module>pluto-utils</module>
 		<module>notification-manager</module>
+		<module>pluto-command</module>
 	</modules>

 	<build>