diff --git a/docs/src/main/asciidoc/intro.adoc b/docs/src/main/asciidoc/intro.adoc
index cd1f07221..00326bcc9 100644
--- a/docs/src/main/asciidoc/intro.adoc
+++ b/docs/src/main/asciidoc/intro.adoc
@@ -8,7 +8,7 @@ Here's a sample source module (output channel only):
 @ComponentScan(basePackageClasses=TimerSource.class)
 public class ModuleApplication {
 
-  public static void main(String[] args) throws InterruptedException {
+  public static void main(String[] args) {
     SpringApplication.run(ModuleApplication.class, args);
   }
 
diff --git a/spring-cloud-stream-samples/double/src/main/java/demo/DoubleApplication.java b/spring-cloud-stream-samples/double/src/main/java/demo/DoubleApplication.java
index ea5993a41..f8124a5cc 100644
--- a/spring-cloud-stream-samples/double/src/main/java/demo/DoubleApplication.java
+++ b/spring-cloud-stream-samples/double/src/main/java/demo/DoubleApplication.java
@@ -14,10 +14,10 @@ public class DoubleApplication implements AggregateConfigurer {
 	@Override
 	public void configure(AggregateBuilder builder) {
 		builder.from(SourceModuleDefinition.class).as("source")
-		.to(SinkModuleDefinition.class).as("sink");
+				.to(SinkModuleDefinition.class).as("sink");
 	}
 
-	public static void main(String[] args) throws InterruptedException {
+	public static void main(String[] args) {
 		SpringApplication.run(DoubleApplication.class, args);
 	}
 
diff --git a/spring-cloud-stream-samples/extended/src/main/java/extended/ExtendedApplication.java b/spring-cloud-stream-samples/extended/src/main/java/extended/ExtendedApplication.java
index 35fcecc53..77bf8c002 100644
--- a/spring-cloud-stream-samples/extended/src/main/java/extended/ExtendedApplication.java
+++ b/spring-cloud-stream-samples/extended/src/main/java/extended/ExtendedApplication.java
@@ -23,7 +23,7 @@ public class ExtendedApplication implements AggregateConfigurer {
 		// @formatter:on
 	}
 
-	public static void main(String[] args) throws InterruptedException {
+	public static void main(String[] args) {
 		SpringApplication.run(ExtendedApplication.class, args);
 	}
 
diff --git a/spring-cloud-stream-samples/sink/src/main/java/demo/SinkApplication.java b/spring-cloud-stream-samples/sink/src/main/java/demo/SinkApplication.java
index bd26f4e77..b1120bbb6 100644
--- a/spring-cloud-stream-samples/sink/src/main/java/demo/SinkApplication.java
+++ b/spring-cloud-stream-samples/sink/src/main/java/demo/SinkApplication.java
@@ -10,7 +10,7 @@ import sink.LogSink;
 @ComponentScan(basePackageClasses=LogSink.class)
 public class SinkApplication {
 
-	public static void main(String[] args) throws InterruptedException {
+	public static void main(String[] args) {
 		SpringApplication.run(SinkApplication.class, args);
 	}
 
diff --git a/spring-cloud-stream-samples/source/src/main/java/demo/SourceApplication.java b/spring-cloud-stream-samples/source/src/main/java/demo/SourceApplication.java
index 57f9eb186..40aa01ce5 100644
--- a/spring-cloud-stream-samples/source/src/main/java/demo/SourceApplication.java
+++ b/spring-cloud-stream-samples/source/src/main/java/demo/SourceApplication.java
@@ -10,7 +10,7 @@ import source.TimeSource;
 @ComponentScan(basePackageClasses=TimeSource.class)
 public class SourceApplication {
 
-	public static void main(String[] args) throws InterruptedException {
+	public static void main(String[] args) {
 		SpringApplication.run(SourceApplication.class, args);
 	}
 
diff --git a/spring-cloud-stream-samples/tap/src/main/java/demo/TapApplication.java b/spring-cloud-stream-samples/tap/src/main/java/demo/TapApplication.java
index c57894628..b2e9f3a3a 100644
--- a/spring-cloud-stream-samples/tap/src/main/java/demo/TapApplication.java
+++ b/spring-cloud-stream-samples/tap/src/main/java/demo/TapApplication.java
@@ -10,7 +10,7 @@ import config.TappingLoggingSink;
 @ComponentScan(basePackageClasses= TappingLoggingSink.class)
 public class TapApplication {
 
-	public static void main(String[] args) throws InterruptedException {
+	public static void main(String[] args) {
 		SpringApplication.run(TapApplication.class, args);
 	}
 
diff --git a/spring-cloud-stream-samples/transform/src/main/java/demo/TransformApplication.java b/spring-cloud-stream-samples/transform/src/main/java/demo/TransformApplication.java
index 8a2dd6f2b..6223d8672 100644
--- a/spring-cloud-stream-samples/transform/src/main/java/demo/TransformApplication.java
+++ b/spring-cloud-stream-samples/transform/src/main/java/demo/TransformApplication.java
@@ -10,7 +10,7 @@ import transform.LoggingTransformer;
 @ComponentScan(basePackageClasses=LoggingTransformer.class)
 public class TransformApplication {
 
-	public static void main(String[] args) throws InterruptedException {
+	public static void main(String[] args) {
 		SpringApplication.run(TransformApplication.class, args);
 	}