KAFKA-1502 source jar is empty patch by Jun Rao reviewed by Joe Stein

This commit is contained in:
Joe Stein 2014-08-30 12:14:54 -04:00
parent 953e35b5c5
commit 3abe3403a1
1 changed files with 32 additions and 38 deletions

View File

@ -74,7 +74,6 @@ subprojects {
from '../NOTICE' from '../NOTICE'
} }
tasks.withType(Javadoc) {
task srcJar(type:Jar) { task srcJar(type:Jar) {
classifier = 'sources' classifier = 'sources'
from '../LICENSE' from '../LICENSE'
@ -89,32 +88,17 @@ subprojects {
from javadoc.destinationDir from javadoc.destinationDir
} }
task docsJar(type: Jar, dependsOn: javadocJar) { } task docsJar(dependsOn: javadocJar)
artifacts { artifacts {
archives srcJar archives srcJar
archives javadocJar archives javadocJar
} }
}
tasks.withType(ScalaCompile) { plugins.withType(ScalaPlugin) {
task srcJar(type:Jar, overwrite: true) { //source jar should also contain scala source:
classifier = 'sources' srcJar.from sourceSets.main.scala
from '../LICENSE'
from '../NOTICE'
from sourceSets.main.scala
from sourceSets.main.java
}
scalaCompileOptions.useAnt = false
configure(scalaCompileOptions.forkOptions) {
memoryMaximumSize = '1g'
jvmArgs = ['-XX:MaxPermSize=512m']
}
}
tasks.withType(ScalaDoc) {
task scaladocJar(type:Jar) { task scaladocJar(type:Jar) {
classifier = 'scaladoc' classifier = 'scaladoc'
from '../LICENSE' from '../LICENSE'
@ -122,12 +106,22 @@ subprojects {
from scaladoc from scaladoc
} }
task docsJar(type: Jar, dependsOn: ['javadocJar', 'scaladocJar'], overwrite: true) { } //documentation task should also trigger building scala doc jar
docsJar.dependsOn scaladocJar
artifacts { artifacts {
archives scaladocJar archives scaladocJar
} }
} }
tasks.withType(ScalaCompile) {
scalaCompileOptions.useAnt = false
configure(scalaCompileOptions.forkOptions) {
memoryMaximumSize = '1g'
jvmArgs = ['-XX:MaxPermSize=512m']
}
}
} }
for ( sv in ['2_9_1', '2_9_2', '2_10_1', '2_11'] ) { for ( sv in ['2_9_1', '2_9_2', '2_10_1', '2_11'] ) {