From 3fb38e45c96006ee4a1548b058b34077ec708e9a Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Fri, 6 Dec 2019 15:31:52 +0100 Subject: [PATCH] Revert "Bumping versions" This reverts commit ef8d03645debb1a7c0aa02af443766417cc0c06a. --- README.adoc | 25 +++++++++++++++++++ docs/pom.xml | 2 +- pom.xml | 4 +-- spring-cloud-function-adapters/pom.xml | 2 +- .../spring-cloud-function-adapter-aws/pom.xml | 2 +- .../pom.xml | 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 | 4 +-- spring-cloud-function-deployer/pom.xml | 2 +- .../src/it/bootapp-multi/pom.xml | 2 +- .../src/it/bootapp-with-javax/pom.xml | 2 +- .../src/it/bootapp-with-scf/pom.xml | 2 +- .../src/it/bootapp/pom.xml | 2 +- .../src/it/bootjar-multi/pom.xml | 2 +- .../src/it/bootjar/pom.xml | 2 +- .../src/it/bootjarnostart/pom.xml | 2 +- spring-cloud-function-kotlin/pom.xml | 2 +- .../function-sample-aws-custom/pom.xml | 2 +- .../function-sample-aws/pom.xml | 2 +- .../function-sample-compiler/pom.xml | 2 +- .../function-sample-pof/pom.xml | 2 +- .../function-sample-pojo/pom.xml | 2 +- .../pom.xml | 2 +- .../function-sample-task/pom.xml | 2 +- .../function-sample/pom.xml | 2 +- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-starter-function-webflux/pom.xml | 2 +- 33 files changed, 59 insertions(+), 34 deletions(-) diff --git a/README.adoc b/README.adoc index 3d99877fe..356b3a48f 100644 --- a/README.adoc +++ b/README.adoc @@ -100,6 +100,31 @@ HELLOWORLD (You can use `^Q^J` in a terminal to insert a new line in a literal string like that.) +== Building and Running a Function + +The sample `@SpringBootApplication` above has a function that can be +decorated at runtime by Spring Cloud Function to be an HTTP endpoint, +or a Stream processor, for instance with RabbitMQ, Apache Kafka or +JMS. + +The `@Beans` can be `Function`, `Consumer` or `Supplier` (all from +`java.util`), and their parametric types can be String or POJO. + +Functions can also be of `Flux` or `Flux` and Spring +Cloud Function takes care of converting the data to and from the +desired types, as long as it comes in as plain text or (in the case of +the POJO) JSON. There is also support for `Message` where the +message headers are copied from the incoming event, depending on the +adapter. The web adapter also supports conversion from form-encoded +data to a `Map`, and if you are using the function with Spring Cloud +Stream then all the conversion and coercion features for message +payloads will be applicable as well. + +Functions can be grouped together in a single application, or deployed +one-per-jar. It's up to the developer to choose. An app with multiple +functions can be deployed multiple times in different "personalities", +exposing different functions over different physical transports. + == Building :jdkversion: 1.7 diff --git a/docs/pom.xml b/docs/pom.xml index bd9b3c695..d94480bcd 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -7,7 +7,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 5ca7976b7..3873b8ef9 100644 --- a/pom.xml +++ b/pom.xml @@ -6,13 +6,13 @@ spring-cloud-function-parent Spring Cloud Function Parent - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT pom org.springframework.cloud spring-cloud-build - 2.2.0.RELEASE + 2.2.1.BUILD-SNAPSHOT diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index 1fdd84600..6555c90bf 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT spring-cloud-function-adapter-parent 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 964e2d7d5..f7e89c6af 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 - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT 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 0b04eb84f..137296679 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 @@ -13,7 +13,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT 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 510de9e1e..1c0a4d0c6 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 - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index c7df2c205..13019101d 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 48a33cbc7..4e5520b9c 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index fde8e88f9..865c4e7c8 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 8397228a5..43e0a8b6e 100644 --- a/spring-cloud-function-dependencies/pom.xml +++ b/spring-cloud-function-dependencies/pom.xml @@ -6,11 +6,11 @@ spring-cloud-dependencies-parent org.springframework.cloud - 2.2.0.RELEASE + 2.2.1.BUILD-SNAPSHOT spring-cloud-function-dependencies - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT pom Spring Cloud Function Dependencies Spring Cloud Function Dependencies diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index fd7632ca0..3e1da5e5b 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -10,7 +10,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT diff --git a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml index fa547e1db..3bac7f06a 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT 1.0.17.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml index d5d5f1a77..ee520e7e4 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-javax/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT 1.0.17.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml index 58b2ac955..b0b17c820 100644 --- a/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp-with-scf/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT 1.0.17.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootapp/pom.xml b/spring-cloud-function-deployer/src/it/bootapp/pom.xml index 05829a20e..4e63e882f 100644 --- a/spring-cloud-function-deployer/src/it/bootapp/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootapp/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT 1.0.17.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml index 24e44245e..d96920f6f 100644 --- a/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar-multi/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT 1.0.17.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjar/pom.xml b/spring-cloud-function-deployer/src/it/bootjar/pom.xml index e7749a525..6a5a52df4 100644 --- a/spring-cloud-function-deployer/src/it/bootjar/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjar/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT 1.0.17.RELEASE diff --git a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml index 469700193..5edce8f84 100644 --- a/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml +++ b/spring-cloud-function-deployer/src/it/bootjarnostart/pom.xml @@ -18,7 +18,7 @@ 1.8 - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT 1.0.17.RELEASE diff --git a/spring-cloud-function-kotlin/pom.xml b/spring-cloud-function-kotlin/pom.xml index c69628f68..942539a5a 100644 --- a/spring-cloud-function-kotlin/pom.xml +++ b/spring-cloud-function-kotlin/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml index 55ab59eeb..082001ee6 100644 --- a/spring-cloud-function-samples/function-sample-aws-custom/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws-custom/pom.xml @@ -17,7 +17,7 @@ 1.8 1.0.22.RELEASE - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index 4b7651d44..e7ed58deb 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -25,7 +25,7 @@ 1.8 1.0.17.RELEASE 2.0.2 - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT example.Config diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index b2b930bf4..2dc888823 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT 3.1.2.RELEASE 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index afba435b4..26ba24e79 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -22,7 +22,7 @@ UTF-8 1.8 3.1.2.RELEASE - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index d67846acd..bada077be 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT 1.0.21.RELEASE diff --git a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml index c3a7f1f78..5afe44575 100644 --- a/spring-cloud-function-samples/function-sample-spring-integration/pom.xml +++ b/spring-cloud-function-samples/function-sample-spring-integration/pom.xml @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index 003391401..e5b2af462 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT 1.0.10.RELEASE 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 23640485a..f5970901b 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -20,7 +20,7 @@ 1.8 - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT 1.0.17.RELEASE diff --git a/spring-cloud-function-samples/pom.xml b/spring-cloud-function-samples/pom.xml index cb520aa39..d5ae201bb 100644 --- a/spring-cloud-function-samples/pom.xml +++ b/spring-cloud-function-samples/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index c56db5c63..ac99a2843 100644 --- a/spring-cloud-function-task/pom.xml +++ b/spring-cloud-function-task/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index e88556c54..af5fa3c74 100644 --- a/spring-cloud-function-web/pom.xml +++ b/spring-cloud-function-web/pom.xml @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 801690788..8a935a079 100644 --- a/spring-cloud-starter-function-web/pom.xml +++ b/spring-cloud-starter-function-web/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT .. spring-cloud-starter-function-web diff --git a/spring-cloud-starter-function-webflux/pom.xml b/spring-cloud-starter-function-webflux/pom.xml index 35ca1cee8..af696df2b 100644 --- a/spring-cloud-starter-function-webflux/pom.xml +++ b/spring-cloud-starter-function-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.cloud spring-cloud-function-parent - 3.0.0.BUILD-SNAPSHOT + 3.0.1.BUILD-SNAPSHOT spring-cloud-starter-function-webflux spring-cloud-starter-function-webflux