Skip to content

Commit fe2c0c1

Browse files
committed
GH-1033 - Revert explicit Mockito agent configuration.
This reverts commit f6dd783. 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 12b6a2d commit fe2c0c1

File tree

3 files changed

+0
-39
lines changed

3 files changed

+0
-39
lines changed

pom.xml

-14
Original file line numberDiff line numberDiff line change
@@ -562,27 +562,13 @@ limitations under the License.
562562
</configuration>
563563
</plugin>
564564

565-
<plugin>
566-
<groupId>org.apache.maven.plugins</groupId>
567-
<artifactId>maven-dependency-plugin</artifactId>
568-
<executions>
569-
<execution>
570-
<goals>
571-
<goal>properties</goal>
572-
</goals>
573-
</execution>
574-
</executions>
575-
</plugin>
576-
577565
<plugin>
578566
<groupId>org.apache.maven.plugins</groupId>
579567
<artifactId>maven-surefire-plugin</artifactId>
580568
<configuration>
581569
<excludes>
582570
<exclude />
583571
</excludes>
584-
<!-- To avoid warnings of Mockito dynamically attaching an agent -->
585-
<argLine>-javaagent:${org.mockito:mockito-core:jar}</argLine>
586572
</configuration>
587573
</plugin>
588574

spring-modulith-apt/pom.xml

-6
Original file line numberDiff line numberDiff line change
@@ -63,12 +63,6 @@
6363
<scope>test</scope>
6464
</dependency>
6565

66-
<dependency>
67-
<groupId>org.mockito</groupId>
68-
<artifactId>mockito-core</artifactId>
69-
<scope>test</scope>
70-
</dependency>
71-
7266
</dependencies>
7367

7468
<build>

spring-modulith-examples/pom.xml

-19
Original file line numberDiff line numberDiff line change
@@ -93,25 +93,6 @@
9393
</annotationProcessorPaths>
9494
</configuration>
9595
</plugin>
96-
<plugin>
97-
<groupId>org.apache.maven.plugins</groupId>
98-
<artifactId>maven-dependency-plugin</artifactId>
99-
<executions>
100-
<execution>
101-
<goals>
102-
<goal>properties</goal>
103-
</goals>
104-
</execution>
105-
</executions>
106-
</plugin>
107-
<plugin>
108-
<groupId>org.apache.maven.plugins</groupId>
109-
<artifactId>maven-surefire-plugin</artifactId>
110-
<configuration>
111-
<!-- To avoid warnings of Mockito dynamically attaching an agent -->
112-
<argLine>-javaagent:${org.mockito:mockito-core:jar}</argLine>
113-
</configuration>
114-
</plugin>
11596
</plugins>
11697
</build>
11798

0 commit comments

Comments
 (0)