Move spring-retry from spring-amqp to spring-rabbit

The Spring Retry project is phasing out, plus there is really no
reason to keep extra dependency in the SPI module.

Author: artembilan

build.gradle

@@ -300,9 +300,6 @@ project('spring-amqp') {
 
 	dependencies {
 		api 'org.springframework:spring-core'
-		api("org.springframework.retry:spring-retry:$springRetryVersion") {
-			exclude group: 'org.springframework'
-		}
 		optionalApi 'org.springframework:spring-messaging'
 		optionalApi 'org.springframework:spring-oxm'
 		optionalApi 'org.springframework:spring-context'
@@ -357,6 +354,9 @@ project('spring-rabbit') {
 		api 'org.springframework:spring-messaging'
 		api 'org.springframework:spring-tx'
 		api 'io.micrometer:micrometer-observation'
+		api("org.springframework.retry:spring-retry:$springRetryVersion") {
+			exclude group: 'org.springframework'
+		}
 
 		optionalApi 'org.springframework:spring-aop'
 		optionalApi 'org.springframework:spring-webflux'

spring-amqp/src/main/java/org/springframework/amqp/support/SendRetryContextAccessor.java

@@ -20,12 +20,14 @@
 
 import org.springframework.amqp.core.Address;
 import org.springframework.amqp.core.Message;
-import org.springframework.retry.RetryContext;
+import org.springframework.core.AttributeAccessor;
 
 /**
  * Type safe accessor for retried message sending.
  *
  * @author Gary Russell
+ * @author Artem Bilan
+ *
  * @since 2.0.6
  *
  */
@@ -50,7 +52,7 @@ private SendRetryContextAccessor() {
 	 * @return the message.
 	 * @see #MESSAGE
 	 */
-	public static @Nullable Message getMessage(RetryContext context) {
+	public static @Nullable Message getMessage(AttributeAccessor context) {
 		return (Message) context.getAttribute(MESSAGE);
 	}
 
@@ -60,7 +62,7 @@ private SendRetryContextAccessor() {
 	 * @return the address.
 	 * @see #ADDRESS
 	 */
-	public static @Nullable Address getAddress(RetryContext context) {
+	public static @Nullable Address getAddress(AttributeAccessor context) {
 		return (Address) context.getAttribute(ADDRESS);
 	}