From c1a30bb0cc0bd2e0eaa4836411053d0bdcc0ab4b Mon Sep 17 00:00:00 2001
From: marcelmeyer <marcel.meyer@flendly.de>
Date: Thu, 4 Jul 2024 09:23:33 +0200
Subject: [PATCH 1/2] Fix pom.xml for docker images

---
 sts-secret-server/pom.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/sts-secret-server/pom.xml b/sts-secret-server/pom.xml
index b3b5021a..c4472657 100644
--- a/sts-secret-server/pom.xml
+++ b/sts-secret-server/pom.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -8,11 +7,9 @@
         <version>1.1.28-SNAPSHOT</version>
     </parent>
 
-
     <modelVersion>4.0.0</modelVersion>
     <artifactId>sts-secret-server</artifactId>
 
-
     <dependencies>
 
         <!-- https://mvnrepository.com/artifact/org.springframework.data/spring-data-jpa -->
@@ -133,7 +130,6 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-failsafe-plugin</artifactId>
-                <!--https://stackoverflow.com/questions/49363222/maven-failsafe-plugin-surefirebooterforkexception-there-was-an-error-in-the-f-->
                 <version>${failsafe.version}</version>
                 <configuration>
                     <includes>
@@ -161,18 +157,17 @@
                         </goals>
                     </execution>
                     <execution>
-                        <id>fat-jar</id>
+                        <id>repackage</id>
                         <goals>
                             <goal>repackage</goal>
                         </goals>
                         <configuration>
-                            <classifier>exec</classifier>
+                            <mainClass>de.adorsys.sts.secretserver.SecretServerApplication</mainClass>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
             <plugin>
-                <!--this plugin replaces the placeholders within application-IT.yml needed for the integration tests-->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-resources-plugin</artifactId>
                 <version>3.2.0</version>

From 699529f1be300244e5792687d36544c35a3c3a37 Mon Sep 17 00:00:00 2001
From: marcelmeyer <marcel.meyer@flendly.de>
Date: Thu, 4 Jul 2024 09:45:29 +0200
Subject: [PATCH 2/2] Fix pom.xml for docker images

---
 sts-secret-server/pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/sts-secret-server/pom.xml b/sts-secret-server/pom.xml
index c4472657..21d57f2c 100644
--- a/sts-secret-server/pom.xml
+++ b/sts-secret-server/pom.xml
@@ -161,9 +161,6 @@
                         <goals>
                             <goal>repackage</goal>
                         </goals>
-                        <configuration>
-                            <mainClass>de.adorsys.sts.secretserver.SecretServerApplication</mainClass>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>