From 3f4717c44e26d586e2b03b1b87cfff63248e993a Mon Sep 17 00:00:00 2001
From: Ceki Gulcu <ceki@qos.ch>
Date: Mon, 8 Jan 2024 20:48:59 +0100
Subject: [PATCH] get javadoc:aggregate command to work

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
---
 parent/pom.xml | 105 ++++++++++---------------------------------------
 pom.xml        |   2 +-
 2 files changed, 21 insertions(+), 86 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 21812c2d9..973e36abd 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -24,7 +24,6 @@
   <inceptionYear>2005</inceptionYear>
 
 
-
   <properties>
     <!-- yyyy-MM-dd'T'HH:mm:ss'Z' -->
     <project.build.outputTimestamp>2024-01-08T17:55:00Z</project.build.outputTimestamp>
@@ -38,14 +37,14 @@
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <!-- used in integration testing -->
     <cal10n.version>0.8.1</cal10n.version>
-    <reload4j.version>1.2.22</reload4j.version>    
+    <reload4j.version>1.2.22</reload4j.version>
     <logback.version>1.2.10</logback.version>
     <jcl.version>1.2</jcl.version>
     <junit.version>4.13.1</junit.version>
     <maven-site-plugin.version>3.7.1</maven-site-plugin.version>
     <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
     <maven-surefire-plugin.version>3.0.0-M7</maven-surefire-plugin.version>
-    <maven-javadoc-plugin.version>3.5.0</maven-javadoc-plugin.version>
+    <maven-javadoc-plugin.version>3.6.3</maven-javadoc-plugin.version>
     <maven-source-plugin.version>3.2.1</maven-source-plugin.version>
     <maven-deploy-plugin.version>3.0.0-M1</maven-deploy-plugin.version>
     <maven-jar-plugin.version>3.2.0</maven-jar-plugin.version>
@@ -53,7 +52,6 @@
     <maven-bundle-plugin.version>5.1.9</maven-bundle-plugin.version>
   </properties>
 
- 
 
   <dependencies>
     <dependency>
@@ -72,7 +70,7 @@
         <artifactId>reload4j</artifactId>
         <version>${reload4j.version}</version>
       </dependency>
-      
+
       <dependency>
         <groupId>ch.qos.cal10n</groupId>
         <artifactId>cal10n-api</artifactId>
@@ -147,14 +145,14 @@
               <source>${jdk.version}</source>
               <target>${jdk.version}</target>
             </configuration>
-          </execution> 
+          </execution>
 
-          <execution>                      
+          <execution>
             <id>module-compile</id>
             <phase>compile</phase>
             <goals>
               <goal>compile</goal>
-            </goals>          
+            </goals>
             <configuration>
               <release>9</release>
               <compileSourceRoots>
@@ -165,7 +163,6 @@
           </execution>
 
 
-
         </executions>
 
       </plugin>
@@ -200,19 +197,19 @@
           <supportIncrementalBuild>true</supportIncrementalBuild>
           <!-- populated by the plugin itself -->
           <instructions>
-			  <Bundle-SymbolicName>${replacestring;${project.artifactId};-;.}</Bundle-SymbolicName>
-			  <Bundle-Vendor>SLF4J.ORG</Bundle-Vendor>
-			  <_snapshot/>
-			  <_exportcontents>!META-INF.versions.9,*;-noimport:=true</_exportcontents>
-			  <Bundle-Description>${project.description}</Bundle-Description>
-			  <Bundle-DocURL>${project.url}</Bundle-DocURL>
-			  <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
-			  <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
-			  <Implementation-Version>${project.version}</Implementation-Version>
-			  <Implementation-Title>${project.artifactId}</Implementation-Title>
-			  <Multi-Release>true</Multi-Release>
-			  <_removeheaders>Private-Package,Bundle-SCM, Bundle-Developers, Include-Resource</_removeheaders>
-		  </instructions>
+            <Bundle-SymbolicName>${replacestring;${project.artifactId};-;.}</Bundle-SymbolicName>
+            <Bundle-Vendor>SLF4J.ORG</Bundle-Vendor>
+            <_snapshot/>
+            <_exportcontents>!META-INF.versions.9,*;-noimport:=true</_exportcontents>
+            <Bundle-Description>${project.description}</Bundle-Description>
+            <Bundle-DocURL>${project.url}</Bundle-DocURL>
+            <X-Compile-Source-JDK>${maven.compiler.source}</X-Compile-Source-JDK>
+            <X-Compile-Target-JDK>${maven.compiler.target}</X-Compile-Target-JDK>
+            <Implementation-Version>${project.version}</Implementation-Version>
+            <Implementation-Title>${project.artifactId}</Implementation-Title>
+            <Multi-Release>true</Multi-Release>
+            <_removeheaders>Private-Package,Bundle-SCM, Bundle-Developers, Include-Resource</_removeheaders>
+          </instructions>
         </configuration>
         <executions>
           <execution>
@@ -267,70 +264,8 @@
         <version>3.0.0</version>
       </plugin>
     </plugins>
-  
-  </build>
 
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jxr-plugin</artifactId>
-        <version>${maven-jxr-plugin.version}</version>
-        <configuration>
-          <aggregate>true</aggregate>
-          <javadocDir>target/site/apidocs/</javadocDir>
-          <linkJavadoc>true</linkJavadoc>
-        </configuration>
-      </plugin>
-      
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-        <version>${maven-javadoc-plugin.version}</version>
-        <configuration>
-          <linkJavadoc>true</linkJavadoc>
-          <linksource>true</linksource>
-          <aggregate>true</aggregate>
-          <additionalOptions>
-            <additionalOption>-Xdoclint:none</additionalOption>
-          </additionalOptions>
-          <sourceFileExcludes>
-            <sourceFileExclude>**/module-info.java</sourceFileExclude>
-          </sourceFileExcludes>
-          
-          <groups>
-            <group>
-              <title>SLF4J packages</title>
-              <packages>org.slf4j:org.slf4j.*</packages>
-            </group>
-            
-            <group>
-              <title>SLF4J extensions</title>
-              <packages>
-                org.slf4j.cal10n:org.slf4j.profiler:org.slf4j.ext:org.slf4j.instrumentation:org.slf4j.agent
-              </packages>
-            </group>
-            
-            <group>
-              <title>Jakarta Commons Logging packages</title>
-              <packages>org.apache.commons.*</packages>
-            </group>
-            
-            <group>
-              <title>java.util.logging (JUL) to SLF4J bridge</title>
-              <packages>org.slf4j.bridge</packages>
-            </group>
-            
-            <group>
-              <title>Apache log4j</title>
-              <packages>org.apache.log4j:org.apache.log4j.*</packages>
-            </group>
-          </groups>
-        </configuration>
-      </plugin>
-      
-    </plugins>
-  </reporting>
+  </build>
 
   <profiles>
     <profile>
diff --git a/pom.xml b/pom.xml
index 152f74738..1661c4cf4 100755
--- a/pom.xml
+++ b/pom.xml
@@ -157,7 +157,7 @@
              slf4j-jdk-platform-logging,slf4j-migrator,osgi-over-slf4j
           </skippedModules>
           <detectLinks>true</detectLinks>
-          <doctitle>SLF4J project modules 2.1.0-alpha1</doctitle>
+          <doctitle>SLF4J project modules ${project.version}</doctitle>
           <windowtitle>SLF4J javadoc</windowtitle>
           <bottom><![CDATA[Copyright  &copy; 2005-{currentYear} QOS.CH Sarl. All rights reserved]]></bottom>
           <linksource>true</linksource>