diff --git a/pom.xml b/pom.xml index 3d1bdb0b7..1f3a60bc2 100644 --- a/pom.xml +++ b/pom.xml @@ -17,6 +17,7 @@ 1.8 Chelsea.SR2 + 1.1.2.RELEASE 1.0.7.RELEASE 1.5.7.RELEASE spring-cloud-function @@ -24,11 +25,6 @@ - - commons-io - commons-io - 2.3 - org.springframework.cloud spring-cloud-function-dependencies @@ -43,6 +39,13 @@ pom import + + org.springframework.cloud + spring-cloud-task-dependencies + ${spring-cloud-task.version} + pom + import + diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index d52c07e08..c4ebb7718 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -14,18 +14,6 @@ spring-cloud-function-adapter-parent - - - - org.springframework.cloud - spring-cloud-dependencies - Dalston.SR3 - pom - import - - - - spring-cloud-function-adapter-aws spring-cloud-function-adapter-openwhisk diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/.jdk8 b/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/.jdk8 similarity index 100% rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/.jdk8 rename to spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/.jdk8 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/build.gradle b/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/build.gradle similarity index 95% rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/build.gradle rename to spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/build.gradle index 23f6e9b03..f213f23c0 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/build.gradle +++ b/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 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/gradle/wrapper/gradle-wrapper.jar b/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/gradle/wrapper/gradle-wrapper.jar rename to spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/gradle/wrapper/gradle-wrapper.jar diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/gradle/wrapper/gradle-wrapper.properties b/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/gradle/wrapper/gradle-wrapper.properties rename to spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/gradle/wrapper/gradle-wrapper.properties diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/gradlew b/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/gradlew similarity index 100% rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/gradlew rename to spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/gradlew diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/gradlew.bat b/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/gradlew.bat similarity index 100% rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/gradlew.bat rename to spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/gradlew.bat diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/pom.xml similarity index 93% rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/pom.xml rename to spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/pom.xml index bd24d63cd..5825fd20e 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/pom.xml +++ b/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"> 4.0.0 - org.springframework.cloud - spring-cloud-function-adapter-sample + io.spring.sample + function-adapter-sample-aws 1.0.0.BUILD-SNAPSHOT jar @@ -65,13 +65,6 @@ - - org.springframework.cloud - spring-cloud-dependencies - Dalston.SR3 - pom - import - org.springframework.cloud spring-cloud-function-dependencies diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/src/main/java/example/Config.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/main/java/example/Config.java similarity index 100% rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/src/main/java/example/Config.java rename to spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/main/java/example/Config.java diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/src/main/java/example/Handler.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/main/java/example/Handler.java similarity index 100% rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/src/main/java/example/Handler.java rename to spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/main/java/example/Handler.java diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/src/main/java/example/Properties.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/main/java/example/Properties.java similarity index 100% rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/src/main/java/example/Properties.java rename to spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/main/java/example/Properties.java diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/src/main/resources/META-INF/thin.properties b/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/main/resources/META-INF/thin.properties similarity index 100% rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/src/main/resources/META-INF/thin.properties rename to spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/main/resources/META-INF/thin.properties diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/src/main/resources/log4j.properties b/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/main/resources/log4j.properties similarity index 100% rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/src/main/resources/log4j.properties rename to spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/main/resources/log4j.properties diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/src/test/java/example/MapTests.java b/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-aws/src/test/java/example/MapTests.java similarity index 100% rename from spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/src/test/java/example/MapTests.java rename to spring-cloud-function-adapters/spring-cloud-function-adapter-samples/function-adapter-sample-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 index cd73b3bb7..04ed9523b 100644 --- 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 @@ pom - spring-cloud-function-adapter-sample + function-adapter-sample-aws diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 0392c204c..288fd1f28 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -23,10 +23,6 @@ ecj 4.4.2 - - commons-io - commons-io - commons-collections commons-collections diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 6b4929afd..86179f447 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -26,11 +26,6 @@ org.springframework spring-context - - commons-io - commons-io - 2.3 - org.springframework.boot spring-boot-starter-logging diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 71c5d4e97..b992963dd 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -55,13 +55,6 @@ maven-aether-provider 3.3.9 - - org.springframework.cloud - spring-cloud-dependencies - Dalston.SR3 - pom - import - diff --git a/spring-cloud-function-deployer/src/main/resources/core-pom.xml b/spring-cloud-function-deployer/src/main/resources/core-pom.xml index 12465fb6b..d68f83f34 100644 --- 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 @@ org.springframework.cloud spring-cloud-dependencies - Dalston.BUILD-SNAPSHOT + Dalston.SR3 pom import diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-compiler/.jdk8 b/spring-cloud-function-samples/function-sample-compiler/.jdk8 similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-compiler/.jdk8 rename to spring-cloud-function-samples/function-sample-compiler/.jdk8 diff --git a/spring-cloud-function-samples/spring-cloud-function-sample/build.gradle b/spring-cloud-function-samples/function-sample-compiler/build.gradle similarity index 95% rename from spring-cloud-function-samples/spring-cloud-function-sample/build.gradle rename to spring-cloud-function-samples/function-sample-compiler/build.gradle index 4c4e8045a..9eb02bdb1 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample/build.gradle +++ b/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 diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-compiler/gradle/wrapper/gradle-wrapper.jar b/spring-cloud-function-samples/function-sample-compiler/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-compiler/gradle/wrapper/gradle-wrapper.jar rename to spring-cloud-function-samples/function-sample-compiler/gradle/wrapper/gradle-wrapper.jar diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-compiler/gradle/wrapper/gradle-wrapper.properties b/spring-cloud-function-samples/function-sample-compiler/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-compiler/gradle/wrapper/gradle-wrapper.properties rename to spring-cloud-function-samples/function-sample-compiler/gradle/wrapper/gradle-wrapper.properties diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-compiler/gradlew b/spring-cloud-function-samples/function-sample-compiler/gradlew similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-compiler/gradlew rename to spring-cloud-function-samples/function-sample-compiler/gradlew diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-compiler/gradlew.bat b/spring-cloud-function-samples/function-sample-compiler/gradlew.bat similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-compiler/gradlew.bat rename to spring-cloud-function-samples/function-sample-compiler/gradlew.bat diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml similarity index 99% rename from spring-cloud-function-samples/spring-cloud-function-sample-compiler/pom.xml rename to spring-cloud-function-samples/function-sample-compiler/pom.xml index 24101f242..4f24f8199 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample-compiler/pom.xml +++ b/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"> 4.0.0 - com.example + io.spring.sample function-sample-compiler 1.0.0.BUILD-SNAPSHOT jar diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-compiler/src/main/java/com/example/SampleApplication.java b/spring-cloud-function-samples/function-sample-compiler/src/main/java/com/example/SampleApplication.java similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-compiler/src/main/java/com/example/SampleApplication.java rename to spring-cloud-function-samples/function-sample-compiler/src/main/java/com/example/SampleApplication.java diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-compiler/src/test/java/com/example/SampleCompiledConsumerTests.java b/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledConsumerTests.java similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-compiler/src/test/java/com/example/SampleCompiledConsumerTests.java rename to spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledConsumerTests.java diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-compiler/src/test/java/com/example/SampleCompiledFunctionTests.java b/spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledFunctionTests.java similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-compiler/src/test/java/com/example/SampleCompiledFunctionTests.java rename to spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledFunctionTests.java diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/build.gradle b/spring-cloud-function-samples/function-sample-pof/build.gradle similarity index 95% rename from spring-cloud-function-samples/spring-cloud-function-sample-pojo/build.gradle rename to spring-cloud-function-samples/function-sample-pof/build.gradle index 4c4e8045a..9eb02bdb1 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/build.gradle +++ b/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 diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pof/gradle/wrapper/gradle-wrapper.jar b/spring-cloud-function-samples/function-sample-pof/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-pof/gradle/wrapper/gradle-wrapper.jar rename to spring-cloud-function-samples/function-sample-pof/gradle/wrapper/gradle-wrapper.jar diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pof/gradle/wrapper/gradle-wrapper.properties b/spring-cloud-function-samples/function-sample-pof/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-pof/gradle/wrapper/gradle-wrapper.properties rename to spring-cloud-function-samples/function-sample-pof/gradle/wrapper/gradle-wrapper.properties diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pof/gradlew b/spring-cloud-function-samples/function-sample-pof/gradlew similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-pof/gradlew rename to spring-cloud-function-samples/function-sample-pof/gradlew diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pof/gradlew.bat b/spring-cloud-function-samples/function-sample-pof/gradlew.bat similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-pof/gradlew.bat rename to spring-cloud-function-samples/function-sample-pof/gradlew.bat diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml similarity index 97% rename from spring-cloud-function-samples/spring-cloud-function-sample-pof/pom.xml rename to spring-cloud-function-samples/function-sample-pof/pom.xml index ce4776406..6ca57a43f 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample-pof/pom.xml +++ b/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"> 4.0.0 - com.example - pof-sample + io.spring.sample + function-sample-pof 1.0.0.BUILD-SNAPSHOT jar spring-cloud-function-sample-pof diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pof/src/main/java/functions/Application.java b/spring-cloud-function-samples/function-sample-pof/src/main/java/functions/Application.java similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-pof/src/main/java/functions/Application.java rename to spring-cloud-function-samples/function-sample-pof/src/main/java/functions/Application.java diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pof/src/main/java/functions/Greeter.java b/spring-cloud-function-samples/function-sample-pof/src/main/java/functions/Greeter.java similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-pof/src/main/java/functions/Greeter.java rename to spring-cloud-function-samples/function-sample-pof/src/main/java/functions/Greeter.java diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/.jdk8 b/spring-cloud-function-samples/function-sample-pojo/.jdk8 similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-pojo/.jdk8 rename to spring-cloud-function-samples/function-sample-pojo/.jdk8 diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pof/build.gradle b/spring-cloud-function-samples/function-sample-pojo/build.gradle similarity index 95% rename from spring-cloud-function-samples/spring-cloud-function-sample-pof/build.gradle rename to spring-cloud-function-samples/function-sample-pojo/build.gradle index 4c4e8045a..9eb02bdb1 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample-pof/build.gradle +++ b/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 diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/gradle/wrapper/gradle-wrapper.jar b/spring-cloud-function-samples/function-sample-pojo/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-pojo/gradle/wrapper/gradle-wrapper.jar rename to spring-cloud-function-samples/function-sample-pojo/gradle/wrapper/gradle-wrapper.jar diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/gradle/wrapper/gradle-wrapper.properties b/spring-cloud-function-samples/function-sample-pojo/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-pojo/gradle/wrapper/gradle-wrapper.properties rename to spring-cloud-function-samples/function-sample-pojo/gradle/wrapper/gradle-wrapper.properties diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/gradlew b/spring-cloud-function-samples/function-sample-pojo/gradlew similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-pojo/gradlew rename to spring-cloud-function-samples/function-sample-pojo/gradlew diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/gradlew.bat b/spring-cloud-function-samples/function-sample-pojo/gradlew.bat similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-pojo/gradlew.bat rename to spring-cloud-function-samples/function-sample-pojo/gradlew.bat diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml similarity index 93% rename from spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml rename to spring-cloud-function-samples/function-sample-pojo/pom.xml index 123eaeb8e..b7fd990e5 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml +++ b/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"> 4.0.0 - com.example + io.spring.sample function-sample-pojo 1.0.0.BUILD-SNAPSHOT jar @@ -50,13 +50,6 @@ pom import - - org.springframework.cloud - spring-cloud-dependencies - Dalston.SR3 - pom - import - diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/src/main/java/com/example/LowercaseConfiguration.java b/spring-cloud-function-samples/function-sample-pojo/src/main/java/com/example/LowercaseConfiguration.java similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-pojo/src/main/java/com/example/LowercaseConfiguration.java rename to spring-cloud-function-samples/function-sample-pojo/src/main/java/com/example/LowercaseConfiguration.java diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/src/main/java/com/example/SampleApplication.java b/spring-cloud-function-samples/function-sample-pojo/src/main/java/com/example/SampleApplication.java similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-pojo/src/main/java/com/example/SampleApplication.java rename to spring-cloud-function-samples/function-sample-pojo/src/main/java/com/example/SampleApplication.java diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/src/main/resources/META-INF/thin-stream.properties b/spring-cloud-function-samples/function-sample-pojo/src/main/resources/META-INF/thin-stream.properties similarity index 55% rename from spring-cloud-function-samples/spring-cloud-function-sample-pojo/src/main/resources/META-INF/thin-stream.properties rename to spring-cloud-function-samples/function-sample-pojo/src/main/resources/META-INF/thin-stream.properties index 3f836e60c..ec3b784d4 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/src/main/resources/META-INF/thin-stream.properties +++ b/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 \ No newline at end of file diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/src/main/resources/application.properties b/spring-cloud-function-samples/function-sample-pojo/src/main/resources/application.properties similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-pojo/src/main/resources/application.properties rename to spring-cloud-function-samples/function-sample-pojo/src/main/resources/application.properties diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/src/test/java/com/example/SampleApplicationTests.java b/spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationTests.java similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-pojo/src/test/java/com/example/SampleApplicationTests.java rename to spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationTests.java diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-task/.jdk8 b/spring-cloud-function-samples/function-sample-task/.jdk8 similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-task/.jdk8 rename to spring-cloud-function-samples/function-sample-task/.jdk8 diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-task/build.gradle b/spring-cloud-function-samples/function-sample-task/build.gradle similarity index 95% rename from spring-cloud-function-samples/spring-cloud-function-sample-task/build.gradle rename to spring-cloud-function-samples/function-sample-task/build.gradle index 2397f00f3..0e4df4fbd 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample-task/build.gradle +++ b/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 diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-task/gradle/wrapper/gradle-wrapper.jar b/spring-cloud-function-samples/function-sample-task/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-task/gradle/wrapper/gradle-wrapper.jar rename to spring-cloud-function-samples/function-sample-task/gradle/wrapper/gradle-wrapper.jar diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-task/gradle/wrapper/gradle-wrapper.properties b/spring-cloud-function-samples/function-sample-task/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-task/gradle/wrapper/gradle-wrapper.properties rename to spring-cloud-function-samples/function-sample-task/gradle/wrapper/gradle-wrapper.properties diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-task/gradlew b/spring-cloud-function-samples/function-sample-task/gradlew similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-task/gradlew rename to spring-cloud-function-samples/function-sample-task/gradlew diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-task/gradlew.bat b/spring-cloud-function-samples/function-sample-task/gradlew.bat similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-task/gradlew.bat rename to spring-cloud-function-samples/function-sample-task/gradlew.bat diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml similarity index 99% rename from spring-cloud-function-samples/spring-cloud-function-sample-task/pom.xml rename to spring-cloud-function-samples/function-sample-task/pom.xml index 18b117ac7..5cab8d70a 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample-task/pom.xml +++ b/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"> 4.0.0 - com.example + io.spring.sample function-sample-task 1.0.0.BUILD-SNAPSHOT jar diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-task/src/main/java/com/example/SampleApplication.java b/spring-cloud-function-samples/function-sample-task/src/main/java/com/example/SampleApplication.java similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-task/src/main/java/com/example/SampleApplication.java rename to spring-cloud-function-samples/function-sample-task/src/main/java/com/example/SampleApplication.java diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-task/src/main/resources/application.yml b/spring-cloud-function-samples/function-sample-task/src/main/resources/application.yml similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-task/src/main/resources/application.yml rename to spring-cloud-function-samples/function-sample-task/src/main/resources/application.yml diff --git a/spring-cloud-function-samples/spring-cloud-function-sample/.jdk8 b/spring-cloud-function-samples/function-sample/.jdk8 similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample/.jdk8 rename to spring-cloud-function-samples/function-sample/.jdk8 diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-compiler/build.gradle b/spring-cloud-function-samples/function-sample/build.gradle similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample-compiler/build.gradle rename to spring-cloud-function-samples/function-sample/build.gradle diff --git a/spring-cloud-function-samples/spring-cloud-function-sample/gradle/wrapper/gradle-wrapper.jar b/spring-cloud-function-samples/function-sample/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample/gradle/wrapper/gradle-wrapper.jar rename to spring-cloud-function-samples/function-sample/gradle/wrapper/gradle-wrapper.jar diff --git a/spring-cloud-function-samples/spring-cloud-function-sample/gradle/wrapper/gradle-wrapper.properties b/spring-cloud-function-samples/function-sample/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample/gradle/wrapper/gradle-wrapper.properties rename to spring-cloud-function-samples/function-sample/gradle/wrapper/gradle-wrapper.properties diff --git a/spring-cloud-function-samples/spring-cloud-function-sample/gradlew b/spring-cloud-function-samples/function-sample/gradlew similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample/gradlew rename to spring-cloud-function-samples/function-sample/gradlew diff --git a/spring-cloud-function-samples/spring-cloud-function-sample/gradlew.bat b/spring-cloud-function-samples/function-sample/gradlew.bat similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample/gradlew.bat rename to spring-cloud-function-samples/function-sample/gradlew.bat diff --git a/spring-cloud-function-samples/spring-cloud-function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml similarity index 98% rename from spring-cloud-function-samples/spring-cloud-function-sample/pom.xml rename to spring-cloud-function-samples/function-sample/pom.xml index ed7215c4f..a51421b7c 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.example - function-sample + spring-cloud-function-sample 1.0.0.BUILD-SNAPSHOT jar spring-cloud-function-sample diff --git a/spring-cloud-function-samples/spring-cloud-function-sample/src/main/java/com/example/SampleApplication.java b/spring-cloud-function-samples/function-sample/src/main/java/com/example/SampleApplication.java similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample/src/main/java/com/example/SampleApplication.java rename to spring-cloud-function-samples/function-sample/src/main/java/com/example/SampleApplication.java diff --git a/spring-cloud-function-samples/spring-cloud-function-sample/src/main/java/com/example/functions/CharCounter.java b/spring-cloud-function-samples/function-sample/src/main/java/com/example/functions/CharCounter.java similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample/src/main/java/com/example/functions/CharCounter.java rename to spring-cloud-function-samples/function-sample/src/main/java/com/example/functions/CharCounter.java diff --git a/spring-cloud-function-samples/spring-cloud-function-sample/src/main/java/com/example/functions/Exclaimer.java b/spring-cloud-function-samples/function-sample/src/main/java/com/example/functions/Exclaimer.java similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample/src/main/java/com/example/functions/Exclaimer.java rename to spring-cloud-function-samples/function-sample/src/main/java/com/example/functions/Exclaimer.java diff --git a/spring-cloud-function-samples/spring-cloud-function-sample/src/main/java/com/example/functions/Greeter.java b/spring-cloud-function-samples/function-sample/src/main/java/com/example/functions/Greeter.java similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample/src/main/java/com/example/functions/Greeter.java rename to spring-cloud-function-samples/function-sample/src/main/java/com/example/functions/Greeter.java diff --git a/spring-cloud-function-samples/spring-cloud-function-sample/src/main/resources/META-INF/thin-stream.properties b/spring-cloud-function-samples/function-sample/src/main/resources/META-INF/thin-stream.properties similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample/src/main/resources/META-INF/thin-stream.properties rename to spring-cloud-function-samples/function-sample/src/main/resources/META-INF/thin-stream.properties diff --git a/spring-cloud-function-samples/spring-cloud-function-sample/src/main/resources/application.properties b/spring-cloud-function-samples/function-sample/src/main/resources/application.properties similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample/src/main/resources/application.properties rename to spring-cloud-function-samples/function-sample/src/main/resources/application.properties diff --git a/spring-cloud-function-samples/spring-cloud-function-sample/src/test/java/com/example/FunctionTests.java b/spring-cloud-function-samples/function-sample/src/test/java/com/example/FunctionTests.java similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample/src/test/java/com/example/FunctionTests.java rename to spring-cloud-function-samples/function-sample/src/test/java/com/example/FunctionTests.java diff --git a/spring-cloud-function-samples/spring-cloud-function-sample/src/test/java/com/example/SampleApplicationTests.java b/spring-cloud-function-samples/function-sample/src/test/java/com/example/SampleApplicationTests.java similarity index 100% rename from spring-cloud-function-samples/spring-cloud-function-sample/src/test/java/com/example/SampleApplicationTests.java rename to spring-cloud-function-samples/function-sample/src/test/java/com/example/SampleApplicationTests.java diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 6f545509f..5aedc1268 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -13,11 +13,11 @@ - spring-cloud-function-sample - spring-cloud-function-sample-pof - spring-cloud-function-sample-pojo - spring-cloud-function-sample-compiler - spring-cloud-function-sample-task + function-sample + function-sample-pof + function-sample-pojo + function-sample-compiler + function-sample-task diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index f1811b39e..d77912847 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -16,13 +16,11 @@ org.springframework.cloud - spring-cloud-task-starter - 1.1.0.BUILD-SNAPSHOT + spring-cloud-starter-task org.springframework.cloud spring-cloud-function-core - ${project.version} io.projectreactor