diff --git a/pom.xml b/pom.xml index f127a8bba..a51d2a797 100644 --- a/pom.xml +++ b/pom.xml @@ -10,32 +10,29 @@ org.springframework.cloud spring-cloud-build - 1.3.3.RELEASE + 1.3.5.RELEASE 1.8 - Aluminium-SR3 - Chelsea.SR1 - 1.0.5.RELEASE - 1.5.4.RELEASE + Chelsea.SR2 + 1.0.7.RELEASE + 1.5.7.RELEASE spring-cloud-function - org.springframework.cloud - spring-cloud-stream-dependencies - ${spring-cloud-stream.version} - pom - import + commons-io + commons-io + 2.3 - io.projectreactor - reactor-bom - ${reactor-bom.version} + org.springframework.cloud + spring-cloud-function-dependencies + ${project.version} pom import @@ -50,6 +47,7 @@ + spring-cloud-function-dependencies spring-cloud-function-compiler spring-cloud-function-core spring-cloud-function-context diff --git a/spring-cloud-function-adapters/pom.xml b/spring-cloud-function-adapters/pom.xml index 04f254bc1..d52c07e08 100644 --- a/spring-cloud-function-adapters/pom.xml +++ b/spring-cloud-function-adapters/pom.xml @@ -19,7 +19,7 @@ org.springframework.cloud spring-cloud-dependencies - Dalston.BUILD-SNAPSHOT + Dalston.SR3 pom import 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 906375cba..85d2d140f 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 @@ -5,17 +5,15 @@ org.springframework.cloud spring-cloud-function-adapter-aws - 1.0.0.BUILD-SNAPSHOT jar spring-cloud-function-adapter-aws AWS Lambda Adapter for Spring Cloud Function - org.springframework.boot - spring-boot-starter-parent - 1.5.3.RELEASE - + org.springframework.cloud + spring-cloud-function-adapter-parent + 1.0.0.BUILD-SNAPSHOT @@ -23,14 +21,12 @@ UTF-8 1.8 1.2.1 - 3.0.7.RELEASE org.springframework.cloud spring-cloud-function-context - 1.0.0.BUILD-SNAPSHOT org.springframework.boot @@ -59,18 +55,6 @@ - - - - org.springframework.cloud - spring-cloud-dependencies - Dalston.BUILD-SNAPSHOT - pom - import - - - - spring-snapshots 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 3fb90e0e9..deee72e3d 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 @@ -5,32 +5,21 @@ org.springframework.cloud spring-cloud-function-adapter-openwhisk - 1.0.0.BUILD-SNAPSHOT jar spring-cloud-function-adapter-openwhisk Apache OpenWhisk Adapter for Spring Cloud Function - org.springframework.boot - spring-boot-starter-parent - 1.5.3.RELEASE - + org.springframework.cloud + spring-cloud-function-adapter-parent + 1.0.0.BUILD-SNAPSHOT - - UTF-8 - UTF-8 - 1.8 - 3.0.7.RELEASE - 1.0.5.RELEASE - - org.springframework.cloud spring-cloud-function-context - 1.0.0.BUILD-SNAPSHOT org.springframework.boot @@ -47,18 +36,6 @@ - - - - org.springframework.cloud - spring-cloud-dependencies - Dalston.BUILD-SNAPSHOT - pom - import - - - - diff --git a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/pom.xml b/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/pom.xml index 31e5b57ce..bd24d63cd 100644 --- a/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/pom.xml +++ b/spring-cloud-function-adapters/spring-cloud-function-adapter-samples/spring-cloud-function-adapter-sample/pom.xml @@ -33,7 +33,6 @@ org.springframework.cloud spring-cloud-function-adapter-aws - ${project.version} org.springframework.cloud @@ -69,14 +68,16 @@ org.springframework.cloud spring-cloud-dependencies - Dalston.BUILD-SNAPSHOT + Dalston.SR3 pom import org.springframework.cloud - spring-cloud-function-web + spring-cloud-function-dependencies ${spring-cloud-function.version} + pom + import diff --git a/spring-cloud-function-compiler/pom.xml b/spring-cloud-function-compiler/pom.xml index 799611b9a..0392c204c 100644 --- a/spring-cloud-function-compiler/pom.xml +++ b/spring-cloud-function-compiler/pom.xml @@ -26,7 +26,6 @@ commons-io commons-io - 2.3 commons-collections @@ -39,7 +38,6 @@ org.springframework.cloud spring-cloud-function-core - ${project.version} org.springframework.boot diff --git a/spring-cloud-function-context/pom.xml b/spring-cloud-function-context/pom.xml index 7ceaad390..52bbd046f 100644 --- a/spring-cloud-function-context/pom.xml +++ b/spring-cloud-function-context/pom.xml @@ -14,15 +14,10 @@ 1.0.0.BUILD-SNAPSHOT - - 1.0.0.BUILD-SNAPSHOT - - org.springframework.cloud spring-cloud-function-core - ${spring-cloud-function.version} org.springframework @@ -49,7 +44,6 @@ org.springframework.cloud spring-cloud-function-compiler - ${spring-cloud-function.version} test diff --git a/spring-cloud-function-core/pom.xml b/spring-cloud-function-core/pom.xml index 1d65c187d..6b4929afd 100644 --- a/spring-cloud-function-core/pom.xml +++ b/spring-cloud-function-core/pom.xml @@ -14,6 +14,10 @@ + + io.projectreactor + reactor-core + org.springframework.boot spring-boot-starter @@ -22,10 +26,6 @@ org.springframework spring-context - - io.projectreactor - reactor-core - commons-io commons-io diff --git a/spring-cloud-function-dependencies/pom.xml b/spring-cloud-function-dependencies/pom.xml new file mode 100644 index 000000000..7ca152ad9 --- /dev/null +++ b/spring-cloud-function-dependencies/pom.xml @@ -0,0 +1,130 @@ + + + 4.0.0 + + spring-cloud-dependencies-parent + org.springframework.cloud + 1.3.5.RELEASE + + + spring-cloud-function-dependencies + 1.0.0.BUILD-SNAPSHOT + pom + Spring Cloud Function Dependencies + Spring Cloud Function Dependencies + + Aluminium-SR3 + + + + + io.projectreactor + reactor-bom + ${reactor-bom.version} + pom + import + + + org.springframework.cloud + spring-cloud-function-context + ${project.version} + + + org.springframework.cloud + spring-cloud-function-core + ${project.version} + + + org.springframework.cloud + spring-cloud-function-stream + ${project.version} + + + org.springframework.cloud + spring-cloud-function-compiler + ${project.version} + + + org.springframework.cloud + spring-cloud-function-task + ${project.version} + + + org.springframework.cloud + spring-cloud-function-web + ${project.version} + + + org.springframework.cloud + spring-cloud-function-deployer + ${project.version} + + + org.springframework.cloud + spring-cloud-function-adapter-aws + ${project.version} + + + org.springframework.cloud + spring-cloud-function-adapter-openwhisk + ${project.version} + + + + + + spring + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/libs-snapshot-local + + true + + + false + + + + spring-milestones + Spring Milestones + https://repo.spring.io/libs-milestone-local + + false + + + + spring-releases + Spring Releases + https://repo.spring.io/release + + false + + + + + + spring-snapshots + Spring Snapshots + https://repo.spring.io/libs-snapshot-local + + true + + + false + + + + spring-milestones + Spring Milestones + https://repo.spring.io/libs-milestone-local + + false + + + + + + diff --git a/spring-cloud-function-deployer/pom.xml b/spring-cloud-function-deployer/pom.xml index 4bffead12..71c5d4e97 100644 --- a/spring-cloud-function-deployer/pom.xml +++ b/spring-cloud-function-deployer/pom.xml @@ -15,24 +15,21 @@ - 1.0.6.RELEASE + 1.0.7.RELEASE org.springframework.cloud spring-cloud-function-core - ${project.version} org.springframework.cloud spring-cloud-function-web - ${project.version} org.springframework.cloud spring-cloud-function-stream - ${project.version} org.springframework.boot @@ -58,17 +55,10 @@ maven-aether-provider 3.3.9 - - org.springframework.cloud - spring-cloud-function-parent - ${project.version} - pom - import - org.springframework.cloud spring-cloud-dependencies - Dalston.BUILD-SNAPSHOT + Dalston.SR3 pom import diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-compiler/build.gradle b/spring-cloud-function-samples/spring-cloud-function-sample-compiler/build.gradle index 4277277a4..4c4e8045a 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample-compiler/build.gradle +++ b/spring-cloud-function-samples/spring-cloud-function-sample-compiler/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { springBootVersion = '1.5.2.RELEASE' - wrapperVersion = '1.0.6.RELEASE' + wrapperVersion = '1.0.7.RELEASE' } repositories { mavenLocal() @@ -41,8 +41,14 @@ ext['reactor.version'] = "3.0.7.RELEASE" // TODO: remove this when pom.xml generator is fixed jar.dependsOn = [thinProperties] +dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-function-dependencies:${springCloudFunctionVersion}" + } +} + dependencies { - compile("org.springframework.cloud:spring-cloud-function-web:${springCloudFunctionVersion}") - compile("org.springframework.cloud:spring-cloud-function-compiler:${springCloudFunctionVersion}") + compile('org.springframework.cloud:spring-cloud-function-web') + compile('org.springframework.cloud:spring-cloud-function-compiler') testCompile('org.springframework.boot:spring-boot-starter-test') } diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-compiler/pom.xml b/spring-cloud-function-samples/spring-cloud-function-sample-compiler/pom.xml index 9a9cc5ff0..24101f242 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample-compiler/pom.xml +++ b/spring-cloud-function-samples/spring-cloud-function-sample-compiler/pom.xml @@ -20,30 +20,27 @@ 1.8 1.0.0.BUILD-SNAPSHOT - 1.0.5.RELEASE - 3.0.6.RELEASE + Chelsea.SR2 + 3.0.7.RELEASE + 1.0.7.RELEASE org.springframework.cloud spring-cloud-function-web - ${spring-cloud-function.version} org.springframework.cloud spring-cloud-function-stream - ${spring-cloud-function.version} org.springframework.cloud spring-cloud-starter-stream-rabbit - 1.2.0.RELEASE org.springframework.cloud spring-cloud-function-compiler - ${spring-cloud-function.version} org.springframework.boot @@ -52,6 +49,25 @@ + + + + org.springframework.cloud + spring-cloud-function-dependencies + ${spring-cloud-function.version} + pom + import + + + org.springframework.cloud + spring-cloud-stream-dependencies + ${spring-cloud-stream.version} + pom + import + + + + diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pof/build.gradle b/spring-cloud-function-samples/spring-cloud-function-sample-pof/build.gradle index 4277277a4..4c4e8045a 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample-pof/build.gradle +++ b/spring-cloud-function-samples/spring-cloud-function-sample-pof/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { springBootVersion = '1.5.2.RELEASE' - wrapperVersion = '1.0.6.RELEASE' + wrapperVersion = '1.0.7.RELEASE' } repositories { mavenLocal() @@ -41,8 +41,14 @@ ext['reactor.version'] = "3.0.7.RELEASE" // TODO: remove this when pom.xml generator is fixed jar.dependsOn = [thinProperties] +dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-function-dependencies:${springCloudFunctionVersion}" + } +} + dependencies { - compile("org.springframework.cloud:spring-cloud-function-web:${springCloudFunctionVersion}") - compile("org.springframework.cloud:spring-cloud-function-compiler:${springCloudFunctionVersion}") + compile('org.springframework.cloud:spring-cloud-function-web') + compile('org.springframework.cloud:spring-cloud-function-compiler') testCompile('org.springframework.boot:spring-boot-starter-test') } diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pof/pom.xml b/spring-cloud-function-samples/spring-cloud-function-sample-pof/pom.xml index 62269e4ec..ce4776406 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample-pof/pom.xml +++ b/spring-cloud-function-samples/spring-cloud-function-sample-pof/pom.xml @@ -28,15 +28,25 @@ org.springframework.cloud spring-cloud-function-web - ${spring-cloud-function.version} org.springframework.cloud spring-cloud-function-context - ${spring-cloud-function.version} + + + + org.springframework.cloud + spring-cloud-function-dependencies + ${spring-cloud-function.version} + pom + import + + + + diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/build.gradle b/spring-cloud-function-samples/spring-cloud-function-sample-pojo/build.gradle index 4277277a4..4c4e8045a 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/build.gradle +++ b/spring-cloud-function-samples/spring-cloud-function-sample-pojo/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { springBootVersion = '1.5.2.RELEASE' - wrapperVersion = '1.0.6.RELEASE' + wrapperVersion = '1.0.7.RELEASE' } repositories { mavenLocal() @@ -41,8 +41,14 @@ ext['reactor.version'] = "3.0.7.RELEASE" // TODO: remove this when pom.xml generator is fixed jar.dependsOn = [thinProperties] +dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-function-dependencies:${springCloudFunctionVersion}" + } +} + dependencies { - compile("org.springframework.cloud:spring-cloud-function-web:${springCloudFunctionVersion}") - compile("org.springframework.cloud:spring-cloud-function-compiler:${springCloudFunctionVersion}") + compile('org.springframework.cloud:spring-cloud-function-web') + compile('org.springframework.cloud:spring-cloud-function-compiler') testCompile('org.springframework.boot:spring-boot-starter-test') } diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml b/spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml index 5edb802d8..123eaeb8e 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/spring-cloud-function-sample-pojo/pom.xml @@ -20,15 +20,14 @@ 1.8 1.0.0.BUILD-SNAPSHOT - 1.0.5.RELEASE - 3.0.7.BUILD-SNAPSHOT + 1.0.7.RELEASE + 3.0.7.RELEASE org.springframework.cloud spring-cloud-function-web - ${spring-cloud-function.version} org.springframework.boot @@ -44,10 +43,17 @@ + + org.springframework.cloud + spring-cloud-function-dependencies + ${spring-cloud-function.version} + pom + import + org.springframework.cloud spring-cloud-dependencies - Dalston.RELEASE + Dalston.SR3 pom import diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-task/build.gradle b/spring-cloud-function-samples/spring-cloud-function-sample-task/build.gradle index 96afd2cd8..2397f00f3 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample-task/build.gradle +++ b/spring-cloud-function-samples/spring-cloud-function-sample-task/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { springBootVersion = '1.5.2.RELEASE' - wrapperVersion = '1.0.6.RELEASE' + wrapperVersion = '1.0.7.RELEASE' } repositories { mavenLocal() @@ -41,9 +41,14 @@ ext['reactor.version'] = "3.0.7.RELEASE" // TODO: remove this when pom.xml generator is fixed jar.dependsOn = [thinProperties] +dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-function-dependencies:${springCloudFunctionVersion}" + } +} + dependencies { - compile("org.springframework.cloud:spring-cloud-function-task:${springCloudFunctionVersion}") - compile("org.springframework.cloud:spring-cloud-function-context:${springCloudFunctionVersion}") - compile("org.springframework.cloud:spring-cloud-function-compiler:${springCloudFunctionVersion}") + compile('org.springframework.cloud:spring-cloud-function-task') + compile('org.springframework.cloud:spring-cloud-function-compiler') testCompile('org.springframework.boot:spring-boot-starter-test') } diff --git a/spring-cloud-function-samples/spring-cloud-function-sample-task/pom.xml b/spring-cloud-function-samples/spring-cloud-function-sample-task/pom.xml index 7b3d4a6e5..18b117ac7 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample-task/pom.xml +++ b/spring-cloud-function-samples/spring-cloud-function-sample-task/pom.xml @@ -20,25 +20,22 @@ 1.8 1.0.0.BUILD-SNAPSHOT - 1.0.5.RELEASE - 3.0.6.RELEASE + 1.0.7.RELEASE + 3.0.7.RELEASE org.springframework.cloud spring-cloud-function-task - ${spring-cloud-function.version} org.springframework.cloud spring-cloud-function-context - ${spring-cloud-function.version} org.springframework.cloud spring-cloud-function-compiler - ${spring-cloud-function.version} org.springframework.boot @@ -47,6 +44,18 @@ + + + + org.springframework.cloud + spring-cloud-function-dependencies + ${spring-cloud-function.version} + pom + import + + + + diff --git a/spring-cloud-function-samples/spring-cloud-function-sample/build.gradle b/spring-cloud-function-samples/spring-cloud-function-sample/build.gradle index 4277277a4..4c4e8045a 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample/build.gradle +++ b/spring-cloud-function-samples/spring-cloud-function-sample/build.gradle @@ -1,7 +1,7 @@ buildscript { ext { springBootVersion = '1.5.2.RELEASE' - wrapperVersion = '1.0.6.RELEASE' + wrapperVersion = '1.0.7.RELEASE' } repositories { mavenLocal() @@ -41,8 +41,14 @@ ext['reactor.version'] = "3.0.7.RELEASE" // TODO: remove this when pom.xml generator is fixed jar.dependsOn = [thinProperties] +dependencyManagement { + imports { + mavenBom "org.springframework.cloud:spring-cloud-function-dependencies:${springCloudFunctionVersion}" + } +} + dependencies { - compile("org.springframework.cloud:spring-cloud-function-web:${springCloudFunctionVersion}") - compile("org.springframework.cloud:spring-cloud-function-compiler:${springCloudFunctionVersion}") + compile('org.springframework.cloud:spring-cloud-function-web') + compile('org.springframework.cloud:spring-cloud-function-compiler') testCompile('org.springframework.boot:spring-boot-starter-test') } diff --git a/spring-cloud-function-samples/spring-cloud-function-sample/pom.xml b/spring-cloud-function-samples/spring-cloud-function-sample/pom.xml index 097ef82fa..ed7215c4f 100644 --- a/spring-cloud-function-samples/spring-cloud-function-sample/pom.xml +++ b/spring-cloud-function-samples/spring-cloud-function-sample/pom.xml @@ -20,25 +20,22 @@ 1.8 1.0.0.BUILD-SNAPSHOT - 1.0.6.RELEASE - 3.0.7.BUILD-SNAPSHOT + 3.0.7.RELEASE + 1.0.7.RELEASE org.springframework.cloud spring-cloud-function-web - ${spring-cloud-function.version} org.springframework.cloud spring-cloud-function-context - ${spring-cloud-function.version} org.springframework.cloud spring-cloud-function-compiler - ${spring-cloud-function.version} org.springframework.boot @@ -52,6 +49,18 @@ + + + + org.springframework.cloud + spring-cloud-function-dependencies + ${spring-cloud-function.version} + pom + import + + + + diff --git a/spring-cloud-function-stream/pom.xml b/spring-cloud-function-stream/pom.xml index 681112122..a3b367a18 100644 --- a/spring-cloud-function-stream/pom.xml +++ b/spring-cloud-function-stream/pom.xml @@ -34,12 +34,10 @@ org.springframework.cloud spring-cloud-function-core - ${project.version} org.springframework.cloud spring-cloud-function-context - ${project.version} org.springframework.cloud