From 6e28a9f6e1384a7bc4c8b57d501f553877368be4 Mon Sep 17 00:00:00 2001
From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Thu, 28 Dec 2023 09:25:33 +0700
Subject: [PATCH 1/2] Move AspectJ Maven executions to default phases

Document the pros and cons in the POM with this comment:

Attention: aspectj-maven-plugin MUST be declared AFTER
maven-compiler-plugin, if they are both supposed to run in the same
default phases 'compile' and 'test-compile', but execution order is to
be guaranteed. Then, you have the convenience of being able to run e.g.
'mvn [clean] compile' instead of 'mvn [clean] process-classes'. For a
slightly less convenient, but less refactoring-error-prone solution,
see the commented-out phases below.
---
 spring-data-jpa/pom.xml | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/spring-data-jpa/pom.xml b/spring-data-jpa/pom.xml
index 4a2875c758..69ad44bcc6 100644
--- a/spring-data-jpa/pom.xml
+++ b/spring-data-jpa/pom.xml
@@ -357,6 +357,12 @@
 				</configuration>
 			</plugin>
 
+			<!--
+				Attention: aspectj-maven-plugin MUST be declared AFTER maven-compiler-plugin, if they are both supposed to run
+				in the same default phases 'compile' and 'test-compile', but execution order is to be guaranteed. Then, you have
+				the convenience of being able to run e.g. 'mvn [clean] compile' instead of 'mvn [clean] process-classes'. For a
+				slightly less convenient, but less refactoring-error-prone solution, see the commented-out phases below.
+			-->
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
 				<artifactId>aspectj-maven-plugin</artifactId>
@@ -374,14 +380,14 @@
 						<goals>
 							<goal>compile</goal>
 						</goals>
-						<phase>process-classes</phase>
+						<!--<phase>process-classes</phase>-->
 					</execution>
 					<execution>
 						<id>aspectj-test-compile</id>
 						<goals>
 							<goal>test-compile</goal>
 						</goals>
-						<phase>process-test-classes</phase>
+						<!--<phase>process-test-classes</phase>-->
 					</execution>
 				</executions>
 				<configuration>

From 4ac9cb4ac1dce5ba8c9611469f40d3c15512bbab Mon Sep 17 00:00:00 2001
From: Alexander Kriegisch <Alexander@Kriegisch.name>
Date: Sat, 30 Dec 2023 11:58:56 +0700
Subject: [PATCH 2/2] Code review: remove commented-out phases

---
 spring-data-jpa/pom.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/spring-data-jpa/pom.xml b/spring-data-jpa/pom.xml
index 69ad44bcc6..b07b6d7898 100644
--- a/spring-data-jpa/pom.xml
+++ b/spring-data-jpa/pom.xml
@@ -360,8 +360,7 @@
 			<!--
 				Attention: aspectj-maven-plugin MUST be declared AFTER maven-compiler-plugin, if they are both supposed to run
 				in the same default phases 'compile' and 'test-compile', but execution order is to be guaranteed. Then, you have
-				the convenience of being able to run e.g. 'mvn [clean] compile' instead of 'mvn [clean] process-classes'. For a
-				slightly less convenient, but less refactoring-error-prone solution, see the commented-out phases below.
+				the convenience of being able to run e.g. 'mvn [clean] compile' instead of 'mvn [clean] process-classes'.
 			-->
 			<plugin>
 				<groupId>org.codehaus.mojo</groupId>
@@ -380,14 +379,12 @@
 						<goals>
 							<goal>compile</goal>
 						</goals>
-						<!--<phase>process-classes</phase>-->
 					</execution>
 					<execution>
 						<id>aspectj-test-compile</id>
 						<goals>
 							<goal>test-compile</goal>
 						</goals>
-						<!--<phase>process-test-classes</phase>-->
 					</execution>
 				</executions>
 				<configuration>