From e8fafe014dcb5c0aaf0f803921ae401739ba5330 Mon Sep 17 00:00:00 2001
From: Jochen Schalanda <jochen@schalanda.name>
Date: Tue, 26 Sep 2023 13:41:39 +0200
Subject: [PATCH] Use new maven-javadoc-plugin legacyMode (#3594)

https://maven.apache.org/plugins/maven-javadoc-plugin/javadoc-mojo.html#legacyMode
---
 .github/workflows/maven.yml |  2 +-
 pom.xml                     | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index e4cb3ad78f..6e82d5e70a 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -43,7 +43,7 @@ jobs:
         key: ${{ runner.os }}-sonar
         restore-keys: ${{ runner.os }}-sonar
     - name: Build
-      run: ./mvnw -B -V -ff -ntp install
+      run: ./mvnw -B -V -ff -ntp install javadoc:javadoc
     - name: Analyze with SonarCloud
       if: ${{ env.SONAR_TOKEN != null && env.SONAR_TOKEN != '' && matrix.java_version == '17' }}
       env:
diff --git a/pom.xml b/pom.xml
index 291d7e20b7..1bbc844bf9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -230,13 +230,6 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.6.0</version>
-                        <configuration>
-                            <source>8</source>
-                            <doclint>none</doclint>
-                            <quiet>true</quiet>
-                            <notimestamp>true</notimestamp>
-                        </configuration>
                         <executions>
                             <execution>
                                 <id>attach-javadocs</id>
@@ -316,6 +309,18 @@
                     <artifactId>maven-deploy-plugin</artifactId>
                     <version>3.1.1</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-javadoc-plugin</artifactId>
+                    <version>3.6.0</version>
+                    <configuration>
+                        <source>8</source>
+                        <doclint>none</doclint>
+                        <quiet>true</quiet>
+                        <notimestamp>true</notimestamp>
+                        <legacyMode>true</legacyMode>
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
         <plugins>
@@ -323,8 +328,7 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <release>8</release>
                     <fork>true</fork>
                     <parameters>true</parameters>
                     <showWarnings>true</showWarnings>