|
226 | 226 | <artifactId>maven-failsafe-plugin</artifactId> |
227 | 227 | <version>2.19.1</version> |
228 | 228 | <configuration> |
229 | | - <argLine>${surefireArgLine}</argLine> |
| 229 | + <argLine>${failsafeArgLine}</argLine> |
230 | 230 | <includes> |
231 | 231 | <include>**/IntegrationSuite.java</include> |
232 | 232 | </includes> |
|
316 | 316 | <groupId>org.jacoco</groupId> |
317 | 317 | <artifactId>jacoco-maven-plugin</artifactId> |
318 | 318 | <version>${jacoco.version}</version> |
| 319 | + <configuration> |
| 320 | + <excludes> |
| 321 | + <exclude>**/org/hyperledger/fabric/protos/**</exclude> |
| 322 | + </excludes> |
| 323 | + </configuration> |
319 | 324 | <executions> |
320 | 325 | <execution> |
321 | 326 | <id>default-prepare-agent</id> |
|
340 | 345 | <goal>prepare-agent</goal> |
341 | 346 | </goals> |
342 | 347 | <configuration> |
| 348 | + <propertyName>surefireArgLine</propertyName> |
343 | 349 | <!-- Sets the path to the file which contains the execution data. --> |
344 | 350 | <destFile>${project.build.directory}/coverage-reports/jacoco-ut.exec</destFile> |
345 | 351 | <!-- |
346 | 352 | Sets the name of the property containing the settings |
347 | | - for JaCoCo runtime agent. |
| 353 | + for JaCoCo runtime agent. |
348 | 354 | --> |
349 | | - <propertyName>surefireArgLine</propertyName> |
| 355 | + |
350 | 356 | </configuration> |
351 | 357 | </execution> |
352 | 358 | <!-- |
|
404 | 410 | <outputDirectory>${project.reporting.outputDirectory}/jacoco-it</outputDirectory> |
405 | 411 | </configuration> |
406 | 412 | </execution> |
| 413 | + <execution> |
| 414 | + <id>merge-results</id> |
| 415 | + <phase>verify</phase> |
| 416 | + <goals> |
| 417 | + <goal>merge</goal> |
| 418 | + </goals> |
| 419 | + <configuration> |
| 420 | + <fileSets> |
| 421 | + <!-- Implementation attribute not needed in Maven 3 --> |
| 422 | + <!--<fileSet implementation="org.apache.maven.shared.model.fileset.FileSet">--> |
| 423 | + <fileSet> |
| 424 | + <directory>${project.build.directory}/coverage-reports</directory> |
| 425 | + <includes> |
| 426 | + <include>*.exec</include> |
| 427 | + </includes> |
| 428 | + </fileSet> |
| 429 | + </fileSets> |
| 430 | + <!-- File containing the merged data --> |
| 431 | + <destFile>${project.build.directory}/jacoco-merged/merged.exec</destFile> |
| 432 | + </configuration> |
| 433 | + </execution> |
| 434 | + <execution> |
| 435 | + <id>post-merge-report</id> |
| 436 | + <phase>verify</phase> |
| 437 | + <goals> |
| 438 | + <goal>report</goal> |
| 439 | + </goals> |
| 440 | + <configuration> |
| 441 | + <dataFile>${project.build.directory}/jacoco-merged/merged.exec</dataFile> |
| 442 | + <outputDirectory>${project.reporting.outputDirectory}/jacoco-aggregate</outputDirectory> |
| 443 | + </configuration> |
| 444 | + </execution> |
407 | 445 | </executions> |
408 | 446 | </plugin> |
409 | 447 | </plugins> |
|
0 commit comments