From b20cb700eaec5fe95ced308f5851db469b55345d Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Sat, 26 May 2018 09:34:02 +0100 Subject: [PATCH] Update to RC2 --- 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 +- .../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/pom.xml | 2 +- .../src/it/support/pom.xml | 2 +- .../function-sample-aws/build.gradle | 10 +++++----- .../function-sample-aws/pom.xml | 6 +++--- .../function-sample-azure/pom.xml | 4 ++-- .../src/main/azure/uppercase/function.json | 2 +- .../function-sample-compiler/build.gradle | 10 +++++----- .../function-sample-compiler/pom.xml | 4 ++-- .../function-sample-pof/build.gradle | 12 +++++------- .../function-sample-pof/pom.xml | 6 +++--- .../function-sample-pojo/build.gradle | 10 +++++----- .../function-sample-pojo/pom.xml | 4 ++-- .../function-sample-task/build.gradle | 12 +++++------- .../function-sample-task/pom.xml | 4 ++-- .../function-sample/build.gradle | 8 ++++---- .../function-sample/pom.xml | 4 ++-- spring-cloud-function-samples/pom.xml | 2 +- spring-cloud-function-stream/pom.xml | 2 +- spring-cloud-function-task/pom.xml | 2 +- spring-cloud-function-web/pom.xml | 2 +- spring-cloud-starter-function-web/pom.xml | 2 +- spring-cloud-stream-binder-servlet/pom.xml | 2 +- 39 files changed, 71 insertions(+), 75 deletions(-) diff --git a/docs/pom.xml b/docs/pom.xml index 54722c399..2d6a19ca8 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.RC2 pom Spring Cloud Function Docs diff --git a/pom.xml b/pom.xml index 9558f5bfc..49084a21e 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.RC2 pom diff --git a/scripts/function-registry.sh b/scripts/function-registry.sh index 8d63c3b76..872e802c2 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.RC2.jar diff --git a/scripts/stream.sh b/scripts/stream.sh index 812989524..de6544d62 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/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.RC2.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..908459854 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.RC2.jar\ --lambda.supplier=$SUPP --lambda.function=$FUNC --lambda.consumer=$CONS diff --git a/scripts/web.sh b/scripts/web.sh index f9d182923..3111015bd 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.RC2.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..6eaef87ed 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.RC2 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..0956e69cc 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.RC2-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 ae9449cd3..117137560 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.RC2 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..75b201325 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.RC2-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..c091dbe6a 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.RC2 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..db7b384a5 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.RC2.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 d68486f58..cbccef850 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 @@ -12,7 +12,7 @@ org.springframework.cloud spring-cloud-function-adapter-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.RC2 diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 417b5a4f1..d88dea7b8 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.RC2 diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index badafe205..f280358f8 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.RC2 diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 21cf54a23..ed551c1b4 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.RC2 diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml index 9bbb23707..01ead8f7d 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.RC2 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 c64b3be00..cd01a9aed 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.RC2 diff --git a/spring-cloud-function-deployer/src/it/support/pom.xml b/spring-cloud-function-deployer/src/it/support/pom.xml index 8c375b326..d6ad55d43 100644 --- a/spring-cloud-function-deployer/src/it/support/pom.xml +++ b/spring-cloud-function-deployer/src/it/support/pom.xml @@ -17,7 +17,7 @@ 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.RC2 1.0.10.RELEASE 3.2.0.M1 diff --git a/spring-cloud-function-samples/function-sample-aws/build.gradle b/spring-cloud-function-samples/function-sample-aws/build.gradle index 8902b487c..b4dbe1c57 100644 --- a/spring-cloud-function-samples/function-sample-aws/build.gradle +++ b/spring-cloud-function-samples/function-sample-aws/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { - springBootVersion = '1.5.11.RELEASE' - wrapperVersion = '1.0.10.RELEASE' + springBootVersion = '1.5.12.RELEASE' + wrapperVersion = '1.0.11.RELEASE' shadowVersion = '2.0.1' } repositories { @@ -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.RC2' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -38,11 +38,11 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.RC2" awsLambdaEventsVersion = "1.2.1" awsLambdaCoreVersion = "1.1.0" } -ext['reactor.version'] = "3.1.2.RELEASE" +ext['reactor.version'] = "3.1.7.RELEASE" assemble.dependsOn = [shadowJar, bootRepackage] diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index a1f0cb9e3..e3bcb144a 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.RC2 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.RC2 + 1.0.0.RC2 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 e47e27361..ed382f549 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.RC2 jar function-sample-azure @@ -57,7 +57,7 @@ org.springframework.cloud spring-cloud-function-dependencies - 1.0.0.BUILD-SNAPSHOT + 1.0.0.RC2 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..ceb1100ba 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.RC2-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..1b3bb3b5f 100644 --- a/spring-cloud-function-samples/function-sample-compiler/build.gradle +++ b/spring-cloud-function-samples/function-sample-compiler/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { - springBootVersion = '1.5.11.RELEASE' - wrapperVersion = '1.0.10.RELEASE' + springBootVersion = '1.5.12.RELEASE' + wrapperVersion = '1.0.11.RELEASE' } repositories { mavenLocal() @@ -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.RC2' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -34,9 +34,9 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.RC2" } -ext['reactor.version'] = "3.1.2.RELEASE" +ext['reactor.version'] = "3.1.7.RELEASE" dependencyManagement { imports { diff --git a/spring-cloud-function-samples/function-sample-compiler/pom.xml b/spring-cloud-function-samples/function-sample-compiler/pom.xml index 951703bdc..dfab56a54 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.RC2 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.RC2 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..1b3bb3b5f 100644 --- a/spring-cloud-function-samples/function-sample-pof/build.gradle +++ b/spring-cloud-function-samples/function-sample-pof/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { - springBootVersion = '1.5.11.RELEASE.BUILD-SNAPSHOT' - wrapperVersion = '1.0.10.BUILD-SNAPSHOT' + springBootVersion = '1.5.12.RELEASE' + wrapperVersion = '1.0.11.RELEASE' } repositories { mavenLocal() @@ -12,8 +12,6 @@ buildscript { dependencies { classpath("org.springframework.boot.experimental:spring-boot-thin-gradle-plugin:${wrapperVersion}") classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") - // Remove this when Boot 1.5.11.RELEASE is out. - classpath "io.spring.gradle:dependency-management-plugin:1.0.4.BUILD-SNAPSHOT" } } @@ -24,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.RC2' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -36,9 +34,9 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.RC2" } -ext['reactor.version'] = "3.1.2.RELEASE" +ext['reactor.version'] = "3.1.7.RELEASE" dependencyManagement { imports { diff --git a/spring-cloud-function-samples/function-sample-pof/pom.xml b/spring-cloud-function-samples/function-sample-pof/pom.xml index 501488f9f..75a7b35bd 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.RC2 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.RC2 + 1.0.0.RC2 diff --git a/spring-cloud-function-samples/function-sample-pojo/build.gradle b/spring-cloud-function-samples/function-sample-pojo/build.gradle index f1db65278..356ecdeb4 100644 --- a/spring-cloud-function-samples/function-sample-pojo/build.gradle +++ b/spring-cloud-function-samples/function-sample-pojo/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { - springBootVersion = '1.5.11.RELEASE' - wrapperVersion = '1.0.10.RELEASE' + springBootVersion = '1.5.12.RELEASE' + wrapperVersion = '1.0.11.RELEASE' } repositories { mavenLocal() @@ -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.RC2' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -34,9 +34,9 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.RC2" } -ext['reactor.version'] = "3.1.2.RELEASE" +ext['reactor.version'] = "3.1.7.RELEASE" dependencyManagement { imports { diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index 48dbdb0b6..3eff999a2 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.RC2 jar function-sample-pojo Spring Cloud Function Web Support @@ -19,7 +19,7 @@ 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.RC2 1.0.11.BUILD-SNAPSHOT 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..53800a6a4 100644 --- a/spring-cloud-function-samples/function-sample-task/build.gradle +++ b/spring-cloud-function-samples/function-sample-task/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { - springBootVersion = '1.5.11.RELEASE' - wrapperVersion = '1.0.10.RELEASE' + springBootVersion = '1.5.12.RELEASE' + wrapperVersion = '1.0.11.RELEASE' } repositories { mavenLocal() @@ -12,8 +12,6 @@ buildscript { dependencies { classpath("org.springframework.boot.experimental:spring-boot-thin-gradle-plugin:${wrapperVersion}") classpath("org.springframework.boot:spring-boot-gradle-plugin:${springBootVersion}") - // Remove this when Boot 1.5.11.RELEASE is out. - classpath "io.spring.gradle:dependency-management-plugin:1.0.4.BUILD-SNAPSHOT" } } @@ -24,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.RC2' sourceCompatibility = 1.8 targetCompatibility = 1.8 @@ -36,9 +34,9 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.RC2" } -ext['reactor.version'] = "3.1.2.RELEASE" +ext['reactor.version'] = "3.1.7.RELEASE" dependencyManagement { imports { diff --git a/spring-cloud-function-samples/function-sample-task/pom.xml b/spring-cloud-function-samples/function-sample-task/pom.xml index f1abf976e..c37dfbe9c 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.RC2 jar function-sample-task Spring Cloud Function Task Support @@ -19,7 +19,7 @@ 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.RC2 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..0803239dd 100644 --- a/spring-cloud-function-samples/function-sample/build.gradle +++ b/spring-cloud-function-samples/function-sample/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { - springBootVersion = '1.5.11.RELEASE' - wrapperVersion = '1.0.10.RELEASE' + springBootVersion = '1.5.12.RELEASE' + wrapperVersion = '1.0.11.RELEASE' } repositories { mavenLocal() @@ -34,9 +34,9 @@ repositories { } ext { - springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" + springCloudFunctionVersion = "1.0.0.RC2" } -ext['reactor.version'] = "3.1.2.RELEASE" +ext['reactor.version'] = "3.1.7.RELEASE" dependencyManagement { imports { diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index 192ae5f2b..23c0835ee 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.RC2 jar function-sample Spring Cloud Function Web Support @@ -19,7 +19,7 @@ 1.8 - 1.0.0.BUILD-SNAPSHOT + 1.0.0.RC2 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..847319c8f 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.RC2 diff --git a/spring-cloud-function-stream/pom.xml b/spring-cloud-function-stream/pom.xml index d575c73a6..f5975f66e 100644 --- a/spring-cloud-function-stream/pom.xml +++ b/spring-cloud-function-stream/pom.xml @@ -11,7 +11,7 @@ org.springframework.cloud spring-cloud-function-parent - 1.0.0.BUILD-SNAPSHOT + 1.0.0.RC2 diff --git a/spring-cloud-function-task/pom.xml b/spring-cloud-function-task/pom.xml index 7c1fcfdbe..ef3ce0783 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.RC2 diff --git a/spring-cloud-function-web/pom.xml b/spring-cloud-function-web/pom.xml index 10ffe4ddf..1417238ec 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.RC2 diff --git a/spring-cloud-starter-function-web/pom.xml b/spring-cloud-starter-function-web/pom.xml index 102dc99d7..f477eb66c 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.RC2 .. 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..e00e2f8de 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.RC2 jar spring-cloud-stream-binder-servlet Servlet binder implementation