(logging-log4j2) branch 2.x-docgen updated: Switch to the standard Maven Javadoc Plugin properties

[vy]

This is an automated email from the ASF dual-hosted git repository.

vy pushed a commit to branch 2.x-docgen
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git


The following commit(s) were added to refs/heads/2.x-docgen by this push:
     new d7e6efe823 Switch to the standard Maven Javadoc Plugin properties
d7e6efe823 is described below

commit d7e6efe823877aa02c374cf337b5194c91bbc76b
Author: Volkan Yazıcı <vol...@yazi.ci>
AuthorDate: Tue Mar 19 13:02:09 2024 +0100

    Switch to the standard Maven Javadoc Plugin properties
---
 log4j-api/pom.xml  |  2 +-
 log4j-core/pom.xml |  2 +-
 pom.xml            | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/log4j-api/pom.xml b/log4j-api/pom.xml
index 082fd2f657..f6e2b44a16 100644
--- a/log4j-api/pom.xml
+++ b/log4j-api/pom.xml
@@ -28,7 +28,7 @@
   <name>Apache Log4j API</name>
   <description>The Apache Log4j API</description>
   <properties>
-    <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 b8ef135c25..6173151e6f 100644
--- a/log4j-core/pom.xml
+++ b/log4j-core/pom.xml
@@ -33,7 +33,7 @@
 
   <properties>
 
-    <javadoc.skip>false</javadoc.skip>
+    <maven.javadoc.skip>false</maven.javadoc.skip>
 
     <!-- Tests are located elsewhere, no need to do any processing for the 
`src/test` directory: -->
     <maven.test.skip>true</maven.test.skip>
diff --git a/pom.xml b/pom.xml
index 4a1e5e866d..974486a2e5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -326,8 +326,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>
@@ -640,12 +640,12 @@
             </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>
+              <skip>${maven.javadoc.skip}</skip>
               <legacyMode>true</legacyMode>
               <bottom><![CDATA[<p align="center">
               Copyright &copy; {inceptionYear}-{currentYear} 
{organizationName}.
@@ -715,10 +715,10 @@
             </goals>
             <phase>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>
-              <skip>${javadoc.skip}</skip>
+              <skip>${maven.javadoc.skip}</skip>
               
<outputDirectory>${maven.multiModuleProjectDirectory}/target/site/javadoc/${project.artifactId}</outputDirectory>
               <resources>
                 <resource>
@@ -907,7 +907,7 @@
         <jdk>[1.8,)</jdk>
       </activation>
       <properties>
-        <doclint>${javadoc.doclint}</doclint>
+        <doclint>${doclint}</doclint>
       </properties>
     </profile>