From 0a9dafe7209085c9eb745f1b83079092b01e1394 Mon Sep 17 00:00:00 2001
From: Tamas Cservenak <tamas@cservenak.net>
Date: Wed, 8 Nov 2023 21:33:42 +0100
Subject: [PATCH] [MRESOLVER-422] Fix javadoc configuration (#359)

Not much to fix really, but simply put the "minimally required Java" and Javadoc URL needs to be kept in sync. But, as former is a range, latter is a "base version", it goes only manually.

Hence, I left a note in POM for this.

Site related fixes:
* Javadoc craps out on 19 and 21 JDK transport modules (nothing to document).
* PMD does not supports Java 21.

---

https://issues.apache.org/jira/browse/MRESOLVER-422
---
 .../maven-resolver-transport-jdk-19/pom.xml                  | 3 +++
 .../maven-resolver-transport-jdk-21/pom.xml                  | 5 ++++-
 pom.xml                                                      | 5 +++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-19/pom.xml b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-19/pom.xml
index 4bbfc270a..35d97f29b 100644
--- a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-19/pom.xml
+++ b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-19/pom.xml
@@ -37,6 +37,9 @@
     <Bundle-SymbolicName>${Automatic-Module-Name}</Bundle-SymbolicName>
 
     <javaVersion>19</javaVersion>
+    <!-- Different workarounds for site -->
+    <maven.javadoc.skip>true</maven.javadoc.skip>
+    <pmd.skip>true</pmd.skip>
   </properties>
 
   <dependencies>
diff --git a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-21/pom.xml b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-21/pom.xml
index 743101231..9e0b6dad9 100644
--- a/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-21/pom.xml
+++ b/maven-resolver-transport-jdk-parent/maven-resolver-transport-jdk-21/pom.xml
@@ -36,7 +36,10 @@
     <Automatic-Module-Name>org.apache.maven.resolver.transport.jdk</Automatic-Module-Name>
     <Bundle-SymbolicName>${Automatic-Module-Name}</Bundle-SymbolicName>
 
-    <javaVersion>19</javaVersion>
+    <javaVersion>21</javaVersion>
+    <!-- Different workarounds for site -->
+    <maven.javadoc.skip>true</maven.javadoc.skip>
+    <pmd.skip>true</pmd.skip>
   </properties>
 
   <dependencies>
diff --git a/pom.xml b/pom.xml
index 17877992c..c429416c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,6 +100,7 @@
     <!-- used by supplier and demo only -->
     <mavenVersion>4.0.0-alpha-8</mavenVersion>
     <minimalMavenBuildVersion>[3.8.8,)</minimalMavenBuildVersion>
+    <!-- MRESOLVER-422: keep this in sync with Javadoc plugin configuration (but cannot directly, as this below is range) -->
     <minimalJavaBuildVersion>[21.0.1,)</minimalJavaBuildVersion>
     <project.build.outputTimestamp>2023-11-02T11:01:10Z</project.build.outputTimestamp>
   </properties>
@@ -398,9 +399,9 @@
             <linksource>true</linksource>
             <notimestamp>true</notimestamp>
             <legacyMode>true</legacyMode>
-            <release>11</release>
+            <release>21</release>
             <links>
-              <link>https://docs.oracle.com/en/java/javase/11/docs/api/</link>
+              <link>https://docs.oracle.com/en/java/javase/21/docs/api/</link>
             </links>
             <tags>
               <tag>