Skip to content

Commit

Permalink
Polishing.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mp911de committed Dec 27, 2023
1 parent 24c8b77 commit 027c48a
Showing 1 changed file with 25 additions and 12 deletions.
37 changes: 25 additions & 12 deletions spring-data-jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,7 @@
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>${aspectj}</version>
<optional>true</optional>
</dependency>

<dependency>
Expand Down Expand Up @@ -329,6 +330,7 @@
<phase>generate-sources</phase>
<configuration>
<visitor>true</visitor>
<sourceDirectory>${project.basedir}/src/main/antlr4</sourceDirectory>
</configuration>
</execution>
</executions>
Expand All @@ -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>

Expand All @@ -381,17 +398,13 @@
<goal>compile</goal>
</goals>
<phase>process-classes</phase>
<configuration>
</configuration>
</execution>
<execution>
<id>aspectj-test-compile</id>
<goals>
<goal>test-compile</goal>
</goals>
<phase>process-test-classes</phase>
<configuration>
</configuration>
</execution>
</executions>
<configuration>
Expand Down

0 comments on commit 027c48a

Please sign in to comment.