From 3211a2061944ec76eae1f979768275d6710a0048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Pupier?= <apupier@redhat.com>
Date: Wed, 16 Oct 2024 16:38:57 +0200
Subject: [PATCH] CAMEL-21190 - Configure Maven Javadoc Plugin for Java version
 used for compilation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

it requires then to not use the doclint as there are a bunch of invalid
or no more valid Javadoc in the codebase

Signed-off-by: Aurélien Pupier <apupier@redhat.com>
---
 parent/pom.xml | 13 +++++++------
 pom.xml        |  5 +++--
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index f2cec37e86f6e..d3fbad2dbad27 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -3546,12 +3546,12 @@
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <configuration>
                         <attach>true</attach>
-                        <source>${jdk.version}</source>
+                        <release>${maven.javadoc.release}</release>
                         <quiet>true</quiet>
                         <bottom>Apache Camel</bottom>
                         <detectOfflineLinks>false</detectOfflineLinks>
-                        <javadocVersion>1.8.0</javadocVersion>
                         <encoding>UTF-8</encoding>
+                        <doclint>none</doclint>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -3717,14 +3717,15 @@
                 <version>${maven-javadoc-plugin-version}</version>
                 <configuration>
                     <links>
-                        <link>http://docs.oracle.com/javase/8/docs/api/</link>
-                        <link>http://docs.oracle.com/javaee/7/api/</link>
-                        <link>http://docs.spring.io/spring/docs/${spring-version}/javadoc-api/</link>
+                        <link>https://docs.oracle.com/javase/17/docs/api/</link>
+                        <link>https://docs.oracle.com/javaee/7/api/</link>
+                        <link>https://docs.spring.io/spring/docs/${spring-version}/javadoc-api/</link>
                     </links>
                     <stylesheetfile>${basedir}/../../etc/css/stylesheet.css</stylesheetfile>
                     <linksource>true</linksource>
                     <maxmemory>500m</maxmemory>
-                    <source>${jdk.version}</source>
+                    <release>${maven.javadoc.release}</release>
+                    <doclint>none</doclint>
                 </configuration>
             </plugin>
             <plugin>
diff --git a/pom.xml b/pom.xml
index 1a7e58fc581c1..c351feda8287f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -115,6 +115,7 @@
         <maven.compiler.source>${jdk.version}</maven.compiler.source>
         <maven.compiler.target>${jdk.version}</maven.compiler.target>
         <maven.compiler.release>${jdk.version}</maven.compiler.release>
+        <maven.javadoc.release>${jdk.version}</maven.javadoc.release>
         <minimalJavaBuildVersion>${jdk.version}</minimalJavaBuildVersion>
 
         <!-- reproduceable builds: https://maven.apache.org/guides/mini/guide-reproducible-builds.html -->
@@ -634,7 +635,7 @@
                                     <goal>jar</goal>
                                 </goals>
                                 <configuration>
-                                    <source>11</source>
+                                    <release>${maven.javadoc.release}</release>
                                     <doclint>none</doclint>
                                 </configuration>
                             </execution>
@@ -708,7 +709,7 @@
                             </execution>
                         </executions>
                         <configuration>
-                            <source>8</source>
+                            <release>${maven.javadoc.release}</release>
                             <additionalOptions>${javadoc.opts}</additionalOptions>
                             <!-- disable Javadoc linting for buildung the release with Java 11 -->
                             <doclint>none</doclint>