SpringCloud/spring-cloud-contract
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.1.x' into 4.0.x

Browse Source
This commit is contained in:
Marcin Grzejszczak
2023-06-29 11:16:33 +02:00
parent 38fb1bd81e 17a5fa0c5d
commit 2d11471dbb
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker/spring-cloud-contract-docker/project/build.gradle
View File

@@ -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" }
}
}

4
pom.xml
View File

@@ -37,7 +37,7 @@
<spock-spring.version>2.3-groovy-4.0</spock-spring.version> <!-- @releaser:version-check-off -->
<hoverfly-junit.version>0.2.2</hoverfly-junit.version>
<commons-text.version>1.10.0</commons-text.version>
<handlebars.version>4.3.0</handlebars.version>
<handlebars.version>4.3.1</handlebars.version>
<jgit.version>6.3.0.202209071007-r</jgit.version>
<javax-inject.version>1</javax-inject.version>
<json-unit-assertj.version>2.32.0</json-unit-assertj.version>
@@ -65,7 +65,7 @@
<jacoco-maven-plugin.version>0.8.8</jacoco-maven-plugin.version>
<exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
<InMemoryJavaCompiler.version>1.3.0</InMemoryJavaCompiler.version>
<thin-jar.version>1.0.27.RELEASE</thin-jar.version>
<thin-jar.version>1.0.30.RELEASE</thin-jar.version>
<contract.kotlin.version>1.6.21</contract.kotlin.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>

4
spring-cloud-contract-tools/spring-cloud-contract-gradle-plugin/src/main/java/org/springframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.java
View File

@@ -125,7 +125,7 @@ public class SpringCloudContractVerifierGradlePlugin implements Plugin<Project>
TaskProvider<GenerateClientStubsFromDslTask> generateClientStubs = registerGenerateClientStubsTask(
extension, copyContracts);
registerStubsJarTask(extension, generateClientStubs);
registerStubsJarTask(extension, copyContracts, generateClientStubs);
TaskProvider<GenerateServerTestsTask> generateServerTestsTaskProvider =
registerGenerateServerTestsTask(extension, copyContracts);
registerPublishStubsToScmTask(extension, generateClientStubs);
@@ -342,6 +342,7 @@ public class SpringCloudContractVerifierGradlePlugin implements Plugin<Project>
}
private void registerStubsJarTask(ContractVerifierExtension extension,
TaskProvider<ContractsCopyTask> copyContracts,
TaskProvider<GenerateClientStubsFromDslTask> generateClientStubs) {
TaskProvider<Jar> verifierStubsJar = project.getTasks().register(VERIFIER_STUBS_JAR_TASK_NAME, Jar.class);
verifierStubsJar.configure(stubsJar -> {
@@ -351,6 +352,7 @@ public class SpringCloudContractVerifierGradlePlugin implements Plugin<Project>
stubsJar.getArchiveClassifier().convention(extension.getStubsSuffix());
stubsJar.from(extension.getStubsOutputDir());
stubsJar.dependsOn(copyContracts);
stubsJar.dependsOn(generateClientStubs);
});
project.artifacts(artifactHandler -> artifactHandler.add("archives", verifierStubsJar));