You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@causeway.apache.org by ah...@apache.org on 2023/03/04 09:08:03 UTC
[causeway] branch master updated: CAUSEWAY-3252: reinstate the lombok workaround profile, but simplify
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new 5d83b7bdd8 CAUSEWAY-3252: reinstate the lombok workaround profile, but simplify
5d83b7bdd8 is described below
commit 5d83b7bdd84c3319b5820dfc3d1356fec0ac78ee
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Mar 4 10:07:58 2023 +0100
CAUSEWAY-3252: reinstate the lombok workaround profile, but simplify
- that is, instead of looking for presence of a 'lombok.processor' file
looks at absence of a 'logging-dn-enhance.properties' file
---
bom/pom.xml | 48 ++++++++++++++++++++----------------------------
1 file changed, 20 insertions(+), 28 deletions(-)
diff --git a/bom/pom.xml b/bom/pom.xml
index 23129a2576..6e0dc5c2b6 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -2233,22 +2233,6 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
<parameters>true</parameters>
- <annotationProcessorPaths>
- <!-- this is a workaround
-
- Details: The maven compiler plugin ought to pick up all available processors on the classpath.
- In effect Lombok's annotation processor should be picked up implicitly, but yet is not
-
- Also Note: Presence of file 'logging-dn-enhance.properties' activates a profile (defined blow),
- that configures maven-compiler-plugin to run all annotation processors required
- for DataNucleus AND lombok.
- -->
- <annotationProcessorPath>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
- </annotationProcessorPath>
- </annotationProcessorPaths>
</configuration>
<!-- goal:compile binds to phase:compile -->
<!-- goal:testCompile binds to phase:test-compile -->
@@ -3051,6 +3035,18 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<artifactId>datanucleus-maven-plugin</artifactId>
<inherited>true</inherited>
</plugin>
+ </plugins>
+ </build>
+ </profile>
+ <profile>
+ <id>causeway-lombok-workaround</id>
+ <activation>
+ <file>
+ <missing>${basedir}/logging-dn-enhance.properties</missing>
+ </file>
+ </activation>
+ <build>
+ <plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -3059,23 +3055,19 @@ It is therefore a copy of org.apache:apache, with customisations clearly identif
<showWarnings>true</showWarnings>
<parameters>true</parameters>
<annotationProcessorPaths>
+ <!-- this is a workaround
+
+ Details: The maven compiler plugin ought to pick up all available processors on the classpath.
+ In effect Lombok's annotation processor should be picked up implicitly, but yet is not
+
+ Presence of file 'logging-dn-enhance.properties' decativates this profile and
+ the maven-compiler-plugin runs all annotation processors as picked up from the class-path.
+ -->
<annotationProcessorPath>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</annotationProcessorPath>
- <annotationProcessorPath>
- <!-- not a processor, but provides all dependencies for
- 'datanucleus-jdo-query' below -->
- <groupId>org.datanucleus</groupId>
- <artifactId>javax.jdo</artifactId>
- <version>${datanucleus-jdo-api.version}</version>
- </annotationProcessorPath>
- <annotationProcessorPath>
- <groupId>org.datanucleus</groupId>
- <artifactId>datanucleus-jdo-query</artifactId>
- <version>${datanucleus-jdo-query.version}</version>
- </annotationProcessorPath>
</annotationProcessorPaths>
</configuration>
</plugin>