You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by pk...@apache.org on 2023/11/02 19:45:57 UTC
(logging-log4j2) 01/05: Switch to official Maven Javadoc plugin properties
This is an automated email from the ASF dual-hosted git repository.
pkarwasz pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit 3389ee7482674e61243fe01addd2be901b6dff00
Author: Piotr P. Karwasz <pi...@karwasz.org>
AuthorDate: Thu Nov 2 19:28:41 2023 +0100
Switch to official Maven Javadoc plugin properties
---
log4j-api/pom.xml | 2 +-
log4j-core/pom.xml | 2 +-
log4j-parent/pom.xml | 2 +-
pom.xml | 11 ++++-------
4 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index 8f4934a00c..4f529fbd12 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -32,7 +32,7 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>API Documentation</docLabel>
<projectDir>/api</projectDir>
- <javadoc.skip>false</javadoc.skip>
+ <maven.javadoc.skip>false</maven.javadoc.skip>
<!--
~ OSGi and JPMS options
diff --git a/log4j-core/pom.xml b/log4j-core/pom.xml
index 006859b806..98dae41e27 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -32,7 +32,7 @@
<log4jParentDir>${basedir}/..</log4jParentDir>
<docLabel>Core Documentation</docLabel>
<projectDir>/core</projectDir>
- <javadoc.skip>false</javadoc.skip>
+ <maven.javadoc.skip>false</maven.javadoc.skip>
<!--
~ OSGi and JPMS options
diff --git a/log4j-parent/pom.xml b/log4j-parent/pom.xml
index 66b09d7dc1..e38253cb66 100644
--- a/log4j-parent/pom.xml
+++ b/log4j-parent/pom.xml
@@ -61,7 +61,7 @@
<!-- `maven-javadoc-plugin` is only used to generate Javadoc HTML used in the website.
We don't deploy any Javadoc JARs.
We also don't generate Javadoc HTML for all modules, but only for two modules: `log4j-api` and `log4j-core`. -->
- <javadoc.skip>true</javadoc.skip>
+ <maven.javadoc.skip>true</maven.javadoc.skip>
<!-- Skipping `maven-site-plugin` globally.
It is manually enabled only for the parent module below. -->
<maven.site.skip>true</maven.site.skip>
diff --git a/pom.xml b/pom.xml
index fefa94570c..d96fe7c058 100644
--- a/pom.xml
+++ b/pom.xml
@@ -334,8 +334,8 @@
<!-- `maven-javadoc-plugin` is only used to generate Javadoc HTML used in the website.
We don't deploy any Javadoc JARs.
We also don't generate Javadoc HTML for all modules, but only for two modules: `log4j-api` and `log4j-core`. -->
- <javadoc.doclint>all,-missing,-html</javadoc.doclint>
- <javadoc.skip>true</javadoc.skip>
+ <doclint>all,-missing,-html</doclint>
+ <maven.javadoc.skip>true</maven.javadoc.skip>
<!-- Skipping `maven-site-plugin` globally.
It is manually enabled only for this root module below. -->
<maven.site.skip>true</maven.site.skip>
@@ -722,12 +722,9 @@
</goals>
<phase>pre-site</phase>
<!-- This execution must be inherited and enabled by modules publishing javadocs: `-api` and `-core`.
- Such modules enable this execution via `javadoc.skip` property.
+ Such modules enable this execution via `maven.javadoc.skip` property.
Hence, don't insert a `<inherited>false</inherited>`, please! -->
- <configuration combine.self="override">
- <!-- `notimestamp` avoids `diff` noise and is required for reproducible builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
- <notimestamp>true</notimestamp>
- <skip>${javadoc.skip}</skip>
+ <configuration>
<bottom><![CDATA[<p align="center">
Copyright © {inceptionYear}-{currentYear} {organizationName}.
All Rights Reserved.<br/>