Merge branch 'main' into part2

trask · web-flow · commit 9fa6e28d8615 · 2025-11-18T18:15:59.000-05:00
diff --git a/instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts b/instrumentation/spring/spring-rabbit-1.0/javaagent/build.gradle.kts
@@ -21,6 +21,8 @@ dependencies {
   testLibrary("org.springframework.amqp:spring-rabbit:2.1.7.RELEASE")
   testLibrary("org.springframework.boot:spring-boot-starter-test:1.5.22.RELEASE")
   testLibrary("org.springframework.boot:spring-boot-starter:1.5.22.RELEASE")
+  // spring-retry is required by org.springframework.amqp:spring-rabbit:4.0.0
+  testLibrary("org.springframework.retry:spring-retry")
 }
 
 tasks {

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ dependencies {`
`21`	`21`	`testLibrary("org.springframework.amqp:spring-rabbit:2.1.7.RELEASE")`
`22`	`22`	`testLibrary("org.springframework.boot:spring-boot-starter-test:1.5.22.RELEASE")`
`23`	`23`	`testLibrary("org.springframework.boot:spring-boot-starter:1.5.22.RELEASE")`
	`24`	`+ // spring-retry is required by org.springframework.amqp:spring-rabbit:4.0.0`
	`25`	`+ testLibrary("org.springframework.retry:spring-retry")`
`24`	`26`	`}`
`25`	`27`
`26`	`28`	`tasks {`