resolve dependency conflicts

Jenkinsfile

@@ -81,11 +81,6 @@ pipeline {
                     }
                 }
             }
-            post {
-                always{
-                    junit testResults: '**/target/surefire-reports/*.xml', skipPublishingChecks: true
-                }
-            }
         }
 
         stage('Deploy to Nexus'){
@@ -335,7 +330,13 @@ String getPomVersion(String pomFile){
 }
 
 String generateImageTag() {
-    return "${env.BRANCH_NAME}-${getPomVersion('pom.xml')}"+"-${env.GIT_COMMIT.take(7)}"
+    def imageTag = "${env.BRANCH_NAME}-${getPomVersion('pom.xml')}"
+
+    if (env.BRANCH_NAME == 'master') {
+        imageTag += "-${env.GIT_COMMIT.take(7)}"
+    }
+
+    return imageTag
 }
 
 

pom.xml

@@ -23,6 +23,8 @@
 		<spring-security-core.version>6.3.3</spring-security-core.version>
 		<mustache.version>0.9.14</mustache.version>
 		<snakeyaml.version>2.0</snakeyaml.version>
+		
+		<squareup.okio.version>3.9.1</squareup.okio.version>
 		<spring-boot.build-image.imageName>docker.ozg-sh.de/ozgcloud-elster-transfer-operator:build-latest</spring-boot.build-image.imageName>
 	</properties>
 
@@ -58,7 +60,11 @@
 			<artifactId>compiler</artifactId>
 			<version>${mustache.version}</version>
 		</dependency>
-
+		<dependency>
+			<groupId>com.squareup.okio</groupId>
+			<artifactId>okio</artifactId>
+			<version>${squareup.okio.version}</version>
+		</dependency>
 
 		<!-- test -->
 		<dependency>

src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserRemoteService.java

@@ -4,7 +4,6 @@ import java.util.Base64;
 import java.util.Objects;
 
 import org.springframework.stereotype.Component;
-import org.yaml.snakeyaml.Yaml;
 
 import io.fabric8.kubernetes.api.model.ConfigMap;
 import io.fabric8.kubernetes.api.model.ConfigMapBuilder;

src/main/java/de/ozgcloud/operator/elstertransfer/user/OzgCloudElsterTransferUserService.java

@@ -138,7 +138,7 @@ public class OzgCloudElsterTransferUserService {
         Mustache mustache = mf.compile("users.tmpl");
 
         StringWriter writer = new StringWriter();
-        mustache.execute(writer, userEntry);  // Automatically fills placeholders from userEntry map
+        mustache.execute(writer, userEntry); 
         return writer.toString();
 
 	}