Skip to content

Commit c0c2825

Browse files
committed
GH-1035 - Revert explicit Mockito agent configuration.
This reverts commit 74f4417. See [0] for details. Additionally, the change causes our integration builds to fail as the Mockito versions referred to by older Boot versions do not contain the necessary manifest entries. [0] eclipse-m2e/m2e-core#1916 (comment)
1 parent 74f4417 commit c0c2825

File tree

2 files changed

+0
-33
lines changed

2 files changed

+0
-33
lines changed

pom.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -496,18 +496,6 @@ limitations under the License.
496496
</configuration>
497497
</plugin>
498498

499-
<plugin>
500-
<groupId>org.apache.maven.plugins</groupId>
501-
<artifactId>maven-dependency-plugin</artifactId>
502-
<executions>
503-
<execution>
504-
<goals>
505-
<goal>properties</goal>
506-
</goals>
507-
</execution>
508-
</executions>
509-
</plugin>
510-
511499
<plugin>
512500
<groupId>org.apache.maven.plugins</groupId>
513501
<artifactId>maven-surefire-plugin</artifactId>
@@ -516,8 +504,6 @@ limitations under the License.
516504
<excludes>
517505
<exclude />
518506
</excludes>
519-
<!-- To avoid warnings of Mockito dynamically attaching an agent -->
520-
<argLine>-javaagent:${org.mockito:mockito-core:jar}</argLine>
521507
</configuration>
522508
</plugin>
523509

spring-modulith-examples/pom.xml

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -50,25 +50,6 @@
5050
</annotationProcessorPaths>
5151
</configuration>
5252
</plugin>
53-
<plugin>
54-
<groupId>org.apache.maven.plugins</groupId>
55-
<artifactId>maven-dependency-plugin</artifactId>
56-
<executions>
57-
<execution>
58-
<goals>
59-
<goal>properties</goal>
60-
</goals>
61-
</execution>
62-
</executions>
63-
</plugin>
64-
<plugin>
65-
<groupId>org.apache.maven.plugins</groupId>
66-
<artifactId>maven-surefire-plugin</artifactId>
67-
<configuration>
68-
<!-- To avoid warnings of Mockito dynamically attaching an agent -->
69-
<argLine>-javaagent:${org.mockito:mockito-core:jar}</argLine>
70-
</configuration>
71-
</plugin>
7253
</plugins>
7354
</build>
7455

0 commit comments

Comments
 (0)