Skip to content

Commit

Permalink
chore: use explicit dependency versions instead of refreshVersions
Browse files Browse the repository at this point in the history
This improves support for Renovatebot and Dependabot
  • Loading branch information
vlsi committed Feb 15, 2024
1 parent 196babc commit d533a88
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 200 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
}

dependencies {
testImplementation("org.assertj:assertj-core:_")
testImplementation("org.assertj:assertj-core:3.23.1")
}

tasks.withType<Test>().configureEach {
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("testng.repositories")
id("com.github.vlsi.stage-vote-release")
id("com.github.vlsi.stage-vote-release") version "1.90"
id("idea")
}

Expand Down
1 change: 0 additions & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ rootProject.name = "testng-root"

plugins {
`gradle-enterprise`
id("de.fayard.refreshVersions") version "0.60.3"
id("org.gradle.toolchains.foojay-resolver-convention") version "0.8.0"
}

Expand Down
4 changes: 2 additions & 2 deletions testng-ant/testng-ant-build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ plugins {
}

dependencies {
api("org.apache.ant:ant:_")
api("org.apache.ant:ant:1.10.12")

implementation(projects.testngCore)
testImplementation(projects.testngAsserts)
testImplementation("org.apache.ant:ant-testutil:_")
testImplementation("org.apache.ant:ant-testutil:1.10.12")
}
8 changes: 4 additions & 4 deletions testng-core-api/testng-core-api-build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ java {

dependencies {
api(projects.testngCollections)
compileOnly("com.github.spotbugs:spotbugs:_")
"guiceApi"(platform("com.google.inject:guice-bom:_"))
compileOnly("com.github.spotbugs:spotbugs:4.8.1")
"guiceApi"(platform("com.google.inject:guice-bom:5.1.0"))
"guiceApi"("com.google.inject:guice")

implementation(projects.testngReflectionUtils)
api("org.slf4j:slf4j-api:_")
testImplementation("org.slf4j:slf4j-simple:_")
api("org.slf4j:slf4j-api:1.7.36")
testImplementation("org.slf4j:slf4j-simple:1.7.36")
}
30 changes: 15 additions & 15 deletions testng-core/testng-core-build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,30 +29,30 @@ tasks.withType<GroovyCompile>().configureEach {
dependencies {
api(projects.testngCoreApi)
// Annotations have to be available on the compile classpath for the proper compilation
compileOnly("com.github.spotbugs:spotbugs:_")
api("com.beust:jcommander:_")
compileOnly("com.github.spotbugs:spotbugs:4.8.1")
api("com.beust:jcommander:1.82")

"guiceApi"(platform("com.google.inject:guice-bom:_"))
"guiceApi"(platform("com.google.inject:guice-bom:5.1.0"))
"guiceApi"("com.google.inject:guice")
"yamlImplementation"("org.yaml:snakeyaml:_")
"yamlImplementation"("org.yaml:snakeyaml:2.2")

implementation(projects.testngCollections)
implementation(projects.testngReflectionUtils)
implementation(projects.testngRunnerApi)
implementation("org.webjars:jquery:_")
implementation("org.webjars:jquery:3.7.1")
testImplementation(projects.testngAsserts)
testImplementation("org.codehaus.groovy:groovy-all:_") {
testImplementation("org.codehaus.groovy:groovy-all:3.0.13") {
exclude("org.testng", "testng")
}
testImplementation("org.apache-extras.beanshell:bsh:_")
testImplementation("org.mockito:mockito-core:_")
testImplementation("org.jboss.shrinkwrap:shrinkwrap-api:_")
testImplementation("org.jboss.shrinkwrap:shrinkwrap-impl-base:_")
testImplementation("org.xmlunit:xmlunit-assertj:_")
testImplementation("in.jlibs:jlibs-core:_")
testImplementation("org.gridkit.jvmtool:heaplib:_")
testImplementation("org.gridkit.lab:jvm-attach-api:_")
testImplementation("commons-io:commons-io:_")
testImplementation("org.apache-extras.beanshell:bsh:2.0b6")
testImplementation("org.mockito:mockito-core:4.5.1")
testImplementation("org.jboss.shrinkwrap:shrinkwrap-api:1.2.6")
testImplementation("org.jboss.shrinkwrap:shrinkwrap-impl-base:1.2.6")
testImplementation("org.xmlunit:xmlunit-assertj:2.9.1")
testImplementation("in.jlibs:jlibs-core:3.0.1")
testImplementation("org.gridkit.jvmtool:heaplib:0.2")
testImplementation("org.gridkit.lab:jvm-attach-api:1.5")
testImplementation("commons-io:commons-io:2.15.0")
}

tasks.compileTestGroovy {
Expand Down
2 changes: 1 addition & 1 deletion testng-runner-api/testng-runner-api-build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ plugins {

dependencies {
api(projects.testngCoreApi)
compileOnly("com.github.spotbugs:spotbugs:_")
compileOnly("com.github.spotbugs:spotbugs:4.8.1")
}
16 changes: 8 additions & 8 deletions testng-test-osgi/testng-test-osgi-build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,19 +18,19 @@ dependencies {

testImplementation(projects.testng)

testImplementation("javax:javaee-api:_") {
testImplementation("javax:javaee-api:8.0.1") {
// The dependency was not obvious, logged https://github.com/cbeust/testng/issues/2578
because("PaxExam uses javax.transaction.NotSupportedException and other classes")
}
testImplementation("org.ops4j.pax.exam:pax-exam-container-native:_")
testImplementation("org.ops4j.pax.exam:pax-exam-container-native:4.13.1")
// pax-exam is not yet compatible with junit5
// see https://github.com/ops4j/org.ops4j.pax.exam2/issues/886
testImplementation("org.ops4j.pax.exam:pax-exam-testng:_")
testImplementation("org.ops4j.pax.exam:pax-exam-link-mvn:_")
testImplementation("org.ops4j.pax.url:pax-url-aether:_")
testImplementation("org.apache.felix:org.apache.felix.framework:_")
testImplementation("ch.qos.logback:logback-core:_")
testImplementation("ch.qos.logback:logback-classic:_")
testImplementation("org.ops4j.pax.exam:pax-exam-testng:4.13.5")
testImplementation("org.ops4j.pax.exam:pax-exam-link-mvn:4.13.5")
testImplementation("org.ops4j.pax.url:pax-url-aether:2.6.12")
testImplementation("org.apache.felix:org.apache.felix.framework:7.0.5")
testImplementation("ch.qos.logback:logback-core:1.4.11")
testImplementation("ch.qos.logback:logback-classic:1.4.11")
}

// <editor-fold defaultstate="collapsed" desc="Pass dependency versions to pax-exam container">
Expand Down
4 changes: 2 additions & 2 deletions testng/testng-build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ java {
api(projects.testngAnt)
}
create("guice") {
api(platform("com.google.inject:guice-bom:_"))
api(platform("com.google.inject:guice-bom:5.1.0"))
api("com.google.inject:guice")
}
create("yaml") {
implementation("org.yaml:snakeyaml:_")
implementation("org.yaml:snakeyaml:2.2")
}
}
}
Expand Down
165 changes: 0 additions & 165 deletions versions.properties

This file was deleted.

0 comments on commit d533a88

Please sign in to comment.