diff --git a/Jenkinsfile b/Jenkinsfile index c8eea4dc8a133ce36ca4a401aa92195de60a29c9..b06c6ff64c1278ea094e16def20f224feeb0c553 100644 --- a/Jenkinsfile +++ b/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' } diff --git a/goofy-server/pom.xml b/goofy-server/pom.xml index d1aebfa1fd364a83fefb74e592bcc15fe5bba75b..a4e3fb2caabc20dd23710c925c1116209e05717f 100644 --- a/goofy-server/pom.xml +++ b/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> diff --git a/pom.xml b/pom.xml index d480207e3ce90c945008adbec0b48f5718c13c1b..42e83e324994503ab9fc8f639c73a4ed416919f6 100644 --- a/pom.xml +++ b/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>