Update SNAPSHOT to 2.0.0.M2

README.adoc

@@ -183,16 +183,10 @@ http://eclipse.org/m2e/[m2eclipse] eclipse plugin for maven support. Other IDEs
 should also work without issue as long as they use Maven 3.3.3 or better.
 
 ==== Importing into eclipse with m2eclipse
-
 We recommend the http://eclipse.org/m2e/[m2eclipse] eclipse plugin when working with
 eclipse. If you don't already have m2eclipse installed it is available from the "eclipse
 marketplace".
 
-Also, you will need to install Kotlin plug-in from the "eclipse marketplace" to ensure projects 
-that depend on Kotlin complile under `m2eclipse` plugin (mentioned above). 
-
-NOTE: If you still see compile errors after installing Kotlin plugin, simply right-click on the project with error and _remove_ and then _add_ Kotlin Nature via ***Configure Kotlin*** feature. 
-
 NOTE: Older versions of m2e do not support Maven 3.3, so once the
 projects are imported into Eclipse you will also need to tell
 m2eclipse to use the right profile for the projects.  If you
@@ -260,4 +254,4 @@ added after the original pull request but before a merge.
   other target branch in the main project).
 * When writing a commit message please follow http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html[these conventions],
   if you are fixing an existing issue please add `Fixes gh-XXXX` at the end of the commit
-  message (where XXXX is the issue number).
+  message (where XXXX is the issue number).

docs/pom.xml

@@ -6,7 +6,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.M2</version>
 	</parent>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Function Docs</name>

pom.xml

@@ -4,13 +4,13 @@
 
 	<artifactId>spring-cloud-function-parent</artifactId>
 	<name>Spring Cloud Function Parent</name>
-	<version>2.0.0.BUILD-SNAPSHOT</version>
+	<version>2.0.0.M2</version>
 	<packaging>pom</packaging>
 
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-build</artifactId>
-		<version>2.1.0.BUILD-SNAPSHOT</version>
+		<version>2.1.0.M2</version>
 		<relativePath />
 	</parent>
 
@@ -18,7 +18,7 @@
 		<java.version>1.8</java.version>
 		<spring-cloud-task.version>2.0.0.RELEASE</spring-cloud-task.version>
 		<wrapper.version>1.0.12.RELEASE</wrapper.version>
-		<spring-boot.version>2.1.0.BUILD-SNAPSHOT</spring-boot.version>
+		<spring-boot.version>2.1.0.M3</spring-boot.version>
 		<docs.main>spring-cloud-function</docs.main>
 		<reactor-bom.version>Californium-RC1</reactor-bom.version>
 	</properties>

spring-cloud-function-adapters/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.M2</version>
 	</parent>
 
 	<name>spring-cloud-function-adapter-parent</name>

spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml

@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-adapter-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.M2</version>
 	</parent>
 
 	<properties>

spring-cloud-function-adapters/spring-cloud-function-adapter-azure/README.adoc

@@ -3,31 +3,44 @@
 This project provides an adapter layer for a Spring Cloud Function application onto Azure.
 You can write an app with a single `@Bean` of type `Function` and it will be deployable in Azure if you get the JAR file laid out right.
 
-There is a `AzureSpringBootRequestHandler` which you must extend, and provide the input and output types as annotated method parameters (enabling Azure to inspect the class and create JSON bindings). The base class has two useful methods (`handleRequest` and `handleOutput`) to which you can delegate the actual function call, so mostly the function will only ever have one line.
+This project provides an adapter layer for a Spring Cloud Function application onto Azure.
+You can write an app with a single `@Bean` of type `Function` and it will be deployable in Azure if you get the JAR file laid out right.
 
-Example:
+The adapter has a generic HTTP request handler that you can use optionally.
+There is a `AzureSpringBootRequestHandler` which you must extend, and provide the input and output types as type parameters (enabling Azure to inspect the class and do the JSON conversions itself).
 
-```java
-public class FooHandler extends AzureSpringBootRequestHandler<Foo, Bar> {
-	@FunctionName("uppercase")
-	public Bar execute(
-			@HttpTrigger(name = "req", methods = { HttpMethod.GET,
-					HttpMethod.POST }, authLevel = AuthorizationLevel.ANONYMOUS)
-                    Foo foo,
-			ExecutionContext context) {
-		return handleRequest(foo, context);
-	}
-}
-```
-
-This Azure handler will delegate to a `Function<Foo,Bar>` bean (or a `Function<Publisher<Foo>,Publisher<Bar>>`). Some Azure triggers (e.g. `@CosmosDBTrigger`) result in a input type of `List` and in that case you can bind to `List` in the Azure handler, or `String` (the raw JSON). The `List` input delegates to a `Function` with input type `Map<String,Object>`, or `Publisher` or `List` of the same type. The output of the `Function` can be a `List` (one-for-one) or a single value (aggregation), and the output binding in the Azure declaration should match.
-
-If your app has more than one `@Bean` of type `Function` etc. then you can choose the one to use by configuring `function.name`. Or if you make the `@FunctionName` in the Azure handler method match the function name it should work that way (also for function apps with multiple functions). The functions are extracted from the Spring Cloud `FunctionCatalog`.
+If your app has more than one `@Bean` of type `Function` etc. then you can choose the one to use by configuring `function.name`.
+The functions are extracted from the Spring Cloud `FunctionCatalog`.
 
 === Notes on JAR Layout
 
-You don't need the Spring Cloud Function Web at runtime in Azure, so you can optionally exclude this before you create the JAR you deploy to Azure.
-A function application on Azure is an archive generated by the Maven plugin. The function lives in the JAR file generated by this project. The sample creates it as an executable jar, using the thin layout, so that Azure can find the handler classes. If you prefer you can just use a regular flat JAR file. The dependencies should *not* be included.
+You don't need the Spring Cloud Function Web at runtime in Azure, so you need to exclude this before you create the JAR you deploy to Azure.
+A function application on Azure has to be shaded, but a Spring Boot standalone application does not, so you can run the same app using 2 separate jars (as per the sample here).
+The sample app creates the shaded jar file, with an `azure` classifier for deploying in Azure.
+
+=== JSON Configuration
+
+The Azure tooling needs to find some JSON configuration files to tell it how to deploy and integrate the function (e.g. which Java class to use as the entry point, and which triggers to use). Those files can be created with the Maven plugin for a non-Spring function, but the tooling doesn't work yet with the adapter in its current form. There is an example `function.json` in the sample which hooks the function up as an HTTP endpoint:
+
+```
+{
+  "scriptFile" : "../function-sample-azure-2.0.0.BUILD-SNAPSHOT-azure.jar",
+  "entryPoint" : "example.FooHandler.execute",
+  "bindings" : [ {
+    "type" : "httpTrigger",
+    "name" : "foo",
+    "direction" : "in",
+    "authLevel" : "anonymous",
+    "methods" : [ "get", "post" ]
+  }, {
+    "type" : "http",
+    "name" : "$return",
+    "direction" : "out"
+  } ],
+  "disabled" : false
+}
+```
+
 
 == Build
 
@@ -45,13 +58,7 @@ You can run the sample locally, just like the other Spring Cloud Function sample
 
 and `curl -H "Content-Type: text/plain" localhost:8080/function -d '{"value": "hello foobar"}'`.
 
-Or you can run locally in an Azure host:
-
----
-./mvnw azure-functions:run
----
-
-You will need the `az` and `func` CLI apps (see https://docs.microsoft.com/en-us/azure/azure-functions/functions-create-first-java-maven for more detail). To deploy the function on Azure runtime:
+You will need the `az` CLI app and some node.js fu (see https://docs.microsoft.com/en-us/azure/azure-functions/functions-create-first-java-maven for more detail). To deploy the function on Azure runtime:
 
 ----
 $ az login

spring-cloud-function-adapters/spring-cloud-function-adapter-azure/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-adapter-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.M2</version>
 	</parent>
 
 	<properties>

spring-cloud-function-adapters/spring-cloud-function-adapter-openwhisk/pom.xml

@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-adapter-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.M2</version>
 	</parent>
 
 	<dependencies>

spring-cloud-function-compiler/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.M2</version>
 	</parent>
 
 	<dependencies>

spring-cloud-function-context/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.M2</version>
 	</parent>
 	<properties>
 		<kotlin.version>1.2.61</kotlin.version>

spring-cloud-function-core/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.M2</version>
 	</parent>
 
 	<dependencies>

spring-cloud-function-dependencies/pom.xml

@@ -5,11 +5,11 @@
 	<parent>
 		<artifactId>spring-cloud-dependencies-parent</artifactId>
 		<groupId>org.springframework.cloud</groupId>
-		<version>2.1.0.BUILD-SNAPSHOT</version>
+		<version>2.1.0.M2</version>
 		<relativePath/>
 	</parent>
 	<artifactId>spring-cloud-function-dependencies</artifactId>
-	<version>2.0.0.BUILD-SNAPSHOT</version>
+	<version>2.0.0.M2</version>
 	<packaging>pom</packaging>
 	<name>Spring Cloud Function Dependencies</name>
 	<description>Spring Cloud Function Dependencies</description>

spring-cloud-function-deployer/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.M2</version>
 	</parent>
 
 	<properties>

spring-cloud-function-deployer/src/it/support/pom.xml

@@ -11,13 +11,13 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.0.3.RELEASE</version>
+        <version>2.1.0.M3</version>
         <relativePath/>
     </parent>
 
     <properties>
         <java.version>1.8</java.version>
-        <spring-cloud-function.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
+        <spring-cloud-function.version>2.0.0.M2</spring-cloud-function.version>
         <wrapper.version>1.0.12.RELEASE</wrapper.version>
     </properties>
 

spring-cloud-function-samples/function-sample-aws/pom.xml

@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.3.RELEASE</version>
+		<version>2.1.0.M3</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 
@@ -25,7 +25,7 @@
 		<wrapper.version>1.0.11.RELEASE</wrapper.version>
 		<aws-lambda-events.version>2.0.2</aws-lambda-events.version>
 		<reactor.version>3.1.2.RELEASE</reactor.version>
-		<spring-cloud-function.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>2.0.0.M2</spring-cloud-function.version>
 		<start-class>example.Config</start-class>
 	</properties>
 

spring-cloud-function-samples/function-sample-azure/pom.xml

@@ -13,7 +13,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.3.RELEASE</version>
+		<version>2.1.0.M3</version>
 		<relativePath /> <!-- lookup parent from repository -->
 	</parent>
 

spring-cloud-function-samples/function-sample-compiler/pom.xml

@@ -13,13 +13,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.2.RELEASE</version>
+		<version>2.1.0.M3</version>
 		<relativePath/>
 	</parent>
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>2.0.0.M2</spring-cloud-function.version>
 		<spring-cloud-stream.version>Elmhurst.RELEASE</spring-cloud-stream.version>
 		<reactor.version>3.1.2.RELEASE</reactor.version>
 		<wrapper.version>1.0.10.RELEASE</wrapper.version>

spring-cloud-function-samples/function-sample-pof/pom.xml

@@ -12,7 +12,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.11.RELEASE</version>
+		<version>2.1.0.M3</version>
 		<relativePath />
 	</parent>
 
@@ -21,7 +21,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<java.version>1.8</java.version>
 		<reactor.version>3.1.2.RELEASE</reactor.version>
-		<spring-cloud-function.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>2.0.0.M2</spring-cloud-function.version>
 	</properties>
 
 	<dependencies>

spring-cloud-function-samples/function-sample-pojo/pom.xml

@@ -13,13 +13,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.0.3.RELEASE</version>
+		<version>2.1.0.M3</version>
 		<relativePath />
 	</parent>
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>2.0.0.M2</spring-cloud-function.version>
 		<wrapper.version>1.0.13.RELEASE</wrapper.version>
 	</properties>
 

spring-cloud-function-samples/function-sample-task/pom.xml

@@ -13,13 +13,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.5.11.RELEASE</version>
+		<version>2.1.0.M3</version>
 		<relativePath/>
 	</parent>
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>2.0.0.M2</spring-cloud-function.version>
 		<wrapper.version>1.0.10.RELEASE</wrapper.version>
 		<reactor.version>3.1.2.RELEASE</reactor.version>
 	</properties>

spring-cloud-function-samples/function-sample/pom.xml

@@ -13,13 +13,13 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>2.1.0.BUILD-SNAPSHOT</version>
+		<version>2.1.0.M3</version>
 		<relativePath/>
 	</parent>
 
 	<properties>
 		<java.version>1.8</java.version>
-		<spring-cloud-function.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
+		<spring-cloud-function.version>2.0.0.M2</spring-cloud-function.version>
 		<wrapper.version>1.0.13.RELEASE</wrapper.version>
 	</properties>
 

spring-cloud-function-samples/pom.xml

@@ -9,7 +9,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.M2</version>
 	</parent>
 
 	<modules>

spring-cloud-function-task/pom.xml

@@ -10,7 +10,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.M2</version>
 	</parent>
 
 	<dependencies>

spring-cloud-function-web/pom.xml

@@ -11,7 +11,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.M2</version>
 	</parent>
 
 	<dependencies>

spring-cloud-starter-function-web/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.M2</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>spring-cloud-starter-function-web</artifactId>

spring-cloud-starter-function-webflux/pom.xml

@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.springframework.cloud</groupId>
 		<artifactId>spring-cloud-function-parent</artifactId>
-		<version>2.0.0.BUILD-SNAPSHOT</version>
+		<version>2.0.0.M2</version>
 	</parent>
 	<artifactId>spring-cloud-starter-function-webflux</artifactId>
 	<name>spring-cloud-starter-function-webflux</name>