|
164 | 164 |
|
165 | 165 | <plugin>
|
166 | 166 | <groupId>org.apache.maven.plugins</groupId>
|
167 |
| - <artifactId>maven-jar-plugin</artifactId> |
| 167 | + <artifactId>maven-surefire-plugin</artifactId> |
| 168 | + <configuration> |
| 169 | + <excludes> |
| 170 | + <exclude>**/DiktatSaveSmokeTest.*</exclude> |
| 171 | + </excludes> |
| 172 | + </configuration> |
| 173 | + </plugin> |
| 174 | + |
| 175 | + <plugin> |
| 176 | + <groupId>org.apache.maven.plugins</groupId> |
| 177 | + <artifactId>maven-failsafe-plugin</artifactId> |
| 178 | + <configuration> |
| 179 | + <includes> |
| 180 | + <include>**/DiktatSaveSmokeTest.*</include> |
| 181 | + </includes> |
| 182 | + </configuration> |
| 183 | + <executions> |
| 184 | + <execution> |
| 185 | + <goals> |
| 186 | + <goal>integration-test</goal> |
| 187 | + <goal>verify</goal> |
| 188 | + </goals> |
| 189 | + </execution> |
| 190 | + </executions> |
| 191 | + </plugin> |
| 192 | + |
| 193 | + <plugin> |
| 194 | + <groupId>org.jacoco</groupId> |
| 195 | + <artifactId>jacoco-maven-plugin</artifactId> |
168 | 196 | <executions>
|
169 |
| - <!-- Don't produce the JAR during the `package` phase. --> |
| 197 | + <!-- These executions complement those defined in the parent pom.xml. --> |
170 | 198 | <execution>
|
171 |
| - <id>default-jar</id> |
172 |
| - <phase>none</phase> |
| 199 | + <id>default-prepare-agent-integration</id> |
| 200 | + <goals> |
| 201 | + <goal>prepare-agent-integration</goal> |
| 202 | + </goals> |
173 | 203 | </execution>
|
174 |
| - <!-- Instead, create it immediately before the `test` phase |
175 |
| - so that the shade plug-in may use it. --> |
176 | 204 | <execution>
|
177 |
| - <id>fat-jar-for-smoke-tests</id> |
178 |
| - <phase>process-test-classes</phase> |
| 205 | + <id>default-merge</id> |
| 206 | + <phase>post-integration-test</phase> |
| 207 | + <goals> |
| 208 | + <goal>merge</goal> |
| 209 | + </goals> |
| 210 | + <configuration> |
| 211 | + <fileSets> |
| 212 | + <fileSet> |
| 213 | + <directory>${project.build.directory}</directory> |
| 214 | + <includes> |
| 215 | + <include>jacoco.exec</include> |
| 216 | + <include>jacoco-it.exec</include> |
| 217 | + </includes> |
| 218 | + </fileSet> |
| 219 | + </fileSets> |
| 220 | + <destFile>${project.build.directory}/jacoco-merged.exec</destFile> |
| 221 | + </configuration> |
| 222 | + </execution> |
| 223 | + <execution> |
| 224 | + <id>default-report-merged</id> |
179 | 225 | <goals>
|
180 |
| - <goal>jar</goal> |
| 226 | + <goal>report-integration</goal> |
181 | 227 | </goals>
|
| 228 | + <configuration> |
| 229 | + <outputDirectory>${project.reporting.outputDirectory}/jacoco</outputDirectory> |
| 230 | + <dataFile>${project.build.directory}/jacoco-merged.exec</dataFile> |
| 231 | + </configuration> |
182 | 232 | </execution>
|
183 | 233 | </executions>
|
184 | 234 | </plugin>
|
|
188 | 238 | <plugin>
|
189 | 239 | <groupId>org.apache.maven.plugins</groupId>
|
190 | 240 | <artifactId>maven-shade-plugin</artifactId>
|
191 |
| - <version>3.3.0</version> |
192 | 241 | <configuration>
|
193 | 242 | <!-- Suppress the generation of `dependency-reduced-pom.xml`,
|
194 | 243 | because it will also get installed under `~/.m2`,
|
|
221 | 270 | <executions>
|
222 | 271 | <execution>
|
223 | 272 | <id>fat-jar-for-smoke-tests</id>
|
224 |
| - <phase>process-test-classes</phase> |
| 273 | + <phase>package</phase> |
225 | 274 | <goals>
|
226 | 275 | <goal>shade</goal>
|
227 | 276 | </goals>
|
|
0 commit comments