Skip to content

Commit 8eee9c5

Browse files
committed
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
1 parent 4b1ea8c commit 8eee9c5

File tree

1 file changed

+25
-12
lines changed

1 file changed

+25
-12
lines changed

spring-data-jpa/pom.xml

+25-12
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
<groupId>org.aspectj</groupId>
8484
<artifactId>aspectjrt</artifactId>
8585
<version>${aspectj}</version>
86+
<optional>true</optional>
8687
</dependency>
8788

8889
<dependency>
@@ -329,6 +330,7 @@
329330
<phase>generate-sources</phase>
330331
<configuration>
331332
<visitor>true</visitor>
333+
<sourceDirectory>${project.basedir}/src/main/antlr4</sourceDirectory>
332334
</configuration>
333335
</execution>
334336
</executions>
@@ -344,22 +346,37 @@
344346
<goals>
345347
<goal>replace</goal>
346348
</goals>
349+
<configuration>
350+
<basedir>${project.build.directory}/generated-sources</basedir>
351+
<includes>
352+
<include>antlr4/**/*.java</include>
353+
</includes>
354+
<variableTokenValueMap>
355+
public class=class,public interface=interface
356+
</variableTokenValueMap>
357+
</configuration>
347358
</execution>
348359
</executions>
349-
<configuration>
350-
<includes>
351-
<include>target/generated-sources/antlr4/**/*.java</include>
352-
</includes>
353-
<variableTokenValueMap>
354-
public class=class,public interface=interface
355-
</variableTokenValueMap>
356-
</configuration>
357360
</plugin>
358361

359362
<plugin>
363+
<groupId>org.apache.maven.plugins</groupId>
360364
<artifactId>maven-compiler-plugin</artifactId>
361365
<configuration>
362366
<proc>only</proc>
367+
<annotationProcessorPaths>
368+
<path>
369+
<groupId>com.querydsl</groupId>
370+
<artifactId>querydsl-apt</artifactId>
371+
<version>${querydsl}</version>
372+
<classifier>jakarta</classifier>
373+
</path>
374+
<path>
375+
<groupId>org.hibernate.orm</groupId>
376+
<artifactId>hibernate-jpamodelgen</artifactId>
377+
<version>${hibernate}</version>
378+
</path>
379+
</annotationProcessorPaths>
363380
</configuration>
364381
</plugin>
365382

@@ -381,17 +398,13 @@
381398
<goal>compile</goal>
382399
</goals>
383400
<phase>process-classes</phase>
384-
<configuration>
385-
</configuration>
386401
</execution>
387402
<execution>
388403
<id>aspectj-test-compile</id>
389404
<goals>
390405
<goal>test-compile</goal>
391406
</goals>
392407
<phase>process-test-classes</phase>
393-
<configuration>
394-
</configuration>
395408
</execution>
396409
</executions>
397410
<configuration>

0 commit comments

Comments
 (0)