From e06a88d4b5fb72271324fa48bbb8236cd9b4dd43 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@vmware.com>
Date: Wed, 5 Jan 2022 12:06:54 -0500
Subject: [PATCH] Add javadoc artifact for Maven Central

Turns out Sonatype requires a `javadoc.jar` artifact to be present
in the distribution for proper publishing

* Create a `javadoc.jar` based on the `groovydoc` task
* Include `groovydoc.jar` into a publication and distribution
---
 spring-integration-groovy-dsl/build.gradle         | 9 ++++++---
 spring-integration-groovy-dsl/publish-maven.gradle | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/spring-integration-groovy-dsl/build.gradle b/spring-integration-groovy-dsl/build.gradle
index 3abb029..9c06e75 100644
--- a/spring-integration-groovy-dsl/build.gradle
+++ b/spring-integration-groovy-dsl/build.gradle
@@ -109,8 +109,8 @@ groovydoc {
     link 'https://www.reactive-streams.org/reactive-streams-1.0.3-javadoc/', 'org.reactivestreams.'
 }
 
-task javadocJar(type: Jar, dependsOn: groovydoc) {
-    archiveClassifier = 'groovydoc'
+task javadocJar(type: Jar) {
+    archiveClassifier = 'javadoc'
     from groovydoc
 }
 
@@ -146,7 +146,7 @@ task distZip(type: Zip, dependsOn: docsZip) {
     description = "Builds -${archiveClassifier} archive, containing all jars and docs, " +
             "suitable for community download page."
 
-    ext.baseDir = "${project.name}-${project.version}";
+    ext.baseDir = "${project.name}-${project.version}"
 
     from('src/dist') {
         include 'readme.txt'
@@ -158,6 +158,9 @@ task distZip(type: Zip, dependsOn: docsZip) {
         from project.jar
         from project.sourcesJar
         from project.javadocJar
+        from (project.javadocJar) {
+            rename { it.replace('javadoc', 'groovydoc') }
+        }
     }
 
     from(zipTree(docsZip.archiveFile)) {
diff --git a/spring-integration-groovy-dsl/publish-maven.gradle b/spring-integration-groovy-dsl/publish-maven.gradle
index a83b650..f506b1a 100644
--- a/spring-integration-groovy-dsl/publish-maven.gradle
+++ b/spring-integration-groovy-dsl/publish-maven.gradle
@@ -9,6 +9,9 @@ publishing {
 		mavenJava(MavenPublication) {
 		    suppressAllPomMetadataWarnings()
             from components.java
+			artifact(javadocJar) {
+				classifier = 'groovydoc'
+			}
             artifact docsZip
             artifact distZip
 			pom {