[skip ci] fix: do not add licensing artifacts to javadoc jars

Author: jdaugherty

gradle/publish-config.gradle

@@ -34,11 +34,11 @@ extensions.configure(GrailsPublishExtension) {
 }
 
 tasks.withType(Jar).configureEach {
-    from(rootProject.layout.projectDirectory.file('DISCLAIMER')) {
-        into('META-INF')
-    }
-
     if(it.archiveClassifier.getOrNull() != 'javadoc') {
+        from(rootProject.layout.projectDirectory.file('DISCLAIMER')) {
+            into('META-INF')
+        }
+
         def projectLicense = layout.projectDirectory.file('src/main/resources/META-INF/LICENSE')
         if (!projectLicense.asFile.exists()) {
             def basicLicense = rootProject.layout.projectDirectory.file('licenses/LICENSE-Apache-2.0.txt')

grails-forge/gradle/java-config.gradle

@@ -53,27 +53,6 @@ tasks.withType(Jar).configureEach {
             'Implementation-Vendor': 'grails.apache.org'
     )
     duplicatesStrategy = DuplicatesStrategy.INCLUDE
-
-    from(rootProject.layout.projectDirectory.file('../DISCLAIMER')) {
-        into('META-INF')
-    }
-
-    def projectLicense = layout.projectDirectory.file('src/main/resources/META-INF/LICENSE')
-    if (!projectLicense.asFile.exists()) {
-        def basicLicense = rootProject.layout.projectDirectory.file('../licenses/LICENSE-Apache-2.0.txt')
-        from(basicLicense) {
-            into('META-INF')
-            rename { 'LICENSE' }
-        }
-    }
-
-    def projectNotice = layout.projectDirectory.file('src/main/resources/META-INF/NOTICE')
-    if (!projectNotice.asFile.exists()) {
-        def basicNotice = rootProject.layout.projectDirectory.file('../grails-core/src/main/resources/META-INF/NOTICE')
-        from(basicNotice) {
-            into('META-INF')
-        }
-    }
 }
 
 // Any jar, zip, or archive should be reproducible

grails-forge/gradle/publish-config.gradle

@@ -33,6 +33,31 @@ extensions.configure(GrailsPublishExtension) {
     it.publishTestSources = findProperty('pomPublishTestSources') ?: false
 }
 
+tasks.withType(Jar).configureEach {
+    if(it.archiveClassifier.getOrNull() != 'javadoc') {
+        from(rootProject.layout.projectDirectory.file('../DISCLAIMER')) {
+            into('META-INF')
+        }
+
+        def projectLicense = layout.projectDirectory.file('src/main/resources/META-INF/LICENSE')
+        if (!projectLicense.asFile.exists()) {
+            def basicLicense = rootProject.layout.projectDirectory.file('../licenses/LICENSE-Apache-2.0.txt')
+            from(basicLicense) {
+                into('META-INF')
+                rename { 'LICENSE' }
+            }
+        }
+
+        def projectNotice = layout.projectDirectory.file('src/main/resources/META-INF/NOTICE')
+        if (!projectNotice.asFile.exists()) {
+            def basicNotice = rootProject.layout.projectDirectory.file('../grails-core/src/main/resources/META-INF/NOTICE')
+            from(basicNotice) {
+                into('META-INF')
+            }
+        }
+    }
+}
+
 apply plugin: 'org.gradle.crypto.checksum'
 
 afterEvaluate {

grails-gradle/gradle/java-config.gradle

@@ -64,24 +64,26 @@ tasks.withType(Jar).configureEach {
             'Implementation-Vendor': 'grails.apache.org'
     )
 
-    from(rootProject.layout.projectDirectory.file('../DISCLAIMER')) {
-        into('META-INF')
-    }
-
-    def projectLicense = layout.projectDirectory.file('src/main/resources/META-INF/LICENSE')
-    if (!projectLicense.asFile.exists()) {
-        def basicLicense = rootProject.layout.projectDirectory.file('../licenses/LICENSE-Apache-2.0.txt')
-        from(basicLicense) {
+    if(it.archiveClassifier.getOrNull() != 'javadoc') {
+        from(rootProject.layout.projectDirectory.file('../DISCLAIMER')) {
             into('META-INF')
-            rename { 'LICENSE' }
         }
-    }
 
-    def projectNotice = layout.projectDirectory.file('src/main/resources/META-INF/NOTICE')
-    if (!projectNotice.asFile.exists()) {
-        def basicNotice = rootProject.layout.projectDirectory.file('../grails-core/src/main/resources/META-INF/NOTICE')
-        from(basicNotice) {
-            into('META-INF')
+        def projectLicense = layout.projectDirectory.file('src/main/resources/META-INF/LICENSE')
+        if (!projectLicense.asFile.exists()) {
+            def basicLicense = rootProject.layout.projectDirectory.file('../licenses/LICENSE-Apache-2.0.txt')
+            from(basicLicense) {
+                into('META-INF')
+                rename { 'LICENSE' }
+            }
+        }
+
+        def projectNotice = layout.projectDirectory.file('src/main/resources/META-INF/NOTICE')
+        if (!projectNotice.asFile.exists()) {
+            def basicNotice = rootProject.layout.projectDirectory.file('../grails-core/src/main/resources/META-INF/NOTICE')
+            from(basicNotice) {
+                into('META-INF')
+            }
         }
     }
 }