Upgrade versions

dgroomes · Jul 17, 2021 · bfaf316 · bfaf316
1 parent 793573e
commit bfaf316
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 41 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,8 +1,3 @@
-val wireMockVersion = "2.26.3"
-val junitJupiterVersion = "5.6.0"
-val assertJVersion = "3.15.0"
-val slf4jVersion = "1.7.30"
-
 val dependencyConstraints = project(":dependency-constraints")
 configure(allprojects.minus(dependencyConstraints)) {
     apply(plugin = "java")

diff --git a/dependency-constraints/build.gradle.kts b/dependency-constraints/build.gradle.kts
@@ -7,28 +7,14 @@ plugins {
     `java-platform`
 }
 
-val wireMockVersion = "2.26.3"
-val junitJupiterVersion = "5.6.0"
-val assertJVersion = "3.15.0"
-val slf4jVersion = "1.7.30"
+val slf4jVersion = "1.7.30" // releases: http://www.slf4j.org/news.html
+val wireMockVersion = "2.29.1" // releases: https://github.com/tomakehurst/wiremock/tags
 
 dependencies {
     constraints {
-        /**
-         * For some reason, using the overloaded method `api(group: String, name: String, version: String)` causes the
-         * Gradle configuration phase to fail with the error "Adding dependencies to platforms is not allowed by default."
-         * So instead I am using the method `api(constraintNotation: String)`. But shouldn't I be able to use the former
-         * method overload? Is this a defect? From the JavaDoc, it actually suggests that the former "adds a dependency"
-         * while the latter "adds a dependency constraint" so that suggests it is not a defect. But from a user perspective,
-         * the method calls convey the same information so I would guess they should do the same thing. But they don't.
-         */
-     // api("com.github.tomakehurst", "wiremock-jre8", wireMockVersion) // This form causes Gradle to fail
-        api("com.github.tomakehurst:wiremock-jre8:$wireMockVersion")    // This form works (and is indeed the form that the official Gradle example uses)
         api("org.slf4j:slf4j-api:$slf4jVersion")
         api("org.slf4j:slf4j-simple:$slf4jVersion")
-        api("com.github.tomakehurst:wiremock-standalone:$wireMockVersion")
-        api("org.assertj:assertj-core:$assertJVersion")
-        api("org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion")
-        api("org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion")
+        api("com.github.tomakehurst:wiremock-jre8:$wireMockVersion")
+        api("com.github.tomakehurst:wiremock-jre8-standalone:$wireMockVersion")
     }
 }
diff --git a/programmatic/build.gradle.kts b/programmatic/build.gradle.kts
@@ -2,10 +2,6 @@ dependencies {
     implementation(group = "com.github.tomakehurst", name = "wiremock-jre8")
     implementation(group = "org.slf4j", name = "slf4j-api")
     implementation(group = "org.slf4j", name = "slf4j-simple")
-
-    testImplementation(group = "org.assertj", name = "assertj-core")
-    testImplementation(group = "org.junit.jupiter", name = "junit-jupiter-api")
-    testRuntimeOnly(group = "org.junit.jupiter", name = "junit-jupiter-engine")
 }
 
 application {

diff --git a/programmatic/src/test/java/dgroomes/wiremock/ProgrammaticMainTest.java b/programmatic/src/test/java/dgroomes/wiremock/ProgrammaticMainTest.java
diff --git a/standalone/build.gradle.kts b/standalone/build.gradle.kts
@@ -1,5 +1,5 @@
 dependencies {
-    implementation(group = "com.github.tomakehurst", name = "wiremock-standalone")
+    implementation(group = "com.github.tomakehurst", name = "wiremock-jre8-standalone")
 }
 
 application {