From c0c2825ad5d45e60e7e42254bc8de1dbc3d74e5f Mon Sep 17 00:00:00 2001
From: Oliver Drotbohm <oliver.drotbohm@broadcom.com>
Date: Mon, 27 Jan 2025 18:03:46 +0100
Subject: [PATCH] GH-1035 - Revert explicit Mockito agent configuration.

This reverts commit 74f4417cd9d777caea50c4f082fc3efc32def60a. 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] https://github.com/eclipse-m2e/m2e-core/issues/1916#issuecomment-2616344357
---
 pom.xml                          | 14 --------------
 spring-modulith-examples/pom.xml | 19 -------------------
 2 files changed, 33 deletions(-)

diff --git a/pom.xml b/pom.xml
index ccf5dc42..dab98e07 100644
--- a/pom.xml
+++ b/pom.xml
@@ -496,18 +496,6 @@ limitations under the License.
 				</configuration>
 			</plugin>
 
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>properties</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
@@ -516,8 +504,6 @@ limitations under the License.
 					<excludes>
 						<exclude />
 					</excludes>
-					<!-- To avoid warnings of Mockito dynamically attaching an agent -->
-					<argLine>-javaagent:${org.mockito:mockito-core:jar}</argLine>
 				</configuration>
 			</plugin>
 
diff --git a/spring-modulith-examples/pom.xml b/spring-modulith-examples/pom.xml
index 4705121c..4b1aa446 100644
--- a/spring-modulith-examples/pom.xml
+++ b/spring-modulith-examples/pom.xml
@@ -50,25 +50,6 @@
 					</annotationProcessorPaths>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-dependency-plugin</artifactId>
-				<executions>
-					<execution>
-						<goals>
-							<goal>properties</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-surefire-plugin</artifactId>
-				<configuration>
-					<!-- To avoid warnings of Mockito dynamically attaching an agent -->
-					<argLine>-javaagent:${org.mockito:mockito-core:jar}</argLine>
-				</configuration>
-			</plugin>
 		</plugins>
 	</build>