Putting javadoc and sources into proper confs and setting types

Author: Justin Ryan

gradle/convention.gradle

@@ -13,23 +13,30 @@ subprojects { project ->
     status = rootProject.status
 
     task sourcesJar(type: Jar, dependsOn:classes) {
-        classifier = 'sources'
         from sourceSets.main.allSource
     }
 
     task javadocJar(type: Jar, dependsOn:javadoc) {
-        classifier = 'javadoc'
         from javadoc.destinationDir
     }
 
-    // Ensure output is on a new line
-    javadoc.doFirst { println "" }
-
+    configurations.add('sources')
+    configurations.add('javadoc')
 
     artifacts {
-        archives sourcesJar
-        archives javadocJar
+        sources(sourcesJar) {
+            type 'source'
+            classifier 'sources'
+        }
+        javadoc(javadocJar) {
+            type 'javadoc'
+            classifier 'javadoc'
+        }
     }
+
+    // Ensure output is on a new line
+    javadoc.doFirst { println "" }
+
 }
 
 task aggregateJavadoc(type: Javadoc) {