Skip to content

Commit 0d70b48

Browse files
temporal-spring-ai: resolve stray merge-conflict markers in build.gradle
The master merge at 5e1e2eb landed with unresolved <<<<<<< markers in the test dependencies block, which broke CI with a Groovy parse error. Keep both test-only deps: spring-ai-mcp for McpPluginTest and spring-ai-retry for the non-retryable-error classification test. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 5e1e2eb commit 0d70b48

1 file changed

Lines changed: 0 additions & 3 deletions

File tree

temporal-spring-ai/build.gradle

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,11 @@ dependencies {
4646
testImplementation "org.mockito:mockito-core:${mockitoVersion}"
4747
testImplementation 'org.springframework.boot:spring-boot-starter-test'
4848
testImplementation 'org.springframework.ai:spring-ai-rag'
49-
<<<<<<< spring-ai/mcp-bean-lookup
5049
// Needed only so McpPluginTest can mock/reference McpSyncClient directly.
5150
testImplementation 'org.springframework.ai:spring-ai-mcp'
52-
=======
5351
// Needed only so tests can reference Spring AI's NonTransientAiException to
5452
// verify the plugin's default retry classification.
5553
testImplementation 'org.springframework.ai:spring-ai-retry'
56-
>>>>>>> master
5754

5855
testRuntimeOnly group: 'ch.qos.logback', name: 'logback-classic', version: "${logbackVersion}"
5956
testRuntimeOnly "org.junit.platform:junit-platform-launcher"

0 commit comments

Comments
 (0)