From a9fa5aacea5577cae98e0260e0d7e34eef53383f Mon Sep 17 00:00:00 2001 From: Lauri Tulmin Date: Fri, 31 Mar 2023 11:26:06 +0300 Subject: [PATCH] Add testcontainersBuildService to spring kafka tests that don't have it (#8186) --- .../spring/spring-boot-autoconfigure/build.gradle.kts | 2 ++ .../spring/spring-kafka-2.7/library/build.gradle.kts | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts b/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts index 7bb99d5cb6..68aa2dc6b9 100644 --- a/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts +++ b/instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts @@ -81,6 +81,8 @@ tasks.compileTestJava { } tasks.withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) + systemProperty("testLatestDeps", latestDepTest) // required on jdk17 diff --git a/instrumentation/spring/spring-kafka-2.7/library/build.gradle.kts b/instrumentation/spring/spring-kafka-2.7/library/build.gradle.kts index 858b8449c8..66499b5c30 100644 --- a/instrumentation/spring/spring-kafka-2.7/library/build.gradle.kts +++ b/instrumentation/spring/spring-kafka-2.7/library/build.gradle.kts @@ -22,6 +22,10 @@ dependencies { testLibrary("org.springframework.boot:spring-boot-starter:2.5.3") } +tasks.withType().configureEach { + usesService(gradle.sharedServices.registrations["testcontainersBuildService"].service) +} + val latestDepTest = findProperty("testLatestDeps") as Boolean // spring 6 (which spring-kafka 3.+ uses) requires java 17