Merge pull request 'OZG-6327-Updates common-lib dependency' (#119) from...

Merge pull request 'OZG-6327-Updates common-lib dependency' (#119) from 6327-Update-common-lib-dependency into master

Reviewed-on: https://git.ozg-sh.de/ozgcloud-app/user-manager/pulls/119


Reviewed-by: OZGCloud <ozgcloud@mgm-tp.com>

Jenkinsfile

@@ -95,7 +95,6 @@ pipeline {
 
                     configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
                         sh 'mvn -pl user-manager-server -s $MAVEN_SETTINGS clean deploy -Dmaven.wagon.http.retryHandler.count=3'
-                        sh "mvn -s $MAVEN_SETTINGS versions:revert"
                         junit testResults: '**/target/surefire-reports/*.xml', skipPublishingChecks: true
                     }
                 }
@@ -116,6 +115,18 @@ pipeline {
             }
         }
 
+        stage('Revert Version') {
+              steps {
+                    script {
+                        FAILED_STAGE=env.STAGE_NAME
+                    }
+                    configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
+                        sh 'mvn -s $MAVEN_SETTINGS versions:revert'
+
+                    }
+              }
+        }
+
         stage ('OWASP Dependency-Check Vulnerabilities') {
             steps {
                 dependencyCheck additionalArguments: '''

pom.xml

@@ -24,12 +24,14 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<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">
+<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">
 
 	<parent>
 		<groupId>de.ozgcloud.common</groupId>
 		<artifactId>ozgcloud-common-dependencies</artifactId>
-		<version>4.0.1</version>
+		<version>4.3.1</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
@@ -43,15 +45,15 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-		<ozgcloud.license.version>1.3.0</ozgcloud.license.version>
-		<lombok.version>1.18.30</lombok.version>
+		<ozgcloud.license.version>1.6.0</ozgcloud.license.version>
+		<lombok.version>1.18.34</lombok.version>
 
 		<!-- plugins -->
 		<maven.compiler.release>21</maven.compiler.release>
 		<jandex-maven-plugin-version>1.2.3</jandex-maven-plugin-version>
 		<compiler-plugin.version>3.11.0</compiler-plugin.version>
 		<jacoco.plugin.version>0.8.11</jacoco.plugin.version>
-		<surefire-plugin.version>3.2.5</surefire-plugin.version>
+		<maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
 		<maven-failsafe-plugin.version>3.2.5</maven-failsafe-plugin.version>
 		<git-commit-id-maven-plugin.version>7.0.0</git-commit-id-maven-plugin.version>
 		<maven-source.plugin.version>3.3.0</maven-source.plugin.version>
@@ -171,7 +173,7 @@
 				</plugin>
 				<plugin>
 					<artifactId>maven-surefire-plugin</artifactId>
-					<version>${surefire-plugin.version}</version>
+					<version>${maven-surefire-plugin.version}</version>
 				</plugin>
 				<plugin>
 					<artifactId>maven-failsafe-plugin</artifactId>