diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java
index 4204c85966..c3ba65e68f 100644
--- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java
+++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java
@@ -63,13 +63,14 @@ public class JmsDestinationPollingSource extends AbstractJmsTemplateBasedAdapter
 		this.extractPayload = extractPayload;
 	}
 
+	@SuppressWarnings("unchecked")
 	public Message<Object> receive() {
 		Object receivedObject = this.getJmsTemplate().receiveAndConvert();
 		if (receivedObject == null) {
 			return null;
 		}
 		if (receivedObject instanceof Message) {
-			return (Message<Object>) receivedObject;
+			return (Message) receivedObject;
 		}
 		return new GenericMessage<Object>(receivedObject);
 	}
diff --git a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/StubMarshaller.java b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/StubMarshaller.java
index 7fea47e992..4033cd4257 100644
--- a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/StubMarshaller.java
+++ b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/StubMarshaller.java
@@ -28,6 +28,7 @@ import org.springframework.oxm.XmlMappingException;
  */
 public class StubMarshaller implements Marshaller {
 
+	@SuppressWarnings("unchecked")
 	public boolean supports(Class clazz) {
 		return false;
 	}
diff --git a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/StubMarshallerAndUnmarshaller.java b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/StubMarshallerAndUnmarshaller.java
index a3a8428ad3..bcf4a6fe49 100644
--- a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/StubMarshallerAndUnmarshaller.java
+++ b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/StubMarshallerAndUnmarshaller.java
@@ -30,6 +30,7 @@ import org.springframework.oxm.XmlMappingException;
  */
 public class StubMarshallerAndUnmarshaller implements Marshaller, Unmarshaller {
 
+	@SuppressWarnings("unchecked")
 	public boolean supports(Class clazz) {
 		return false;
 	}
diff --git a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/StubUnmarshaller.java b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/StubUnmarshaller.java
index 356968f418..f8252187fa 100644
--- a/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/StubUnmarshaller.java
+++ b/org.springframework.integration.ws/src/test/java/org/springframework/integration/ws/config/StubUnmarshaller.java
@@ -28,6 +28,7 @@ import org.springframework.oxm.XmlMappingException;
  */
 public class StubUnmarshaller implements Unmarshaller {
 
+	@SuppressWarnings("unchecked")
 	public boolean supports(Class clazz) {
 		return false;
 	}
diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java
index 4a83075e53..9b79215411 100644
--- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java
+++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java
@@ -80,9 +80,9 @@ public class XPathMessageSplitterParserTests {
 		inputChannel.send(docMessage);
 		assertEquals("Wrong number of split messages ", 2, outputChannel.getMesssageCount());
 		assertTrue("Splitter failed to create documents ",
-				((Message) outputChannel.receive(1000)).getPayload() instanceof Document);
+				((Message<?>) outputChannel.receive(1000)).getPayload() instanceof Document);
 		assertTrue("Splitter failed to create documents ",
-				((Message) outputChannel.receive(1000)).getPayload() instanceof Document);
+				((Message<?>) outputChannel.receive(1000)).getPayload() instanceof Document);
 	}
 
 	@Test
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierHandler.java
index e714ff20f0..d7f38c50b7 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierHandler.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierHandler.java
@@ -76,7 +76,7 @@ import org.springframework.util.Assert;
  * @author Mark Fisher
  * @author Marius Bogoevici
  */
-public abstract class AbstractMessageBarrierHandler<T extends Collection<? extends Message>>
+public abstract class AbstractMessageBarrierHandler<T extends Collection<? extends Message<?>>>
 		extends AbstractMessageHandler implements BeanFactoryAware, InitializingBean {
 
 	public final static long DEFAULT_SEND_TIMEOUT = 1000;
@@ -261,6 +261,7 @@ public abstract class AbstractMessageBarrierHandler<T extends Collection<? exten
 		}
 	}
 
+	@SuppressWarnings("unchecked")
 	private void processMessage(Message<?> message, Object correlationKey) {
 		MessageBarrier<T> barrier = barriers.putIfAbsent(correlationKey, createMessageBarrier(correlationKey));
 		if (barrier == null) {
@@ -366,8 +367,9 @@ public abstract class AbstractMessageBarrierHandler<T extends Collection<? exten
 	 * @param entry
 	 * @param barrier
 	 */
+	
 	protected void discardBarrier(MessageBarrier<T> barrier) {
-		for (Message message : barrier.getMessages()) {
+		for (Message<?> message : barrier.getMessages()) {
 			if (logger.isDebugEnabled()) {
 				logger.debug("Handling of Message group with correlation key '" + barrier.getCorrelationKey()+ "' has timed out.");
 			}
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageBarrier.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageBarrier.java
index d556c353fa..9c36e64cf0 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageBarrier.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageBarrier.java
@@ -37,7 +37,7 @@ import org.springframework.integration.core.Message;
  * 
  * @author Marius Bogoevici
  */
-public class MessageBarrier<T extends Collection<? extends Message>> {
+public class MessageBarrier<T extends Collection<? extends Message<?>>> {
 
 	protected final T messages;
 
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingMessageSource.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingMessageSource.java
index 4dd38fb8d6..3a71a2ad12 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingMessageSource.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingMessageSource.java
@@ -75,6 +75,7 @@ public class MethodInvokingMessageSource implements MessageSource<Object>, Initi
 		}
 	}
 
+	@SuppressWarnings("unchecked")
 	public Message<Object> receive() {
 		if (this.invoker == null) {
 			this.afterPropertiesSet();
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractSingleChannelNameRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractSingleChannelNameRouter.java
index e8ae0de2f9..be1d972803 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractSingleChannelNameRouter.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractSingleChannelNameRouter.java
@@ -17,7 +17,6 @@
 package org.springframework.integration.router;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 import org.springframework.integration.core.Message;
diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java
index d927468eb7..0742c18458 100644
--- a/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java
+++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java
@@ -18,7 +18,6 @@ package org.springframework.integration.router;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 import org.springframework.integration.annotation.Router;
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/HeaderAttributeCorrelationStrategyTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/HeaderAttributeCorrelationStrategyTests.java
index 534b304216..185062dd2c 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/HeaderAttributeCorrelationStrategyTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/HeaderAttributeCorrelationStrategyTests.java
@@ -19,7 +19,6 @@ package org.springframework.integration.aggregator;
 import static org.junit.Assert.assertEquals;
 
 import org.springframework.integration.core.Message;
-import org.springframework.integration.core.MessageHeaders;
 import org.springframework.integration.message.MessageBuilder;
 
 import org.junit.Test;
@@ -33,7 +32,7 @@ public class HeaderAttributeCorrelationStrategyTests {
     public void testHeaderAttributeCorrelationStrategy() {
         String testedHeaderValue = "@!arbitraryTestValue!@";
         String testHeaderName = "header.for.test";
-        Message message = MessageBuilder.withPayload("irrelevantData").setHeader(testHeaderName, testedHeaderValue).build();
+        Message<?> message = MessageBuilder.withPayload("irrelevantData").setHeader(testHeaderName, testedHeaderValue).build();
         HeaderAttributeCorrelationStrategy correlationStrategy = new HeaderAttributeCorrelationStrategy(testHeaderName);
         assertEquals(testedHeaderValue, correlationStrategy.getCorrelationKey(message));
     }
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MessageBarrierTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MessageBarrierTests.java
index 5ae8dc75ef..edc37537e7 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MessageBarrierTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MessageBarrierTests.java
@@ -16,21 +16,18 @@
 
 package org.springframework.integration.aggregator;
 
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
-import org.junit.Test;
 
+import java.util.LinkedHashSet;
+
+import org.junit.Test;
 import org.springframework.integration.message.StringMessage;
-import org.springframework.integration.core.Message;
 
 /**
  * @author Mark Fisher
  */
+@SuppressWarnings("unchecked")
 public class MessageBarrierTests {
 
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/SelectorChainParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/SelectorChainParserTests.java
index ada2138469..1a4436bc57 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/SelectorChainParserTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/SelectorChainParserTests.java
@@ -26,10 +26,8 @@ import org.junit.Test;
 import org.junit.runner.RunWith;
 
 import org.springframework.beans.DirectFieldAccessor;
-import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.core.Message;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.integration.selector.MessageSelector;
@@ -49,7 +47,7 @@ public class SelectorChainParserTests {
 	@Autowired
 	ApplicationContext context;
 	
-	@Test @Ignore
+	@Test @Ignore 
 	public void topLevelSelector() throws Exception {
 		MessageSelector topLevelSelector = (MessageSelector) context.getBean("topLevelSelector");
 	}
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java
index dbed9f979a..ab5881ac94 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java
@@ -38,7 +38,6 @@ import org.springframework.integration.aggregator.CorrelationStrategyAdapter;
 import org.springframework.integration.channel.BeanFactoryChannelResolver;
 import org.springframework.integration.channel.ChannelResolver;
 import org.springframework.integration.endpoint.EventDrivenConsumer;
-import org.springframework.integration.annotation.CorrelationStrategy;
 import org.springframework.integration.handler.HandlerMethodResolver;
 import org.springframework.integration.handler.StaticHandlerMethodResolver;
 
diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java
index 1f2e0d3603..9815888095 100644
--- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java
+++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java
@@ -23,6 +23,7 @@ public class MethodInvokingSelectorParserTests {
 	@Autowired
 	MessageSelectorChain chain;
 
+	@SuppressWarnings("unchecked")
 	@Test
 	public void configOK() throws Exception {
 		DirectFieldAccessor accessor = new DirectFieldAccessor(chain);