From 9a071f2b58876da92ed99c3a9c7df5ea2a19843c Mon Sep 17 00:00:00 2001 From: Shannon Pamperl Date: Tue, 27 Jun 2023 07:59:02 -0500 Subject: [PATCH 1/6] Add dependency on copyContracts (#1913) * Re-enable full exception logging * Add dependency on copyContracts --- samples/standalone/dsl/http-server/build.gradle | 6 +++--- .../plugin/SpringCloudContractVerifierGradlePlugin.java | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/samples/standalone/dsl/http-server/build.gradle b/samples/standalone/dsl/http-server/build.gradle index cf0135b58e..b62fa49a03 100644 --- a/samples/standalone/dsl/http-server/build.gradle +++ b/samples/standalone/dsl/http-server/build.gradle @@ -45,9 +45,9 @@ dependencies { contractTest { useJUnitPlatform() systemProperty 'spring.profiles.active', 'gradle' - // testLogging { - // exceptionFormat = 'full' - // } + testLogging { + exceptionFormat = 'full' + } afterSuite { desc, result -> if (!desc.parent) { println "Results: (${result.testCount} tests, ${result.successfulTestCount} successes, ${result.failedTestCount} failures, ${result.skippedTestCount} skipped)" diff --git a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.java b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.java index 6acf78b05a..28f849552d 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.java +++ b/spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.java @@ -103,7 +103,7 @@ public class SpringCloudContractVerifierGradlePlugin implements Plugin TaskProvider generateClientStubs = createAndConfigureGenerateClientStubs( extension, copyContracts); - createAndConfigureStubsJarTasks(extension, generateClientStubs); + createAndConfigureStubsJarTasks(extension, copyContracts, generateClientStubs); createGenerateTestsTask(extension, contractTestSourceSet, copyContracts); createAndConfigurePublishStubsToScmTask(extension, generateClientStubs); @@ -308,6 +308,7 @@ public class SpringCloudContractVerifierGradlePlugin implements Plugin } private void createAndConfigureStubsJarTasks(ContractVerifierExtension extension, + TaskProvider copyContracts, TaskProvider generateClientStubs) { TaskProvider verifierStubsJar = project.getTasks().register(VERIFIER_STUBS_JAR_TASK_NAME, Jar.class); verifierStubsJar.configure(stubsJar -> { @@ -317,6 +318,7 @@ public class SpringCloudContractVerifierGradlePlugin implements Plugin stubsJar.getArchiveClassifier().convention(extension.getStubsSuffix()); stubsJar.from(extension.getStubsOutputDir()); + stubsJar.dependsOn(copyContracts); stubsJar.dependsOn(generateClientStubs); }); project.artifacts(artifactHandler -> artifactHandler.add("archives", verifierStubsJar)); From 98b3c5de2b4919b9c48a43d83ef1dccd8e6d17d1 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 29 Jun 2023 10:29:15 +0200 Subject: [PATCH 2/6] Trying to fix docker setup with gradle and thin jar --- docker/spring-cloud-contract-docker/project/build.gradle | 4 ++-- pom.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker/spring-cloud-contract-docker/project/build.gradle b/docker/spring-cloud-contract-docker/project/build.gradle index f169b70645..83ec6aa1dc 100644 --- a/docker/spring-cloud-contract-docker/project/build.gradle +++ b/docker/spring-cloud-contract-docker/project/build.gradle @@ -52,10 +52,10 @@ version = getProp(envVars, "PROJECT_VERSION") ?: '0.0.1-SNAPSHOT' repositories { mavenLocal() mavenCentral() - if (!"${verifierVersion}".contains("RELEASE")) { + if ("${verifierVersion}".contains("SNAPSHOT")) { maven { url "https://repo.spring.io/snapshot" } + } else if ("${verifierVersion}".contains("M") || "${verifierVersion}".contains("RC")) { maven { url "https://repo.spring.io/milestone" } - maven { url "https://repo.spring.io/release" } } } diff --git a/pom.xml b/pom.xml index 818c7b8a88..44e0e9904f 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 0.8.5 1.6.0 1.3.0 - 1.0.27.RELEASE + 1.0.30.RELEASE 1.5.20 1.9.4 From dd6cb86be4ebc5058d76e84db8c59935b70f3a98 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 29 Jun 2023 10:30:16 +0200 Subject: [PATCH 3/6] Upgraded Camel to 3.14.9 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 44e0e9904f..ef7fdd7f74 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ - 3.14.5 + 3.14.9 4.1.38 0.0.9 3.1.8-SNAPSHOT From 559510e991490252731927199fbca072b7d1e5f1 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 29 Jun 2023 10:31:47 +0200 Subject: [PATCH 4/6] Upgraded pact to 4.1.41 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index ef7fdd7f74..06c838b426 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 3.14.9 - 4.1.38 + 4.1.41 0.0.9 3.1.8-SNAPSHOT 3.1.4-SNAPSHOT From e692110a1588c9b1a57cd21421d720c4059e53d2 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 29 Jun 2023 10:32:30 +0200 Subject: [PATCH 5/6] Upgraded handlebars to 4.3.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 06c838b426..988397df78 100644 --- a/pom.xml +++ b/pom.xml @@ -39,7 +39,7 @@ 2.0-M5-groovy-3.0 0.2.2 1.10.0 - 4.3.0 + 4.3.1 5.13.1.202206130422-r 1 2.27.0 From 17a5fa0c5d1e1ec8a992b9d2f9b50911b4222330 Mon Sep 17 00:00:00 2001 From: Marcin Grzejszczak Date: Thu, 29 Jun 2023 11:03:32 +0200 Subject: [PATCH 6/6] Fixed broken pact tests --- .../verifier/spec/pact/PactContractConverterSpec.groovy | 2 +- .../test/resources/contracts/grouped/shouldWorkWithBeer.json | 2 +- .../test/resources/contracts/shouldConvertAllGenerators.json | 2 +- .../src/test/resources/contracts/shouldMarkClientAsFraud.json | 2 +- .../test/resources/contracts/shouldMarkClientAsNotFraud.json | 2 +- .../src/test/resources/contracts/shouldReturnFraudStats.json | 2 +- .../resources/contracts/shouldSendMessageWhenBookReturned.json | 2 +- .../contracts/shouldSendMessageWhenMessageReceived.json | 2 +- .../resources/contracts/shouldVerifyWhenBookWasDeleted.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/verifier/spec/pact/PactContractConverterSpec.groovy b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/verifier/spec/pact/PactContractConverterSpec.groovy index 63028e0dda..ffc1458ab7 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/verifier/spec/pact/PactContractConverterSpec.groovy +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/groovy/org/springframework/cloud/contract/verifier/spec/pact/PactContractConverterSpec.groovy @@ -347,7 +347,7 @@ class PactContractConverterSpec extends Specification { ], "metadata": { "pact-jvm": { - "version": "4.1.38" + "version": "4.1.41" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/grouped/shouldWorkWithBeer.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/grouped/shouldWorkWithBeer.json index 27fa2f4470..a3117a124c 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/grouped/shouldWorkWithBeer.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/grouped/shouldWorkWithBeer.json @@ -147,7 +147,7 @@ ], "metadata": { "pact-jvm": { - "version": "4.1.38" + "version": "4.1.41" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldConvertAllGenerators.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldConvertAllGenerators.json index 7c87121530..5eb49d61dd 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldConvertAllGenerators.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldConvertAllGenerators.json @@ -290,7 +290,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "4.1.38" + "version": "4.1.41" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsFraud.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsFraud.json index 0b0f2b57c5..5834b44f01 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsFraud.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsFraud.json @@ -98,7 +98,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "4.1.38" + "version": "4.1.41" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsNotFraud.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsNotFraud.json index 51133d2c38..67920d994f 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsNotFraud.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldMarkClientAsNotFraud.json @@ -90,7 +90,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "4.1.38" + "version": "4.1.41" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldReturnFraudStats.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldReturnFraudStats.json index dac7e96c94..0ef9aa2883 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldReturnFraudStats.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldReturnFraudStats.json @@ -70,7 +70,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "4.1.38" + "version": "4.1.41" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenBookReturned.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenBookReturned.json index dab98cb87c..3c9f288dbf 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenBookReturned.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenBookReturned.json @@ -39,7 +39,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "4.1.38" + "version": "4.1.41" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenMessageReceived.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenMessageReceived.json index a41dc948cf..d9c0315e55 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenMessageReceived.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldSendMessageWhenMessageReceived.json @@ -38,7 +38,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "4.1.38" + "version": "4.1.41" } } } diff --git a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldVerifyWhenBookWasDeleted.json b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldVerifyWhenBookWasDeleted.json index d7995426e5..f5e2ce1cf7 100644 --- a/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldVerifyWhenBookWasDeleted.json +++ b/spring-cloud-contract-tools/spring-cloud-contract-pact/src/test/resources/contracts/shouldVerifyWhenBookWasDeleted.json @@ -22,7 +22,7 @@ "version": "3.0.0" }, "pact-jvm": { - "version": "4.1.38" + "version": "4.1.41" } } }