diff --git a/.gitignore b/.gitignore
index 11fee3f1a0..354097cc50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,7 @@
 .pmd
 .project
 .settings
+.checkstyle
 bin
 build
 build.log
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests-context.xml
index 0b5bfb0d5c..d39acdbde5 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests-context.xml
@@ -16,4 +16,4 @@
 		<queue capacity="5" />
 	</channel>
 
-</beans:beans>
\ No newline at end of file
+</beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests-context.xml
index fce67df61d..1a9847b8ce 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests-context.xml
@@ -15,4 +15,4 @@
 		<beans:bean class="org.springframework.integration.aggregator.integration.AnnotationAggregatorTests$TestAggregator"/>
 	</aggregator>
 
-</beans:beans>
\ No newline at end of file
+</beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml
index 89d502edfc..59effe5d62 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests-context.xml
@@ -23,4 +23,4 @@
 		<queue capacity="5" />
 	</channel>
 
-</beans:beans>
\ No newline at end of file
+</beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/MethodInvokingAggregatorReturningMessageTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/MethodInvokingAggregatorReturningMessageTests-context.xml
index 82de024d28..9e05bdca92 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/MethodInvokingAggregatorReturningMessageTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/MethodInvokingAggregatorReturningMessageTests-context.xml
@@ -25,4 +25,4 @@
 
 	<aggregator input-channel="defaultAggregator" output-channel="defaultOutput"/>
 
-</beans:beans>
\ No newline at end of file
+</beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTests-context.xml
index c21cee3d0d..1c588ac095 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTests-context.xml
@@ -33,4 +33,4 @@
 	<aggregator id="aggregator_without_explicit_timeout"
 				input-channel="aggregator_without_explicit_timeout_channel"/>
 
-</beans:beans>
\ No newline at end of file
+</beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests-context.xml
index d770d56f84..4190babf86 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests-context.xml
@@ -15,4 +15,4 @@
 
 	<aggregator id="aggregator" input-channel="aggregatorChannel" auto-startup="true"/>
 
-</beans:beans>
\ No newline at end of file
+</beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/NestedAggregationTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/NestedAggregationTests-context.xml
index 199ebdb87e..a8bce6bdf1 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/NestedAggregationTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/NestedAggregationTests-context.xml
@@ -25,4 +25,4 @@
 
 	<splitter id="downstream-another" input-channel="upstream-another" output-channel="downstream-splits" />
 
-</beans:beans>
\ No newline at end of file
+</beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests-context.xml
index bbfce39234..2c8b90197c 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests-context.xml
@@ -12,5 +12,5 @@
 	<resequencer input-channel="in" output-channel="out" release-partial-sequences="true"/>
 
 	<channel id="out"/>
-	
-</beans:beans>
\ No newline at end of file
+
+</beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/aggregator-with-custom-release-strategy.xml b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/aggregator-with-custom-release-strategy.xml
index 570e34d96d..0c4fc562b9 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/aggregator-with-custom-release-strategy.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/aggregator-with-custom-release-strategy.xml
@@ -20,4 +20,4 @@
 	<int:channel id="resultChannel">
 		<int:queue/>
 	</int:channel>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests-context.xml
index a2f1e4a78d..4b536159a1 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests-context.xml
@@ -19,4 +19,4 @@
 
 	<si:annotation-config default-publisher-channel="defaultChannel"/>
 
-</beans>
\ No newline at end of file
+</beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests-context.xml
index b089482c38..9132bf7b91 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests-context.xml
@@ -21,24 +21,24 @@
 	<channel id="noLoadBalancerNoFailoverExecutor" >
 		<dispatcher load-balancer="none" failover="false" task-executor="taskExecutor"/>
 	</channel>
-	
+
 	<channel id="loadBalancerNoFailover">
 		<dispatcher load-balancer="round-robin" failover="false"/>
 	</channel>
 	<channel id="loadBalancerNoFailoverExecutor">
 		<dispatcher load-balancer="round-robin" failover="false" task-executor="taskExecutor"/>
 	</channel>
-	
+
 	<channel id="noLoadBalancerFailover">
 		<dispatcher load-balancer="none" failover="true"/>
 	</channel>
 	<channel id="noLoadBalancerFailoverExecutor">
 		<dispatcher load-balancer="none" failover="true" task-executor="taskExecutor"/>
 	</channel>
-	
+
 	<beans:bean id="taskExecutor" class="java.util.concurrent.Executors" factory-method="newCachedThreadPool"/>
 
 	<!-- send async errors to null channel to avoid chatter -->
 	<bridge input-channel="errorChannel" output-channel="nullChannel"/>
 
-</beans:beans>
\ No newline at end of file
+</beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelWithCustomQueueParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelWithCustomQueueParserTests-context.xml
index 06ced4a690..ef2c1cdd22 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelWithCustomQueueParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelWithCustomQueueParserTests-context.xml
@@ -14,4 +14,4 @@
 		<beans:constructor-arg value="2" />
 	</beans:bean>
 
-</beans:beans>
\ No newline at end of file
+</beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ms.properties b/spring-integration-core/src/test/java/org/springframework/integration/config/ms.properties
index 7521049ed4..197eb467fb 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/ms.properties
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ms.properties
@@ -1 +1 @@
-ms=messageStore
\ No newline at end of file
+ms=messageStore
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/IntervalTriggerParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/IntervalTriggerParserTests-context.xml
index b59c922e63..b634b9550e 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/IntervalTriggerParserTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/IntervalTriggerParserTests-context.xml
@@ -11,4 +11,4 @@
 
     <poller id="pollerWithFixedDelayAttribute" fixed-delay="37" receive-timeout="1234"/>
 
-</beans:beans>
\ No newline at end of file
+</beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/childApplicationContext.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/childApplicationContext.xml
index 0078147aa2..b0b024bfc8 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/childApplicationContext.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/childApplicationContext.xml
@@ -21,4 +21,4 @@
     </channel>
 
 
-</beans:beans>
\ No newline at end of file
+</beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties
index edc777dd12..d17d38496d 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/innerdefaware.properties
@@ -13,7 +13,7 @@ splitter-inner-success=\
 	<splitter id="testSplitter" input-channel="inChannel" output-channel="outChannel"> \
 		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestSplitter" /> \
 	</splitter>  \
-</beans:beans> 
+</beans:beans>
 splitter-inner-success-with-poller=\
 <?xml version="1.0" encoding="UTF-8"?> \
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
@@ -37,7 +37,7 @@ splitter-inner-success-with-poller=\
 		<poller task-executor="executor" max-messages-per-poll="5" fixed-delay="20" /> \
 	</splitter>  \
 	<task:executor id="executor" pool-size="5" /> \
-</beans:beans> 
+</beans:beans>
 splitter-inner-success-with-poller-reversed-order=\
 <?xml version="1.0" encoding="UTF-8"?> \
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
@@ -61,7 +61,7 @@ splitter-inner-success-with-poller-reversed-order=\
         <beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestSplitter" /> \
 	</splitter>  \
 	<task:executor id="executor" pool-size="5" /> \
-</beans:beans> 
+</beans:beans>
 splitter-ref-success=\
 <?xml version="1.0" encoding="UTF-8"?> \
 <beans:beans xmlns="http://www.springframework.org/schema/integration" \
@@ -384,4 +384,4 @@ filter-failure-refAndBean=\
 	<filter input-channel="inChannel" ref="testFilterBean" method="filter" output-channel="outChannel"> \
 		<beans:bean class="org.springframework.integration.config.xml.InnerDefinitionHandlerAwareEndpointParserTests$TestMessageFilter"/> \
 	</filter>
-</beans:beans>
\ No newline at end of file
+</beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/propertyplaceholder/PropertyPlaceholderTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/propertyplaceholder/PropertyPlaceholderTests-context.xml
index 0124acad2d..976c66168a 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/propertyplaceholder/PropertyPlaceholderTests-context.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/propertyplaceholder/PropertyPlaceholderTests-context.xml
@@ -25,4 +25,4 @@
 	<context:property-placeholder
 		location="org/springframework/integration/config/xml/propertyplaceholder/channel.properties" />
 
-</beans:beans>
\ No newline at end of file
+</beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/expression/expressions.properties b/spring-integration-core/src/test/java/org/springframework/integration/expression/expressions.properties
index 584df3a98a..2532cc382a 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/expression/expressions.properties
+++ b/spring-integration-core/src/test/java/org/springframework/integration/expression/expressions.properties
@@ -1 +1 @@
-test.greeting='Hello World!'
\ No newline at end of file
+test.greeting='Hello World!'
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/filter/expressions.properties b/spring-integration-core/src/test/java/org/springframework/integration/filter/expressions.properties
index 17b14a2975..0163b08a4e 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/filter/expressions.properties
+++ b/spring-integration-core/src/test/java/org/springframework/integration/filter/expressions.properties
@@ -1 +1 @@
-filter.positive=payload > 0
\ No newline at end of file
+filter.positive=payload > 0
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/expressions.properties b/spring-integration-core/src/test/java/org/springframework/integration/router/config/expressions.properties
index 16bcf95361..391fc9ebb2 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/expressions.properties
+++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/expressions.properties
@@ -1 +1 @@
-router.oddeven=payload.number % 2 == 0 ? 'even' : 'odd'
\ No newline at end of file
+router.oddeven=payload.number % 2 == 0 ? 'even' : 'odd'
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-invalidExpression.xml b/spring-integration-core/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-invalidExpression.xml
index 3cc8e2a859..f89c933c65 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-invalidExpression.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-invalidExpression.xml
@@ -2,7 +2,7 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans 
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
 		http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/integration
 		http://www.springframework.org/schema/integration/spring-integration.xsd">
@@ -13,4 +13,4 @@
 
 	<splitter input-channel="in" output-channel="out" delimiters="," expression="'foo,bar'"/>
 
-</beans:beans>
\ No newline at end of file
+</beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-invalidInnerBean.xml b/spring-integration-core/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-invalidInnerBean.xml
index e2da4dcde0..21b2eac755 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-invalidInnerBean.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-invalidInnerBean.xml
@@ -2,7 +2,7 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans 
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
 		http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/integration
 		http://www.springframework.org/schema/integration/spring-integration.xsd">
@@ -15,4 +15,4 @@
 		<beans:bean id="bean" class="org.springframework.integration.splitter.SplitterIntegrationTests$Receiver"/>
 	</splitter>
 
-</beans:beans>
\ No newline at end of file
+</beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-invalidRef.xml b/spring-integration-core/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-invalidRef.xml
index 41fc255695..e0ad6477ac 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-invalidRef.xml
+++ b/spring-integration-core/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests-invalidRef.xml
@@ -2,7 +2,7 @@
 <beans:beans xmlns="http://www.springframework.org/schema/integration"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:beans="http://www.springframework.org/schema/beans"
-	xsi:schemaLocation="http://www.springframework.org/schema/beans 
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
 		http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/integration
 		http://www.springframework.org/schema/integration/spring-integration.xsd">
@@ -15,4 +15,4 @@
 
 	<beans:bean id="bean" class="org.springframework.integration.splitter.SplitterIntegrationTests$Receiver"/>
 
-</beans:beans>
\ No newline at end of file
+</beans:beans>
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/splitter/expressions.properties b/spring-integration-core/src/test/java/org/springframework/integration/splitter/expressions.properties
index 9bfa728289..4a254b5d72 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/splitter/expressions.properties
+++ b/spring-integration-core/src/test/java/org/springframework/integration/splitter/expressions.properties
@@ -1 +1 @@
-split.lessThan5=payload.numbers.?[#this < 5]
\ No newline at end of file
+split.lessThan5=payload.numbers.?[#this < 5]