Skip to content

Commit

Permalink
config: remove unneeded jacoco JMockit workarounds
Browse files Browse the repository at this point in the history 
Signed-off-by: Marc Nuri <[email protected]>
  • Loading branch information
@manusa
manusa authored Oct 25, 2024
1 parent 68adf9d commit ac97b95
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 120 deletions.
52 changes: 0 additions & 52 deletions gradle-plugin/kubernetes/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
52 changes: 0 additions & 52 deletions gradle-plugin/openshift/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
16 changes: 0 additions & 16 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit ac97b95

Please sign in to comment.