From ac97b9516d8cf15408b0f9e9ef16c3be9023f3f4 Mon Sep 17 00:00:00 2001
From: Marc Nuri <marc@marcnuri.com>
Date: Fri, 25 Oct 2024 20:51:38 +0800
Subject: [PATCH] config: remove unneeded jacoco JMockit workarounds

Signed-off-by: Marc Nuri <marc@marcnuri.com>
---
 gradle-plugin/kubernetes/pom.xml | 52 --------------------------------
 gradle-plugin/openshift/pom.xml  | 52 --------------------------------
 pom.xml                          | 16 ----------
 3 files changed, 120 deletions(-)

diff --git a/gradle-plugin/kubernetes/pom.xml b/gradle-plugin/kubernetes/pom.xml
index fe305b6f76..b55cfe191c 100644
--- a/gradle-plugin/kubernetes/pom.xml
+++ b/gradle-plugin/kubernetes/pom.xml
@@ -206,56 +206,4 @@
             It's unrealistic to add a dependency for each of the gradle subprojects
          -->
     </dependencies>
-
-    <!-- TODO: Remove once JMockit is no longer in the project -->
-    <profiles>
-        <profile>
-            <id>jacoco</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.jacoco</groupId>
-                        <artifactId>jacoco-maven-plugin</artifactId>
-                        <version>${version.jacoco}</version>
-                        <executions>
-                            <execution>
-                                <id>default-prepare-agent</id>
-                                <goals>
-                                    <goal>prepare-agent</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>default-report</id>
-                                <goals>
-                                    <goal>report</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>instrument</id>
-                                <phase>none</phase>
-                            </execution>
-                            <execution>
-                                <id>restore</id>
-                                <phase>none</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <!-- JaCoCo runtime must know where to dump coverage: -->
-                                <jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
-                            </systemPropertyVariables>
-                            <environmentVariables>
-                                <LC_ALL>en_EN.UTF-8</LC_ALL>
-                            </environmentVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-    <!-- ///////////////////////////////////////////////////// -->
 </project>
diff --git a/gradle-plugin/openshift/pom.xml b/gradle-plugin/openshift/pom.xml
index 01bca5c4de..51ec257ade 100644
--- a/gradle-plugin/openshift/pom.xml
+++ b/gradle-plugin/openshift/pom.xml
@@ -103,56 +103,4 @@
             It's unrealistic to add a dependency for each of the gradle subprojects
          -->
     </dependencies>
-
-    <!-- TODO: Remove once JMockit is no longer in the project -->
-    <profiles>
-        <profile>
-            <id>jacoco</id>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.jacoco</groupId>
-                        <artifactId>jacoco-maven-plugin</artifactId>
-                        <version>${version.jacoco}</version>
-                        <executions>
-                            <execution>
-                                <id>default-prepare-agent</id>
-                                <goals>
-                                    <goal>prepare-agent</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>default-report</id>
-                                <goals>
-                                    <goal>report</goal>
-                                </goals>
-                            </execution>
-                            <execution>
-                                <id>instrument</id>
-                                <phase>none</phase>
-                            </execution>
-                            <execution>
-                                <id>restore</id>
-                                <phase>none</phase>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-surefire-plugin</artifactId>
-                        <configuration>
-                            <systemPropertyVariables>
-                                <!-- JaCoCo runtime must know where to dump coverage: -->
-                                <jacoco-agent.destfile>target/jacoco.exec</jacoco-agent.destfile>
-                            </systemPropertyVariables>
-                            <environmentVariables>
-                                <LC_ALL>en_EN.UTF-8</LC_ALL>
-                            </environmentVariables>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-    </profiles>
-    <!-- ///////////////////////////////////////////////////// -->
 </project>
diff --git a/pom.xml b/pom.xml
index 2d2503e7fa..0d18cee6bb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -317,22 +317,6 @@
                 <goal>report</goal>
               </goals>
             </execution>
-            <!-- TODO: Remove once JMockit is no longer in the project -->
-            <execution>
-              <id>instrument</id>
-              <phase>process-classes</phase>
-              <goals>
-                <goal>instrument</goal>
-              </goals>
-            </execution>
-            <execution>
-              <id>restore</id>
-              <phase>test</phase>
-              <goals>
-                <goal>restore-instrumented-classes</goal>
-              </goals>
-            </execution>
-            <!-- ///////////////////////////////////////////////////// -->
           </executions>
         </plugin>
         <plugin>