Merge branch '4.0.x'

spring-cloud · Dec 7, 2023 · 4d07b8d · 4d07b8d
2 parents 2b81c31 + 44c4ab0
commit 4d07b8d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/docs/pom.xml b/docs/pom.xml
@@ -15,7 +15,7 @@
 	<name>Spring Cloud Contract Docs</name>
 	<description>Spring Cloud Contract Docs</description>
 	<properties>
-		<jackson-module-jsonSchema.version>2.14.2</jackson-module-jsonSchema.version>
+		<jackson-module-jsonSchema.version>2.14.3</jackson-module-jsonSchema.version>
 		<docs.main>spring-cloud-contract</docs.main>
 		<main.basedir>${basedir}/..</main.basedir>
 		<configprops.inclusionPattern>spring.cloud.*</configprops.inclusionPattern>

diff --git a/pom.xml b/pom.xml
@@ -55,7 +55,7 @@
 		<hamcrest.version>2.2</hamcrest.version>
 
 		<!-- We need to have compatibility with Gradle -->
-		<groovy.version>4.0.0</groovy.version>
+		<groovy.version>4.0.16</groovy.version>
 		<!-- We need to have compatibility with Boot -->
 		<maven.version>3.6.3</maven.version>
 		<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>

diff --git a/...ringframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.java b/...ringframework/cloud/contract/verifier/plugin/SpringCloudContractVerifierGradlePlugin.java
@@ -182,6 +182,8 @@ public void apply(Project project) {
 
 	private SourceSet configureSourceSets(ContractVerifierExtension extension, JavaPluginExtension javaExtension, SourceSet contractTest) {
 		SourceSetContainer sourceSets = javaExtension.getSourceSets();
+		ConfigurationContainer configurations = project.getConfigurations();
+		ObjectFactory objects = project.getObjects();
 		contractTest.getJava().srcDirs(extension.getGeneratedTestJavaSourcesDir());
 		project.getPlugins().withType(GroovyPlugin.class, groovyPlugin -> {
 			GroovySourceDirectorySet groovy = contractTest.getExtensions().getByType(GroovySourceDirectorySet.class);
@@ -192,11 +194,11 @@ private SourceSet configureSourceSets(ContractVerifierExtension extension, JavaP
 		SourceSetOutput mainOutput = sourceSets.getByName(SourceSet.MAIN_SOURCE_SET_NAME).getOutput();
 		SourceSetOutput testOutput = sourceSets.getByName(SourceSet.TEST_SOURCE_SET_NAME).getOutput();
 
-		FileCollection compileClasspath = contractTest.getCompileClasspath();
-		contractTest.setCompileClasspath(compileClasspath.plus(mainOutput).plus(testOutput));
+		Configuration contractTestCompileClasspathConfiguration = configurations.getByName(contractTest.getCompileClasspathConfigurationName());
+		Configuration contractTestRuntimeClasspathConfiguration = configurations.getByName(contractTest.getRuntimeClasspathConfigurationName());
 
-		FileCollection runtimeClasspath = contractTest.getRuntimeClasspath();
-		contractTest.setRuntimeClasspath(runtimeClasspath.plus(mainOutput).plus(testOutput));
+		contractTest.setCompileClasspath(objects.fileCollection().from(testOutput, mainOutput, contractTestCompileClasspathConfiguration));
+		contractTest.setRuntimeClasspath(objects.fileCollection().from(contractTest.getOutput(), testOutput, mainOutput, contractTestRuntimeClasspathConfiguration));
 		return contractTest;
 	}