From 2aba9ed403f5c4793b718bdd4352a48a4a0195be Mon Sep 17 00:00:00 2001 From: Spring Buildmaster Date: Thu, 30 Jul 2020 10:56:44 +0000 Subject: [PATCH] [artifactory-release] Release version 2.6.0 --- pom.xml | 4 +- spring-cloud-dataflow-audit/pom.xml | 2 +- spring-cloud-dataflow-autoconfigure/pom.xml | 2 +- spring-cloud-dataflow-classic-docs/pom.xml | 2 +- spring-cloud-dataflow-completion/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-dataflow-core-dsl/pom.xml | 2 +- spring-cloud-dataflow-core/pom.xml | 2 +- spring-cloud-dataflow-dependencies/pom.xml | 40 +++++++++---------- spring-cloud-dataflow-docs/pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- spring-cloud-dataflow-registry/pom.xml | 2 +- spring-cloud-dataflow-rest-client/pom.xml | 2 +- spring-cloud-dataflow-rest-resource/pom.xml | 2 +- spring-cloud-dataflow-server-core/pom.xml | 2 +- spring-cloud-dataflow-server/pom.xml | 2 +- spring-cloud-dataflow-shell-core/pom.xml | 2 +- spring-cloud-dataflow-shell/pom.xml | 2 +- spring-cloud-dataflow-test/pom.xml | 2 +- spring-cloud-starter-dataflow-server/pom.xml | 2 +- spring-cloud-starter-dataflow-ui/pom.xml | 2 +- .../grafana/grafana-deployment.yaml | 2 +- src/kubernetes/server/server-deployment.yaml | 4 +- 25 files changed, 46 insertions(+), 46 deletions(-) diff --git a/pom.xml b/pom.xml index 2c5e235da7..740d6c94ed 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 pom https://cloud.spring.io/spring-cloud-dataflow/ @@ -146,7 +146,7 @@ org.springframework.cloud spring-cloud-dataflow-dependencies - 2.6.0-SNAPSHOT + 2.6.0 pom import diff --git a/spring-cloud-dataflow-audit/pom.xml b/spring-cloud-dataflow-audit/pom.xml index 615065d90b..6e8f406344 100644 --- a/spring-cloud-dataflow-audit/pom.xml +++ b/spring-cloud-dataflow-audit/pom.xml @@ -4,7 +4,7 @@ spring-cloud-dataflow-parent org.springframework.cloud - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-dataflow-audit jar diff --git a/spring-cloud-dataflow-autoconfigure/pom.xml b/spring-cloud-dataflow-autoconfigure/pom.xml index 30d5a17cba..c291efc928 100644 --- a/spring-cloud-dataflow-autoconfigure/pom.xml +++ b/spring-cloud-dataflow-autoconfigure/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-dataflow-autoconfigure jar diff --git a/spring-cloud-dataflow-classic-docs/pom.xml b/spring-cloud-dataflow-classic-docs/pom.xml index 2dfab5f574..ab7d600f6c 100644 --- a/spring-cloud-dataflow-classic-docs/pom.xml +++ b/spring-cloud-dataflow-classic-docs/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-dataflow-classic-docs Spring Cloud Data Flow Docs for Classic mode diff --git a/spring-cloud-dataflow-completion/pom.xml b/spring-cloud-dataflow-completion/pom.xml index 116ca39287..5f27001455 100644 --- a/spring-cloud-dataflow-completion/pom.xml +++ b/spring-cloud-dataflow-completion/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-dataflow-completion diff --git a/spring-cloud-dataflow-composed-task-runner/pom.xml b/spring-cloud-dataflow-composed-task-runner/pom.xml index 2c759906d6..11912f976b 100644 --- a/spring-cloud-dataflow-composed-task-runner/pom.xml +++ b/spring-cloud-dataflow-composed-task-runner/pom.xml @@ -18,7 +18,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-dataflow-composed-task-runner jar diff --git a/spring-cloud-dataflow-configuration-metadata/pom.xml b/spring-cloud-dataflow-configuration-metadata/pom.xml index 17d43a93e1..4c45d60ffa 100644 --- a/spring-cloud-dataflow-configuration-metadata/pom.xml +++ b/spring-cloud-dataflow-configuration-metadata/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-dataflow-configuration-metadata diff --git a/spring-cloud-dataflow-core-dsl/pom.xml b/spring-cloud-dataflow-core-dsl/pom.xml index 86c57f14d7..3235e72a4b 100644 --- a/spring-cloud-dataflow-core-dsl/pom.xml +++ b/spring-cloud-dataflow-core-dsl/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-dataflow-core-dsl jar diff --git a/spring-cloud-dataflow-core/pom.xml b/spring-cloud-dataflow-core/pom.xml index a73fdae33c..5443dc05fd 100644 --- a/spring-cloud-dataflow-core/pom.xml +++ b/spring-cloud-dataflow-core/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-dataflow-core jar diff --git a/spring-cloud-dataflow-dependencies/pom.xml b/spring-cloud-dataflow-dependencies/pom.xml index 5f0c65cf86..fe50a67ae0 100644 --- a/spring-cloud-dataflow-dependencies/pom.xml +++ b/spring-cloud-dataflow-dependencies/pom.xml @@ -8,7 +8,7 @@ spring-cloud-dataflow-dependencies - 2.6.0-SNAPSHOT + 2.6.0 pom spring-cloud-dataflow-dependencies Spring Cloud Data Flow Dependencies BOM designed to support consumption of Spring Cloud Data Flow from @@ -27,98 +27,98 @@ org.springframework.cloud spring-cloud-dataflow-shell - 2.6.0-SNAPSHOT + 2.6.0 org.springframework.cloud spring-cloud-dataflow-shell-core - 2.6.0-SNAPSHOT + 2.6.0 org.springframework.cloud spring-cloud-dataflow-completion - 2.6.0-SNAPSHOT + 2.6.0 org.springframework.cloud spring-cloud-dataflow-core-dsl - 2.6.0-SNAPSHOT + 2.6.0 org.springframework.cloud spring-cloud-dataflow-core - 2.6.0-SNAPSHOT + 2.6.0 org.springframework.cloud spring-cloud-dataflow-rest-client - 2.6.0-SNAPSHOT + 2.6.0 org.springframework.cloud spring-cloud-dataflow-configuration-metadata - 2.6.0-SNAPSHOT + 2.6.0 org.springframework.cloud spring-cloud-dataflow-rest-resource - 2.6.0-SNAPSHOT + 2.6.0 org.springframework.cloud spring-cloud-dataflow-registry - 2.6.0-SNAPSHOT + 2.6.0 org.springframework.cloud spring-cloud-dataflow-server-core - 2.6.0-SNAPSHOT + 2.6.0 org.springframework.cloud spring-cloud-dataflow-server - 2.6.0-SNAPSHOT + 2.6.0 org.springframework.cloud spring-cloud-dataflow-autoconfigure - 2.6.0-SNAPSHOT + 2.6.0 org.springframework.cloud spring-cloud-starter-dataflow-server - 2.6.0-SNAPSHOT + 2.6.0 org.springframework.cloud spring-cloud-starter-dataflow-ui - 2.6.0-SNAPSHOT + 2.6.0 org.springframework.cloud spring-cloud-starter-dataflow-server - 2.6.0-SNAPSHOT + 2.6.0 test-jar org.springframework.cloud spring-cloud-dataflow-audit - 2.6.0-SNAPSHOT + 2.6.0 org.springframework.cloud spring-cloud-dataflow-platform-kubernetes - 2.6.0-SNAPSHOT + 2.6.0 org.springframework.cloud spring-cloud-dataflow-platform-cloudfoundry - 2.6.0-SNAPSHOT + 2.6.0 org.springframework.cloud spring-cloud-dataflow-test - 2.6.0-SNAPSHOT + 2.6.0 diff --git a/spring-cloud-dataflow-docs/pom.xml b/spring-cloud-dataflow-docs/pom.xml index 8945be569a..dfee619da6 100644 --- a/spring-cloud-dataflow-docs/pom.xml +++ b/spring-cloud-dataflow-docs/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-dataflow-docs Spring Cloud Data Flow Docs diff --git a/spring-cloud-dataflow-platform-cloudfoundry/pom.xml b/spring-cloud-dataflow-platform-cloudfoundry/pom.xml index 31fd8ee934..216811eae9 100644 --- a/spring-cloud-dataflow-platform-cloudfoundry/pom.xml +++ b/spring-cloud-dataflow-platform-cloudfoundry/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-dataflow-platform-cloudfoundry jar diff --git a/spring-cloud-dataflow-platform-kubernetes/pom.xml b/spring-cloud-dataflow-platform-kubernetes/pom.xml index 4be765cf6b..625dfafff0 100644 --- a/spring-cloud-dataflow-platform-kubernetes/pom.xml +++ b/spring-cloud-dataflow-platform-kubernetes/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-dataflow-platform-kubernetes jar diff --git a/spring-cloud-dataflow-registry/pom.xml b/spring-cloud-dataflow-registry/pom.xml index 76260b8c79..86003622b7 100644 --- a/spring-cloud-dataflow-registry/pom.xml +++ b/spring-cloud-dataflow-registry/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-dataflow-registry spring-cloud-dataflow-registry diff --git a/spring-cloud-dataflow-rest-client/pom.xml b/spring-cloud-dataflow-rest-client/pom.xml index 8eb1c42a55..150bafafbf 100644 --- a/spring-cloud-dataflow-rest-client/pom.xml +++ b/spring-cloud-dataflow-rest-client/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-dataflow-rest-client jar diff --git a/spring-cloud-dataflow-rest-resource/pom.xml b/spring-cloud-dataflow-rest-resource/pom.xml index c460d6b02e..0c810e2c42 100644 --- a/spring-cloud-dataflow-rest-resource/pom.xml +++ b/spring-cloud-dataflow-rest-resource/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-dataflow-rest-resource jar diff --git a/spring-cloud-dataflow-server-core/pom.xml b/spring-cloud-dataflow-server-core/pom.xml index d2d6768a47..206f184f31 100644 --- a/spring-cloud-dataflow-server-core/pom.xml +++ b/spring-cloud-dataflow-server-core/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-dataflow-server-core jar diff --git a/spring-cloud-dataflow-server/pom.xml b/spring-cloud-dataflow-server/pom.xml index 6efd11316a..89823c7e00 100644 --- a/spring-cloud-dataflow-server/pom.xml +++ b/spring-cloud-dataflow-server/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-dataflow-server jar diff --git a/spring-cloud-dataflow-shell-core/pom.xml b/spring-cloud-dataflow-shell-core/pom.xml index bbb82ae3c8..c30fb6b39c 100644 --- a/spring-cloud-dataflow-shell-core/pom.xml +++ b/spring-cloud-dataflow-shell-core/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-dataflow-shell-core jar diff --git a/spring-cloud-dataflow-shell/pom.xml b/spring-cloud-dataflow-shell/pom.xml index 8f8f80e414..07ce750ce2 100644 --- a/spring-cloud-dataflow-shell/pom.xml +++ b/spring-cloud-dataflow-shell/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-dataflow-shell jar diff --git a/spring-cloud-dataflow-test/pom.xml b/spring-cloud-dataflow-test/pom.xml index 692b154bf3..cd86bbbf91 100644 --- a/spring-cloud-dataflow-test/pom.xml +++ b/spring-cloud-dataflow-test/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-dataflow-test jar diff --git a/spring-cloud-starter-dataflow-server/pom.xml b/spring-cloud-starter-dataflow-server/pom.xml index 85f9d65bcb..f8328e1884 100644 --- a/spring-cloud-starter-dataflow-server/pom.xml +++ b/spring-cloud-starter-dataflow-server/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-starter-dataflow-server Data Flow Server Starter diff --git a/spring-cloud-starter-dataflow-ui/pom.xml b/spring-cloud-starter-dataflow-ui/pom.xml index d22b746809..8595d66913 100644 --- a/spring-cloud-starter-dataflow-ui/pom.xml +++ b/spring-cloud-starter-dataflow-ui/pom.xml @@ -4,7 +4,7 @@ org.springframework.cloud spring-cloud-dataflow-parent - 2.6.0-SNAPSHOT + 2.6.0 spring-cloud-starter-dataflow-ui Data Flow UI Starter diff --git a/src/kubernetes/grafana/grafana-deployment.yaml b/src/kubernetes/grafana/grafana-deployment.yaml index ec8d265e76..f4372f47ee 100644 --- a/src/kubernetes/grafana/grafana-deployment.yaml +++ b/src/kubernetes/grafana/grafana-deployment.yaml @@ -14,7 +14,7 @@ spec: app: grafana spec: containers: - - image: springcloud/spring-cloud-dataflow-grafana-prometheus:2.6.0-SNAPSHOT + - image: springcloud/spring-cloud-dataflow-grafana-prometheus:2.6.0 name: grafana env: - name: GF_SECURITY_ADMIN_USER diff --git a/src/kubernetes/server/server-deployment.yaml b/src/kubernetes/server/server-deployment.yaml index 4e6d0b4bbb..88ae5eb88d 100644 --- a/src/kubernetes/server/server-deployment.yaml +++ b/src/kubernetes/server/server-deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: scdf-server - image: springcloud/spring-cloud-dataflow-server:2.6.0-SNAPSHOT + image: springcloud/spring-cloud-dataflow-server:2.6.0 imagePullPolicy: Always volumeMounts: - name: config @@ -58,7 +58,7 @@ spec: - name: SPRING_CLOUD_DATAFLOW_FEATURES_SCHEDULES_ENABLED value: 'true' - name: SPRING_CLOUD_DATAFLOW_TASK_COMPOSED_TASK_RUNNER_URI - value: 'docker://springcloud/spring-cloud-dataflow-composed-task-runner:2.6.0-SNAPSHOT' + value: 'docker://springcloud/spring-cloud-dataflow-composed-task-runner:2.6.0' - name: SPRING_CLOUD_KUBERNETES_CONFIG_ENABLE_API value: 'false' - name: SPRING_CLOUD_KUBERNETES_SECRETS_ENABLE_API