diff --git a/spring-cloud-function-samples/function-sample-aws/build.gradle b/spring-cloud-function-samples/function-sample-aws/build.gradle index f213f23c0..1496dad34 100644 --- a/spring-cloud-function-samples/function-sample-aws/build.gradle +++ b/spring-cloud-function-samples/function-sample-aws/build.gradle @@ -1,8 +1,8 @@ buildscript { ext { - springBootVersion = '1.5.2.RELEASE' - wrapperVersion = '1.0.7.RELEASE' - shadowVersion = '2.0.1' + springBootVersion = '1.5.10.BUILD-SNAPSHOT' + wrapperVersion = '1.0.9.RELEASE' + shadowVersion = '2.0.1' } repositories { jcenter() @@ -15,6 +15,8 @@ buildscript { classpath "com.github.jengelman.gradle.plugins:shadow:${shadowVersion}" 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.10 is out. + classpath "io.spring.gradle:dependency-management-plugin:1.0.4.BUILD-SNAPSHOT" } } @@ -42,7 +44,7 @@ ext { awsLambdaEventsVersion = "1.2.1" awsLambdaCoreVersion = "1.1.0" } -ext['reactor.version'] = "3.0.7.RELEASE" +ext['reactor.version'] = "3.1.1.RELEASE" assemble.dependsOn = [shadowJar, bootRepackage] @@ -63,9 +65,6 @@ configurations { testCompile.extendsFrom(compileOnly) } -// TODO: remove this when pom.xml generator is fixed -jar.dependsOn = [thinProperties] - dependencies { compile("org.springframework.cloud:spring-cloud-function-web:${springCloudFunctionVersion}") compile("org.springframework.cloud:spring-cloud-function-adapter-aws:${springCloudFunctionVersion}") diff --git a/spring-cloud-function-samples/function-sample-aws/pom.xml b/spring-cloud-function-samples/function-sample-aws/pom.xml index e55aee5ad..27e5846a4 100644 --- a/spring-cloud-function-samples/function-sample-aws/pom.xml +++ b/spring-cloud-function-samples/function-sample-aws/pom.xml @@ -22,7 +22,7 @@ UTF-8 UTF-8 1.8 - 1.0.5.RELEASE + 1.0.9.RELEASE 1.2.1 3.0.7.RELEASE 1.0.0.BUILD-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-compiler/build.gradle b/spring-cloud-function-samples/function-sample-compiler/build.gradle index 9eb02bdb1..027bcf25d 100644 --- a/spring-cloud-function-samples/function-sample-compiler/build.gradle +++ b/spring-cloud-function-samples/function-sample-compiler/build.gradle @@ -1,17 +1,19 @@ buildscript { ext { - springBootVersion = '1.5.2.RELEASE' - wrapperVersion = '1.0.7.RELEASE' + springBootVersion = '1.5.10.BUILD-SNAPSHOT' + wrapperVersion = '1.0.9.RELEASE' } repositories { mavenLocal() mavenCentral() - maven { url "https://repo.spring.io/snapshot" } - maven { url "https://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/plugins-snapshot" } + maven { url "https://repo.spring.io/plugins-milestone" } } 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.10 is out. + classpath "io.spring.gradle:dependency-management-plugin:1.0.4.BUILD-SNAPSHOT" } } @@ -36,10 +38,7 @@ repositories { ext { springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" } -ext['reactor.version'] = "3.0.7.RELEASE" - -// TODO: remove this when pom.xml generator is fixed -jar.dependsOn = [thinProperties] +ext['reactor.version'] = "3.1.1.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 4f24f8199..5c653652b 100644 --- a/spring-cloud-function-samples/function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/function-sample-compiler/pom.xml @@ -13,16 +13,16 @@ org.springframework.boot spring-boot-starter-parent - 1.5.1.RELEASE + 1.5.9.RELEASE 1.8 1.0.0.BUILD-SNAPSHOT - Chelsea.SR2 - 3.0.7.RELEASE - 1.0.7.RELEASE + Ditmars.RELEASE + 3.1.1.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 9eb02bdb1..8affd9918 100644 --- a/spring-cloud-function-samples/function-sample-pof/build.gradle +++ b/spring-cloud-function-samples/function-sample-pof/build.gradle @@ -1,17 +1,19 @@ buildscript { ext { - springBootVersion = '1.5.2.RELEASE' - wrapperVersion = '1.0.7.RELEASE' + springBootVersion = '1.5.10.BUILD-SNAPSHOT' + wrapperVersion = '1.0.9.BUILD-SNAPSHOT' } repositories { mavenLocal() mavenCentral() - maven { url "https://repo.spring.io/snapshot" } - maven { url "https://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/plugins-snapshot" } + maven { url "https://repo.spring.io/plugins-milestone" } } 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.10 is out. + classpath "io.spring.gradle:dependency-management-plugin:1.0.4.BUILD-SNAPSHOT" } } @@ -36,10 +38,7 @@ repositories { ext { springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" } -ext['reactor.version'] = "3.0.7.RELEASE" - -// TODO: remove this when pom.xml generator is fixed -jar.dependsOn = [thinProperties] +ext['reactor.version'] = "3.1.1.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 645f9e2ae..377bbf092 100644 --- a/spring-cloud-function-samples/function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/function-sample-pof/pom.xml @@ -12,7 +12,7 @@ org.springframework.boot spring-boot-starter-parent - 1.5.2.RELEASE + 1.5.9.RELEASE @@ -20,7 +20,7 @@ UTF-8 UTF-8 1.8 - 3.0.7.RELEASE + 3.1.1.RELEASE 1.0.0.BUILD-SNAPSHOT diff --git a/spring-cloud-function-samples/function-sample-pojo/build.gradle b/spring-cloud-function-samples/function-sample-pojo/build.gradle index 9eb02bdb1..772af3744 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.2.RELEASE' - wrapperVersion = '1.0.7.RELEASE' + springBootVersion = '1.5.10.BUILD-SNAPSHOT' + wrapperVersion = '1.0.9.RELEASE' } repositories { mavenLocal() @@ -12,6 +12,8 @@ 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.10 is out. + classpath "io.spring.gradle:dependency-management-plugin:1.0.4.BUILD-SNAPSHOT" } } @@ -29,17 +31,14 @@ targetCompatibility = 1.8 repositories { mavenLocal() mavenCentral() - maven { url "https://repo.spring.io/snapshot" } - maven { url "https://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/plugins-snapshot" } + maven { url "https://repo.spring.io/plugins-milestone" } } ext { springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" } -ext['reactor.version'] = "3.0.7.RELEASE" - -// TODO: remove this when pom.xml generator is fixed -jar.dependsOn = [thinProperties] +ext['reactor.version'] = "3.1.1.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 2cb0ef6db..c73d5f985 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -13,15 +13,15 @@ org.springframework.boot spring-boot-starter-parent - 1.5.1.RELEASE + 1.5.9.RELEASE 1.8 1.0.0.BUILD-SNAPSHOT - 1.0.7.RELEASE - 3.0.7.RELEASE + 1.0.9.RELEASE + 3.1.1.RELEASE diff --git a/spring-cloud-function-samples/function-sample-task/build.gradle b/spring-cloud-function-samples/function-sample-task/build.gradle index 0e4df4fbd..fb160c6a6 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.2.RELEASE' - wrapperVersion = '1.0.7.RELEASE' + springBootVersion = '1.5.10.BUILD-SNAPSHOT' + wrapperVersion = '1.0.9.RELEASE' } repositories { mavenLocal() @@ -12,6 +12,8 @@ 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.10 is out. + classpath "io.spring.gradle:dependency-management-plugin:1.0.4.BUILD-SNAPSHOT" } } @@ -36,10 +38,7 @@ repositories { ext { springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" } -ext['reactor.version'] = "3.0.7.RELEASE" - -// TODO: remove this when pom.xml generator is fixed -jar.dependsOn = [thinProperties] +ext['reactor.version'] = "3.1.1.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 20903b75c..3833f42a2 100644 --- a/spring-cloud-function-samples/function-sample-task/pom.xml +++ b/spring-cloud-function-samples/function-sample-task/pom.xml @@ -13,15 +13,15 @@ org.springframework.boot spring-boot-starter-parent - 1.5.1.RELEASE + 1.5.9.RELEASE 1.8 1.0.0.BUILD-SNAPSHOT - 1.0.7.RELEASE - 3.0.7.RELEASE + 1.0.9.RELEASE + 3.1.1.RELEASE diff --git a/spring-cloud-function-samples/function-sample/build.gradle b/spring-cloud-function-samples/function-sample/build.gradle index 4c4e8045a..4e6380f2b 100644 --- a/spring-cloud-function-samples/function-sample/build.gradle +++ b/spring-cloud-function-samples/function-sample/build.gradle @@ -1,17 +1,19 @@ buildscript { ext { - springBootVersion = '1.5.2.RELEASE' - wrapperVersion = '1.0.7.RELEASE' + springBootVersion = '1.5.10.BUILD-SNAPSHOT' + wrapperVersion = '1.0.9.RELEASE' } repositories { mavenLocal() mavenCentral() - maven { url "https://repo.spring.io/snapshot" } - maven { url "https://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/plugins-snapshot" } + maven { url "https://repo.spring.io/plugins-milestone" } } 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.10 is out. + classpath "io.spring.gradle:dependency-management-plugin:1.0.4.BUILD-SNAPSHOT" } } @@ -36,10 +38,7 @@ repositories { ext { springCloudFunctionVersion = "1.0.0.BUILD-SNAPSHOT" } -ext['reactor.version'] = "3.0.7.RELEASE" - -// TODO: remove this when pom.xml generator is fixed -jar.dependsOn = [thinProperties] +ext['reactor.version'] = "3.1.1.RELEASE" dependencyManagement { imports { diff --git a/spring-cloud-function-samples/function-sample/pom.xml b/spring-cloud-function-samples/function-sample/pom.xml index eb1ef17cd..8ff3c43d5 100644 --- a/spring-cloud-function-samples/function-sample/pom.xml +++ b/spring-cloud-function-samples/function-sample/pom.xml @@ -13,15 +13,15 @@ org.springframework.boot spring-boot-starter-parent - 1.5.2.RELEASE + 1.5.9.RELEASE 1.8 1.0.0.BUILD-SNAPSHOT - 3.0.7.RELEASE - 1.0.7.RELEASE + 3.1.1.RELEASE + 1.0.9.RELEASE diff --git a/spring-cloud-function-samples/function-sample/src/main/resources/META-INF/thin-stream.properties b/spring-cloud-function-samples/function-sample/src/main/resources/META-INF/thin-stream.properties index 9ecef0d7b..5ce12b0a0 100644 --- a/spring-cloud-function-samples/function-sample/src/main/resources/META-INF/thin-stream.properties +++ b/spring-cloud-function-samples/function-sample/src/main/resources/META-INF/thin-stream.properties @@ -1,3 +1,3 @@ -boms.spring-cloud-dependencies: org.springframework.cloud:spring-cloud-dependencies:Dalston.RELEASE +boms.spring-cloud-dependencies: org.springframework.cloud:spring-cloud-dependencies:Edgware.RELEASE dependencies.spring-cloud-function-stream: org.springframework.cloud:spring-cloud-function-stream:1.0.0.BUILD-SNAPSHOT dependencies.spring-cloud-stream-rabbit: org.springframework.cloud:spring-cloud-starter-stream-rabbit \ No newline at end of file