From 858b7404c6932a07fbaddca33a77253953acb96b Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Fri, 15 Sep 2017 17:48:51 +0100 Subject: [PATCH] Update to 1.0.0.M1 --- docs/pom.xml | 2 +- pom.xml | 2 +- scripts/function-registry.sh | 2 +- scripts/stream.sh | 2 +- scripts/task.sh | 2 +- scripts/web.sh | 2 +- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/README.adoc | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../spring-cloud-function-adapter-openwhisk/README.md | 2 +- .../spring-cloud-function-adapter-openwhisk/pom.xml | 2 +- spring-cloud-function-compiler/pom.xml | 2 +- spring-cloud-function-context/pom.xml | 2 +- spring-cloud-function-core/pom.xml | 2 +- spring-cloud-function-dependencies/pom.xml | 2 +- spring-cloud-function-deployer/README.md | 8 ++++---- spring-cloud-function-deployer/pom.xml | 2 +- .../src/main/resources/META-INF/thin-slim.properties | 2 +- .../function/deployer/FunctionAppDeployerTests.java | 10 +++++----- ...tionExtractingFunctionCatalogIntegrationTests.java | 8 ++++---- .../FunctionExtractingFunctionCatalogTests.java | 4 ++-- .../function-sample-aws/build.gradle | 4 ++-- .../function-sample-aws/pom.xml | 4 ++-- .../function-sample-compiler/build.gradle | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-pof/build.gradle | 4 ++-- .../function-sample-pof/pom.xml | 11 +++++++++-- .../function-sample-pojo/build.gradle | 4 ++-- .../function-sample-pojo/pom.xml | 4 ++-- .../function-sample-task/build.gradle | 4 ++-- .../function-sample-task/pom.xml | 4 ++-- .../function-sample/build.gradle | 2 +- spring-cloud-function-samples/function-sample/pom.xml | 8 ++++---- .../main/resources/META-INF/thin-stream.properties | 2 +- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-stream/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- 38 files changed, 69 insertions(+), 62 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 54722c399..9a72ef163 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 1f3a60bc2..7988bb0e3 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ spring-cloud-function-parent Spring Cloud Function Parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 pom diff --git a/scripts/function-registry.sh b/scripts/function-registry.sh index 8d63c3b76..19e388f02 100755 --- a/scripts/function-registry.sh +++ b/scripts/function-registry.sh @@ -1,3 +1,3 @@ #!/bin/bash -java -jar ../spring-cloud-function-compiler/target/spring-cloud-function-compiler-1.0.0.BUILD-SNAPSHOT.jar +java -jar ../spring-cloud-function-compiler/target/spring-cloud-function-compiler-1.0.0.M1.jar diff --git a/scripts/stream.sh b/scripts/stream.sh index e9bb2c429..bc787844d 100755 --- a/scripts/stream.sh +++ b/scripts/stream.sh @@ -45,7 +45,7 @@ while getopts ":i:s:f:c:o:p:d:" opt; do esac done -java -jar ../spring-cloud-function-samples/spring-cloud-function-sample-compiler/target/function-sample-compiler-1.0.0.BUILD-SNAPSHOT.jar\ +java -jar ../spring-cloud-function-samples/spring-cloud-function-sample-compiler/target/function-sample-compiler-1.0.0.M1.jar\ --management.security.enabled=false\ --server.port=$PORT\ --spring.cloud.function.stream.endpoint=$FUNC\ diff --git a/scripts/task.sh b/scripts/task.sh index 022978965..b50ed11f9 100755 --- a/scripts/task.sh +++ b/scripts/task.sh @@ -14,5 +14,5 @@ while getopts ":s:f:c:" opt; do esac done -java -noverify -XX:TieredStopAtLevel=1 -Xss256K -Xms16M -Xmx256M -XX:MaxMetaspaceSize=128M -jar ../spring-cloud-function-task/target/spring-cloud-function-task-1.0.0.BUILD-SNAPSHOT.jar\ +java -noverify -XX:TieredStopAtLevel=1 -Xss256K -Xms16M -Xmx256M -XX:MaxMetaspaceSize=128M -jar ../spring-cloud-function-task/target/spring-cloud-function-task-1.0.0.M1.jar\ --lambda.supplier=$SUPP --lambda.function=$FUNC --lambda.consumer=$CONS diff --git a/scripts/web.sh b/scripts/web.sh index b1c72a14c..be30a1a49 100755 --- a/scripts/web.sh +++ b/scripts/web.sh @@ -20,7 +20,7 @@ while getopts ":s:f:c:p:" opt; do esac done -java -jar ../spring-cloud-function-samples/spring-cloud-function-sample-compiler/target/function-sample-compiler-1.0.0.BUILD-SNAPSHOT.jar\ +java -jar ../spring-cloud-function-samples/spring-cloud-function-sample-compiler/target/function-sample-compiler-1.0.0.M1.jar\ --spring.cloud.function.import.$FUNC.type=$TYPE\ --spring.cloud.function.import.$FUNC.location=file:///tmp/function-registry/$TYPE's'/$FUNC.fun\ --management.security.enabled=false\ diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index 431c83115..3e3069790 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-function-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 spring-cloud-function-adapter-parent diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/README.adoc b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/README.adoc index 5cd47e126..26bbb1664 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/README.adoc +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/README.adoc @@ -21,6 +21,6 @@ Build the sample under `spring-cloud-function-samples/function-sample-aws` and u Using the AWS command line tools it looks like this: ---- -aws lambda create-function --function-name Uppercase --role arn:aws:iam::[USERID]:role/service-role/[ROLE] --zip-file fileb://function-sample-aws/target/function-sample-aws-1.0.0.BUILD-SNAPSHOT-aws.jar --handler org.springframework.cloud.function.adapter.aws.SpringBootStreamHandler --description "Spring Cloud Function Adapter Example" --runtime java8 --region us-east-1 --timeout 30 --memory-size 1024 --publish +aws lambda create-function --function-name Uppercase --role arn:aws:iam::[USERID]:role/service-role/[ROLE] --zip-file fileb://function-sample-aws/target/function-sample-aws-1.0.0.M1-aws.jar --handler org.springframework.cloud.function.adapter.aws.SpringBootStreamHandler --description "Spring Cloud Function Adapter Example" --runtime java8 --region us-east-1 --timeout 30 --memory-size 1024 --publish ---- diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml index 85d2d140f..0298abf9b 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/README.md b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/README.md index 99dd78197..c685052ed 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/README.md +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/README.md @@ -28,7 +28,7 @@ dependencies.function: com.example:pof:0.0.1-SNAPSHOT Copy the openwhisk runner JAR to the working directory (same directory as the properties file): ``` -cp spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/target/spring-cloud-function-adapter-openwhisk-1.0.0.BUILD-SNAPSHOT.jar runner.jar +cp spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/target/spring-cloud-function-adapter-openwhisk-1.0.0.M1.jar runner.jar ``` Generate a m2 repo from the `--thin.dryrun` of the runner JAR with the above properties file: diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml index deee72e3d..7605dbc9c 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 288fd1f28..d1727f060 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 52bbd046f..a464a3090 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 86179f447..72af696ab 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index ba128458e..5f8319b12 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -9,7 +9,7 @@ spring-cloud-function-dependencies - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/README.md b/spring-cloud-function-deployer/README.md index 069d4501d..87e2162c4 100644 --- a/spring-cloud-function-deployer/README.md +++ b/spring-cloud-function-deployer/README.md @@ -22,14 +22,14 @@ $ curl localhost:8080/admin Deploy a sample like this: ``` -$ curl localhost:8080/admin/pojos -d path=maven://com.example:function-sample-pojo:1.0.0.BUILD-SNAPSHOT +$ curl localhost:8080/admin/pojos -d path=maven://com.example:function-sample-pojo:1.0.0.M1 {"id":"81c568e36c7909ec1dd841aa7ee6d3e3"} ``` (takes about 500ms, once the local Maven cache is warm). Deploy another one: ``` -$ curl localhost:8080/admin/sample -d path=maven://com.example:function-sample:1.0.0.BUILD-SNAPSHOT +$ curl localhost:8080/admin/sample -d path=maven://com.example:function-sample:1.0.0.M1 {"id":"cb2fdb3130f6349f143f4686848ea90f"} ``` @@ -37,14 +37,14 @@ Undeploy the first one: ``` $ curl localhost:8080/admin/pojos -X DELETE -{"name":"81c568e36c7909ec1dd841aa7ee6d3e3","id":"pojos","path":"maven://com.example:function-sample-pojo:1.0.0.BUILD-SNAPSHOT"} +{"name":"81c568e36c7909ec1dd841aa7ee6d3e3","id":"pojos","path":"maven://com.example:function-sample-pojo:1.0.0.M1"} ``` List the deployed apps: ``` $ curl localhost:8080/admin -{"sample":{"name":"sample","id":"cb2fdb3130f6349f143f4686848ea90","path":"maven://com.example:function-sample:1.0.0.BUILD-SNAPSHOT"}} +{"sample":{"name":"sample","id":"cb2fdb3130f6349f143f4686848ea90","path":"maven://com.example:function-sample:1.0.0.M1"}} ``` Send an event to one of the functions: diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index b992963dd..6e945c140 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 diff --git a/spring-cloud-function-deployer/src/main/resources/META-INF/thin-slim.properties b/spring-cloud-function-deployer/src/main/resources/META-INF/thin-slim.properties index 7336d7ff9..611c4ae3f 100644 --- a/spring-cloud-function-deployer/src/main/resources/META-INF/thin-slim.properties +++ b/spring-cloud-function-deployer/src/main/resources/META-INF/thin-slim.properties @@ -11,5 +11,5 @@ exclusions.spring-boot-starter-actuator: org.springframework.boot:spring-boot-st dependencies.spring-web: org.springframework:spring-web dependencies.jackson-databind: com.fasterxml.jackson.core:jackson-databind dependencies.spring-boot-starter: org.springframework.boot:spring-boot-starter -dependencies.spring-cloud-function-context: org.springframework.cloud:spring-cloud-function-context:1.0.0.BUILD-SNAPSHOT +dependencies.spring-cloud-function-context: org.springframework.cloud:spring-cloud-function-context:1.0.0.M1 diff --git a/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionAppDeployerTests.java b/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionAppDeployerTests.java index e4a3d476b..611761eca 100644 --- a/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionAppDeployerTests.java +++ b/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionAppDeployerTests.java @@ -57,8 +57,8 @@ public class FunctionAppDeployerTests { @BeforeClass public static void skip() { try { - ArchiveUtils.getArchiveRoot(ArchiveUtils.getArchive( - "maven://com.example:function-sample:1.0.0.BUILD-SNAPSHOT")); + ArchiveUtils.getArchiveRoot(ArchiveUtils + .getArchive("maven://io.spring.sample:function-sample:1.0.0.M1")); } catch (Exception e) { Assume.assumeNoException( @@ -75,8 +75,8 @@ public class FunctionAppDeployerTests { @Test public void web() throws Exception { - String first = deploy("maven://com.example:function-sample:1.0.0.BUILD-SNAPSHOT", - "", "--spring.cloud.function.stream.supplier.enabled=false"); + String first = deploy("maven://io.spring.sample:function-sample:1.0.0.M1", "", + "--spring.cloud.function.stream.supplier.enabled=false"); // Deployment is blocking so it either failed or succeeded. assertThat(deployer.status(first).getState()).isEqualTo(DeploymentState.deployed); deployer.undeploy(first); @@ -84,7 +84,7 @@ public class FunctionAppDeployerTests { @Test public void stream() throws Exception { - String first = deploy("maven://com.example:function-sample:1.0.0.BUILD-SNAPSHOT", + String first = deploy("maven://io.spring.sample:function-sample:1.0.0.M1", "spring.cloud.deployer.thin.profile=stream", "--spring.cloud.function.stream.supplier.enabled=false", "--debug=true"); // Deployment is blocking so it either failed or succeeded. diff --git a/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionExtractingFunctionCatalogIntegrationTests.java b/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionExtractingFunctionCatalogIntegrationTests.java index 99775e8e7..a397be4ac 100644 --- a/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionExtractingFunctionCatalogIntegrationTests.java +++ b/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionExtractingFunctionCatalogIntegrationTests.java @@ -45,7 +45,7 @@ public class FunctionExtractingFunctionCatalogIntegrationTests { // System.setProperty("debug", "true"); context = new ApplicationRunner().start("--server.port=" + port, "--spring.cloud.stream.enabled=false"); - deploy("sample", "maven://com.example:function-sample:1.0.0.BUILD-SNAPSHOT"); + deploy("sample", "maven://io.spring.sample:function-sample:1.0.0.M1"); } private static void deploy(String name, String path) throws Exception { @@ -93,7 +93,7 @@ public class FunctionExtractingFunctionCatalogIntegrationTests { @Test public void another() throws Exception { - deploy("strings", "maven://com.example:function-sample:1.0.0.BUILD-SNAPSHOT"); + deploy("strings", "maven://io.spring.sample:function-sample:1.0.0.M1"); assertThat(new TestRestTemplate().getForObject( "http://localhost:" + port + "/strings/words", String.class)) .isEqualTo("[\"foo\",\"bar\"]"); @@ -104,12 +104,12 @@ public class FunctionExtractingFunctionCatalogIntegrationTests { String undeploy = undeploy("sample"); assertThat(undeploy.contains("\"name\":\"sample\"")); assertThat(undeploy.contains( - "\"path\":\"maven://com.example:function-sample-pojo:1.0.0.BUILD-SNAPSHOT\"")); + "\"path\":\"maven://io.spring.sample:function-sample-pojo:1.0.0.M1\"")); ResponseEntity result = new TestRestTemplate().exchange(RequestEntity .get(new URI("http://localhost:" + port + "/sample/words")).build(), String.class); assertThat(result.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); - deploy("sample", "maven://com.example:function-sample-pojo:1.0.0.BUILD-SNAPSHOT"); + deploy("sample", "maven://io.spring.sample:function-sample-pojo:1.0.0.M1"); assertThat(new TestRestTemplate().postForObject( "http://localhost:" + port + "/sample/uppercase", "{\"value\":\"foo\"}", String.class)).isEqualTo("[{\"value\":\"FOO\"}]"); diff --git a/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionExtractingFunctionCatalogTests.java b/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionExtractingFunctionCatalogTests.java index 4b750a468..c4bb39ebe 100644 --- a/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionExtractingFunctionCatalogTests.java +++ b/spring-cloud-function-deployer/src/test/java/org/springframework/cloud/function/deployer/FunctionExtractingFunctionCatalogTests.java @@ -47,10 +47,10 @@ public class FunctionExtractingFunctionCatalogTests { @Before public void init() throws Exception { if (id == null) { - deploy("sample", "maven://com.example:function-sample:1.0.0.BUILD-SNAPSHOT"); + deploy("sample", "maven://io.spring.sample:function-sample:1.0.0.M1"); // "--debug"); id = deploy("pojos", - "maven://com.example:function-sample-pojo:1.0.0.BUILD-SNAPSHOT"); + "maven://io.spring.sample:function-sample-pojo:1.0.0.M1"); } } diff --git a/spring-cloud-function-samples/function-sample-aws/build.gradle b/spring-cloud-function-samples/function-sample-aws/build.gradle index f213f23c0..2deba817a 100644 --- a/spring-cloud-function-samples/function-sample-aws/build.gradle +++ b/spring-cloud-function-samples/function-sample-aws/build.gradle @@ -26,7 +26,7 @@ apply plugin: 'spring-boot' apply plugin: 'org.springframework.boot.experimental.thin-launcher' group = 'io.spring.sample' -version = '1.0.0.BUILD-SNAPSHOT' +version = '1.0.0.M1' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -38,7 +38,7 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.M1" awsLambdaEventsVersion = "1.2.1" awsLambdaCoreVersion = "1.1.0" } diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index e55aee5ad..870675f8b 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -5,7 +5,7 @@ io.spring.sample function-sample-aws - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 jar function-sample-aws @@ -25,7 +25,7 @@ 1.0.5.RELEASE 1.2.1 3.0.7.RELEASE - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 example.Config diff --git a/spring-cloud-function-samples/function-sample-compiler/build.gradle b/spring-cloud-function-samples/function-sample-compiler/build.gradle index 9eb02bdb1..0f779ac1f 100644 --- a/spring-cloud-function-samples/function-sample-compiler/build.gradle +++ b/spring-cloud-function-samples/function-sample-compiler/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'spring-boot' apply plugin: 'org.springframework.boot.experimental.thin-launcher' group = 'io.spring.sample' -version = '1.0.0.BUILD-SNAPSHOT' +version = '1.0.0.M1' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -34,7 +34,7 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.M1" } ext['reactor.version'] = "3.0.7.RELEASE" diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 4f24f8199..d6ab49d3d 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -5,7 +5,7 @@ io.spring.sample function-sample-compiler - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 jar spring-cloud-function-sample-compiler Spring Cloud Function Lambda Compiling Support @@ -19,7 +19,7 @@ 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 Chelsea.SR2 3.0.7.RELEASE 1.0.7.RELEASE diff --git a/spring-cloud-function-samples/function-sample-pof/build.gradle b/spring-cloud-function-samples/function-sample-pof/build.gradle index 9eb02bdb1..0f779ac1f 100644 --- a/spring-cloud-function-samples/function-sample-pof/build.gradle +++ b/spring-cloud-function-samples/function-sample-pof/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'spring-boot' apply plugin: 'org.springframework.boot.experimental.thin-launcher' group = 'io.spring.sample' -version = '1.0.0.BUILD-SNAPSHOT' +version = '1.0.0.M1' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -34,7 +34,7 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.M1" } ext['reactor.version'] = "3.0.7.RELEASE" diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 6ca57a43f..dccbdf812 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -4,7 +4,7 @@ io.spring.sample function-sample-pof - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 jar spring-cloud-function-sample-pof Spring Cloud Function Web Support @@ -21,7 +21,7 @@ UTF-8 1.8 3.0.7.RELEASE - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 @@ -49,6 +49,13 @@ + + org.apache.maven.plugins + maven-deploy-plugin + + true + + org.springframework.boot spring-boot-maven-plugin diff --git a/spring-cloud-function-samples/function-sample-pojo/build.gradle b/spring-cloud-function-samples/function-sample-pojo/build.gradle index 9eb02bdb1..0f779ac1f 100644 --- a/spring-cloud-function-samples/function-sample-pojo/build.gradle +++ b/spring-cloud-function-samples/function-sample-pojo/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'spring-boot' apply plugin: 'org.springframework.boot.experimental.thin-launcher' group = 'io.spring.sample' -version = '1.0.0.BUILD-SNAPSHOT' +version = '1.0.0.M1' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -34,7 +34,7 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.M1" } ext['reactor.version'] = "3.0.7.RELEASE" diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index b7fd990e5..524382936 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -5,7 +5,7 @@ io.spring.sample function-sample-pojo - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 jar spring-cloud-function-sample-pojo Spring Cloud Function Web Support @@ -19,7 +19,7 @@ 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 1.0.7.RELEASE 3.0.7.RELEASE diff --git a/spring-cloud-function-samples/function-sample-task/build.gradle b/spring-cloud-function-samples/function-sample-task/build.gradle index 0e4df4fbd..f7aca9dc3 100644 --- a/spring-cloud-function-samples/function-sample-task/build.gradle +++ b/spring-cloud-function-samples/function-sample-task/build.gradle @@ -22,7 +22,7 @@ apply plugin: 'spring-boot' apply plugin: 'org.springframework.boot.experimental.thin-launcher' group = 'io.spring.sample' -version = '1.0.0.BUILD-SNAPSHOT' +version = '1.0.0.M1' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -34,7 +34,7 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.M1" } ext['reactor.version'] = "3.0.7.RELEASE" diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 5cab8d70a..a3210a6df 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -5,7 +5,7 @@ io.spring.sample function-sample-task - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 jar spring-cloud-function-sample-task Spring Cloud Function Task Support @@ -19,7 +19,7 @@ 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 1.0.7.RELEASE 3.0.7.RELEASE diff --git a/spring-cloud-function-samples/function-sample/build.gradle b/spring-cloud-function-samples/function-sample/build.gradle index 4c4e8045a..6b4643db5 100644 --- a/spring-cloud-function-samples/function-sample/build.gradle +++ b/spring-cloud-function-samples/function-sample/build.gradle @@ -34,7 +34,7 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.M1" } ext['reactor.version'] = "3.0.7.RELEASE" diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index a51421b7c..22fc76f82 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -3,9 +3,9 @@ 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 - spring-cloud-function-sample - 1.0.0.BUILD-SNAPSHOT + io.spring.sample + function-sample + 1.0.0.M1 jar spring-cloud-function-sample Spring Cloud Function Web Support @@ -19,7 +19,7 @@ 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 3.0.7.RELEASE 1.0.7.RELEASE diff --git a/spring-cloud-function-samples/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 index 9ecef0d7b..dbb33dd27 100644 --- a/spring-cloud-function-samples/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 @@ -1,3 +1,3 @@ boms.spring-cloud-dependencies: org.springframework.cloud:spring-cloud-dependencies:Dalston.RELEASE -dependencies.spring-cloud-function-stream: org.springframework.cloud:spring-cloud-function-stream:1.0.0.BUILD-SNAPSHOT +dependencies.spring-cloud-function-stream: org.springframework.cloud:spring-cloud-function-stream:1.0.0.M1 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/pom.xml b/spring-cloud-function-samples/pom.xml index 77df80170..69faaab26 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -9,7 +9,7 @@ org.springframework.cloud spring-cloud-function-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 diff --git a/spring-cloud-function-stream/pom.xml b/spring-cloud-function-stream/pom.xml index a3b367a18..0c436eccd 100644 --- a/spring-cloud-function-stream/pom.xml +++ b/spring-cloud-function-stream/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index d77912847..6c59636bc 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1 diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 259d217cb..172865118 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M1