This is an automated email from the ASF dual-hosted git repository. pkarwasz pushed a commit to branch bnd in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 517c9a37d405a3603fbecaac7db23483334ebce2 Author: Piotr P. Karwasz <[email protected]> AuthorDate: Wed Sep 27 22:47:27 2023 +0200 Fix annotation processors --- log4j-api-java9/pom.xml | 9 ++++++++- log4j-api/pom.xml | 20 ++++++++++---------- log4j-bom/pom.xml | 1 + log4j-core-java9/pom.xml | 10 ++++++++++ log4j-core/pom.xml | 18 +++++++++++------- pom.xml | 34 +++++++++++++++------------------- 6 files changed, 55 insertions(+), 37 deletions(-) diff --git a/log4j-api-java9/pom.xml b/log4j-api-java9/pom.xml index cfd02630aa..d010419126 100644 --- a/log4j-api-java9/pom.xml +++ b/log4j-api-java9/pom.xml @@ -71,7 +71,14 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> <configuration> - <proc>none</proc> + <!-- TODO: copy/paste from `logging-parent` to override this module's parent --> + <annotationProcessorPaths combine.self="override"> + <path> + <groupId>com.google.errorprone</groupId> + <artifactId>error_prone_core</artifactId> + <version>${error-prone.version}</version> + </path> + </annotationProcessorPaths> </configuration> <executions> <execution> diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml index 11669b7080..1ac6fd4fe6 100644 --- a/log4j-api/pom.xml +++ b/log4j-api/pom.xml @@ -67,16 +67,16 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <executions> - <execution> - <id>default-compile</id> - <!-- recompile everything for target VM except the module-info.java --> - <configuration> - <source>1.8</source> - <target>1.8</target> - </configuration> - </execution> - </executions> + <configuration> + <!-- TODO: copy/paste from `logging-parent` to override this module's parent --> + <annotationProcessorPaths combine.self="override"> + <path> + <groupId>com.google.errorprone</groupId> + <artifactId>error_prone_core</artifactId> + <version>${error-prone.version}</version> + </path> + </annotationProcessorPaths> + </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/log4j-bom/pom.xml b/log4j-bom/pom.xml index 725989476e..1cd7392dc7 100644 --- a/log4j-bom/pom.xml +++ b/log4j-bom/pom.xml @@ -40,6 +40,7 @@ <distMgmtSnapshotsUrl>https://repository.apache.org/content/repositories/snapshots</distMgmtSnapshotsUrl> <!-- JDK version of the main Maven process (used in ASF parent POM) --> <minimalJavaBuildVersion>[11, )</minimalJavaBuildVersion> + <revision>2.21.0-SNAPSHOT</revision> </properties> <dependencyManagement> diff --git a/log4j-core-java9/pom.xml b/log4j-core-java9/pom.xml index 25a15e29b0..4dee800e41 100644 --- a/log4j-core-java9/pom.xml +++ b/log4j-core-java9/pom.xml @@ -78,6 +78,16 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <!-- TODO: copy/paste from `logging-parent` to override this module's parent --> + <annotationProcessorPaths combine.self="override"> + <path> + <groupId>com.google.errorprone</groupId> + <artifactId>error_prone_core</artifactId> + <version>${error-prone.version}</version> + </path> + </annotationProcessorPaths> + </configuration> <executions> <execution> <id>default-compile</id> diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml index a4bcecf24b..b084361c82 100644 --- a/log4j-core/pom.xml +++ b/log4j-core/pom.xml @@ -184,15 +184,21 @@ </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <annotationProcessorPaths combine.self="override" /> + </configuration> <executions> <execution> <!-- disable annotation processing for first pass --> <id>default-compile</id> <configuration> - <excludes> - <exclude>module-info.java</exclude> - </excludes> - <proc>none</proc> + <annotationProcessorPaths> + <path> + <groupId>com.google.errorprone</groupId> + <artifactId>error_prone_core</artifactId> + <version>${error-prone.version}</version> + </path> + </annotationProcessorPaths> </configuration> </execution> <execution> @@ -203,9 +209,7 @@ </goals> <phase>process-classes</phase> <configuration> - <excludes> - <exclude>module-info.java</exclude> - </excludes> + <compilerArgs combine.self="override" /> <proc>only</proc> </configuration> </execution> diff --git a/pom.xml b/pom.xml index cb24b8d7c3..ffde0bb927 100644 --- a/pom.xml +++ b/pom.xml @@ -1398,25 +1398,6 @@ <version>${maven-artifact-plugin.version}</version> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <release>${maven.compiler.release}</release> - <parameters>true</parameters> - <showDeprecation>true</showDeprecation> - <showWarnings>true</showWarnings> - <encoding>UTF-8</encoding> - <fork>true</fork> - <meminitial>256</meminitial> - <maxmem>1024</maxmem> - <compilerArguments> - <Xmaxwarns>10000</Xmaxwarns> - <Xlint /> - </compilerArguments> - </configuration> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> @@ -1527,6 +1508,21 @@ </executions> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <!-- TODO: this only applies to `log4j-core` dependents --> + <annotationProcessorPaths combine.children="append"> + <path> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + <version>${project.version}</version> + </path> + </annotationProcessorPaths> + </configuration> + </plugin> + <!-- Ensure that version for each dependency resolved during a build, is equal to or higher than all transitive dependency declarations. A failure here requires adding the dependency to the dependency management. --> <plugin>
