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 e4dc266fd2..ba054091e7 100644 --- a/pom.xml +++ b/pom.xml @@ -37,7 +37,7 @@ 2.3-groovy-4.0 0.2.2 1.10.0 - 4.3.0 + 4.3.1 6.3.0.202209071007-r 1 2.32.0 @@ -65,7 +65,7 @@ 0.8.8 1.6.0 1.3.0 - 1.0.27.RELEASE + 1.0.30.RELEASE 1.6.21 1.9.4 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 62c1c37dcb..332f41d92a 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 @@ -125,7 +125,7 @@ public class SpringCloudContractVerifierGradlePlugin implements Plugin TaskProvider generateClientStubs = registerGenerateClientStubsTask( extension, copyContracts); - registerStubsJarTask(extension, generateClientStubs); + registerStubsJarTask(extension, copyContracts, generateClientStubs); TaskProvider generateServerTestsTaskProvider = registerGenerateServerTestsTask(extension, copyContracts); registerPublishStubsToScmTask(extension, generateClientStubs); @@ -342,6 +342,7 @@ public class SpringCloudContractVerifierGradlePlugin implements Plugin } private void registerStubsJarTask(ContractVerifierExtension extension, + TaskProvider copyContracts, TaskProvider generateClientStubs) { TaskProvider verifierStubsJar = project.getTasks().register(VERIFIER_STUBS_JAR_TASK_NAME, Jar.class); verifierStubsJar.configure(stubsJar -> { @@ -351,6 +352,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));