Merge pull request #1878 from grails/sourceAndJavadocFix

Include javadoc & groovydoc in the same jar and restore source inclusion

Author: jdaugherty

gradle/publish-config.gradle

@@ -14,19 +14,4 @@ extensions.configure(GrailsPublishExtension) {
             'puneetbehl': 'Puneet Behl',
             'jamesfredley': 'James Fredley'
     ]
-}
-
-// Add sources and javadoc jar tasks
-// java.withSourcesJar() and java.withJavadocJar() is not compatible here with GrailsPublishPlugin
-if (!tasks.findByName('sourcesJar')) {
-    tasks.register('sourcesJar', Jar) {
-        archiveClassifier = 'sources'
-        from sourceSets.main.allSource
-    }
-}
-if (!tasks.findByName('javadocJar')) {
-    tasks.register('javadocJar', Jar) {
-        archiveClassifier = 'javadoc'
-        from javadoc.destinationDir
-    }
 }