Prune dependencies and rename samples

spring-cloud · Sep 15, 2017 · 472f0e3 · 472f0e3
1 parent 9768549
commit 472f0e3
Show file tree

Hide file tree

Showing 76 changed files with 37 additions and 77 deletions.
diff --git a/pom.xml b/pom.xml
@@ -17,18 +17,14 @@
 	<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>
 	</properties>
 
 	<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>
 

diff --git a/spring-cloud-function-adapters/pom.xml b/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>

diff --git a/...pring-cloud-function-adapter-sample/.jdk8 → ...samples/function-adapter-sample-aws/.jdk8 b/...pring-cloud-function-adapter-sample/.jdk8 → ...samples/function-adapter-sample-aws/.jdk8
diff --git a/...loud-function-adapter-sample/build.gradle → .../function-adapter-sample-aws/build.gradle b/...loud-function-adapter-sample/build.gradle → .../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
 

diff --git a/...-sample/gradle/wrapper/gradle-wrapper.jar → ...ple-aws/gradle/wrapper/gradle-wrapper.jar b/...-sample/gradle/wrapper/gradle-wrapper.jar → ...ple-aws/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/...ing-cloud-function-adapter-sample/gradlew → ...mples/function-adapter-sample-aws/gradlew b/...ing-cloud-function-adapter-sample/gradlew → ...mples/function-adapter-sample-aws/gradlew
diff --git a/...cloud-function-adapter-sample/gradlew.bat → ...s/function-adapter-sample-aws/gradlew.bat b/...cloud-function-adapter-sample/gradlew.bat → ...s/function-adapter-sample-aws/gradlew.bat
diff --git a/...ing-cloud-function-adapter-sample/pom.xml → ...mples/function-adapter-sample-aws/pom.xml b/...ing-cloud-function-adapter-sample/pom.xml → ...mples/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>

diff --git a/...-sample/src/main/java/example/Config.java → ...ple-aws/src/main/java/example/Config.java b/...-sample/src/main/java/example/Config.java → ...ple-aws/src/main/java/example/Config.java
diff --git a/...sample/src/main/java/example/Handler.java → ...le-aws/src/main/java/example/Handler.java b/...sample/src/main/java/example/Handler.java → ...le-aws/src/main/java/example/Handler.java
diff --git a/...ple/src/main/java/example/Properties.java → ...aws/src/main/java/example/Properties.java b/...ple/src/main/java/example/Properties.java → ...aws/src/main/java/example/Properties.java
diff --git a/...c/main/resources/META-INF/thin.properties → ...c/main/resources/META-INF/thin.properties b/...c/main/resources/META-INF/thin.properties → ...c/main/resources/META-INF/thin.properties
diff --git a/...ample/src/main/resources/log4j.properties → ...e-aws/src/main/resources/log4j.properties b/...ample/src/main/resources/log4j.properties → ...e-aws/src/main/resources/log4j.properties
diff --git a/...ample/src/test/java/example/MapTests.java → ...e-aws/src/test/java/example/MapTests.java b/...ample/src/test/java/example/MapTests.java → ...e-aws/src/test/java/example/MapTests.java
diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/pom.xml b/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>

diff --git a/spring-cloud-function-compiler/pom.xml b/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>

diff --git a/spring-cloud-function-core/pom.xml b/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>

diff --git a/spring-cloud-function-deployer/pom.xml b/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>
 

diff --git a/spring-cloud-function-deployer/src/main/resources/core-pom.xml b/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>

diff --git a/...ring-cloud-function-sample-compiler/.jdk8 → ...on-samples/function-sample-compiler/.jdk8 b/...ring-cloud-function-sample-compiler/.jdk8 → ...on-samples/function-sample-compiler/.jdk8
diff --git a/...spring-cloud-function-sample/build.gradle → ...les/function-sample-compiler/build.gradle b/...spring-cloud-function-sample/build.gradle → ...les/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
 

diff --git a/...ompiler/gradle/wrapper/gradle-wrapper.jar → ...ompiler/gradle/wrapper/gradle-wrapper.jar b/...ompiler/gradle/wrapper/gradle-wrapper.jar → ...ompiler/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/...ng-cloud-function-sample-compiler/gradlew → ...-samples/function-sample-compiler/gradlew b/...ng-cloud-function-sample-compiler/gradlew → ...-samples/function-sample-compiler/gradlew
diff --git a/...loud-function-sample-compiler/gradlew.bat → ...ples/function-sample-compiler/gradlew.bat b/...loud-function-sample-compiler/gradlew.bat → ...ples/function-sample-compiler/gradlew.bat
diff --git a/...ng-cloud-function-sample-compiler/pom.xml → ...-samples/function-sample-compiler/pom.xml b/...ng-cloud-function-sample-compiler/pom.xml → ...-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>

diff --git a/...n/java/com/example/SampleApplication.java → ...n/java/com/example/SampleApplication.java b/...n/java/com/example/SampleApplication.java → ...n/java/com/example/SampleApplication.java
diff --git a/.../example/SampleCompiledConsumerTests.java → .../example/SampleCompiledConsumerTests.java b/.../example/SampleCompiledConsumerTests.java → .../example/SampleCompiledConsumerTests.java
diff --git a/.../example/SampleCompiledFunctionTests.java → .../example/SampleCompiledFunctionTests.java b/.../example/SampleCompiledFunctionTests.java → .../example/SampleCompiledFunctionTests.java
diff --git a/...g-cloud-function-sample-pojo/build.gradle → ...-samples/function-sample-pof/build.gradle b/...g-cloud-function-sample-pojo/build.gradle → ...-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
 

diff --git a/...ple-pof/gradle/wrapper/gradle-wrapper.jar → ...ple-pof/gradle/wrapper/gradle-wrapper.jar b/...ple-pof/gradle/wrapper/gradle-wrapper.jar → ...ple-pof/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/.../spring-cloud-function-sample-pof/gradlew → ...ction-samples/function-sample-pof/gradlew b/.../spring-cloud-function-sample-pof/gradlew → ...ction-samples/function-sample-pof/gradlew
diff --git a/...ing-cloud-function-sample-pof/gradlew.bat → ...n-samples/function-sample-pof/gradlew.bat b/...ing-cloud-function-sample-pof/gradlew.bat → ...n-samples/function-sample-pof/gradlew.bat
diff --git a/.../spring-cloud-function-sample-pof/pom.xml → ...ction-samples/function-sample-pof/pom.xml b/.../spring-cloud-function-sample-pof/pom.xml → ...ction-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>

diff --git a/.../src/main/java/functions/Application.java → .../src/main/java/functions/Application.java b/.../src/main/java/functions/Application.java → .../src/main/java/functions/Application.java
diff --git a/...-pof/src/main/java/functions/Greeter.java → ...-pof/src/main/java/functions/Greeter.java b/...-pof/src/main/java/functions/Greeter.java → ...-pof/src/main/java/functions/Greeter.java
diff --git a/...s/spring-cloud-function-sample-pojo/.jdk8 → ...nction-samples/function-sample-pojo/.jdk8 b/...s/spring-cloud-function-sample-pojo/.jdk8 → ...nction-samples/function-sample-pojo/.jdk8
diff --git a/...ng-cloud-function-sample-pof/build.gradle → ...samples/function-sample-pojo/build.gradle b/...ng-cloud-function-sample-pof/build.gradle → ...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
 

diff --git a/...le-pojo/gradle/wrapper/gradle-wrapper.jar → ...le-pojo/gradle/wrapper/gradle-wrapper.jar b/...le-pojo/gradle/wrapper/gradle-wrapper.jar → ...le-pojo/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/...spring-cloud-function-sample-pojo/gradlew → ...tion-samples/function-sample-pojo/gradlew b/...spring-cloud-function-sample-pojo/gradlew → ...tion-samples/function-sample-pojo/gradlew
diff --git a/...ng-cloud-function-sample-pojo/gradlew.bat → ...-samples/function-sample-pojo/gradlew.bat b/...ng-cloud-function-sample-pojo/gradlew.bat → ...-samples/function-sample-pojo/gradlew.bat
diff --git a/...spring-cloud-function-sample-pojo/pom.xml → ...tion-samples/function-sample-pojo/pom.xml b/...spring-cloud-function-sample-pojo/pom.xml → ...tion-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>
 

diff --git a/...a/com/example/LowercaseConfiguration.java → ...a/com/example/LowercaseConfiguration.java b/...a/com/example/LowercaseConfiguration.java → ...a/com/example/LowercaseConfiguration.java
diff --git a/...n/java/com/example/SampleApplication.java → ...n/java/com/example/SampleApplication.java b/...n/java/com/example/SampleApplication.java → ...n/java/com/example/SampleApplication.java
diff --git a/...resources/META-INF/thin-stream.properties → ...resources/META-INF/thin-stream.properties b/...resources/META-INF/thin-stream.properties → ...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
diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/...a/com/example/SampleApplicationTests.java → ...a/com/example/SampleApplicationTests.java b/...a/com/example/SampleApplicationTests.java → ...a/com/example/SampleApplicationTests.java
diff --git a/...s/spring-cloud-function-sample-task/.jdk8 → ...nction-samples/function-sample-task/.jdk8 b/...s/spring-cloud-function-sample-task/.jdk8 → ...nction-samples/function-sample-task/.jdk8
diff --git a/...g-cloud-function-sample-task/build.gradle → ...samples/function-sample-task/build.gradle b/...g-cloud-function-sample-task/build.gradle → ...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
 

diff --git a/...le-task/gradle/wrapper/gradle-wrapper.jar → ...le-task/gradle/wrapper/gradle-wrapper.jar b/...le-task/gradle/wrapper/gradle-wrapper.jar → ...le-task/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/...spring-cloud-function-sample-task/gradlew → ...tion-samples/function-sample-task/gradlew b/...spring-cloud-function-sample-task/gradlew → ...tion-samples/function-sample-task/gradlew
diff --git a/...ng-cloud-function-sample-task/gradlew.bat → ...-samples/function-sample-task/gradlew.bat b/...ng-cloud-function-sample-task/gradlew.bat → ...-samples/function-sample-task/gradlew.bat
diff --git a/...spring-cloud-function-sample-task/pom.xml → ...tion-samples/function-sample-task/pom.xml b/...spring-cloud-function-sample-task/pom.xml → ...tion-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>

diff --git a/...n/java/com/example/SampleApplication.java → ...n/java/com/example/SampleApplication.java b/...n/java/com/example/SampleApplication.java → ...n/java/com/example/SampleApplication.java
diff --git a/...e-task/src/main/resources/application.yml → ...e-task/src/main/resources/application.yml b/...e-task/src/main/resources/application.yml → ...e-task/src/main/resources/application.yml
diff --git a/...amples/spring-cloud-function-sample/.jdk8 → ...ud-function-samples/function-sample/.jdk8 b/...amples/spring-cloud-function-sample/.jdk8 → ...ud-function-samples/function-sample/.jdk8
diff --git a/...oud-function-sample-compiler/build.gradle → ...tion-samples/function-sample/build.gradle b/...oud-function-sample-compiler/build.gradle → ...tion-samples/function-sample/build.gradle
diff --git a/...-sample/gradle/wrapper/gradle-wrapper.jar → ...-sample/gradle/wrapper/gradle-wrapper.jar b/...-sample/gradle/wrapper/gradle-wrapper.jar → ...-sample/gradle/wrapper/gradle-wrapper.jar
diff --git a/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties b/.../gradle/wrapper/gradle-wrapper.properties → .../gradle/wrapper/gradle-wrapper.properties
diff --git a/...ples/spring-cloud-function-sample/gradlew → ...-function-samples/function-sample/gradlew b/...ples/spring-cloud-function-sample/gradlew → ...-function-samples/function-sample/gradlew
diff --git a/.../spring-cloud-function-sample/gradlew.bat → ...ction-samples/function-sample/gradlew.bat b/.../spring-cloud-function-sample/gradlew.bat → ...ction-samples/function-sample/gradlew.bat
diff --git a/...ples/spring-cloud-function-sample/pom.xml → ...-function-samples/function-sample/pom.xml b/...ples/spring-cloud-function-sample/pom.xml → ...-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>

diff --git a/...n/java/com/example/SampleApplication.java → ...n/java/com/example/SampleApplication.java b/...n/java/com/example/SampleApplication.java → ...n/java/com/example/SampleApplication.java
diff --git a/...va/com/example/functions/CharCounter.java → ...va/com/example/functions/CharCounter.java b/...va/com/example/functions/CharCounter.java → ...va/com/example/functions/CharCounter.java
diff --git a/...java/com/example/functions/Exclaimer.java → ...java/com/example/functions/Exclaimer.java b/...java/com/example/functions/Exclaimer.java → ...java/com/example/functions/Exclaimer.java
diff --git a/...n/java/com/example/functions/Greeter.java → ...n/java/com/example/functions/Greeter.java b/...n/java/com/example/functions/Greeter.java → ...n/java/com/example/functions/Greeter.java
diff --git a/...resources/META-INF/thin-stream.properties → ...resources/META-INF/thin-stream.properties b/...resources/META-INF/thin-stream.properties → ...resources/META-INF/thin-stream.properties
diff --git a/...src/main/resources/application.properties → ...src/main/resources/application.properties b/...src/main/resources/application.properties → ...src/main/resources/application.properties
diff --git a/.../test/java/com/example/FunctionTests.java → .../test/java/com/example/FunctionTests.java b/.../test/java/com/example/FunctionTests.java → .../test/java/com/example/FunctionTests.java
diff --git a/...a/com/example/SampleApplicationTests.java → ...a/com/example/SampleApplicationTests.java b/...a/com/example/SampleApplicationTests.java → ...a/com/example/SampleApplicationTests.java
diff --git a/spring-cloud-function-samples/pom.xml b/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>

diff --git a/spring-cloud-function-task/pom.xml b/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>