erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-25 16:07:12 -07:00
Code Releases Activity

Merge pull request #361 from ethauvin/master

Browse source 
Updated to testng 6.11
This commit is contained in:
Cedric Beust 2017-03-26 12:53:25 -07:00 • committed by GitHub
commit 09b47a9674
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
kobalt/src/Build.kt
View file

@ -31,6 +31,7 @@ object Versions {
val slf4j = "1.7.3" val slf4j = "1.7.3"
val kotlin = "1.1.1" val kotlin = "1.1.1"
val aether = "1.0.2.v20150114" val aether = "1.0.2.v20150114"
val testng = "6.11"
} }
fun mavenResolver(vararg m: String) fun mavenResolver(vararg m: String)
@ -113,7 +114,7 @@ val kobaltPluginApi = project {
*mavenResolver("api", "spi", "util", "impl", "connector-basic", "transport-http", "transport-file"), *mavenResolver("api", "spi", "util", "impl", "connector-basic", "transport-http", "transport-file"),
"org.apache.maven:maven-aether-provider:3.3.9", "org.apache.maven:maven-aether-provider:3.3.9",
"org.testng.testng-remote:testng-remote:1.3.0", "org.testng.testng-remote:testng-remote:1.3.0",
"org.testng:testng:6.10" "org.testng:testng:${Versions.testng}"
) )
exclude(*aether("impl", "spi", "util", "api")) exclude(*aether("impl", "spi", "util", "api"))
} }
@ -183,7 +184,7 @@ val kobaltApp = project(kobaltPluginApi, wrapper) {
} }
dependenciesTest { dependenciesTest {
compile("org.testng:testng:6.10", compile("org.testng:testng:${Versions.testng}",
"org.assertj:assertj-core:3.4.1", "org.assertj:assertj-core:3.4.1",
*mavenResolver("util") *mavenResolver("util")
) )

2
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/internal/TestNgRunner.kt
View file

@ -158,7 +158,7 @@ class TestNgRunner : GenericTestRunner() {
val dep = with(context.dependencyManager) { val dep = with(context.dependencyManager) {
val jf = create("org.testng.testng-remote:testng-remote:1.3.0") val jf = create("org.testng.testng-remote:testng-remote:1.3.0")
val tr = create("org.testng.testng-remote:$remoteRunnerVersion:1.3.0") val tr = create("org.testng.testng-remote:$remoteRunnerVersion:1.3.0")
val testng = create("org.testng:testng:6.10") val testng = create("org.testng:testng:6.11")
transitiveClosure(kotlin.collections.listOf(jf, tr /*, testng */)) transitiveClosure(kotlin.collections.listOf(jf, tr /*, testng */))
} }

2
src/main/resources/templates/build.mustache
View file

@ -38,7 +38,7 @@ val p = {{directive}} {
} }
dependenciesTest { dependenciesTest {
compile("org.testng:testng:6.10") compile("org.testng:testng:6.11")
{{#testDependencies}} {{#testDependencies}}
compile("{{groupId}}:{{artifactId}}:{{version}}") compile("{{groupId}}:{{artifactId}}:{{version}}")
{{/testDependencies}} {{/testDependencies}}