Cleanup

openanalytics · Sep 19, 2023 · 84c49d1 · 84c49d1
1 parent 8744532
commit 84c49d1
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 62 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -73,7 +73,7 @@ pipeline {
             steps {
                 container('builder') {
                     configFileProvider([configFile(fileId: 'maven-settings-rsb', variable: 'MAVEN_SETTINGS_RSB')]) {
-                        sh "mvn -s \$MAVEN_SETTINGS_RSB io.fabric8:docker-maven-plugin:build ${env.MVN_ARGS}"
+                        sh "mvn -s \$MAVEN_SETTINGS_RSB -f server/pom.xml -Pbuild.docker.images docker:build ${env.MVN_ARGS}"
                     }
                 }
             }
@@ -83,7 +83,7 @@ pipeline {
             steps {
                 container('builder') {
                     configFileProvider([configFile(fileId: 'maven-settings-rsb', variable: 'MAVEN_SETTINGS_RSB')]) {
-                        sh "mvn -s \$MAVEN_SETTINGS_RSB io.fabric8:docker-maven-plugin:push -Ddocker.push.registry=${REGISTRY} ${env.MVN_ARGS}"
+                        sh "mvn -s \$MAVEN_SETTINGS_RSB -f server/pom.xml -Pbuild.docker.images docker:push -Ddocker.push.registry=${REGISTRY} ${env.MVN_ARGS}"
                     }
                 }
             }

diff --git a/dto/pom.xml b/dto/pom.xml
@@ -1,10 +1,13 @@
 <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>eu.openanalytics.phaedra</groupId>
-    <artifactId>phaedra2-pipelineservice</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
-  </parent>
-  <artifactId>phaedra2-pipelineservice-dto</artifactId>
-  <name>phaedra2-pipelineservice-dto</name>
+	<modelVersion>4.0.0</modelVersion>
+
+	<parent>
+	    <groupId>eu.openanalytics.phaedra</groupId>
+	    <artifactId>phaedra2-pipelineservice</artifactId>
+	    <version>0.0.1-SNAPSHOT</version>
+	</parent>
+
+	<artifactId>phaedra2-pipelineservice-dto</artifactId>
+	<name>phaedra2-pipelineservice-dto</name>
+
 </project>
diff --git a/pom.xml b/pom.xml
@@ -12,10 +12,6 @@
 	<artifactId>phaedra2-pipelineservice</artifactId>
 	<name>Pipeline Service</name>
 
-	<properties>
-		<java.version>16</java.version>
-	</properties>
-
 	<modules>
 		<module>dto</module>
 		<module>server</module>

diff --git a/server/pom.xml b/server/pom.xml
@@ -7,25 +7,17 @@
 		<groupId>eu.openanalytics.phaedra</groupId>
 		<artifactId>phaedra2-pipelineservice</artifactId>
 		<version>0.0.1-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<artifactId>phaedra2-pipelineservice-server</artifactId>
 	<name>phaedra2-pipelineservice-server</name>
 
 	<properties>
-        <java.version>16</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
         <docker.imageName>openanalytics/${project.parent.artifactId}</docker.imageName>
     </properties>
 
 	<dependencies>
 		<!-- Phaedra dependencies -->
-		<dependency>
-			<groupId>eu.openanalytics.phaedra</groupId>
-			<artifactId>phaedra2-commons</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>eu.openanalytics.phaedra</groupId>
 			<artifactId>phaedra2-pipelineservice-dto</artifactId>
@@ -59,47 +51,25 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
-
-            <plugin>
-                <groupId>io.fabric8</groupId>
-				<artifactId>docker-maven-plugin</artifactId>
-				<version>0.37.0</version>
-				<configuration>
-					<images>
-						<image>
-							<name>${docker.imageName}</name>
-							<build>
-								<dockerFile>${project.basedir}/Dockerfile.app</dockerFile>
-								<tags>
-									<tag>${project.version}</tag>
-								</tags>
-								<args>
-									<JAR_FILE>target/${project.build.finalName}.jar</JAR_FILE>
-								</args>
-							</build>
-						</image>
-                        <image>
-                        	<name>${docker.imageName}.liquibase</name>
-                            <build>
-                                <dockerFile>${project.basedir}/Dockerfile.db</dockerFile>
-                                <tags>
-                                    <tag>${project.version}</tag>
-                                </tags>
-                            </build>
-                        </image>
-					</images>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>install</phase>
-						<goals>
-							<goal>build</goal>
-						</goals>
-					</execution>
-				</executions>
-            </plugin>
-
+			<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+			</plugin>
 		</plugins>
 	</build>
 
+    <profiles>
+        <profile>
+            <id>build.docker.images</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>io.fabric8</groupId>
+                        <artifactId>docker-maven-plugin</artifactId>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
 </project>