From 94db54c06a78f2f3a43964c42a156e60183ef454 Mon Sep 17 00:00:00 2001
From: Niko Dziemba <nikod@spotify.com>
Date: Wed, 13 Apr 2022 15:51:13 +0200
Subject: [PATCH] Fix javadoc generation

- Specify javadoc target release to fix java version mismatch errors
- Remove lots of workarounds that are no longer needed
- Run javadoc in all profiles to catch errors during PR testing, not
  just before publishing a release
---
 pom.xml | 42 ++++++++++++++++--------------------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/pom.xml b/pom.xml
index 83dbe991..a3de8363 100644
--- a/pom.xml
+++ b/pom.xml
@@ -370,32 +370,6 @@
                             </execution>
                         </executions>
                     </plugin>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-javadoc-plugin</artifactId>
-                        <version>3.2.0</version>
-                        <executions>
-                            <execution>
-                                <id>attach-javadocs</id>
-                                <goals>
-                                    <goal>jar</goal>
-                                </goals>
-                            </execution>
-                        </executions>
-                        <configuration>
-                            <sourcepath>${project.build.sourceDirectory}:${project.build.directory}/generated-sources/annotations</sourcepath>
-                            <additionalDependencies>
-                                <additionalDependency>
-                                    <groupId>javax.annotation</groupId>
-                                    <artifactId>javax.annotation-api</artifactId>
-                                    <version>1.3.2</version>
-                                </additionalDependency>
-
-                            </additionalDependencies>
-                            <doclint>none</doclint>
-                        </configuration>
-
-                    </plugin>
                     <plugin>
                         <groupId>org.sonatype.plugins</groupId>
                         <artifactId>nexus-staging-maven-plugin</artifactId>
@@ -529,6 +503,22 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <release>11</release>
+                    <doclint>none</doclint>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 </project>