From 6157647a66f05ba337b3bce4c7ccc5b13f6be6c5 Mon Sep 17 00:00:00 2001
From: dan-s1 <dstieg1@gmail.com>
Date: Wed, 10 Jun 2026 14:56:19 +0000
Subject: [PATCH 1/4] NIFI-15999 Added Mockito as an agent to thereby not have
 Mockito self-attach to enable the inline-mock-maker.

---
 pom.xml | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/pom.xml b/pom.xml
index df48eb6..810859b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,6 +85,8 @@
         <mockito.version>5.23.0</mockito.version>
         <pmd.version>7.23.0</pmd.version>
         <swagger-annotations.version>2.2.46</swagger-annotations.version>
+        <!-- Define empty argLine to prevent possible Maven crash during Mockito instrumentation -->
+        <argLine/>
     </properties>
 
     <dependencyManagement>
@@ -178,6 +180,33 @@
             </plugins>
         </pluginManagement>
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>get-mockito-agent</id>
+                        <phase>initialize</phase>
+                        <goals>
+                            <!--
+                            Automatically sets a project property for every direct and transitive dependency that points
+                             directly to its resolved artifact file on the local file system
+                            -->
+                            <goal>properties</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <!-- @{argLine} preserves any arguments generated by other plugins hence
+                    ${org.mockito:mockito-core:jar} is resolved after executing maven-dependency-plugin
+                    with the properties goal-->
+                    <argLine>@{argLine} -javaagent:${org.mockito:mockito-core:jar}</argLine>
+                </configuration>
+            </plugin>
             <plugin>
                 <groupId>org.apache.rat</groupId>
                 <artifactId>apache-rat-plugin</artifactId>

From 0a4a1572b5c49ed96bfd6377d511797aec04bac6 Mon Sep 17 00:00:00 2001
From: dan-s1 <dstieg1@gmail.com>
Date: Wed, 10 Jun 2026 17:10:08 +0000
Subject: [PATCH 2/4] NIFI-15999 Changed strategy of using agent to allow for
 running tests in IDE without the warning message.

---
 pom.xml | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index 810859b..8da9aa2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,15 +185,21 @@
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>get-mockito-agent</id>
+                        <id>copy-mockito-agent</id>
                         <phase>initialize</phase>
                         <goals>
-                            <!--
-                            Automatically sets a project property for every direct and transitive dependency that points
-                             directly to its resolved artifact file on the local file system
-                            -->
-                            <goal>properties</goal>
+                            <goal>copy</goal>
                         </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.mockito</groupId>
+                                    <artifactId>mockito-core</artifactId>
+                                    <outputDirectory>${project.build.directory}/agents</outputDirectory>
+                                    <destFileName>mockito-core.jar</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
                     </execution>
                 </executions>
             </plugin>
@@ -201,10 +207,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <!-- @{argLine} preserves any arguments generated by other plugins hence
-                    ${org.mockito:mockito-core:jar} is resolved after executing maven-dependency-plugin
-                    with the properties goal-->
-                    <argLine>@{argLine} -javaagent:${org.mockito:mockito-core:jar}</argLine>
+                    <argLine>-javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar</argLine>
                 </configuration>
             </plugin>
             <plugin>

From 7a804df769b924568048c6d569ef99483dd3b30e Mon Sep 17 00:00:00 2001
From: dan-s1 <dstieg1@gmail.com>
Date: Wed, 10 Jun 2026 18:26:14 +0000
Subject: [PATCH 3/4] NIFI-15999 Removed unused argLine property.

---
 pom.xml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 8da9aa2..0c72727 100644
--- a/pom.xml
+++ b/pom.xml
@@ -85,8 +85,6 @@
         <mockito.version>5.23.0</mockito.version>
         <pmd.version>7.23.0</pmd.version>
         <swagger-annotations.version>2.2.46</swagger-annotations.version>
-        <!-- Define empty argLine to prevent possible Maven crash during Mockito instrumentation -->
-        <argLine/>
     </properties>
 
     <dependencyManagement>

From 6b048a0700b666a05119dab27794bf5c55ecb7b3 Mon Sep 17 00:00:00 2001
From: dan-s1 <dstieg1@gmail.com>
Date: Tue, 7 Jul 2026 14:33:06 +0000
Subject: [PATCH 4/4] NIFI-15999 Renamed id and added suggesteed comments.

---
 pom.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0c72727..d76560e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -182,8 +182,9 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
+                    <!-- Copy mockito-core library to target directory to avoid warnings in IntelliJ for agent loading -->
                     <execution>
-                        <id>copy-mockito-agent</id>
+                        <id>copy-mockito-core</id>
                         <phase>initialize</phase>
                         <goals>
                             <goal>copy</goal>
@@ -205,6 +206,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <!-- Configure mockito-core as Java Agent to enable explicit attachment to processes -->
                     <argLine>-javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar</argLine>
                 </configuration>
             </plugin>