Merge branch 'master' of git.ozg-sh.de:mgm/goofy

Jenkinsfile

@@ -65,8 +65,7 @@ pipeline {
                 script {
                     FAILED_STAGE=env.STAGE_NAME
                 }
-                container("maven-16"){ 
-                //container("3-openjdk-17-slim") {
+                container("maven-17"){ 
                     configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
                         sh 'mvn --version'
                         sh 'mvn -s $MAVEN_SETTINGS -pl -goofy-client clean install spring-boot:build-image -Dmaven.wagon.http.retryHandler.count=3'
@@ -167,8 +166,7 @@ pipeline {
                 script {
                     FAILED_STAGE = env.STAGE_NAME
                 }
-                container('maven-16') {
-                //container('3-openjdk-17-slim') {
+                container('maven-17') {
                     configFileProvider([configFile(fileId: 'maven-settings', variable: 'MAVEN_SETTINGS')]) {
                         sh 'mvn -s $MAVEN_SETTINGS -pl -goofy-client -DskipTests deploy'
                     }

goofy-server/pom.xml

@@ -231,25 +231,6 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.7</version>
-				<executions>
-					<execution>
-						<id>start-agent</id>
-						<goals>
-							<goal>prepare-agent</goal>
-						</goals>
-						<configuration>
-							<propertyName>surefire.jacoco.args</propertyName>
-						</configuration>
-					</execution>
-					<execution>
-						<id>generate-report</id>
-						<phase>package</phase>
-						<goals>
-							<goal>report</goal>
-						</goals>
-					</execution>
-				</executions>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>

pom.xml

@@ -41,6 +41,7 @@
 		<maven.failsafe.version>3.0.0-M5</maven.failsafe.version>
 		<git-comit-id.plugin.version>4.0.3</git-comit-id.plugin.version>
 		<sonarqube.version>3.8.2</sonarqube.version>
+		<jacoco.plugin.version>0.8.7</jacoco.plugin.version>
 	</properties>
 
 	<dependencyManagement>
@@ -201,6 +202,29 @@
 					<artifactId>git-commit-id-plugin</artifactId>
 					<version>${git-comit-id.plugin.version}</version>
 				</plugin>
+				<plugin>
+				<groupId>org.jacoco</groupId>
+				<artifactId>jacoco-maven-plugin</artifactId>
+				<version>${jacoco.plugin.version}</version>
+				<executions>
+					<execution>
+						<id>start-agent</id>
+						<goals>
+							<goal>prepare-agent</goal>
+						</goals>
+						<configuration>
+							<propertyName>surefire.jacoco.args</propertyName>
+						</configuration>
+					</execution>
+					<execution>
+						<id>generate-report</id>
+						<phase>package</phase>
+						<goals>
+							<goal>report</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 			</plugins>
 		</pluginManagement>
 	</build>