#378: Introduced merging step for coverage.

itsallcode · Feb 15, 2024 · 3ce102c · 3ce102c
1 parent 6e70d8a
commit 3ce102c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/doc/changes/changes_3.8.0.md b/doc/changes/changes_3.8.0.md
@@ -8,7 +8,7 @@ In this release we derived a parser for Restructured Text (RST) from our existin
 
 The Markdown parser in the process now accepts specification item titles underlined with either "=" (H1) or "-" (H2).
 
-Also, the Markdown parser now ignores whitespace in `Needs` and `Tags` entries and correctly parses `Tags` in beginning of a requirement item.
+Also, the Markdown parser now ignores whitespace in `Needs` and `Tags` entries and correctly parses `Tags` at the start of a requirement item.
 
 The test coverage for the Markdown importer is now at 100%, and we were able to remove tests that were done with mocks in favor or more robust low-level integration tests.
 

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -251,7 +251,7 @@
                 <jdk>21</jdk>
             </activation>
             <properties>
-                <!-- java.security.manager is equired to fix failing tests in TestCliStarter:
+                <!-- java.security.manager is required to fix failing tests in TestCliStarter:
                     UnsupportedOperation The Security Manager is deprecated and will be removed in a future release -->
                 <!-- EnableDynamicAgentLoading suppresses a warning caused by Mockito danyamically loading a Java agent -->
                 <test.args>-Djava.security.manager=allow -XX:+EnableDynamicAgentLoading</test.args>
@@ -329,23 +329,32 @@
                 <version>0.8.11</version>
                 <executions>
                     <execution>
-                        <id>prepare-agent</id>
-                        <goals>
-                            <goal>prepare-agent</goal>
-                        </goals>
-                    </execution>
-                    <execution>
-                        <id>prepare-agent-integration</id>
+                        <id>merge-results</id>
+                        <phase>verify</phase>
                         <goals>
-                            <goal>prepare-agent-integration</goal>
+                            <goal>merge</goal>
                         </goals>
+                        <configuration>
+                            <fileSets>
+                                <fileSet>
+                                    <directory>${project.build.directory}/</directory>
+                                    <includes>
+                                        <include>jacoco*.exec</include>
+                                    </includes>
+                                </fileSet>
+                            </fileSets>
+                            <destFile>${project.build.directory}/aggregate.exec</destFile>
+                        </configuration>
                     </execution>
                     <execution>
                         <id>report</id>
                         <phase>verify</phase>
                         <goals>
                             <goal>report</goal>
                         </goals>
+                        <configuration>
+                            <dataFile>${project.build.directory}/aggregate.exec</dataFile>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>