From 72efd5867501d5411dab9a0227fad541cdbe568f Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 20 Feb 2018 19:25:11 +0000 Subject: [PATCH] Update to 1.0.0.M4 --- 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 +- .../README.adoc | 2 +- .../spring-cloud-function-adapter-azure/pom.xml | 2 +- .../README.md | 2 +- .../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 +- .../main/resources/META-INF/thin-slim.properties | 2 +- .../deployer/FunctionAppDeployerTests.java | 6 +++--- ...ExtractingFunctionCatalogIntegrationTests.java | 8 ++++---- .../FunctionExtractingFunctionCatalogTests.java | 4 ++-- .../function-sample-aws/build.gradle | 4 ++-- .../function-sample-aws/pom.xml | 6 +++--- .../function-sample-azure/pom.xml | 15 +++++++++++---- .../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 ++-- .../function-sample-pof/pom.xml | 6 +++--- .../function-sample-pojo/.attach_pid9535 | 0 .../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 +- .../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-stream-binder-servlet/pom.xml | 2 +- 43 files changed, 75 insertions(+), 68 deletions(-) create mode 100644 spring-cloud-function-samples/function-sample-pojo/.attach_pid9535 diff --git a/docs/pom.xml b/docs/pom.xml index 54722c399..865fa4fd4 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.M4 pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 1d4a6c8d7..8d138768f 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.M4 pom diff --git a/scripts/function-registry.sh b/scripts/function-registry.sh index 8d63c3b76..4aaeb5b01 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.M4.jar diff --git a/scripts/stream.sh b/scripts/stream.sh index e9bb2c429..c8d0042ea 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.M4.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..9aefde0cc 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.M4.jar\ --lambda.supplier=$SUPP --lambda.function=$FUNC --lambda.consumer=$CONS diff --git a/scripts/web.sh b/scripts/web.sh index f9d182923..4335506b9 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.M4.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..6a9206b88 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.M4 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..ae2449e15 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.M4-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 8bc840369..285e3b0fc 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.M4 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 a62d0a838..f38d06299 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.M4-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..df06e9a43 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.M4 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..3a28acc2e 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.M4.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..75603f617 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.M4 diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 288fd1f28..c4d4a91ac 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.M4 diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index f86de9a6d..a2104b961 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.M4 diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 86179f447..bd32b5884 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.M4 diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 18cbf17ae..c9aa15eff 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.M4 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..8a7676ea4 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.M4 {"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.M4 {"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.M4"} ``` 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.M4"}} ``` 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 e5e25c304..d485c0989 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.M4 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..5ff098fb5 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.M4 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..a610215b6 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.M4")); } 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.M4", "", "--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.M4", "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 447392682..11ab7cd4b 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, "--debug", "--logging.level.org.springframework.cloud.function=DEBUG"); - deploy("sample", "maven://io.spring.sample:function-sample-pojo:1.0.0.BUILD-SNAPSHOT"); + deploy("sample", "maven://io.spring.sample:function-sample-pojo:1.0.0.M4"); } private static void deploy(String name, String path) throws Exception { @@ -101,7 +101,7 @@ public class FunctionExtractingFunctionCatalogIntegrationTests { @Test public void another() throws Exception { - deploy("strings", "maven://io.spring.sample:function-sample:1.0.0.BUILD-SNAPSHOT"); + deploy("strings", "maven://io.spring.sample:function-sample:1.0.0.M4"); assertThat(new TestRestTemplate().getForObject( "http://localhost:" + port + "/stream/strings/words", String.class)) .isEqualTo("[\"foo\",\"bar\"]"); @@ -112,12 +112,12 @@ public class FunctionExtractingFunctionCatalogIntegrationTests { String undeploy = undeploy("sample"); assertThat(undeploy.contains("\"name\":\"sample\"")); assertThat(undeploy.contains( - "\"path\":\"maven://io.spring.sample:function-sample-pojo:1.0.0.BUILD-SNAPSHOT\"")); + "\"path\":\"maven://io.spring.sample:function-sample-pojo:1.0.0.M4\"")); 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-pojo:1.0.0.BUILD-SNAPSHOT"); + deploy("sample", "maven://io.spring.sample:function-sample-pojo:1.0.0.M4"); assertThat(new TestRestTemplate().postForObject( "http://localhost:" + port + "/stream/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 930cf013f..20b6c56f7 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://io.spring.sample:function-sample:1.0.0.BUILD-SNAPSHOT"); + deploy("sample", "maven://io.spring.sample:function-sample:1.0.0.M4"); // "--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.M4"); } } diff --git a/spring-cloud-function-samples/function-sample-aws/build.gradle b/spring-cloud-function-samples/function-sample-aws/build.gradle index 28543777f..4a7daad26 100644 --- a/spring-cloud-function-samples/function-sample-aws/build.gradle +++ b/spring-cloud-function-samples/function-sample-aws/build.gradle @@ -28,7 +28,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.M4' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -40,7 +40,7 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.M4" 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 66ebd9b17..0b963b9a0 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.M4 jar function-sample-aws @@ -25,8 +25,8 @@ 1.0.9.RELEASE 2.0.2 3.1.2.RELEASE - 1.0.0.BUILD-SNAPSHOT - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M4 + 1.0.0.M4 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 b47ea38c7..8510a6485 100644 --- a/spring-cloud-function-samples/function-sample-azure/pom.xml +++ b/spring-cloud-function-samples/function-sample-azure/pom.xml @@ -5,10 +5,10 @@ io.spring.sample function-sample-azure - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M4 jar - Azure Java Functions + function-sample-azure org.springframework.boot @@ -37,7 +37,7 @@ spring-cloud-function-web provided - +` com.microsoft.azure azure-functions-java-core 1.0.0-beta-2 @@ -57,7 +57,7 @@ org.springframework.cloud spring-cloud-function-dependencies - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M4 pom import @@ -66,6 +66,13 @@ + + org.apache.maven.plugins + maven-deploy-plugin + + true + + maven-resources-plugin 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..944e2459a 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.M4-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 9431a47e3..3a06e3d8a 100644 --- a/spring-cloud-function-samples/function-sample-compiler/build.gradle +++ b/spring-cloud-function-samples/function-sample-compiler/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.M4' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -36,7 +36,7 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.M4" } 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 4daf6aeb7..c3b984f36 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.M4 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.M4 Ditmars.RELEASE 3.1.2.RELEASE 1.0.9.RELEASE diff --git a/spring-cloud-function-samples/function-sample-pof/build.gradle b/spring-cloud-function-samples/function-sample-pof/build.gradle index e82c025cb..12a092ea1 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.M4' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -36,7 +36,7 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.M4" } 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 29c06b583..da304f827 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.M4 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.M4 + 1.0.0.M4 diff --git a/spring-cloud-function-samples/function-sample-pojo/.attach_pid9535 b/spring-cloud-function-samples/function-sample-pojo/.attach_pid9535 new file mode 100644 index 000000000..e69de29bb diff --git a/spring-cloud-function-samples/function-sample-pojo/build.gradle b/spring-cloud-function-samples/function-sample-pojo/build.gradle index 1faac5462..c461fc723 100644 --- a/spring-cloud-function-samples/function-sample-pojo/build.gradle +++ b/spring-cloud-function-samples/function-sample-pojo/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.M4' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -36,7 +36,7 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.M4" } 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 b347a8dba..9a48bf387 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.M4 jar function-sample-pojo Spring Cloud Function Web Support @@ -19,7 +19,7 @@ 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M4 1.0.9.RELEASE 3.1.2.RELEASE diff --git a/spring-cloud-function-samples/function-sample-task/build.gradle b/spring-cloud-function-samples/function-sample-task/build.gradle index b16b00200..eda9bb222 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.M4' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -36,7 +36,7 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.M4" } 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 4bf0811f8..b2b69b346 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.M4 jar function-sample-task Spring Cloud Function Task Support @@ -19,7 +19,7 @@ 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M4 1.0.9.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 b03eabcd8..a48698bbe 100644 --- a/spring-cloud-function-samples/function-sample/build.gradle +++ b/spring-cloud-function-samples/function-sample/build.gradle @@ -36,7 +36,7 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.M4" } 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 782f4e19a..4bf0d2c2b 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.M4 jar function-sample Spring Cloud Function Web Support @@ -19,7 +19,7 @@ 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M4 3.1.2.RELEASE 1.0.9.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index 3abdda8b4..d884fae55 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.M4 diff --git a/spring-cloud-function-stream/pom.xml b/spring-cloud-function-stream/pom.xml index 442d3e60a..6ee941804 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.M4 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.M4 diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index d77912847..6914a437e 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.M4 diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 259d217cb..545106635 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.M4 diff --git a/spring-cloud-stream-binder-servlet/pom.xml b/spring-cloud-stream-binder-servlet/pom.xml index fb8a1ef90..7817e4a9a 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.M4 jar spring-cloud-stream-binder-servlet Servlet binder implementation