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

This reverts commit 003c4280a46b30a370d286d5130fb3c4f54a0372. 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-apt/pom.xml      |  6 ------
 spring-modulith-examples/pom.xml | 19 -------------------
 3 files changed, 39 deletions(-)

diff --git a/pom.xml b/pom.xml
index 70498cef..bc79beac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -551,18 +551,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>
@@ -570,8 +558,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-apt/pom.xml b/spring-modulith-apt/pom.xml
index 4246489c..78313316 100644
--- a/spring-modulith-apt/pom.xml
+++ b/spring-modulith-apt/pom.xml
@@ -63,12 +63,6 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.mockito</groupId>
-			<artifactId>mockito-core</artifactId>
-			<scope>test</scope>
-		</dependency>
-
 	</dependencies>
 
 	<build>
diff --git a/spring-modulith-examples/pom.xml b/spring-modulith-examples/pom.xml
index b1e2f244..9e4bd7c5 100644
--- a/spring-modulith-examples/pom.xml
+++ b/spring-modulith-examples/pom.xml
@@ -93,25 +93,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>