Prune dependencies and rename samples

pom.xml

@@ -17,6 +17,7 @@
 	<properties>
 		<java.version>1.8</java.version>
 		<spring-cloud-stream.version>Chelsea.SR2</spring-cloud-stream.version>
+		<spring-cloud-task.version>1.1.2.RELEASE</spring-cloud-task.version>
 		<wrapper.version>1.0.7.RELEASE</wrapper.version>
 		<spring-boot.version>1.5.7.RELEASE</spring-boot.version>
 		<docs.main>spring-cloud-function</docs.main>
@@ -24,11 +25,6 @@
 
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<groupId>commons-io</groupId>
-				<artifactId>commons-io</artifactId>
-				<version>2.3</version>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-function-dependencies</artifactId>
@@ -43,6 +39,13 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<dependency>
+				<groupId>org.springframework.cloud</groupId>
+				<artifactId>spring-cloud-task-dependencies</artifactId>
+				<version>${spring-cloud-task.version}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 

spring-cloud-function-adapters/pom.xml

@@ -14,18 +14,6 @@
 
 	<name>spring-cloud-function-adapter-parent</name>
 
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Dalston.SR3</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-
 	<modules>
 		<module>spring-cloud-function-adapter-aws</module>
 		<module>spring-cloud-function-adapter-openwhisk</module>

spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/build.gradle

@@ -1,7 +1,7 @@
 buildscript {
 	ext {
 		springBootVersion = '1.5.2.RELEASE'
-		wrapperVersion = '1.0.7.BUILD-SNAPSHOT'
+		wrapperVersion = '1.0.7.RELEASE'
         shadowVersion = '2.0.1'
 	}
 	repositories {
@@ -25,8 +25,8 @@ apply plugin: 'com.github.johnrengelman.shadow'
 apply plugin: 'spring-boot'
 apply plugin: 'org.springframework.boot.experimental.thin-launcher'
 
-group = 'com.example'
-version = '0.0.1-SNAPSHOT'
+group = 'io.spring.sample'
+version = '1.0.0.BUILD-SNAPSHOT'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 

spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/pom.xml

@@ -3,8 +3,8 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.springframework.cloud</groupId>
-	<artifactId>spring-cloud-function-adapter-sample</artifactId>
+	<groupId>io.spring.sample</groupId>
+	<artifactId>function-adapter-sample-aws</artifactId>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
@@ -65,13 +65,6 @@
 
 	<dependencyManagement>
 		<dependencies>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Dalston.SR3</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-function-dependencies</artifactId>

spring-cloud-function-adapters/spring-cloud-function-adapter-samples/pom.xml

@@ -9,7 +9,7 @@
 	<packaging>pom</packaging>
 
 	<modules>
-		<module>spring-cloud-function-adapter-sample</module>
+		<module>function-adapter-sample-aws</module>
 	</modules>
 
 	<build>

spring-cloud-function-compiler/pom.xml

@@ -23,10 +23,6 @@
 			<artifactId>ecj</artifactId>
 			<version>4.4.2</version>
 		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>commons-collections</groupId>
 			<artifactId>commons-collections</artifactId>

spring-cloud-function-core/pom.xml

@@ -26,11 +26,6 @@
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>commons-io</groupId>
-			<artifactId>commons-io</artifactId>
-			<version>2.3</version>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-logging</artifactId>

spring-cloud-function-deployer/pom.xml

@@ -55,13 +55,6 @@
 				<artifactId>maven-aether-provider</artifactId>
 				<version>3.3.9</version>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Dalston.SR3</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 

spring-cloud-function-deployer/src/main/resources/core-pom.xml

@@ -39,7 +39,7 @@
 			<dependency>
 				<groupId>org.springframework.cloud</groupId>
 				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Dalston.BUILD-SNAPSHOT</version>
+				<version>Dalston.SR3</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

spring-cloud-function-samples/function-sample-compiler/build.gradle

@@ -21,8 +21,8 @@ apply plugin: 'eclipse'
 apply plugin: 'spring-boot'
 apply plugin: 'org.springframework.boot.experimental.thin-launcher'
 
-group = 'com.example'
-version = '0.0.1-SNAPSHOT'
+group = 'io.spring.sample'
+version = '1.0.0.BUILD-SNAPSHOT'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 

spring-cloud-function-samples/function-sample-compiler/pom.xml

@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.example</groupId>
+	<groupId>io.spring.sample</groupId>
 	<artifactId>function-sample-compiler</artifactId>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>

spring-cloud-function-samples/function-sample-pof/build.gradle

@@ -21,8 +21,8 @@ apply plugin: 'eclipse'
 apply plugin: 'spring-boot'
 apply plugin: 'org.springframework.boot.experimental.thin-launcher'
 
-group = 'com.example'
-version = '0.0.1-SNAPSHOT'
+group = 'io.spring.sample'
+version = '1.0.0.BUILD-SNAPSHOT'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 

spring-cloud-function-samples/function-sample-pof/pom.xml

@@ -2,8 +2,8 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.example</groupId>
-	<artifactId>pof-sample</artifactId>
+	<groupId>io.spring.sample</groupId>
+	<artifactId>function-sample-pof</artifactId>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>spring-cloud-function-sample-pof</name>

spring-cloud-function-samples/function-sample-pojo/build.gradle

@@ -21,8 +21,8 @@ apply plugin: 'eclipse'
 apply plugin: 'spring-boot'
 apply plugin: 'org.springframework.boot.experimental.thin-launcher'
 
-group = 'com.example'
-version = '0.0.1-SNAPSHOT'
+group = 'io.spring.sample'
+version = '1.0.0.BUILD-SNAPSHOT'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 

spring-cloud-function-samples/function-sample-pojo/pom.xml

@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.example</groupId>
+	<groupId>io.spring.sample</groupId>
 	<artifactId>function-sample-pojo</artifactId>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
@@ -50,13 +50,6 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
-			<dependency>
-				<groupId>org.springframework.cloud</groupId>
-				<artifactId>spring-cloud-dependencies</artifactId>
-				<version>Dalston.SR3</version>
-				<type>pom</type>
-				<scope>import</scope>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 

spring-cloud-function-samples/function-sample-pojo/src/main/resources/META-INF/thin-stream.properties

@@ -1,2 +1,3 @@
-dependencies.spring-cloud-function-stream: org.springframework.cloud:spring-cloud-function-stream:1.0.0.BUILD-SNAPSHOT
+boms.spring-cloud-dependencies: org.springframework.cloud:spring-cloud-dependencies:Dalston.SR3
+dependencies.spring-cloud-function-stream: org.springframework.cloud:spring-cloud-function-stream
 dependencies.spring-cloud-stream-rabbit: org.springframework.cloud:spring-cloud-starter-stream-rabbit

spring-cloud-function-samples/function-sample-task/build.gradle

@@ -21,8 +21,8 @@ apply plugin: 'eclipse'
 apply plugin: 'spring-boot'
 apply plugin: 'org.springframework.boot.experimental.thin-launcher'
 
-group = 'com.example'
-version = '0.0.1-SNAPSHOT'
+group = 'io.spring.sample'
+version = '1.0.0.BUILD-SNAPSHOT'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 

spring-cloud-function-samples/function-sample-task/pom.xml

@@ -3,7 +3,7 @@
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>com.example</groupId>
+	<groupId>io.spring.sample</groupId>
 	<artifactId>function-sample-task</artifactId>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>

spring-cloud-function-samples/function-sample/pom.xml

@@ -4,7 +4,7 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.example</groupId>
-	<artifactId>function-sample</artifactId>
+	<artifactId>spring-cloud-function-sample</artifactId>
 	<version>1.0.0.BUILD-SNAPSHOT</version>
 	<packaging>jar</packaging>
 	<name>spring-cloud-function-sample</name>

spring-cloud-function-samples/pom.xml

@@ -13,11 +13,11 @@
 	</parent>
 
 	<modules>
-		<module>spring-cloud-function-sample</module>
-		<module>spring-cloud-function-sample-pof</module>
-		<module>spring-cloud-function-sample-pojo</module>
-		<module>spring-cloud-function-sample-compiler</module>
-		<module>spring-cloud-function-sample-task</module>
+		<module>function-sample</module>
+		<module>function-sample-pof</module>
+		<module>function-sample-pojo</module>
+		<module>function-sample-compiler</module>
+		<module>function-sample-task</module>
 	</modules>
 
 	<build>

spring-cloud-function-task/pom.xml

@@ -16,13 +16,11 @@
 	<dependencies>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
-			<artifactId>spring-cloud-task-starter</artifactId>
-			<version>1.1.0.BUILD-SNAPSHOT</version>
+			<artifactId>spring-cloud-starter-task</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.cloud</groupId>
 			<artifactId>spring-cloud-function-core</artifactId>
-			<version>${project.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.projectreactor</groupId>