feat: upgrading dependencies

wiremock · Oct 4, 2024 · b2f8c97 · b2f8c97
1 parent eea3951
commit b2f8c97
Show file tree

Hide file tree

Showing 15 changed files with 130 additions and 126 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,120 +1,110 @@
-apply plugin: 'java-library'
-
 buildscript {
-  repositories {
-    mavenCentral()
-    mavenLocal()
-  }
-  dependencies {
-    classpath 'se.bjurr.gradle:gradle-scripts:2.+'
-    classpath "org.springframework.boot:spring-boot-gradle-plugin:3.2.5"
-  }
+	repositories {
+		maven { url "https://plugins.gradle.org/m2/" }
+		mavenCentral()
+		mavenLocal()
+	}
+	dependencies {
+		classpath 'org.springframework.boot:spring-boot-gradle-plugin:3.3.4'
+		classpath "se.bjurr.gradle:conventional-release-gradle-plugin:0.+"
+		classpath "se.bjurr.gradle:update-versions-gradle-plugin:0.+"
+		classpath "se.bjurr.gradle:java-convention-gradle-plugin:0.+"
+	}
 }
 
+apply plugin: "se.bjurr.gradle.conventional-release"
+
 allprojects {
-  apply plugin: 'java-library'
-
-  project.ext.buildConfig = [
-    repoType: "DEFAULT",
-    sourceCompatibility: 17,
-    targetCompatibility: 17,
-    staticCodeAnalysis: [
-      maxViolations: 0
-    ]
-  ]
-  apply from: project.buildscript.classLoader.getResource('main.gradle').toURI()
-
-  test {
-    useJUnitPlatform()
-  }
-
-  dependencies {
-    testImplementation 'org.assertj:assertj-core:3.25.3'
-    testImplementation platform('org.junit:junit-bom:5.10.2')
-    testImplementation 'org.junit.jupiter:junit-jupiter'
-    testImplementation 'org.junit.platform:junit-platform-launcher'
-  }
+	apply plugin: "se.bjurr.gradle.java-convention"
+	apply plugin: "se.bjurr.gradle.update-versions"
+
+	dependencies {
+		testImplementation 'org.assertj:assertj-core:3.26.3'
+		testImplementation platform('org.junit:junit-bom:5.11.2')
+		testImplementation 'org.junit.jupiter:junit-jupiter'
+		testImplementation 'org.junit.platform:junit-platform-launcher'
+	}
 }
 
 project('wiremock-pact-lib', {
-  def classpathTest = sourceSets.create('classpathTest')
-  configurations[classpathTest.implementationConfigurationName].extendsFrom(configurations.runtimeClasspath)
-  def classpathTestTask = tasks.register('classpathTest', Test) {
-    description = 'Tests that the excluded transitives does not break the library.'
-    group = 'verification'
-    useJUnitPlatform()
-
-    testClassesDirs = classpathTest.output.classesDirs
-    classpath = configurations[classpathTest.runtimeClasspathConfigurationName] + classpathTest.output
-
-    shouldRunAfter(tasks.named('test'))
-  }
-
-  tasks.named('check') {
-    dependsOn(classpathTestTask)
-  }
-
-  dependencies {
-    compileOnly 'org.wiremock:wiremock:3.5.4'
-    implementation('au.com.dius.pact.core:model:4.6.9') {
-      exclude group: "org.apache.groovy", module: "groovy-xml"
-      exclude group: "org.apache.commons", module: "commons-collections4"
-      exclude group: "org.apache.httpcomponents.client5", module: "httpclient5"
-      exclude group: "org.apache.httpcomponents.client5", module: "httpclient5-fluent"
-      exclude group: "com.google.guava", module: "guava"
-      exclude group: "commons-codec", module: "commons-codec"
-      exclude group: "io.ktor", module: "ktor-http-jvm"
-      exclude group: "com.github.mifmif", module: "generex"
-      exclude group: "javax.mail", module: "mail"
-      exclude group: "commons-beanutils", module: "commons-beanutils"
-      exclude group: "au.com.dius.pact.core", module: "pactbroker"
-    }
-
-    testImplementation 'org.wiremock:wiremock:3.5.4'
-    testImplementation "io.rest-assured:rest-assured:5.4.0"
-
-    classpathTestImplementation project
-    classpathTestImplementation 'org.wiremock:wiremock:3.5.4'
-    classpathTestImplementation 'org.assertj:assertj-core:3.25.3'
-    classpathTestImplementation platform('org.junit:junit-bom:5.10.2')
-    classpathTestImplementation 'org.junit.jupiter:junit-jupiter'
-    classpathTestImplementation 'org.junit.platform:junit-platform-launcher'
-  }
+	def classpathTest = sourceSets.create('classpathTest')
+	configurations[classpathTest.implementationConfigurationName].extendsFrom(configurations.runtimeClasspath)
+	def classpathTestTask = tasks.register('classpathTest', Test) {
+		description = 'Tests that the excluded transitives does not break the library.'
+		group = 'verification'
+		useJUnitPlatform()
+
+		testClassesDirs = classpathTest.output.classesDirs
+		classpath = configurations[classpathTest.runtimeClasspathConfigurationName] + classpathTest.output
+
+		shouldRunAfter(tasks.named('test'))
+	}
+
+	tasks.named('check') {
+		dependsOn(classpathTestTask)
+	}
+
+	dependencies {
+		compileOnly 'org.wiremock:wiremock:3.9.1'
+		implementation('au.com.dius.pact.core:model:4.6.14') {
+			exclude group: "org.apache.groovy", module: "groovy-xml"
+			exclude group: "org.apache.commons", module: "commons-collections4"
+			exclude group: "org.apache.httpcomponents.client5", module: "httpclient5"
+			exclude group: "org.apache.httpcomponents.client5", module: "httpclient5-fluent"
+			exclude group: "com.google.guava", module: "guava"
+			exclude group: "commons-codec", module: "commons-codec"
+			exclude group: "io.ktor", module: "ktor-http-jvm"
+			exclude group: "com.github.mifmif", module: "generex"
+			exclude group: "javax.mail", module: "mail"
+			exclude group: "commons-beanutils", module: "commons-beanutils"
+			exclude group: "au.com.dius.pact.core", module: "pactbroker"
+		}
+
+		testImplementation 'org.wiremock:wiremock:3.9.1'
+		testImplementation 'io.rest-assured:rest-assured:5.5.0'
+
+		classpathTestImplementation project
+		classpathTestImplementation 'org.wiremock:wiremock:3.9.1'
+		classpathTestImplementation 'org.assertj:assertj-core:3.26.3'
+		classpathTestImplementation platform('org.junit:junit-bom:5.11.2')
+		classpathTestImplementation 'org.junit.jupiter:junit-jupiter'
+		classpathTestImplementation 'org.junit.platform:junit-platform-launcher'
+	}
 })
 
 project('wiremock-pact-extension-junit5', {
-  dependencies {
-    api project(':wiremock-pact-lib')
-    compileOnly platform('org.junit:junit-bom:5.10.2')
-    compileOnly 'org.junit.jupiter:junit-jupiter'
-    compileOnly 'org.wiremock:wiremock:3.5.4'
-
-    testImplementation 'org.wiremock:wiremock:3.5.4'
-  }
+	dependencies {
+		api project(':wiremock-pact-lib')
+		compileOnly platform('org.junit:junit-bom:5.11.2')
+		compileOnly 'org.junit.jupiter:junit-jupiter'
+		compileOnly 'org.wiremock:wiremock:3.9.1'
+
+		testImplementation 'org.wiremock:wiremock:3.9.1'
+	}
 })
 
 project('wiremock-pact-example-springboot-app', {
-  apply plugin: "org.springframework.boot"
-  apply plugin: 'io.spring.dependency-management'
-
-  dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter-web'
-    implementation 'org.springframework.boot:spring-boot-starter-actuator'
-    implementation 'jakarta.ws.rs:jakarta.ws.rs-api:3.1.0'
-    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.17.0'
-    implementation 'com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider:2.17.0'
-    implementation 'org.jboss.resteasy:resteasy-client:6.2.8.Final'
-
-    testImplementation project(':wiremock-pact-extension-junit5')
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
-    testImplementation 'com.maciejwalkowiak.spring:wiremock-spring-boot:2.1.2'
-  }
-
-  bootJar {
-    enabled = false
-  }
-
-  jar {
-    enabled = true
-  }
+	apply plugin: "org.springframework.boot"
+	apply plugin: 'io.spring.dependency-management'
+
+	dependencies {
+		implementation 'org.springframework.boot:spring-boot-starter-web'
+		implementation 'org.springframework.boot:spring-boot-starter-actuator'
+		implementation 'jakarta.ws.rs:jakarta.ws.rs-api:4.0.0'
+		implementation 'com.fasterxml.jackson.datatype:jackson-datatype-joda:2.18.0'
+		implementation 'com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider:2.18.0'
+		implementation 'org.jboss.resteasy:resteasy-client:6.2.10.Final'
+
+		testImplementation project(':wiremock-pact-extension-junit5')
+		testImplementation 'org.springframework.boot:spring-boot-starter-test'
+		testImplementation 'com.maciejwalkowiak.spring:wiremock-spring-boot:2.1.3'
+	}
+
+	bootJar {
+		enabled = false
+	}
+
+	jar {
+		enabled = true
+	}
 })
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,5 @@
-#Mon Sep 16 17:49:33 CEST 2024
+#
+#Fri Oct 04 17:52:54 CEST 2024
 description="Transform Wiremock mappings to PACT."
-version=0.6.1
 group=se.bjurr.wiremockpact
+version=0.6.2
diff --git a/settings.gradle b/settings.gradle
@@ -1,3 +1,11 @@
-rootProject.name = 'wiremock-pact'   
+pluginManagement {
+	repositories {
+		mavenLocal()
+		mavenCentral()
+		gradlePluginPortal()
+	}
+}
+
+rootProject.name = 'wiremock-pact'
 
 include 'wiremock-pact-lib', 'wiremock-pact-extension-junit5', 'wiremock-pact-example-springboot-app'
diff --git a/...mple-springboot-app/src/test/resources/pact-json/WireMockPactExample-UnknownProvider.json b/...mple-springboot-app/src/test/resources/pact-json/WireMockPactExample-UnknownProvider.json
@@ -120,7 +120,7 @@
   ],
   "metadata": {
     "pact-jvm": {
-      "version": "4.6.9"
+      "version": "4.6.14"
     },
     "pactSpecification": {
       "version": "4.0"

diff --git a/...le-springboot-app/src/test/resources/pact-json/WireMockPactExample-some-other-system.json b/...le-springboot-app/src/test/resources/pact-json/WireMockPactExample-some-other-system.json
@@ -45,7 +45,7 @@
   ],
   "metadata": {
     "pact-jvm": {
-      "version": "4.6.9"
+      "version": "4.6.14"
     },
     "pactSpecification": {
       "version": "4.0"

diff --git a/wiremock-pact-example-springboot-app/src/test/resources/wiremock/mappings/get-animal_1.json b/wiremock-pact-example-springboot-app/src/test/resources/wiremock/mappings/get-animal_1.json
@@ -15,7 +15,9 @@
   "metadata": {
     "wireMockPactSettings": {
       "provider": "some-other-system",
-      "providerStates": ["state1"]
+      "providerStates": [
+        "state1"
+      ]
     }
   }
 }
diff --git a/wiremock-pact-example-springboot-app/src/test/resources/wiremock/mappings/get-animals.json b/wiremock-pact-example-springboot-app/src/test/resources/wiremock/mappings/get-animals.json
@@ -14,7 +14,10 @@
   "uuid": "d68fb4e2-48ed-40d2-bc73-0a18f54f3ece",
   "metadata": {
     "wireMockPactSettings": {
-      "providerStates": ["state1", "state2"]
+      "providerStates": [
+        "state1",
+        "state2"
+      ]
     }
   }
 }
diff --git a/...act-lib/src/classpathTest/java/se/bjurr/wiremockpact/wiremockpact/test/ClasspathTest.java b/...act-lib/src/classpathTest/java/se/bjurr/wiremockpact/wiremockpact/test/ClasspathTest.java
@@ -229,7 +229,7 @@ public static void after() {
   ],
   "metadata": {
     "pact-jvm": {
-      "version": "4.6.9"
+      "version": "4.6.14"
     },
     "pactSpecification": {
       "version": "4.0"

diff --git a/wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/ExampleTest.java b/wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/ExampleTest.java
@@ -144,7 +144,7 @@ public static void after() {
   ],
   "metadata": {
     "pact-jvm": {
-      "version": "4.6.9"
+      "version": "4.6.14"
     },
     "pactSpecification": {
       "version": "4.0"
@@ -206,7 +206,7 @@ public static void after() {
   ],
   "metadata": {
     "pact-jvm": {
-      "version": "4.6.9"
+      "version": "4.6.14"
     },
     "pactSpecification": {
       "version": "4.0"

diff --git a/wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/GetTest.java b/wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/GetTest.java
@@ -63,7 +63,7 @@ public void testThatSingleGetRequestCanGeneratePact() {
   ],
   "metadata": {
     "pact-jvm": {
-      "version": "4.6.9"
+      "version": "4.6.14"
     },
     "pactSpecification": {
       "version": "4.0"
@@ -197,7 +197,7 @@ public void testThatSingleGetRequestCanGeneratePact_3_invocations() {
   ],
   "metadata": {
     "pact-jvm": {
-      "version": "4.6.9"
+      "version": "4.6.14"
     },
     "pactSpecification": {
       "version": "4.0"
@@ -353,7 +353,7 @@ public void testThatSingleGetRequestCanGeneratePact_3_invocations_query() {
   ],
   "metadata": {
     "pact-jvm": {
-      "version": "4.6.9"
+      "version": "4.6.14"
     },
     "pactSpecification": {
       "version": "4.0"

diff --git a/wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/HeadersTest.java b/wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/HeadersTest.java
@@ -75,7 +75,7 @@ public void testThatSingleHeaderIsRecorded() {
   ],
   "metadata": {
     "pact-jvm": {
-      "version": "4.6.9"
+      "version": "4.6.14"
     },
     "pactSpecification": {
       "version": "4.0"

diff --git a/wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/NotMatchedTest.java b/wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/NotMatchedTest.java
@@ -63,7 +63,7 @@ public void testRequestNotMatching() {
   ],
   "metadata": {
     "pact-jvm": {
-      "version": "4.6.9"
+      "version": "4.6.14"
     },
     "pactSpecification": {
       "version": "4.0"

diff --git a/wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/PostTest.java b/wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/PostTest.java
@@ -76,7 +76,7 @@ public void testThatSingleGetRequestCanGeneratePact() {
   ],
   "metadata": {
     "pact-jvm": {
-      "version": "4.6.9"
+      "version": "4.6.14"
     },
     "pactSpecification": {
       "version": "4.0"
@@ -249,7 +249,7 @@ public void testThatSingleGetRequestCanGeneratePact_3_invocations() {
   ],
   "metadata": {
     "pact-jvm": {
-      "version": "4.6.9"
+      "version": "4.6.14"
     },
     "pactSpecification": {
       "version": "4.0"
@@ -444,7 +444,7 @@ public void testThatSingleGetRequestCanGeneratePact_3_invocations_query() {
   ],
   "metadata": {
     "pact-jvm": {
-      "version": "4.6.9"
+      "version": "4.6.14"
     },
     "pactSpecification": {
       "version": "4.0"

diff --git a/wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/QueryParamsTest.java b/wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/QueryParamsTest.java
@@ -70,7 +70,7 @@ public void testThatSingleHeaderIsRecorded() {
           ],
           "metadata": {
             "pact-jvm": {
-              "version": "4.6.9"
+              "version": "4.6.14"
             },
             "pactSpecification": {
               "version": "4.0"

diff --git a/wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/ScenarioTest.java b/wiremock-pact-lib/src/test/java/se/bjurr/wiremockpact/wiremockpact/test/ScenarioTest.java
@@ -184,7 +184,7 @@ public void testThatProviderStateIsSetFromScenario() {
   ],
   "metadata": {
     "pact-jvm": {
-      "version": "4.6.9"
+      "version": "4.6.14"
     },
     "pactSpecification": {
       "version": "4.0"