From 8eee9c52f9140fc86ed5e2e38f535f293e8052a2 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mark.paluch@broadcom.com>
Date: Wed, 27 Dec 2023 09:35:26 +0100
Subject: [PATCH] Polishing.

Move AspectJ dependency from test into optional. Add annotation processor paths to compiler plugin for discovery by Gradle Enterprise.
Rollback replacer/conditional antlr paths.

See #3282
---
 spring-data-jpa/pom.xml | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/spring-data-jpa/pom.xml b/spring-data-jpa/pom.xml
index 6889823431..ae3f2a928c 100644
--- a/spring-data-jpa/pom.xml
+++ b/spring-data-jpa/pom.xml
@@ -83,6 +83,7 @@
 			<groupId>org.aspectj</groupId>
 			<artifactId>aspectjrt</artifactId>
 			<version>${aspectj}</version>
+			<optional>true</optional>
 		</dependency>
 
 		<dependency>
@@ -329,6 +330,7 @@
 						<phase>generate-sources</phase>
 						<configuration>
 							<visitor>true</visitor>
+							<sourceDirectory>${project.basedir}/src/main/antlr4</sourceDirectory>
 						</configuration>
 					</execution>
 				</executions>
@@ -344,22 +346,37 @@
 						<goals>
 							<goal>replace</goal>
 						</goals>
+						<configuration>
+							<basedir>${project.build.directory}/generated-sources</basedir>
+							<includes>
+								<include>antlr4/**/*.java</include>
+							</includes>
+							<variableTokenValueMap>
+								public class=class,public interface=interface
+							</variableTokenValueMap>
+						</configuration>
 					</execution>
 				</executions>
-				<configuration>
-					<includes>
-						<include>target/generated-sources/antlr4/**/*.java</include>
-					</includes>
-					<variableTokenValueMap>
-						public class=class,public interface=interface
-					</variableTokenValueMap>
-				</configuration>
 			</plugin>
 
 			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
 				<configuration>
 					<proc>only</proc>
+					<annotationProcessorPaths>
+						<path>
+							<groupId>com.querydsl</groupId>
+							<artifactId>querydsl-apt</artifactId>
+							<version>${querydsl}</version>
+							<classifier>jakarta</classifier>
+						</path>
+						<path>
+							<groupId>org.hibernate.orm</groupId>
+							<artifactId>hibernate-jpamodelgen</artifactId>
+							<version>${hibernate}</version>
+						</path>
+					</annotationProcessorPaths>
 				</configuration>
 			</plugin>
 
@@ -381,8 +398,6 @@
 							<goal>compile</goal>
 						</goals>
 						<phase>process-classes</phase>
-						<configuration>
-						</configuration>
 					</execution>
 					<execution>
 						<id>aspectj-test-compile</id>
@@ -390,8 +405,6 @@
 							<goal>test-compile</goal>
 						</goals>
 						<phase>process-test-classes</phase>
-						<configuration>
-						</configuration>
 					</execution>
 				</executions>
 				<configuration>