Upgrade to SA-2.0.4

* Fix deprecation in the `AmqpChannelParserTests`

Author: artembilan

build.gradle

@@ -146,7 +146,7 @@ subprojects { subproject ->
 		romeToolsVersion = '1.8.0'
 		servletApiVersion = '4.0.0'
 		smackVersion = '4.2.2'
-		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.3.RELEASE'
+		springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.0.4.RELEASE'
 		springDataJpaVersion = '2.0.7.RELEASE'
 		springDataMongoVersion = '2.0.7.RELEASE'
 		springDataRedisVersion = '2.0.7.RELEASE'

spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpChannelParserTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2017 the original author or authors.
+ * Copyright 2002-2018 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,14 +42,16 @@
 import org.springframework.integration.support.utils.IntegrationUtils;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.messaging.MessageChannel;
-import org.springframework.messaging.support.ChannelInterceptorAdapter;
+import org.springframework.messaging.support.ChannelInterceptor;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 /**
  * @author Mark Fisher
  * @author Gary Russell
+ * @author Artem Bilan
+ *
  * @since 2.1
  */
 @ContextConfiguration
@@ -119,7 +121,8 @@ private void checkExtract(AbstractAmqpChannel channel) {
 		assertTrue(TestUtils.getPropertyValue(channel, "extractPayload", Boolean.class));
 	}
 
-	private static class TestInterceptor extends ChannelInterceptorAdapter {
+	private static class TestInterceptor implements ChannelInterceptor {
+
 	}
 
 }