diff --git a/pom.xml b/pom.xml
index bbc56fbb..31ef4b40 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>org.springframework.shell</groupId>
 	<artifactId>spring-shell2-parent</artifactId>
-	<version>2.0.0-BUILD.SNAPSHOT</version>
+	<version>2.0.0.BUILD-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<parent>
diff --git a/spring-shell2-core/pom.xml b/spring-shell2-core/pom.xml
index 58c8ffe3..ab3e7c28 100644
--- a/spring-shell2-core/pom.xml
+++ b/spring-shell2-core/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.shell</groupId>
 		<artifactId>spring-shell2-parent</artifactId>
-		<version>2.0.0-BUILD.SNAPSHOT</version>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 	
 	<description>Core API and classes for Spring Shell 2</description>
diff --git a/spring-shell2-core/src/main/java/org/springframework/shell2/result/IterableResultHandler.java b/spring-shell2-core/src/main/java/org/springframework/shell2/result/IterableResultHandler.java
index 9ca3767c..0249b486 100644
--- a/spring-shell2-core/src/main/java/org/springframework/shell2/result/IterableResultHandler.java
+++ b/spring-shell2-core/src/main/java/org/springframework/shell2/result/IterableResultHandler.java
@@ -32,11 +32,12 @@ public class IterableResultHandler implements ResultHandler<Iterable> {
 	private ResultHandler delegate;
 
 	// Setter injection to avoid circular dependency at creation time
-	public void setDelegate(ResultHandler delegate) {
+	void setDelegate(ResultHandler delegate) {
 		this.delegate = delegate;
 	}
 
 	@Override
+	@SuppressWarnings("unchecked")
 	public void handleResult(Iterable result) {
 		for (Object o : result) {
 			delegate.handleResult(o);
diff --git a/spring-shell2-jcommander-adapter/pom.xml b/spring-shell2-jcommander-adapter/pom.xml
index 882eca32..edc72e0a 100644
--- a/spring-shell2-jcommander-adapter/pom.xml
+++ b/spring-shell2-jcommander-adapter/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.shell</groupId>
 		<artifactId>spring-shell2-parent</artifactId>
-		<version>2.0.0-BUILD.SNAPSHOT</version>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 	
 	<description>Adapter classes to allow JCommander type annotations and parsing via Spring Shell 2</description>
diff --git a/spring-shell2-samples/pom.xml b/spring-shell2-samples/pom.xml
index 9677943a..73b2329f 100644
--- a/spring-shell2-samples/pom.xml
+++ b/spring-shell2-samples/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.shell</groupId>
 		<artifactId>spring-shell2-parent</artifactId>
-		<version>2.0.0-BUILD.SNAPSHOT</version>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 	
 	<description>Examples of using Spring Shell 2</description>
diff --git a/spring-shell2-shell1-adapter/pom.xml b/spring-shell2-shell1-adapter/pom.xml
index 2e88b81b..6d3ca644 100644
--- a/spring-shell2-shell1-adapter/pom.xml
+++ b/spring-shell2-shell1-adapter/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>org.springframework.shell</groupId>
 		<artifactId>spring-shell2-parent</artifactId>
-		<version>2.0.0-BUILD.SNAPSHOT</version>
+		<version>2.0.0.BUILD-SNAPSHOT</version>
 	</parent>
 	
 	<description>Adapter classes to enable Shell 1 type annotations via Spring Shell 2</description>