Fix javadoc plugin for older Java versions.

raphw · Aug 1, 2022 · 34a2397 · 34a2397
1 parent 2697d88
commit 34a2397
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 17 deletions.
diff --git a/byte-buddy-android/pom.xml b/byte-buddy-android/pom.xml
@@ -13,6 +13,9 @@
 
     <properties>
         <version.android.sdk.dx>11.0.0_r3</version.android.sdk.dx>
+        <version.commons-codec>1.15</version.commons-codec>
+        <version.httpcomponents>4.5.13</version.httpcomponents>
+        <version.org-json>20220320</version.org-json>
     </properties>
 
     <name>Byte Buddy for Android</name>
@@ -58,6 +61,26 @@
         </dependency>
     </dependencies>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>commons-codec</groupId>
+                <artifactId>commons-codec</artifactId>
+                <version>${version.commons-codec}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.httpcomponents</groupId>
+                <artifactId>httpclient</artifactId>
+                <version>${version.httpcomponents}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.json</groupId>
+                <artifactId>json</artifactId>
+                <version>${version.org-json}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <build>
         <resources>
             <resource>

diff --git a/byte-buddy-benchmark/pom.xml b/byte-buddy-benchmark/pom.xml
@@ -156,6 +156,7 @@
                                     <goal>run</goal>
                                 </goals>
                                 <configuration>
+                                    <skip>${javadoc.download.skip}</skip>
                                     <target>
                                         <mkdir dir="${project.basedir}/target/javadoc-lists/jmh-core-${version.jmh}"/>
                                         <get src="https://javadoc.io/doc/org.openjdk.jmh/jmh-core/${version.jmh}/element-list"

diff --git a/byte-buddy-dep/pom.xml b/byte-buddy-dep/pom.xml
@@ -274,6 +274,7 @@
                                     <goal>run</goal>
                                 </goals>
                                 <configuration>
+                                    <skip>${javadoc.download.skip}</skip>
                                     <target>
                                         <mkdir dir="${project.basedir}/target/javadoc-lists/asm-${version.asm}"/>
                                         <get src="https://javadoc.io/doc/org.ow2.asm/asm/${version.asm}/element-list"

diff --git a/byte-buddy-gradle-plugin/common.gradle b/byte-buddy-gradle-plugin/common.gradle
@@ -59,17 +59,22 @@ if (Boolean.getBoolean('net.bytebuddy.misc.extras')) {
             classifier = 'javadoc'
             from javadoc.destinationDir
         }
+        javadoc {
+            options {
+                linksOffline "https://javadoc.io/doc/net.bytebuddy/byte-buddy/${pom.parent.version.text().toString()}", '../byte-buddy/target/apidocs'
+            }
+        }
     } else {
         task copyJavadoc(type: Jar, dependsOn: javadoc) {
             archiveClassifier.set('javadoc')
             from javadoc.destinationDir
         }
-    }
-    javadoc {
-        options {
-            links 'https://docs.oracle.com/javase/1.5.0/docs/api'
-            links 'https://docs.gradle.org/7.5/javadoc'
-            linksOffline "https://javadoc.io/doc/net.bytebuddy/byte-buddy/${pom.parent.version.text().toString()}", '../byte-buddy/target/apidocs'
+        javadoc {
+            options {
+                links 'https://docs.oracle.com/javase/1.5.0/docs/api'
+                links 'https://docs.gradle.org/7.5/javadoc'
+                linksOffline "https://javadoc.io/doc/net.bytebuddy/byte-buddy/${pom.parent.version.text().toString()}", '../byte-buddy/target/apidocs'
+            }
         }
     }
 } else {
@@ -79,9 +84,11 @@ if (Boolean.getBoolean('net.bytebuddy.misc.extras')) {
     task copyJavadoc {
         logger.debug('javadoc jar is only generated if net.bytebuddy.misc.extras is set to true')
     }
-    gradle.taskGraph.whenReady {
-        tasks.getByPath('javadocJar').enabled = false
-        tasks.getByPath('sourcesJar').enabled = false
+    if (!gradle.gradleVersion.startsWith("2.")) { // support legacy version
+        gradle.taskGraph.whenReady {
+            tasks.getByPath('javadocJar').enabled = false
+            tasks.getByPath('sourcesJar').enabled = false
+        }
     }
 }
 

diff --git a/pom.xml b/pom.xml
@@ -112,6 +112,7 @@
         <jacoco.skip>false</jacoco.skip>
         <japicmp.skip>true</japicmp.skip>
         <modulemaker.skip>false</modulemaker.skip>
+        <javadoc.download.skip>false</javadoc.download.skip>
         <repository.url>git@github.com:raphw/byte-buddy.git</repository.url>
     </properties>
 
@@ -375,6 +376,11 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-javadoc-plugin</artifactId>
                     <version>${version.plugin.javadoc}</version>
+                    <configuration>
+                        <source>${sourcecode.main.version}</source>
+                        <failOnWarnings>true</failOnWarnings>
+                        <detectOfflineLinks>false</detectOfflineLinks>
+                    </configuration>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -462,6 +468,7 @@
                 <version.javassist>3.22.0-GA</version.javassist>
                 <modulemaker.skip>true</modulemaker.skip>
                 <spotbugs.skip>true</spotbugs.skip>
+                <javadoc.download.skip>true</javadoc.download.skip>
             </properties>
             <modules>
                 <module>byte-buddy</module>
@@ -531,6 +538,7 @@
                 <version.cglib>3.2.12</version.cglib>
                 <version.javassist>3.23.2-GA</version.javassist>
                 <spotbugs.skip>true</spotbugs.skip>
+                <javadoc.download.skip>true</javadoc.download.skip>
             </properties>
         </profile>
         <!-- Runs the build with compatibility for Java 9 JVMs. -->
@@ -884,14 +892,6 @@
                                 <goals>
                                     <goal>jar</goal>
                                 </goals>
-                                <configuration>
-                                    <source>${sourcecode.main.version}</source>
-                                    <failOnWarnings>true</failOnWarnings>
-                                    <detectJavaApiLink>false</detectJavaApiLink>
-                                    <links>
-                                        <link>https://docs.oracle.com/javase/1.5.0/docs/api</link>
-                                    </links>
-                                </configuration>
                             </execution>
                         </executions>
                     </plugin>