From d1bcb7d14255f5237596b8a4b5da58147a0a8184 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Mon, 16 Apr 2018 16:04:31 +0100 Subject: [PATCH] Update to 1.0.0.M6 --- 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-azure/README.adoc | 2 +- .../spring-cloud-function-adapter-azure/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 +- .../cloud/function/deployer/FunctionAppDeployerTests.java | 6 +++--- ...FunctionExtractingFunctionCatalogIntegrationTests.java | 8 ++++---- .../deployer/FunctionExtractingFunctionCatalogTests.java | 4 ++-- .../function-sample-aws/build.gradle | 4 ++-- spring-cloud-function-samples/function-sample-aws/pom.xml | 6 +++--- .../function-sample-azure/pom.xml | 4 ++-- .../src/main/azure/uppercase/function.json | 2 +- .../function-sample-compiler/build.gradle | 4 ++-- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-pof/build.gradle | 4 ++-- spring-cloud-function-samples/function-sample-pof/pom.xml | 6 +++--- .../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 | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-stream/pom.xml | 4 ++-- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-stream-binder-servlet/pom.xml | 2 +- 43 files changed, 67 insertions(+), 67 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 54722c399..6e9de65f2 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.M6 pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index caa171b35..c09b417c1 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.M6 pom diff --git a/scripts/function-registry.sh b/scripts/function-registry.sh index 8d63c3b76..47a26ca55 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.M6.jar diff --git a/scripts/stream.sh b/scripts/stream.sh index e9bb2c429..8cb8a365d 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.M6.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..2465e6a84 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.M6.jar\ --lambda.supplier=$SUPP --lambda.function=$FUNC --lambda.consumer=$CONS diff --git a/scripts/web.sh b/scripts/web.sh index f9d182923..46ab222bd 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/function-sample-compiler/target/function-sample-compiler-1.0.0.BUILD-SNAPSHOT.jar\ +java -jar ../spring-cloud-function-samples/function-sample-compiler/target/function-sample-compiler-1.0.0.M6.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 19f922f81..1b72371ce 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.M6 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 391072ae4..2b7761341 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,7 +21,7 @@ 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.M6-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 ---- The input type for the function in the AWS sample is a Foo with a single property called "value". So you would need this to test it: 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 31ed08535..923fc75b6 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 @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M6 diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/README.adoc b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/README.adoc index 630092b67..76eea105a 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/README.adoc +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/README.adoc @@ -20,7 +20,7 @@ The Azure tooling needs to find some JSON configuration files to tell it how to ``` { - "scriptFile" : "../function-sample-azure-1.0.0.BUILD-SNAPSHOT-azure.jar", + "scriptFile" : "../function-sample-azure-1.0.0.M6-azure.jar", "entryPoint" : "example.FooHandler.execute", "bindings" : [ { "type" : "httpTrigger", diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml index 7f15cd126..34ca51663 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M6 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 e06a0a440..b3c016669 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.M6.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..4956ad5f6 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.M6 diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 288fd1f28..2ac0d5b77 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.M6 diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index f111e1a40..d256184fc 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.M6 diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 21cf54a23..c8c144f4a 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.M6 diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index f9741bcac..50d3021dc 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.M6 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..72ce5c1c4 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.M6 {"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.M6 {"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.M6"} ``` 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.M6"}} ``` 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 cfdc29e91..cd553ffd5 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.M6 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 af7781b7e..b6717547d 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.M6 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 94a290220..51fdf9084 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 @@ -58,7 +58,7 @@ public class FunctionAppDeployerTests { public static void skip() { try { ArchiveUtils.getArchiveRoot(ArchiveUtils - .getArchive("maven://io.spring.sample:function-sample:1.0.0.BUILD-SNAPSHOT")); + .getArchive("maven://io.spring.sample:function-sample:1.0.0.M6")); } catch (Exception e) { Assume.assumeNoException( @@ -84,7 +84,7 @@ public class FunctionAppDeployerTests { @Test public void web() throws Exception { - String first = deploy("maven://io.spring.sample:function-sample:1.0.0.BUILD-SNAPSHOT", "", + String first = deploy("maven://io.spring.sample:function-sample:1.0.0.M6", "", "--spring.cloud.function.stream.supplier.enabled=false"); // Deployment is blocking so it either failed or succeeded. assertThat(deployer.status(first).getState()).isEqualTo(DeploymentState.deployed); @@ -93,7 +93,7 @@ public class FunctionAppDeployerTests { @Test public void stream() throws Exception { - String first = deploy("maven://io.spring.sample:function-sample:1.0.0.BUILD-SNAPSHOT", + String first = deploy("maven://io.spring.sample:function-sample:1.0.0.M6", "spring.cloud.deployer.thin.profile=rabbit", "--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 a22467008..9505a949d 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 @@ -46,7 +46,7 @@ public class FunctionExtractingFunctionCatalogIntegrationTests { // System.setProperty("debug", "true"); context = new ApplicationRunner().start("--server.port=" + port, "--debug", "--logging.level.org.springframework.cloud.function=DEBUG"); - deploy("sample", "maven://io.spring.sample:function-sample:1.0.0.BUILD-SNAPSHOT"); + deploy("sample", "maven://io.spring.sample:function-sample:1.0.0.M6"); } private static void deploy(String name, String path) throws Exception { @@ -105,7 +105,7 @@ public class FunctionExtractingFunctionCatalogIntegrationTests { @Test public void another() throws Exception { deploy("pof", - "maven://io.spring.sample:function-sample-pof:jar:exec:1.0.0.BUILD-SNAPSHOT"); + "maven://io.spring.sample:function-sample-pof:jar:exec:1.0.0.M6"); assertThat(new TestRestTemplate().postForObject( "http://localhost:" + port + "/stream/pof/greeter", "Foo", String.class)).isEqualTo("Hello Foo"); @@ -116,12 +116,12 @@ public class FunctionExtractingFunctionCatalogIntegrationTests { String undeploy = undeploy("sample"); assertThat(undeploy.contains("\"name\":\"sample\"")); assertThat(undeploy.contains( - "\"path\":\"maven://io.spring.sample:function-sample:1.0.0.BUILD-SNAPSHOT\"")); + "\"path\":\"maven://io.spring.sample:function-sample:1.0.0.M6\"")); ResponseEntity result = new TestRestTemplate().exchange(RequestEntity .get(new URI("http://localhost:" + port + "/stream/sample/words")) .build(), String.class); assertThat(result.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); - deploy("sample", "maven://io.spring.sample:function-sample:1.0.0.BUILD-SNAPSHOT"); + deploy("sample", "maven://io.spring.sample:function-sample:1.0.0.M6"); assertThat(new TestRestTemplate().postForObject( "http://localhost:" + port + "/stream/sample/uppercase", "foo", String.class)).isEqualTo("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 c151098d6..6ce01da2f 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 @@ -52,10 +52,10 @@ public class FunctionExtractingFunctionCatalogTests { public void init() throws Exception { if (id == null) { deploy("sample", - "maven://io.spring.sample:function-sample:1.0.0.BUILD-SNAPSHOT"); + "maven://io.spring.sample:function-sample:1.0.0.M6"); // "--debug"); id = deploy("pojos", - "maven://io.spring.sample:function-sample-pojo:1.0.0.BUILD-SNAPSHOT"); + "maven://io.spring.sample:function-sample-pojo:1.0.0.M6"); } } diff --git a/spring-cloud-function-samples/function-sample-aws/build.gradle b/spring-cloud-function-samples/function-sample-aws/build.gradle index 2d3ab1415..bf4461e83 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.M6' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -38,7 +38,7 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.M6" 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 a1f0cb9e3..8266b44ae 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.M6 jar function-sample-aws @@ -25,8 +25,8 @@ 1.0.10.RELEASE 2.0.2 3.1.2.RELEASE - 1.0.0.BUILD-SNAPSHOT - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M6 + 1.0.0.M6 example.Config diff --git a/spring-cloud-function-samples/function-sample-azure/pom.xml b/spring-cloud-function-samples/function-sample-azure/pom.xml index 116cc69a2..2e7fc0459 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -5,7 +5,7 @@ io.spring.sample function-sample-azure - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M6 jar function-sample-azure @@ -57,7 +57,7 @@ org.springframework.cloud spring-cloud-function-dependencies - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M6 pom import diff --git a/spring-cloud-function-samples/function-sample-azure/src/main/azure/uppercase/function.json b/spring-cloud-function-samples/function-sample-azure/src/main/azure/uppercase/function.json index 0af9eca0f..de6a79e19 100644 --- a/spring-cloud-function-samples/function-sample-azure/src/main/azure/uppercase/function.json +++ b/spring-cloud-function-samples/function-sample-azure/src/main/azure/uppercase/function.json @@ -1,5 +1,5 @@ { - "scriptFile": "../function-sample-azure-1.0.0.BUILD-SNAPSHOT-azure.jar", + "scriptFile": "../function-sample-azure-1.0.0.M6-azure.jar", "entryPoint": "example.FooHandler.execute", "bindings": [ { diff --git a/spring-cloud-function-samples/function-sample-compiler/build.gradle b/spring-cloud-function-samples/function-sample-compiler/build.gradle index 3047962ca..f75e9bc78 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.M6' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -34,7 +34,7 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.M6" } ext['reactor.version'] = "3.1.2.RELEASE" diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 951703bdc..31a919fca 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.M6 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.M6 Ditmars.RELEASE 3.1.2.RELEASE 1.0.10.RELEASE diff --git a/spring-cloud-function-samples/function-sample-pof/build.gradle b/spring-cloud-function-samples/function-sample-pof/build.gradle index 33df5aac6..da88d042a 100644 --- a/spring-cloud-function-samples/function-sample-pof/build.gradle +++ b/spring-cloud-function-samples/function-sample-pof/build.gradle @@ -24,7 +24,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.M6' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -36,7 +36,7 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.M6" } ext['reactor.version'] = "3.1.2.RELEASE" diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 501488f9f..b24086f5f 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.M6 jar function-sample-pof Spring Cloud Function Web Support @@ -21,8 +21,8 @@ UTF-8 1.8 3.1.2.RELEASE - 1.0.0.BUILD-SNAPSHOT - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M6 + 1.0.0.M6 diff --git a/spring-cloud-function-samples/function-sample-pojo/build.gradle b/spring-cloud-function-samples/function-sample-pojo/build.gradle index f1db65278..75c4894d8 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.M6' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -34,7 +34,7 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.M6" } ext['reactor.version'] = "3.1.2.RELEASE" diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index f4ba588db..56eda20f1 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.M6 jar function-sample-pojo Spring Cloud Function Web Support @@ -19,7 +19,7 @@ 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M6 1.0.10.RELEASE 3.1.2.RELEASE 2.19.1 diff --git a/spring-cloud-function-samples/function-sample-task/build.gradle b/spring-cloud-function-samples/function-sample-task/build.gradle index a59a0d466..2005998e1 100644 --- a/spring-cloud-function-samples/function-sample-task/build.gradle +++ b/spring-cloud-function-samples/function-sample-task/build.gradle @@ -24,7 +24,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.M6' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -36,7 +36,7 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.M6" } ext['reactor.version'] = "3.1.2.RELEASE" diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index f1abf976e..61c5d5875 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.M6 jar function-sample-task Spring Cloud Function Task Support @@ -19,7 +19,7 @@ 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M6 1.0.10.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample/build.gradle b/spring-cloud-function-samples/function-sample/build.gradle index c55385117..dea291e7f 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.M6" } ext['reactor.version'] = "3.1.2.RELEASE" diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 192ae5f2b..7012e7b30 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -5,7 +5,7 @@ io.spring.sample function-sample - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M6 jar function-sample Spring Cloud Function Web Support @@ -19,7 +19,7 @@ 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M6 3.1.2.RELEASE 1.0.10.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 3abdda8b4..c726b0ec8 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.M6 diff --git a/spring-cloud-function-stream/pom.xml b/spring-cloud-function-stream/pom.xml index 442d3e60a..76dc274fd 100644 --- a/spring-cloud-function-stream/pom.xml +++ b/spring-cloud-function-stream/pom.xml @@ -11,11 +11,11 @@ org.springframework.cloud spring-cloud-function-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M6 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M6 diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 7c1fcfdbe..f5499e450 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.M6 diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 0c078cfb4..a50d155c6 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.M6 diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 102dc99d7..6d809a5ad 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-function-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M6 .. spring-cloud-starter-function-web diff --git a/spring-cloud-stream-binder-servlet/pom.xml b/spring-cloud-stream-binder-servlet/pom.xml index fb8a1ef90..6713d030c 100644 --- a/spring-cloud-stream-binder-servlet/pom.xml +++ b/spring-cloud-stream-binder-servlet/pom.xml @@ -4,7 +4,7 @@ 4.0.0 spring-cloud-stream-binder-servlet - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M6 jar spring-cloud-stream-binder-servlet Servlet binder implementation