Skip to content

Commit ac97b95

Browse files
manusamanusa
authored
config: remove unneeded jacoco JMockit workarounds
Signed-off-by: Marc Nuri <[email protected]>
1 parent 68adf9d commit ac97b95

File tree

3 files changed

+0
-120
lines changed

3 files changed

+0
-120
lines changed

‎gradle-plugin/kubernetes/pom.xml

-52
Original file line numberDiff line numberDiff line change
@@ -206,56 +206,4 @@
206206
It's unrealistic to add a dependency for each of the gradle subprojects
207207
-->
208208
</dependencies>
209-
210-
<!-- TODO: Remove once JMockit is no longer in the project -->
211-
<profiles>
212-
<profile>
213-
<id>jacoco</id>
214-
<build>
215-
<plugins>
216-
<plugin>
217-
<groupId>org.jacoco</groupId>
218-
<artifactId>jacoco-maven-plugin</artifactId>
219-
<version>${version.jacoco}</version>
220-
<executions>
221-
<execution>
222-
<id>default-prepare-agent</id>
223-
<goals>
224-
<goal>prepare-agent</goal>
225-
</goals>
226-
</execution>
227-
<execution>
228-
<id>default-report</id>
229-
<goals>
230-
<goal>report</goal>
231-
</goals>
232-
</execution>
233-
<execution>
234-
<id>instrument</id>
235-
<phase>none</phase>
236-
</execution>
237-
<execution>
238-
<id>restore</id>
239-
<phase>none</phase>
240-
</execution>
241-
</executions>
242-
</plugin>
243-
<plugin>
244-
<groupId>org.apache.maven.plugins</groupId>
245-
<artifactId>maven-surefire-plugin</artifactId>
246-
<configuration>
247-
<systemPropertyVariables>
248-
<!-- JaCoCo runtime must know where to dump coverage: -->
249-
<jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
250-
</systemPropertyVariables>
251-
<environmentVariables>
252-
<LC_ALL>en_EN.UTF-8</LC_ALL>
253-
</environmentVariables>
254-
</configuration>
255-
</plugin>
256-
</plugins>
257-
</build>
258-
</profile>
259-
</profiles>
260-
<!-- ///////////////////////////////////////////////////// -->
261209
</project>

‎gradle-plugin/openshift/pom.xml

-52
Original file line numberDiff line numberDiff line change
@@ -103,56 +103,4 @@
103103
It's unrealistic to add a dependency for each of the gradle subprojects
104104
-->
105105
</dependencies>
106-
107-
<!-- TODO: Remove once JMockit is no longer in the project -->
108-
<profiles>
109-
<profile>
110-
<id>jacoco</id>
111-
<build>
112-
<plugins>
113-
<plugin>
114-
<groupId>org.jacoco</groupId>
115-
<artifactId>jacoco-maven-plugin</artifactId>
116-
<version>${version.jacoco}</version>
117-
<executions>
118-
<execution>
119-
<id>default-prepare-agent</id>
120-
<goals>
121-
<goal>prepare-agent</goal>
122-
</goals>
123-
</execution>
124-
<execution>
125-
<id>default-report</id>
126-
<goals>
127-
<goal>report</goal>
128-
</goals>
129-
</execution>
130-
<execution>
131-
<id>instrument</id>
132-
<phase>none</phase>
133-
</execution>
134-
<execution>
135-
<id>restore</id>
136-
<phase>none</phase>
137-
</execution>
138-
</executions>
139-
</plugin>
140-
<plugin>
141-
<groupId>org.apache.maven.plugins</groupId>
142-
<artifactId>maven-surefire-plugin</artifactId>
143-
<configuration>
144-
<systemPropertyVariables>
145-
<!-- JaCoCo runtime must know where to dump coverage: -->
146-
<jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
147-
</systemPropertyVariables>
148-
<environmentVariables>
149-
<LC_ALL>en_EN.UTF-8</LC_ALL>
150-
</environmentVariables>
151-
</configuration>
152-
</plugin>
153-
</plugins>
154-
</build>
155-
</profile>
156-
</profiles>
157-
<!-- ///////////////////////////////////////////////////// -->
158106
</project>

‎pom.xml

-16
Original file line numberDiff line numberDiff line change
@@ -317,22 +317,6 @@
317317
<goal>report</goal>
318318
</goals>
319319
</execution>
320-
<!-- TODO: Remove once JMockit is no longer in the project -->
321-
<execution>
322-
<id>instrument</id>
323-
<phase>process-classes</phase>
324-
<goals>
325-
<goal>instrument</goal>
326-
</goals>
327-
</execution>
328-
<execution>
329-
<id>restore</id>
330-
<phase>test</phase>
331-
<goals>
332-
<goal>restore-instrumented-classes</goal>
333-
</goals>
334-
</execution>
335-
<!-- ///////////////////////////////////////////////////// -->
336320
</executions>
337321
</plugin>
338322
<plugin>

0 commit comments

Comments
 (0)