Skip to content

Commit 0d9d1fe

Browse files
committed
GH-1034 - Revert explicit Mockito agent configuration.
This reverts commit 003c428. 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 1cc5719 commit 0d9d1fe

File tree

3 files changed

+0
-39
lines changed

3 files changed

+0
-39
lines changed

pom.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -551,27 +551,13 @@ limitations under the License.
551551
</configuration>
552552
</plugin>
553553

554-
<plugin>
555-
<groupId>org.apache.maven.plugins</groupId>
556-
<artifactId>maven-dependency-plugin</artifactId>
557-
<executions>
558-
<execution>
559-
<goals>
560-
<goal>properties</goal>
561-
</goals>
562-
</execution>
563-
</executions>
564-
</plugin>
565-
566554
<plugin>
567555
<groupId>org.apache.maven.plugins</groupId>
568556
<artifactId>maven-surefire-plugin</artifactId>
569557
<configuration>
570558
<excludes>
571559
<exclude />
572560
</excludes>
573-
<!-- To avoid warnings of Mockito dynamically attaching an agent -->
574-
<argLine>-javaagent:${org.mockito:mockito-core:jar}</argLine>
575561
</configuration>
576562
</plugin>
577563

spring-modulith-apt/pom.xml

Lines changed: 0 additions & 6 deletions
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

Lines changed: 0 additions & 19 deletions
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)