diff --git a/.github/workflows/milestone-worker.yml b/.github/workflows/milestone-worker.yml index 1a0c89beaa..eddedfa23c 100644 --- a/.github/workflows/milestone-worker.yml +++ b/.github/workflows/milestone-worker.yml @@ -71,6 +71,13 @@ jobs: -DnewVersion='${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}-'${BUILD_ZOO_HANDLER_milestone_version} \ -B echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV + jfrog rt mvn versions:set-property \ + -gs .github/settings.xml \ + -Pstagingmilestone \ + -DgenerateBackupPoms=false \ + -Dproperty=dataflow.version \ + -DnewVersion=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_version} \ + -B jfrog rt mvn versions:set-property \ -gs .github/settings.xml \ -Pstagingmilestone \ diff --git a/.github/workflows/next-dev-version-worker.yml b/.github/workflows/next-dev-version-worker.yml index 186ec5cdf2..833574a677 100644 --- a/.github/workflows/next-dev-version-worker.yml +++ b/.github/workflows/next-dev-version-worker.yml @@ -67,6 +67,11 @@ jobs: -DnewVersion='${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.nextIncrementalVersion}-SNAPSHOT' \ -B echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV + jfrog rt mvn versions:set-property \ + -DgenerateBackupPoms=false \ + -Dproperty=dataflow.version \ + -DnewVersion=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_version} \ + -B jfrog rt mvn versions:set-property \ -DgenerateBackupPoms=false \ -Dproperty=spring-cloud-deployer.version \ diff --git a/.github/workflows/release-worker.yml b/.github/workflows/release-worker.yml index 2f69a26e77..734a4d0926 100644 --- a/.github/workflows/release-worker.yml +++ b/.github/workflows/release-worker.yml @@ -70,6 +70,13 @@ jobs: -DnewVersion='${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}' \ -B echo BUILD_ZOO_HANDLER_spring_cloud_dataflow_version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) >> $GITHUB_ENV + jfrog rt mvn versions:set-property \ + -gs .github/settings.xml \ + -Pstagingrelease \ + -DgenerateBackupPoms=false \ + -Dproperty=dataflow.version \ + -DnewVersion=${BUILD_ZOO_HANDLER_spring_cloud_dataflow_version} \ + -B jfrog rt mvn versions:set-property \ -gs .github/settings.xml \ -Pstagingrelease \ diff --git a/spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml b/spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml index b8b3838406..ca8059e848 100644 --- a/spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml +++ b/spring-cloud-dataflow-build/spring-cloud-dataflow-build-dependencies/pom.xml @@ -42,7 +42,6 @@ - net.minidev json-smart @@ -81,7 +80,6 @@ pom import - io.fabric8 kubernetes-client-bom diff --git a/spring-cloud-dataflow-build/spring-cloud-dataflow-dependencies-parent/pom.xml b/spring-cloud-dataflow-build/spring-cloud-dataflow-dependencies-parent/pom.xml index f39e4f5255..00b536639d 100644 --- a/spring-cloud-dataflow-build/spring-cloud-dataflow-dependencies-parent/pom.xml +++ b/spring-cloud-dataflow-build/spring-cloud-dataflow-dependencies-parent/pom.xml @@ -36,6 +36,8 @@ UTF-8 + + 2.11.1-SNAPSHOT diff --git a/spring-cloud-dataflow-common/spring-cloud-dataflow-common-dependencies/pom.xml b/spring-cloud-dataflow-common/spring-cloud-dataflow-common-dependencies/pom.xml index 64e6d8a4c4..a7814115db 100644 --- a/spring-cloud-dataflow-common/spring-cloud-dataflow-common-dependencies/pom.xml +++ b/spring-cloud-dataflow-common/spring-cloud-dataflow-common-dependencies/pom.xml @@ -21,17 +21,17 @@ org.springframework.cloud spring-cloud-dataflow-common-flyway - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-dataflow-common-test-docker - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-dataflow-common-test-docker-junit5 - ${project.version} + ${dataflow.version} diff --git a/spring-cloud-dataflow-dependencies/pom.xml b/spring-cloud-dataflow-dependencies/pom.xml index 2346f25057..31e0596747 100644 --- a/spring-cloud-dataflow-dependencies/pom.xml +++ b/spring-cloud-dataflow-dependencies/pom.xml @@ -19,118 +19,118 @@ org.springframework.cloud spring-cloud-dataflow-shell - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-dataflow-shell-core - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-dataflow-completion - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-dataflow-core-dsl - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-dataflow-core - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-dataflow-rest-client - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-dataflow-configuration-metadata - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-dataflow-rest-resource - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-dataflow-registry - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-dataflow-container-registry - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-dataflow-composed-task-runner - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-dataflow-server-core - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-dataflow-server - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-dataflow-autoconfigure - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-starter-dataflow-server - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-starter-dataflow-server - ${project.version} + ${dataflow.version} test-jar org.springframework.cloud spring-cloud-dataflow-audit - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-dataflow-platform-kubernetes - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-dataflow-platform-cloudfoundry - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-dataflow-test - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-common-security-config-core - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-common-security-config-web - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-starter-common-security-config-web - ${project.version} + ${dataflow.version} @@ -139,7 +139,7 @@ spring-docs - scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${project.version} + scp://static.springframework.org/var/www/domains/springframework.org/static/htdocs/spring-cloud/docs/${project.artifactId}/${dataflow.version} diff --git a/spring-cloud-dataflow-parent/pom.xml b/spring-cloud-dataflow-parent/pom.xml index 8f8a57a6cf..6d5fe8a816 100644 --- a/spring-cloud-dataflow-parent/pom.xml +++ b/spring-cloud-dataflow-parent/pom.xml @@ -11,15 +11,16 @@ pom https://cloud.spring.io/spring-cloud-dataflow/ + + 2.11.1-SNAPSHOT 1.8 -Xdoclint:none 3.3.1 2.7.16 5.3.30 3.4.1-SNAPSHOT - ${project.version} - ${project.version} - ${project.version} + ${dataflow.version} + ${dataflow.version} 2.9.1-SNAPSHOT 2.4.6 ${dataflow.version} @@ -212,16 +213,6 @@ spring-cloud-deployer-cloudfoundry ${spring-cloud-deployer.version} - - org.springframework.cloud - spring-cloud-common-security-config-web - ${project.version} - - - org.springframework.cloud - spring-cloud-starter-common-security-config-web - ${project.version} - org.springframework.cloud spring-cloud-deployer-kubernetes diff --git a/spring-cloud-skipper/spring-cloud-skipper-dependencies/pom.xml b/spring-cloud-skipper/spring-cloud-skipper-dependencies/pom.xml index c2b1df0d9d..f6d298835b 100644 --- a/spring-cloud-skipper/spring-cloud-skipper-dependencies/pom.xml +++ b/spring-cloud-skipper/spring-cloud-skipper-dependencies/pom.xml @@ -19,42 +19,42 @@ org.springframework.cloud spring-cloud-skipper - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-skipper-server-core - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-skipper-shell-commands - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-skipper-client - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-skipper-platform-kubernetes - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-skipper-platform-cloudfoundry - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-skipper-autoconfigure - ${project.version} + ${dataflow.version} org.springframework.cloud spring-cloud-starter-skipper-server - ${project.version} + ${dataflow.version}