From c33cb1916ab0f4d4595909fa3b60e39816770425 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 25 Dec 2023 18:11:03 -0500
Subject: [PATCH 1/2] [pom] Add attach groovy doc annotations

---
 pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pom.xml b/pom.xml
index 0c6298ed5..e44729151 100644
--- a/pom.xml
+++ b/pom.xml
@@ -693,6 +693,7 @@
                 <artifactId>gmavenplus-plugin</artifactId>
                 <version>${gmavenPluginVersion}</version>
                 <configuration>
+                    <attachGroovyDocAnnotation>true</attachGroovyDocAnnotation>
                     <groovyDocOutputDirectory>${project.reporting.outputDirectory}/gapidocs</groovyDocOutputDirectory>
                     <invokeDynamic>true</invokeDynamic>
                 </configuration>

From 750450a138030251b1754d6ccd9fe9d084fe0104 Mon Sep 17 00:00:00 2001
From: Jeremy Landis <jeremylandis@hotmail.com>
Date: Mon, 25 Dec 2023 18:31:33 -0500
Subject: [PATCH 2/2] [groovy] Let javadoc jars get created for groovy

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index e44729151..6d71b11fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -376,7 +376,7 @@
         <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-docgenerator</artifactId>
-            <scope>runtime</scope>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
@@ -387,7 +387,7 @@
         <dependency>
             <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-templates</artifactId>
-            <scope>runtime</scope>
+            <optional>true</optional>
         </dependency>
 
         <dependency>
@@ -723,8 +723,8 @@
                         <goals>
                             <goal>generateStubs</goal>
                             <goal>generateTestStubs</goal>
-                            <goal>groovydoc</goal>
-                            <goal>groovydocTests</goal>
+                            <goal>groovydoc-jar</goal>
+                            <goal>groovydocTests-jar</goal>
                         </goals>
                         <phase>site</phase>
                     </execution>