diff --git build.gradle build.gradle index 2f4167f..be41c28 100644 --- build.gradle +++ build.gradle @@ -106,6 +106,13 @@ subprojects { from sourceSets.main.java } + task testJar(type: Jar, overwrite: true) { + appendix = 'test' + from '../LICENSE' + from '../NOTICE' + from sourceSets.test.output + } + scalaCompileOptions.useAnt = false configure(scalaCompileOptions.forkOptions) { @@ -151,6 +158,12 @@ for ( sv in ['2_8_0', '2_9_1', '2_9_2', '2_10_1'] ) { startParameter.projectProperties = [scalaVersion: "${svInDot}"] } + tasks.create(name: "testJar_${sv}", type: GradleBuild) { + buildFile = './build.gradle' + tasks = ['core:testJar'] + startParameter.projectProperties = [scalaVersion: "${svInDot}"] + } + tasks.create(name: "docsJar_${sv}", type: GradleBuild) { buildFile = './build.gradle' tasks = ['core:docsJar'] @@ -170,13 +183,15 @@ for ( sv in ['2_8_0', '2_9_1', '2_9_2', '2_10_1'] ) { } } -tasks.create(name: "jarAll", dependsOn: ['jar_core_2_8_0', 'jar_core_2_9_1', 'jar_core_2_9_2', 'jar_core_2_10_1', 'clients:jar', 'perf:jar', 'examples:jar', 'contrib:hadoop-consumer:jar', 'contrib:hadoop-producer:jar']) { +tasks.create(name: "jarAll", dependsOn: ['jar_core_2_8_0', 'jar_core_2_9_1', 'jar_core_2_9_2', 'jar_core_2_10_1', 'clients:jar', 'perf:jar', 'examples:jar', 'contrib:hadoop-consumer:jar', 'contrib:hadoop-producer:jar', ':core:testJar']) { } tasks.create(name: "srcJarAll", dependsOn: ['srcJar_2_8_0', 'srcJar_2_9_1', 'srcJar_2_9_2', 'srcJar_2_10_1', 'clients:srcJar', 'perf:srcJar', 'examples:srcJar', 'contrib:hadoop-consumer:srcJar', 'contrib:hadoop-producer:srcJar']) { } tasks.create(name: "docsJarAll", dependsOn: ['docsJar_2_8_0', 'docsJar_2_9_1', 'docsJar_2_9_2', 'docsJar_2_10_1', 'clients:docsJar', 'perf:docsJar', 'examples:docsJar', 'contrib:hadoop-consumer:docsJar', 'contrib:hadoop-producer:docsJar']) { } +tasks.create(name: "testJarAll", dependsOn: ['testJar_2_8_0', 'testJar_2_9_1', 'testJar_2_9_2', 'testJar_2_10_1']) { } + tasks.create(name: "testAll", dependsOn: ['test_core_2_8_0', 'test_core_2_9_1', 'test_core_2_9_2', 'test_core_2_10_1', 'clients:test']) { } @@ -271,12 +286,7 @@ project(':core') { dependsOn 'copyDependantLibs' } - task testJar(type: Jar) { - appendix = 'test' - from sourceSets.test.output - } - - test { + test { testLogging { events "passed", "skipped", "failed" exceptionFormat = 'full'