diff --git a/build.gradle b/build.gradle
index 9e4db1cd..3df93cba 100644
--- a/build.gradle
+++ b/build.gradle
@@ -186,7 +186,7 @@ subprojects { subproject ->
 			postgresVersion = '9.1-901-1.jdbc4'
 			subethasmtpVersion = '1.2'
 			slf4jVersion = '1.7.6'
-			springIntegrationVersion = '4.0.1.RELEASE'
+			springIntegrationVersion = '4.0.2.RELEASE'
 			springIntegrationDslVersion = '1.0.0.M1'
 			springVersion = '4.0.5.RELEASE'
 			springSecurityVersion = '3.2.4.RELEASE'
@@ -351,6 +351,7 @@ project('loanshark') {
 	description = 'Loan Shark Sample'
 
 	apply plugin: 'jetty'
+	apply plugin: 'eclipse-wtp'
 
 	dependencies {
 		compile "org.springframework.integration:spring-integration-ip:$springIntegrationVersion"
@@ -473,6 +474,7 @@ project('http') {
 
 	apply plugin: 'application'
 	apply plugin: 'jetty'
+	apply plugin: 'eclipse-wtp'
 
 	mainClassName = 'org.springframework.integration.samples.http.HttpClientDemo'
 
@@ -717,6 +719,7 @@ project('ws-inbound-gateway') {
 	description = 'WS Inbound Gateway Sample'
 
 	apply plugin: 'jetty'
+	apply plugin: 'eclipse-wtp'
 
 	dependencies {
 		compile "org.springframework.integration:spring-integration-xml:$springIntegrationVersion"
@@ -828,6 +831,7 @@ project('monitoring') {
 
 	apply plugin: 'jetty'
 	apply plugin: 'application'
+	apply plugin: 'eclipse-wtp'
 
 	mainClassName = 'org.springintegration.SpringIntegrationTest'
 
@@ -844,6 +848,7 @@ project('multipart-http') {
 	description = 'HTTP Multipart Demo'
 
 	apply plugin: 'jetty'
+	apply plugin: 'eclipse-wtp'
 
 	dependencies {
 		compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion"
@@ -858,6 +863,7 @@ project('rest-http') {
 	description = 'Spring Integration Rest HTTP Path Usage Demo'
 
 	apply plugin: 'jetty'
+	apply plugin: 'eclipse-wtp'
 
 	dependencies {
 		compile "org.springframework.integration:spring-integration-http:$springIntegrationVersion"
diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java
index 93c6ef32..85088e8f 100644
--- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java
+++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/annotations/Application.java
@@ -18,6 +18,7 @@ package org.springframework.integration.samples.si4demo.annotations;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.social.TwitterAutoConfiguration;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -63,7 +64,7 @@ import org.springframework.social.twitter.api.impl.TwitterTemplate;
  */
 @Configuration
 @ComponentScan
-@EnableAutoConfiguration
+@EnableAutoConfiguration(exclude = TwitterAutoConfiguration.class)
 public class Application {
 
 	public static void main(String[] args) throws Exception {
diff --git a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java
index 99716c9c..a3d49593 100644
--- a/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java
+++ b/dsl/si4demo/src/main/java/org/springframework/integration/samples/si4demo/dsl/Application.java
@@ -20,6 +20,7 @@ import java.util.Scanner;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
+import org.springframework.boot.autoconfigure.social.TwitterAutoConfiguration;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -69,7 +70,7 @@ import org.springframework.social.twitter.api.impl.TwitterTemplate;
 @Configuration
 @ComponentScan
 @IntegrationComponentScan
-@EnableAutoConfiguration
+@EnableAutoConfiguration(exclude = TwitterAutoConfiguration.class)
 public class Application {
 
 	public static void main(String[] args) throws Exception {
diff --git a/gradle.properties b/gradle.properties
index ddf3be4e..896b55a0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,2 +1,2 @@
 version=2.2.0.BUILD-SNAPSHOT
-springBootVersion=1.1.0.M2
+springBootVersion=1.1.0.RELEASE