From 54b351f30c8cecf2f00bf2522f5671fb54add8fb Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Wed, 2 Aug 2017 19:34:17 +0000
Subject: [PATCH 001/158] [artifactory-release] Next development version
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 687c40b..7e3dc54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.2.3.RELEASE</version>
+ <version>1.2.4.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 4e8f014..64279c1 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.2.3.RELEASE</version>
+ <version>1.2.4.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 278b450..6dcca47 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.2.3.RELEASE</version>
+ <version>1.2.4.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.2.3.RELEASE</version>
+ <version>1.2.4.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.2.3.RELEASE</version>
+ <version>1.2.4.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 1419e97..4a5ac99 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.2.3.RELEASE</version>
+ <version>1.2.4.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.2.3.RELEASE</version>
+ <version>1.2.4.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 3338d0a246d9a3826a36fd6d9e4d497c139321a2 Mon Sep 17 00:00:00 2001
From: Eric Bottard <eric.bottard+github@gmail.com>
Date: Tue, 8 Aug 2017 16:49:18 +0200
Subject: [PATCH 002/158] Prepare for 1.3.0.M1 release
---
pom.xml | 6 +++---
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7e3dc54..0dd1d5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,18 +2,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.2.4.BUILD-SNAPSHOT</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.2.3.RELEASE</version>
+ <version>1.3.0.M1</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.2.3.RELEASE</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.3.0.M1</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.2.2.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.2.2.RELEASE</spring-cloud-deployer-spi.version>
<reactor.version>3.0.7.RELEASE</reactor.version>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 64279c1..a7fcacd 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.2.4.BUILD-SNAPSHOT</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 6dcca47..0677fd5 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.2.4.BUILD-SNAPSHOT</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.2.4.BUILD-SNAPSHOT</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.2.4.BUILD-SNAPSHOT</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 4a5ac99..51fff3f 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.2.4.BUILD-SNAPSHOT</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.2.4.BUILD-SNAPSHOT</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From ef7eda32c40584051f85b7d988af9956c52af7cc Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Wed, 9 Aug 2017 11:52:24 +0000
Subject: [PATCH 003/158] [artifactory-release] Release version 1.3.0.M1
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0dd1d5a..29edc8c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M1</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index a7fcacd..92de63d 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M1</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 0677fd5..c91006c 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M1</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M1</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 51fff3f..6ec84fb 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M1</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M1</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From d4c04b5bcf0dce31f1608e94bb58976c65876579 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Wed, 9 Aug 2017 11:52:29 +0000
Subject: [PATCH 004/158] [artifactory-release] Next development version
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 29edc8c..0dd1d5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.M1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 92de63d..a7fcacd 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.M1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index c91006c..0677fd5 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.M1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.3.0.M1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.M1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 6ec84fb..51fff3f 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.M1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.M1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 9c1cd6737933b11bdebf5cb626d46398ed97df45 Mon Sep 17 00:00:00 2001
From: Eric Bottard <eric.bottard+github@gmail.com>
Date: Thu, 24 Aug 2017 11:43:34 +0200
Subject: [PATCH 005/158] Fix configuration section
---
.../src/main/asciidoc/index.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc
index d39190f..157b234 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc
@@ -33,7 +33,7 @@ include::{dataflow-asciidoc}/applications.adoc[]
include::{dataflow-asciidoc}/architecture.adoc[]
-include::{dataflow-asciidoc}/configuration.adoc[]
+include::configuration.adoc[]
include::{dataflow-asciidoc}/shell.adoc[]
From 0b211dafb09c014f2acd1982178d7348e4a453ee Mon Sep 17 00:00:00 2001
From: Sabby Anandan <sabby.anandan@gmail.com>
Date: Wed, 13 Sep 2017 11:56:07 -0700
Subject: [PATCH 006/158] Bring master up to speed with 1.3.BS of SCDF core
- change scdf-core to 1.3.0.BUILD-SNAPSHOT
- add the new common security project as a dependency
- fix the imports/references
Though the tests pass, I couldn't verify the security integration. It is tracked via spring-cloud/spring-cloud-dataflow-ui#455.
---
pom.xml | 5 +++--
.../pom.xml | 5 +++++
.../security/CloudFoundryOAuthSecurityConfiguration.java | 8 ++++----
.../support/CloudFoundryDataflowAuthoritiesExtractor.java | 5 +++--
4 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0dd1d5a..8753889 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,14 +8,15 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.3.0.M1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.3.0.M1</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.2.2.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.2.2.RELEASE</spring-cloud-deployer-spi.version>
+ <spring-cloud-common-security-config.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-common-security-config.version>
<reactor.version>3.0.7.RELEASE</reactor.version>
</properties>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index a7fcacd..e4e4bef 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -23,6 +23,11 @@
<artifactId>spring-cloud-dataflow-server-core</artifactId>
<version>${spring-cloud-dataflow.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-common-security-config-web</artifactId>
+ <version>${spring-cloud-common-security-config.version}</version>
+ </dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/security/CloudFoundryOAuthSecurityConfiguration.java b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/security/CloudFoundryOAuthSecurityConfiguration.java
index e183162..adf81d9 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/security/CloudFoundryOAuthSecurityConfiguration.java
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/security/CloudFoundryOAuthSecurityConfiguration.java
@@ -27,12 +27,12 @@
import org.springframework.boot.autoconfigure.security.oauth2.resource.PrincipalExtractor;
import org.springframework.boot.autoconfigure.security.oauth2.resource.UserInfoTokenServices;
import org.springframework.boot.cloud.CloudPlatform;
+import org.springframework.cloud.common.security.OAuthSecurityConfiguration;
+import org.springframework.cloud.common.security.support.DefaultAuthoritiesExtractor;
+import org.springframework.cloud.common.security.support.OnSecurityEnabledAndOAuth2Enabled;
import org.springframework.cloud.dataflow.server.cloudfoundry.config.security.support.CloudFoundryDataflowAuthoritiesExtractor;
import org.springframework.cloud.dataflow.server.cloudfoundry.config.security.support.CloudFoundryPrincipalExtractor;
import org.springframework.cloud.dataflow.server.cloudfoundry.config.security.support.CloudFoundrySecurityService;
-import org.springframework.cloud.dataflow.server.config.security.OAuthSecurityConfiguration;
-import org.springframework.cloud.dataflow.server.config.security.support.DefaultDataflowAuthoritiesExtractor;
-import org.springframework.cloud.dataflow.server.config.security.support.OnSecurityEnabledAndOAuth2Enabled;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
@@ -48,7 +48,7 @@
* {@code Space Developers} have access to the underlying REST API's.
* <p>
* For this to happen, a REST call will be made to the Cloud Foundry Permissions API via
- * CloudFoundrySecurityService inside the {@link DefaultDataflowAuthoritiesExtractor}.
+ * CloudFoundrySecurityService inside the {@link DefaultAuthoritiesExtractor}.
* <p>
* If the user has the respective permissions, the CF_SPACE_DEVELOPER_ROLE will be
* assigned to the user.
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/security/support/CloudFoundryDataflowAuthoritiesExtractor.java b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/security/support/CloudFoundryDataflowAuthoritiesExtractor.java
index 91b1a55..24efdc5 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/security/support/CloudFoundryDataflowAuthoritiesExtractor.java
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/security/support/CloudFoundryDataflowAuthoritiesExtractor.java
@@ -15,6 +15,7 @@
*/
package org.springframework.cloud.dataflow.server.cloudfoundry.config.security.support;
+
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -24,8 +25,8 @@
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.security.oauth2.resource.AuthoritiesExtractor;
-import org.springframework.cloud.dataflow.server.config.security.support.CoreSecurityRoles;
-import org.springframework.cloud.dataflow.server.config.security.support.SecurityConfigUtils;
+import org.springframework.cloud.common.security.support.CoreSecurityRoles;
+import org.springframework.cloud.common.security.support.SecurityConfigUtils;
import org.springframework.security.config.core.GrantedAuthorityDefaults;
import org.springframework.security.core.GrantedAuthority;
import org.springframework.security.core.authority.SimpleGrantedAuthority;
From 6aa7606d57ea1b5da233e3bbf5491377cf876354 Mon Sep 17 00:00:00 2001
From: Sabby Anandan <sabby.anandan@gmail.com>
Date: Fri, 22 Sep 2017 07:23:37 -0700
Subject: [PATCH 007/158] Fix SAJ formatting issues in sample manifest.yml
---
.../src/main/asciidoc/configuration.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
index 73281c1..97a1b14 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
@@ -293,7 +293,7 @@ applications:
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES: rabbit,my-config-server
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES: mysql,my-config-server
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATION: true
- SPRING_APPLICATION_JSON {"maven": { "remote-repositories": { "repo1": { "url": "https://repo.spring.io/libs-release"} } } }
+ SPRING_APPLICATION_JSON: '{"maven": { "remote-repositories": { "repo1": { "url": "https://repo.spring.io/libs-release"} } } }'
services:
- mysql
- my-config-server
From fa1c775b2ffde2a42fedbce2ad2576deb45fbfa8 Mon Sep 17 00:00:00 2001
From: Gunnar Hillert <ghillert@pivotal.io>
Date: Fri, 22 Sep 2017 10:04:16 -1000
Subject: [PATCH 008/158] gh-355 Prepare for 1.3 M2 release
---
pom.xml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8753889..76cc8d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,15 +8,15 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M2</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.2.2.RELEASE</spring-cloud-deployer-cloudfoundry.version>
- <spring-cloud-deployer-spi.version>1.2.2.RELEASE</spring-cloud-deployer-spi.version>
- <spring-cloud-common-security-config.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-common-security-config.version>
+ <spring-cloud-dataflow.version>1.3.0.M2</spring-cloud-dataflow.version>
+ <spring-cloud-deployer-cloudfoundry.version>1.3.0.M1</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-deployer-spi.version>1.3.0.M1</spring-cloud-deployer-spi.version>
+ <spring-cloud-common-security-config.version>1.0.0.M1</spring-cloud-common-security-config.version>
<reactor.version>3.0.7.RELEASE</reactor.version>
</properties>
From 88726d6bc47e4ecfeaa204cb7e9430b38433ece3 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Fri, 22 Sep 2017 21:42:08 +0000
Subject: [PATCH 009/158] [artifactory-release] Release version 1.3.0.M2
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 76cc8d7..2af1828 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M2</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index e4e4bef..fb18046 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M2</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 0677fd5..5e562c4 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M2</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M2</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M2</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 51fff3f..c86b8aa 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M2</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M2</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 1034aa3d4e9e9f6f45e4abdb31b46179c93e4954 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Fri, 22 Sep 2017 21:42:11 +0000
Subject: [PATCH 010/158] [artifactory-release] Next development version
1.3.0.BUILD-SNAPSHOT
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2af1828..76cc8d7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.M2</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index fb18046..e4e4bef 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.M2</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 5e562c4..0677fd5 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.M2</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.3.0.M2</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.M2</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index c86b8aa..51fff3f 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.M2</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.M2</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 5371ad3bb92303bd338d2209f5cdeec724b2889c Mon Sep 17 00:00:00 2001
From: Soby Chacko <schacko@pivotal.io>
Date: Fri, 20 Oct 2017 14:28:48 -0400
Subject: [PATCH 011/158] Update SCDF core to 1.3.0.BUILD-SNAPSHOT
Fixes #361
Upgrade CF-deployer to 1.3 M2
Fixes #359
Update spring-cloud-deployer-cloudfoundry to 1.3.0.BUILD-SNAPSHOT
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 76cc8d7..52390c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,13 +8,13 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.3.0.M2</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.3.0.M2</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.3.0.M1</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-dataflow.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
+ <spring-cloud-deployer-cloudfoundry.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.0.M1</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.0.M1</spring-cloud-common-security-config.version>
<reactor.version>3.0.7.RELEASE</reactor.version>
From bfd21e34cdd04117a296bec9d6401f551d223a2e Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Mon, 20 Nov 2017 13:22:00 -0500
Subject: [PATCH 012/158] Update to deployer spi 1.3 M2 and cf-deployer 1.3.
M4
Fixes #366
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 52390c9..c78d78a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,8 +14,8 @@
<properties>
<spring-cloud-dataflow.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-deployer-cloudfoundry.version>
- <spring-cloud-deployer-spi.version>1.3.0.M1</spring-cloud-deployer-spi.version>
+ <spring-cloud-deployer-cloudfoundry.version>1.3.0.M4</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-deployer-spi.version>1.3.0.M2</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.0.M1</spring-cloud-common-security-config.version>
<reactor.version>3.0.7.RELEASE</reactor.version>
</properties>
From cb41018a41679c1ada705b3ba47d94cf4576f186 Mon Sep 17 00:00:00 2001
From: Sabby Anandan <sabby.anandan@gmail.com>
Date: Mon, 20 Nov 2017 19:04:00 -0800
Subject: [PATCH 013/158] Document skipper + cf-server integration with example
- Add skipper provisioning steps for pws
- Add stream create, deploy, and update sample
- Include skipper server/shell version regex section in the pom.xml
Fix skipper reference-guide link
---
pom.xml | 1 +
.../pom.xml | 13 +
.../src/main/asciidoc/getting-started.adoc | 355 ++++++++++++++++++
3 files changed, 369 insertions(+)
diff --git a/pom.xml b/pom.xml
index c78d78a..e3f0685 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,7 @@
<spring-cloud-deployer-cloudfoundry.version>1.3.0.M4</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.0.M2</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.0.M1</spring-cloud-common-security-config.version>
+ <spring-cloud-skipper.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-skipper.version>
<reactor.version>3.0.7.RELEASE</reactor.version>
</properties>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 0677fd5..740bca4 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -93,10 +93,13 @@
<dataflow-project-version>${spring-cloud-dataflow.version}</dataflow-project-version>
<deployer-cloudfoundry-version>${spring-cloud-deployer-cloudfoundry.version}</deployer-cloudfoundry-version>
+ <skipper-version>${spring-cloud-skipper.version}</skipper-version>
<dataflow-version-type-lowercase>${dataflow-version-type-lowercase}</dataflow-version-type-lowercase>
+ <skipper-version-type-lowercase>${skipper-version-type-lowercase}</skipper-version-type-lowercase>
<dataflow-branch-or-tag>${dataflow-branch-or-tag}</dataflow-branch-or-tag>
<dataflow-asciidoc>https://raw.githubusercontent.com/spring-cloud/spring-cloud-dataflow/${dataflow-branch-or-tag}/spring-cloud-dataflow-docs/src/main/asciidoc</dataflow-asciidoc>
<deployer-branch-or-tag>${deployer-branch-or-tag}</deployer-branch-or-tag>
+ <skipper-branch-or-tag>${skipper-branch-or-tag}</skipper-branch-or-tag>
<!-- The following two are deps of this project and set automatically.-->
<!-- Others are loose dependencies, and current-SNAPSHOT typically make sense-->
@@ -338,9 +341,19 @@
<lowercase />
</stringutil>
+ <var name="skipper-version-type" value="${spring-cloud-skipper.version}" />
+ <propertyregex property="skipper-version-type" override="true" input="${skipper-version-type}" regexp=".*\.(.*)" replace="\1" />
+ <propertyregex property="skipper-version-type" override="true" input="${skipper-version-type}" regexp="(M)\d+" replace="MILESTONE" />
+ <propertyregex property="skipper-version-type" override="true" input="${skipper-version-type}" regexp="(RC)\d+" replace="MILESTONE" />
+ <propertyregex property="skipper-version-type" override="true" input="${skipper-version-type}" regexp="BUILD-(.*)" replace="SNAPSHOT" />
+ <stringutil string="${skipper-version-type}" property="skipper-version-type-lowercase">
+ <lowercase />
+ </stringutil>
+
<!-- This will use the vX.Y.Z tag for releases, using master for anything else (which is deemed ok, even for maintenance SNAPSHOT) -->
<propertyregex property="dataflow-branch-or-tag" override="true" input="${spring-cloud-dataflow.version}" regexp=".*\.(?:M\d+|RC\d+|RELEASE)" select="v\0" defaultValue="master" />
<propertyregex property="deployer-branch-or-tag" override="true" input="${spring-cloud-deployer-cloudfoundry.version}" regexp=".*\.(?:M\d+|RC\d+|RELEASE)" select="v\0" defaultValue="master" />
+ <propertyregex property="skipper-branch-or-tag" override="true" input="${spring-cloud-skipper.version}" regexp=".*\.(?:M\d+|RC\d+|RELEASE)" select="v\0" defaultValue="master" />
</target>
</configuration>
</execution>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
index a6fcf3c..2988302 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
@@ -331,6 +331,361 @@ You will see the year `2017` printed in the logs. The execution status of the ta
in the database and you can retrieve information about the task execution using the shell commands
`task execution list` and `task execution status --id <ID_OF_TASK>` or though the Data Flow UI.
+[[spring-cloud-skipper-integration]]
+== Spring Cloud Skipper Integration
+
+Skipper is a tool that allows you to discover Spring Boot applications and manage their lifecycle on multiple Cloud Platforms.
+You can use Skipper standalone or integrate it with Continuous Integration pipelines to help achieve Continuous Deployment
+of applications. For more details, review the link:https://docs.spring.io/spring-cloud-skipper/docs/{skipper-version}/reference/htmlsingle/#overview[reference guide]
+for a complete overview and the feature capabilities.
+
+Before we begin setting up Skipper to use with Spring Cloud Data Flow, let's review the basics by understanding foundational
+design by which the relevant infrastructure is provisioned in Kubernetes. The tailormade
+link:https://docs.spring.io/spring-cloud-skipper/docs/{skipper-version}/reference/htmlsingle/#tour-cloud-foundry[three-minute-tour for Cloud Foundry]
+walks through the fundamentals.
+
+Next up, we will review the relevant artifacts to provision Spring Cloud Skipper in Cloud Foundry.
+
+=== Download the Spring Cloud Skipper and Shell apps
+
+[source,yaml,options=nowrap,subs=attributes]
+----
+wget http://repo.spring.io/{skipper-version-type-lowercase}/org/springframework/cloud/spring-cloud-skipper-server/{skipper-version}/spring-cloud-skipper-server-{skipper-version}.jar
+wget http://repo.spring.io/{skipper-version-type-lowercase}/org/springframework/cloud/spring-cloud-skipper-shell/{skipper-version}/spring-cloud-skipper-shell-{skipper-version}.jar
+----
+
+=== Running the Skipper Server
+Similar to SCDF-server, you can either deploy the skipper-server application on Cloud Foundry or on your local machine.
+
+Let's review the sample `manifest.yml` file to deploy the skipper-server application to Cloud Foundry.
+
+[source,yaml,options=nowrap]
+----
+---
+applications:
+- name: skipper-server
+ host: skipper-server
+ memory: 1G
+ disk_quota: 1G
+ instances: 1
+ path: <PATH TO THE DOWNLOADED SKIPPER SERVER UBER-JAR>
+env:
+ SPRING_APPLICATION_NAME: skipper-server
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_URL: https://api.run.pivotal.io
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_ORG: {org}
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_SPACE: {space}
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_DOMAIN: cfapps.io
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_USERNAME: {email}
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_PASSWORD: {password}
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_SERVICES: rabbit
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_STREAM_ENABLE_RANDOM_APP_NAME_PREFIX: false
+----
+
+You need to fill in \{org}, \{space}, \{email} and \{password} before running these commands. Once you have the desired
+config values in the `manifest.yml`, you can run `cf push` command to provision the skipper-server.
+
+WARNING: Only set 'Skip SSL Validation' to true if you're running on a Cloud Foundry instance using self-signed
+certs (e.g. in development). Do not use for production.
+
+[NOTE]
+====
+Skipper includes the concept of link:https://docs.spring.io/spring-cloud-skipper/docs/current/reference/htmlsingle/#platforms[platforms],
+so it is important to define the "accounts" based on the project preferences. In the above YAML file, the accounts map
+to `pws` as the platform. This can be modified, and of course, you can have any number of platform definitions.
+More details are in Spring Cloud Skipper reference guide.
+====
+
+=== Deploying Streams using Skipper
+We will proceed with the assumption that Spring Cloud Data Flow, Spring Cloud Skipper, RDBMS, and desired messaging
+middleware is up and running in PWS.
+
+[source,console,options=nowrap]
+----
+± cf apps [1h] ✭
+Getting apps in org ORG / space SPACE as email@pivotal.io...
+OK
+
+name requested state instances memory disk urls
+skipper-server started 1/1 1G 1G skipper-server.cfapps.io
+dataflow-server started 1/1 1G 1G dataflow-server.cfapps.io
+----
+
+Verify the available platforms in Skipper.
+
+[source,console,options=nowrap]
+----
+skipper:>config http://skipper-server.cfapps.io/api
+Successfully targeted http://skipper-server.cfapps.io/api
+skipper:>platform list
+╔═══════╤════════════╤═════════════════════════════════════════════════════════════════════════════════════════════════════════════╗
+║ Name │ Type │ Description ║
+╠═══════╪════════════╪═════════════════════════════════════════════════════════════════════════════════════════════════════════════╣
+║default│local │ShutdownTimeout = [30], EnvVarsToInherit = [TMP,LANG,LANGUAGE,LC_.*,PATH], JavaCmd = ║
+║ │ │[/home/vcap/app/.java-buildpack/open_jdk_jre/bin/java], WorkingDirectoriesRoot = [/home/vcap/tmp], ║
+║ │ │DeleteFilesOnExit = [true] ║
+║pws │cloudfoundry│org = [org], space = [space], url = [https://api.run.pivotal.io] ║
+╚═══════╧════════════╧═════════════════════════════════════════════════════════════════════════════════════════════════════════════╝
+----
+
+Let's start with deploying a stream with the `time-source` pointing to 1.2.0.RELEASE and `log-sink` pointing
+to 1.1.0.RELEASE. The goal is to rolling upgrade the `log-sink` application to 1.2.0.RELEASE.
+
+```
+dataflow:>app register --name time --type source --uri maven://org.springframework.cloud.stream.app:time-source-rabbit:1.2.0.RELEASE
+Successfully registered application 'source:time'
+
+dataflow:>app register --name log --type sink --uri maven://org.springframework.cloud.stream.app:log-sink-rabbit:1.1.0.RELEASE
+Successfully registered application 'sink:log'
+
+dataflow:>app info source:time
+Information about source application 'time':
+Resource URI: maven://org.springframework.cloud.stream.app:time-source-rabbit:1.2.0.RELEASE
+
+dataflow:>app info sink:log
+Information about sink application 'log':
+Resource URI: maven://org.springframework.cloud.stream.app:log-sink-rabbit:1.1.0.RELEASE
+```
+
+. Create stream.
+
++
+```
+dataflow:>stream create foo --definition "time | log"
+Created new stream 'foo'
+```
++
+
+. Deploy stream.
+
++
+```
+dataflow:>stream skipper deploy foo --platformName pws
+Deployment request has been sent for stream 'foo'
+```
++
+
+[NOTE]
+====
+While deploying the stream, we are supplying `--platformName` and that indicates the platform repository (i.e., `pws`) to
+use when deploying the stream applications via Skipper.
+====
+
+. List apps.
+
++
+[source,console,options=nowrap]
+----
+$ cf apps [1h] ✭
+Getting apps in org ORG / space SPACE as email@pivotal.io...
+
+name requested state instances memory disk urls
+foo-log-v1 started 1/1 1G 1G foo-log-v1.cfapps.io
+foo-time-v1 started 1/1 1G 1G foo-time-v1.cfapps.io
+skipper-server started 1/1 1G 1G skipper-server.cfapps.io
+dataflow-server started 1/1 1G 1G dataflow-server.cfapps.io
+----
++
+
+. Verify logs.
+
++
+[source,console,options=nowrap]
+----
+$ cf logs foo-log-v1
+...
+...
+2017-11-20T15:39:43.76-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:43.761 INFO 12 --- [ foo.time.foo-1] log-sink : 11/20/17 23:39:43
+2017-11-20T15:39:44.75-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:44.757 INFO 12 --- [ foo.time.foo-1] log-sink : 11/20/17 23:39:44
+2017-11-20T15:39:45.75-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:45.757 INFO 12 --- [ foo.time.foo-1] log-sink : 11/20/17 23:39:45
+----
++
+
+. Verify history in Skipper.
+
++
+[source,console,options=nowrap]
+----
+skipper:>history --release-name foo
+╔═══════╤════════════════════════════╤════════╤════════════╤═══════════════╤════════════════╗
+║Version│ Last updated │ Status │Package Name│Package Version│ Description ║
+╠═══════╪════════════════════════════╪════════╪════════════╪═══════════════╪════════════════╣
+║1 │Mon Nov 20 15:34:37 PST 2017│DEPLOYED│foo │1.0.0 │Install complete║
+╚═══════╧════════════════════════════╧════════╧════════════╧═══════════════╧════════════════╝
+----
++
+
+. Verify the package manifest in Skipper. The `log-sink` should be at 1.1.0.RELEASE.
+
++
+[source,yml,options=nowrap]
+----
+skipper:>manifest get foo
+
+---
+# Source: log.yml
+apiVersion: skipper.spring.io/v1
+kind: SpringCloudDeployerApplication
+metadata:
+ name: log
+spec:
+ resource: maven://org.springframework.cloud.stream.app:log-sink-rabbit
+ version: 1.1.0.RELEASE
+ applicationProperties:
+ spring.cloud.dataflow.stream.app.label: log
+ spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
+ spring.cloud.stream.bindings.applicationMetrics.destination: metrics
+ spring.cloud.dataflow.stream.name: foo
+ spring.metrics.export.triggers.application.includes: integration**
+ spring.cloud.stream.metrics.key: foo.log.${spring.cloud.application.guid}
+ spring.cloud.stream.bindings.input.group: foo
+ spring.cloud.dataflow.stream.app.type: sink
+ spring.cloud.stream.bindings.input.destination: foo.time
+ deploymentProperties:
+ spring.cloud.deployer.indexed: true
+ spring.cloud.deployer.group: foo
+
+---
+# Source: time.yml
+apiVersion: skipper.spring.io/v1
+kind: SpringCloudDeployerApplication
+metadata:
+ name: time
+spec:
+ resource: maven://org.springframework.cloud.stream.app:time-source-rabbit
+ version: 1.2.0.RELEASE
+ applicationProperties:
+ spring.cloud.dataflow.stream.app.label: time
+ spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
+ spring.cloud.stream.bindings.applicationMetrics.destination: metrics
+ spring.cloud.dataflow.stream.name: foo
+ spring.metrics.export.triggers.application.includes: integration**
+ spring.cloud.stream.metrics.key: foo.time.${spring.cloud.application.guid}
+ spring.cloud.stream.bindings.output.producer.requiredGroups: foo
+ spring.cloud.stream.bindings.output.destination: foo.time
+ spring.cloud.dataflow.stream.app.type: source
+ deploymentProperties:
+ spring.cloud.deployer.group: foo
+----
+
+. Let's update `log-sink` from 1.1.0.RELEASE to 1.2.0.RELEASE
+
++
+[source,console,options=nowrap]
+----
+dataflow:>stream skipper update --name foo --properties version.log=1.2.0.RELEASE
+Update request has been sent for stream 'foo'
+----
++
+
+. List apps.
+
++
+[source,console,options=nowrap]
+----
+± cf apps [1h] ✭
+Getting apps in org ORG / space SPACE as email@pivotal.io...
+
+Getting apps in org scdf-ci / space space-sabby as sanandan@pivotal.io...
+OK
+
+name requested state instances memory disk urls
+foo-log-v2 started 1/1 1G 1G foo-log-v2.cfapps.io
+foo-log-v1 stopped 0/1 1G 1G
+foo-time-v1 started 1/1 1G 1G foo-time-v1.cfapps.io
+skipper-server started 1/1 1G 1G skipper-server.cfapps.io
+dataflow-server started 1/1 1G 1G dataflow-server.cfapps.io
+----
++
+
+[NOTE]
+====
+Notice that there are two versions of the `log-sink` applications. The `foo-log-v1` application instance is going down
+(route already removed) and the newly spawned `foo-log-v2` application is bootstrapping. The version number is incremented and
+the version-number (`v2`) is included in the new application name.
+====
+
+. Once the new application is up and running, let's verify the logs.
+
++
+[source,console,options=nowrap]
+----
+$ cf logs foo-log-v2
+...
+...
+2017-11-20T18:38:35.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:35.003 INFO 18 --- [foo.time.foo-1] foo-log-v2 : 11/21/17 02:38:34
+2017-11-20T18:38:36.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:36.004 INFO 18 --- [foo.time.foo-1] foo-log-v2 : 11/21/17 02:38:35
+2017-11-20T18:38:37.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:37.005 INFO 18 --- [foo.time.foo-1] foo-log-v2 : 11/21/17 02:38:36
+----
++
+
+. Let's look at the updated package manifest in Skipper. We should now be seeing `log-sink` at 1.2.0.RELEASE.
+
++
+[source,yml,options=nowrap]
+----
+skipper:>manifest get --release-name foo
+
+---
+# Source: log.yml
+apiVersion: skipper.spring.io/v1
+kind: SpringCloudDeployerApplication
+metadata:
+ name: log
+spec:
+ resource: maven://org.springframework.cloud.stream.app:log-sink-rabbit
+ version: 1.2.0.RELEASE
+ applicationProperties:
+ spring.cloud.dataflow.stream.app.label: log
+ spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
+ spring.cloud.stream.bindings.applicationMetrics.destination: metrics
+ spring.cloud.dataflow.stream.name: foo
+ spring.metrics.export.triggers.application.includes: integration**
+ spring.cloud.stream.metrics.key: foo.log.${spring.cloud.application.guid}
+ spring.cloud.stream.bindings.input.group: foo
+ spring.cloud.dataflow.stream.app.type: sink
+ spring.cloud.stream.bindings.input.destination: foo.time
+ deploymentProperties:
+ spring.cloud.deployer.indexed: true
+ spring.cloud.deployer.group: foo
+ spring.cloud.deployer.count: 1
+
+---
+# Source: time.yml
+apiVersion: skipper.spring.io/v1
+kind: SpringCloudDeployerApplication
+metadata:
+ name: time
+spec:
+ resource: maven://org.springframework.cloud.stream.app:time-source-rabbit
+ version: 1.2.0.RELEASE
+ applicationProperties:
+ spring.cloud.dataflow.stream.app.label: time
+ spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
+ spring.cloud.stream.bindings.applicationMetrics.destination: metrics
+ spring.cloud.dataflow.stream.name: foo
+ spring.metrics.export.triggers.application.includes: integration**
+ spring.cloud.stream.metrics.key: foo.time.${spring.cloud.application.guid}
+ spring.cloud.stream.bindings.output.producer.requiredGroups: foo
+ spring.cloud.stream.bindings.output.destination: foo.time
+ spring.cloud.dataflow.stream.app.type: source
+ deploymentProperties:
+ spring.cloud.deployer.group: foo
+----
+
+. Verify history in Skipper.
+
++
+[source,console,options=nowrap]
+----
+skipper:>history --release-name foo
+╔═══════╤════════════════════════════╤════════╤════════════╤═══════════════╤════════════════╗
+║Version│ Last updated │ Status │Package Name│Package Version│ Description ║
+╠═══════╪════════════════════════════╪════════╪════════════╪═══════════════╪════════════════╣
+║2 │Mon Oct 30 16:21:55 PDT 2017│DEPLOYED│foo │1.0.0 │Upgrade complete║
+║1 │Mon Oct 30 16:18:28 PDT 2017│DELETED │foo │1.0.0 │Delete complete ║
+╚═══════╧════════════════════════════╧════════╧════════════╧═══════════════╧════════════════╝
+----
+
[[getting-started-app-names-cloud-foundry]]
== Application Names and Prefixes
From 0fe6d6921d94d8c09aa641340a3e67a75a64da77 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Fri, 24 Nov 2017 21:30:23 -0500
Subject: [PATCH 014/158] Restructure docs
---
.../src/main/asciidoc/getting-started.adoc | 371 ++----------------
.../src/main/asciidoc/index.adoc | 2 +
.../src/main/asciidoc/streams-skipper.adoc | 293 ++++++++++++++
3 files changed, 337 insertions(+), 329 deletions(-)
create mode 100644 spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/streams-skipper.adoc
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
index 2988302..b9b9cbe 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
@@ -47,7 +47,9 @@ cf create-service cleardb spark my_mysql
An RDBMS is used to persist Data Flow state, such as stream definitions and deployment ids.
It can also be used for tasks to persist execution history.
-=== Download the Spring Cloud Data Flow Server and Shell apps
+=== Running the Data Flow Server
+
+First download the server and shell applications
[subs=attributes]
```
@@ -55,7 +57,6 @@ wget http://repo.spring.io/{version-type-lowercase}/org/springframework/cloud/sp
wget http://repo.spring.io/{dataflow-version-type-lowercase}/org/springframework/cloud/spring-cloud-dataflow-shell/{dataflow-project-version}/spring-cloud-dataflow-shell-{dataflow-project-version}.jar
```
-=== Running the Server
You can either deploy the server application on Cloud Foundry itself or on your local machine.
The following two sections explain each way of running the server.
@@ -121,6 +122,43 @@ where `repo1` is the alias name for the remote repository.
If you need to configure multiple Maven repositories, a proxy, or authorization for a private repository, see link:http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#getting-started-maven-configuration[Maven Configuration].
====
+[[sample-manifest-template]]
+===== Sample Manifest Template
+
+As an alternative to setting environment variables via `cf set-env` command, you can curate all the relevant env-var's
+in `manifest.yml` file and use `cf push` command to provision the server.
+
+Following is a sample template to provision the server on PCFDev.
+
+[source,yml]
+----
+---
+applications:
+- name: data-flow-server
+ host: data-flow-server
+ memory: 2G
+ disk_quota: 2G
+ instances: 1
+ path: {PATH TO SERVER UBER-JAR}
+ env:
+ SPRING_APPLICATION_NAME: data-flow-server
+ SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_URL: https://api.local.pcfdev.io
+ SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_ORG: pcfdev-org
+ SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SPACE: pcfdev-space
+ SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_DOMAIN: local.pcfdev.io
+ SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_USERNAME: admin
+ SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_PASSWORD: admin
+ SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES: rabbit
+ SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES: mysql
+ SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATION: true
+ SPRING_APPLICATION_JSON {"maven": { "remote-repositories": { "repo1": { "url": "https://repo.spring.io/libs-release"} } } }
+services:
+- mysql
+----
+
+Once you're ready with the relevant properties in this file, you can issue `cf push` command from the directory where
+this file is stored.
+
[[configuring-defaults]]
===== Configuring Defaults for Deployed Apps
You can also set other optional properties that alter the way Spring Cloud Data Flow will deploy stream and task apps:
@@ -174,6 +212,8 @@ cf start dataflow-server
Alternatively, you can run the Admin application locally on your machine which is described in the next section.
+
+
==== Running the Server app locally
To run the server application locally, targeting your Cloud Foundry installation, you you need to configure the
@@ -217,43 +257,6 @@ NOTE: The current underlying PCF task capabilities are considered experimental f
versions less than 1.9. See http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/enable-disable-specific-features.html[Feature Togglers]
for how to disable task support in Data Flow.
-[[sample-manifest-template]]
-==== Sample Manifest Template
-
-As an alternative to setting environment variables via `cf set-env` command, you can curate all the relevant env-var's
-in `manifest.yml` file and use `cf push` command to provision the server.
-
-Following is a sample template to provision the server on PCFDev.
-
-[source,yml]
-----
----
-applications:
-- name: data-flow-server
- host: data-flow-server
- memory: 2G
- disk_quota: 2G
- instances: 1
- path: {PATH TO SERVER UBER-JAR}
- env:
- SPRING_APPLICATION_NAME: data-flow-server
- SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_URL: https://api.local.pcfdev.io
- SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_ORG: pcfdev-org
- SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SPACE: pcfdev-space
- SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_DOMAIN: local.pcfdev.io
- SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_USERNAME: admin
- SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_PASSWORD: admin
- SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES: rabbit
- SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES: mysql
- SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATION: true
- SPRING_APPLICATION_JSON {"maven": { "remote-repositories": { "repo1": { "url": "https://repo.spring.io/libs-release"} } } }
-services:
-- mysql
-----
-
-Once you're ready with the relevant properties in this file, you can issue `cf push` command from the directory where
-this file is stored.
-
=== Running Spring Cloud Data Flow Shell locally
Run the shell and optionally target the Admin application if not running on the same host (will typically be the case if
@@ -395,296 +398,6 @@ to `pws` as the platform. This can be modified, and of course, you can have any
More details are in Spring Cloud Skipper reference guide.
====
-=== Deploying Streams using Skipper
-We will proceed with the assumption that Spring Cloud Data Flow, Spring Cloud Skipper, RDBMS, and desired messaging
-middleware is up and running in PWS.
-
-[source,console,options=nowrap]
-----
-± cf apps [1h] ✭
-Getting apps in org ORG / space SPACE as email@pivotal.io...
-OK
-
-name requested state instances memory disk urls
-skipper-server started 1/1 1G 1G skipper-server.cfapps.io
-dataflow-server started 1/1 1G 1G dataflow-server.cfapps.io
-----
-
-Verify the available platforms in Skipper.
-
-[source,console,options=nowrap]
-----
-skipper:>config http://skipper-server.cfapps.io/api
-Successfully targeted http://skipper-server.cfapps.io/api
-skipper:>platform list
-╔═══════╤════════════╤═════════════════════════════════════════════════════════════════════════════════════════════════════════════╗
-║ Name │ Type │ Description ║
-╠═══════╪════════════╪═════════════════════════════════════════════════════════════════════════════════════════════════════════════╣
-║default│local │ShutdownTimeout = [30], EnvVarsToInherit = [TMP,LANG,LANGUAGE,LC_.*,PATH], JavaCmd = ║
-║ │ │[/home/vcap/app/.java-buildpack/open_jdk_jre/bin/java], WorkingDirectoriesRoot = [/home/vcap/tmp], ║
-║ │ │DeleteFilesOnExit = [true] ║
-║pws │cloudfoundry│org = [org], space = [space], url = [https://api.run.pivotal.io] ║
-╚═══════╧════════════╧═════════════════════════════════════════════════════════════════════════════════════════════════════════════╝
-----
-
-Let's start with deploying a stream with the `time-source` pointing to 1.2.0.RELEASE and `log-sink` pointing
-to 1.1.0.RELEASE. The goal is to rolling upgrade the `log-sink` application to 1.2.0.RELEASE.
-
-```
-dataflow:>app register --name time --type source --uri maven://org.springframework.cloud.stream.app:time-source-rabbit:1.2.0.RELEASE
-Successfully registered application 'source:time'
-
-dataflow:>app register --name log --type sink --uri maven://org.springframework.cloud.stream.app:log-sink-rabbit:1.1.0.RELEASE
-Successfully registered application 'sink:log'
-
-dataflow:>app info source:time
-Information about source application 'time':
-Resource URI: maven://org.springframework.cloud.stream.app:time-source-rabbit:1.2.0.RELEASE
-
-dataflow:>app info sink:log
-Information about sink application 'log':
-Resource URI: maven://org.springframework.cloud.stream.app:log-sink-rabbit:1.1.0.RELEASE
-```
-
-. Create stream.
-
-+
-```
-dataflow:>stream create foo --definition "time | log"
-Created new stream 'foo'
-```
-+
-
-. Deploy stream.
-
-+
-```
-dataflow:>stream skipper deploy foo --platformName pws
-Deployment request has been sent for stream 'foo'
-```
-+
-
-[NOTE]
-====
-While deploying the stream, we are supplying `--platformName` and that indicates the platform repository (i.e., `pws`) to
-use when deploying the stream applications via Skipper.
-====
-
-. List apps.
-
-+
-[source,console,options=nowrap]
-----
-$ cf apps [1h] ✭
-Getting apps in org ORG / space SPACE as email@pivotal.io...
-
-name requested state instances memory disk urls
-foo-log-v1 started 1/1 1G 1G foo-log-v1.cfapps.io
-foo-time-v1 started 1/1 1G 1G foo-time-v1.cfapps.io
-skipper-server started 1/1 1G 1G skipper-server.cfapps.io
-dataflow-server started 1/1 1G 1G dataflow-server.cfapps.io
-----
-+
-
-. Verify logs.
-
-+
-[source,console,options=nowrap]
-----
-$ cf logs foo-log-v1
-...
-...
-2017-11-20T15:39:43.76-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:43.761 INFO 12 --- [ foo.time.foo-1] log-sink : 11/20/17 23:39:43
-2017-11-20T15:39:44.75-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:44.757 INFO 12 --- [ foo.time.foo-1] log-sink : 11/20/17 23:39:44
-2017-11-20T15:39:45.75-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:45.757 INFO 12 --- [ foo.time.foo-1] log-sink : 11/20/17 23:39:45
-----
-+
-
-. Verify history in Skipper.
-
-+
-[source,console,options=nowrap]
-----
-skipper:>history --release-name foo
-╔═══════╤════════════════════════════╤════════╤════════════╤═══════════════╤════════════════╗
-║Version│ Last updated │ Status │Package Name│Package Version│ Description ║
-╠═══════╪════════════════════════════╪════════╪════════════╪═══════════════╪════════════════╣
-║1 │Mon Nov 20 15:34:37 PST 2017│DEPLOYED│foo │1.0.0 │Install complete║
-╚═══════╧════════════════════════════╧════════╧════════════╧═══════════════╧════════════════╝
-----
-+
-
-. Verify the package manifest in Skipper. The `log-sink` should be at 1.1.0.RELEASE.
-
-+
-[source,yml,options=nowrap]
-----
-skipper:>manifest get foo
-
----
-# Source: log.yml
-apiVersion: skipper.spring.io/v1
-kind: SpringCloudDeployerApplication
-metadata:
- name: log
-spec:
- resource: maven://org.springframework.cloud.stream.app:log-sink-rabbit
- version: 1.1.0.RELEASE
- applicationProperties:
- spring.cloud.dataflow.stream.app.label: log
- spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
- spring.cloud.stream.bindings.applicationMetrics.destination: metrics
- spring.cloud.dataflow.stream.name: foo
- spring.metrics.export.triggers.application.includes: integration**
- spring.cloud.stream.metrics.key: foo.log.${spring.cloud.application.guid}
- spring.cloud.stream.bindings.input.group: foo
- spring.cloud.dataflow.stream.app.type: sink
- spring.cloud.stream.bindings.input.destination: foo.time
- deploymentProperties:
- spring.cloud.deployer.indexed: true
- spring.cloud.deployer.group: foo
-
----
-# Source: time.yml
-apiVersion: skipper.spring.io/v1
-kind: SpringCloudDeployerApplication
-metadata:
- name: time
-spec:
- resource: maven://org.springframework.cloud.stream.app:time-source-rabbit
- version: 1.2.0.RELEASE
- applicationProperties:
- spring.cloud.dataflow.stream.app.label: time
- spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
- spring.cloud.stream.bindings.applicationMetrics.destination: metrics
- spring.cloud.dataflow.stream.name: foo
- spring.metrics.export.triggers.application.includes: integration**
- spring.cloud.stream.metrics.key: foo.time.${spring.cloud.application.guid}
- spring.cloud.stream.bindings.output.producer.requiredGroups: foo
- spring.cloud.stream.bindings.output.destination: foo.time
- spring.cloud.dataflow.stream.app.type: source
- deploymentProperties:
- spring.cloud.deployer.group: foo
-----
-
-. Let's update `log-sink` from 1.1.0.RELEASE to 1.2.0.RELEASE
-
-+
-[source,console,options=nowrap]
-----
-dataflow:>stream skipper update --name foo --properties version.log=1.2.0.RELEASE
-Update request has been sent for stream 'foo'
-----
-+
-
-. List apps.
-
-+
-[source,console,options=nowrap]
-----
-± cf apps [1h] ✭
-Getting apps in org ORG / space SPACE as email@pivotal.io...
-
-Getting apps in org scdf-ci / space space-sabby as sanandan@pivotal.io...
-OK
-
-name requested state instances memory disk urls
-foo-log-v2 started 1/1 1G 1G foo-log-v2.cfapps.io
-foo-log-v1 stopped 0/1 1G 1G
-foo-time-v1 started 1/1 1G 1G foo-time-v1.cfapps.io
-skipper-server started 1/1 1G 1G skipper-server.cfapps.io
-dataflow-server started 1/1 1G 1G dataflow-server.cfapps.io
-----
-+
-
-[NOTE]
-====
-Notice that there are two versions of the `log-sink` applications. The `foo-log-v1` application instance is going down
-(route already removed) and the newly spawned `foo-log-v2` application is bootstrapping. The version number is incremented and
-the version-number (`v2`) is included in the new application name.
-====
-
-. Once the new application is up and running, let's verify the logs.
-
-+
-[source,console,options=nowrap]
-----
-$ cf logs foo-log-v2
-...
-...
-2017-11-20T18:38:35.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:35.003 INFO 18 --- [foo.time.foo-1] foo-log-v2 : 11/21/17 02:38:34
-2017-11-20T18:38:36.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:36.004 INFO 18 --- [foo.time.foo-1] foo-log-v2 : 11/21/17 02:38:35
-2017-11-20T18:38:37.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:37.005 INFO 18 --- [foo.time.foo-1] foo-log-v2 : 11/21/17 02:38:36
-----
-+
-
-. Let's look at the updated package manifest in Skipper. We should now be seeing `log-sink` at 1.2.0.RELEASE.
-
-+
-[source,yml,options=nowrap]
-----
-skipper:>manifest get --release-name foo
-
----
-# Source: log.yml
-apiVersion: skipper.spring.io/v1
-kind: SpringCloudDeployerApplication
-metadata:
- name: log
-spec:
- resource: maven://org.springframework.cloud.stream.app:log-sink-rabbit
- version: 1.2.0.RELEASE
- applicationProperties:
- spring.cloud.dataflow.stream.app.label: log
- spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
- spring.cloud.stream.bindings.applicationMetrics.destination: metrics
- spring.cloud.dataflow.stream.name: foo
- spring.metrics.export.triggers.application.includes: integration**
- spring.cloud.stream.metrics.key: foo.log.${spring.cloud.application.guid}
- spring.cloud.stream.bindings.input.group: foo
- spring.cloud.dataflow.stream.app.type: sink
- spring.cloud.stream.bindings.input.destination: foo.time
- deploymentProperties:
- spring.cloud.deployer.indexed: true
- spring.cloud.deployer.group: foo
- spring.cloud.deployer.count: 1
-
----
-# Source: time.yml
-apiVersion: skipper.spring.io/v1
-kind: SpringCloudDeployerApplication
-metadata:
- name: time
-spec:
- resource: maven://org.springframework.cloud.stream.app:time-source-rabbit
- version: 1.2.0.RELEASE
- applicationProperties:
- spring.cloud.dataflow.stream.app.label: time
- spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
- spring.cloud.stream.bindings.applicationMetrics.destination: metrics
- spring.cloud.dataflow.stream.name: foo
- spring.metrics.export.triggers.application.includes: integration**
- spring.cloud.stream.metrics.key: foo.time.${spring.cloud.application.guid}
- spring.cloud.stream.bindings.output.producer.requiredGroups: foo
- spring.cloud.stream.bindings.output.destination: foo.time
- spring.cloud.dataflow.stream.app.type: source
- deploymentProperties:
- spring.cloud.deployer.group: foo
-----
-
-. Verify history in Skipper.
-
-+
-[source,console,options=nowrap]
-----
-skipper:>history --release-name foo
-╔═══════╤════════════════════════════╤════════╤════════════╤═══════════════╤════════════════╗
-║Version│ Last updated │ Status │Package Name│Package Version│ Description ║
-╠═══════╪════════════════════════════╪════════╪════════════╪═══════════════╪════════════════╣
-║2 │Mon Oct 30 16:21:55 PDT 2017│DEPLOYED│foo │1.0.0 │Upgrade complete║
-║1 │Mon Oct 30 16:18:28 PDT 2017│DELETED │foo │1.0.0 │Delete complete ║
-╚═══════╧════════════════════════════╧════════╧════════════╧═══════════════╧════════════════╝
-----
[[getting-started-app-names-cloud-foundry]]
== Application Names and Prefixes
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc
index 157b234..63b0d28 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc
@@ -39,6 +39,8 @@ include::{dataflow-asciidoc}/shell.adoc[]
include::{dataflow-asciidoc}/streams.adoc[]
+include::streams-skipper.adoc[]
+
include::{dataflow-asciidoc}/tasks.adoc[]
include::cf-tasks.adoc[]
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/streams-skipper.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/streams-skipper.adoc
new file mode 100644
index 0000000..bb170dc
--- /dev/null
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/streams-skipper.adoc
@@ -0,0 +1,293 @@
+[[streams-using-skipper]]
+[[streams-using-skipper]]
+= Streams deployed using Skipper
+
+We will proceed with the assumption that Spring Cloud Data Flow, Spring Cloud Skipper, RDBMS, and desired messaging
+middleware is up and running in PWS.
+
+[source,console,options=nowrap]
+----
+± cf apps [1h] ✭
+Getting apps in org ORG / space SPACE as email@pivotal.io...
+OK
+
+name requested state instances memory disk urls
+skipper-server started 1/1 1G 1G skipper-server.cfapps.io
+dataflow-server started 1/1 1G 1G dataflow-server.cfapps.io
+----
+
+Verify the available platforms in Skipper.
+
+[source,console,options=nowrap]
+----
+skipper:>config http://skipper-server.cfapps.io/api
+Successfully targeted http://skipper-server.cfapps.io/api
+skipper:>platform list
+╔═══════╤════════════╤═════════════════════════════════════════════════════════════════════════════════════════════════════════════╗
+║ Name │ Type │ Description ║
+╠═══════╪════════════╪═════════════════════════════════════════════════════════════════════════════════════════════════════════════╣
+║default│local │ShutdownTimeout = [30], EnvVarsToInherit = [TMP,LANG,LANGUAGE,LC_.*,PATH], JavaCmd = ║
+║ │ │[/home/vcap/app/.java-buildpack/open_jdk_jre/bin/java], WorkingDirectoriesRoot = [/home/vcap/tmp], ║
+║ │ │DeleteFilesOnExit = [true] ║
+║pws │cloudfoundry│org = [scdf-ci], space = [space-sabby], url = [https://api.run.pivotal.io] ║
+╚═══════╧════════════╧═════════════════════════════════════════════════════════════════════════════════════════════════════════════╝
+----
+
+Let's start with deploying a stream with the `time-source` pointing to 1.2.0.RELEASE and `log-sink` pointing
+to 1.1.0.RELEASE. The goal is to rolling upgrade the `log-sink` application to 1.2.0.RELEASE.
+
+```
+dataflow:>app register --name time --type source --uri maven://org.springframework.cloud.stream.app:time-source-rabbit:1.2.0.RELEASE
+Successfully registered application 'source:time'
+
+dataflow:>app register --name log --type sink --uri maven://org.springframework.cloud.stream.app:log-sink-rabbit:1.1.0.RELEASE
+Successfully registered application 'sink:log'
+
+dataflow:>app info source:time
+Information about source application 'time':
+Resource URI: maven://org.springframework.cloud.stream.app:time-source-rabbit:1.2.0.RELEASE
+
+dataflow:>app info sink:log
+Information about sink application 'log':
+Resource URI: maven://org.springframework.cloud.stream.app:log-sink-rabbit:1.1.0.RELEASE
+```
+
+. Create stream.
+
++
+```
+dataflow:>stream create foo --definition "time | log"
+Created new stream 'foo'
+```
++
+
+. Deploy stream.
+
++
+```
+dataflow:>stream skipper deploy foo --platformName pws
+Deployment request has been sent for stream 'foo'
+```
++
+
+[NOTE]
+====
+While deploying the stream, we are supplying `--platformName` and that indicates the platform repository (i.e., `pws`) to
+use when deploying the stream applications via Skipper.
+====
+
+. List apps.
+
++
+[source,console,options=nowrap]
+----
+$ cf apps [1h] ✭
+Getting apps in org ORG / space SPACE as email@pivotal.io...
+
+name requested state instances memory disk urls
+foo-log-v1 started 1/1 1G 1G foo-log-v1.cfapps.io
+foo-time-v1 started 1/1 1G 1G foo-time-v1.cfapps.io
+skipper-server started 1/1 1G 1G skipper-server.cfapps.io
+dataflow-server started 1/1 1G 1G dataflow-server.cfapps.io
+----
++
+
+. Verify logs.
+
++
+[source,console,options=nowrap]
+----
+$ cf logs foo-log-v1
+...
+...
+2017-11-20T15:39:43.76-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:43.761 INFO 12 --- [ foo.time.foo-1] log-sink : 11/20/17 23:39:43
+2017-11-20T15:39:44.75-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:44.757 INFO 12 --- [ foo.time.foo-1] log-sink : 11/20/17 23:39:44
+2017-11-20T15:39:45.75-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:45.757 INFO 12 --- [ foo.time.foo-1] log-sink : 11/20/17 23:39:45
+----
++
+
+. Verify history in Skipper.
+
++
+[source,console,options=nowrap]
+----
+skipper:>history --release-name foo
+╔═══════╤════════════════════════════╤════════╤════════════╤═══════════════╤════════════════╗
+║Version│ Last updated │ Status │Package Name│Package Version│ Description ║
+╠═══════╪════════════════════════════╪════════╪════════════╪═══════════════╪════════════════╣
+║1 │Mon Nov 20 15:34:37 PST 2017│DEPLOYED│foo │1.0.0 │Install complete║
+╚═══════╧════════════════════════════╧════════╧════════════╧═══════════════╧════════════════╝
+----
++
+
+. Verify the package manifest in Skipper. The `log-sink` should be at 1.1.0.RELEASE.
+
++
+[source,yml,options=nowrap]
+----
+skipper:>manifest get foo
+
+---
+# Source: log.yml
+apiVersion: skipper.spring.io/v1
+kind: SpringCloudDeployerApplication
+metadata:
+ name: log
+spec:
+ resource: maven://org.springframework.cloud.stream.app:log-sink-rabbit
+ version: 1.1.0.RELEASE
+ applicationProperties:
+ spring.cloud.dataflow.stream.app.label: log
+ spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
+ spring.cloud.stream.bindings.applicationMetrics.destination: metrics
+ spring.cloud.dataflow.stream.name: foo
+ spring.metrics.export.triggers.application.includes: integration**
+ spring.cloud.stream.metrics.key: foo.log.${spring.cloud.application.guid}
+ spring.cloud.stream.bindings.input.group: foo
+ spring.cloud.dataflow.stream.app.type: sink
+ spring.cloud.stream.bindings.input.destination: foo.time
+ deploymentProperties:
+ spring.cloud.deployer.indexed: true
+ spring.cloud.deployer.group: foo
+
+---
+# Source: time.yml
+apiVersion: skipper.spring.io/v1
+kind: SpringCloudDeployerApplication
+metadata:
+ name: time
+spec:
+ resource: maven://org.springframework.cloud.stream.app:time-source-rabbit
+ version: 1.2.0.RELEASE
+ applicationProperties:
+ spring.cloud.dataflow.stream.app.label: time
+ spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
+ spring.cloud.stream.bindings.applicationMetrics.destination: metrics
+ spring.cloud.dataflow.stream.name: foo
+ spring.metrics.export.triggers.application.includes: integration**
+ spring.cloud.stream.metrics.key: foo.time.${spring.cloud.application.guid}
+ spring.cloud.stream.bindings.output.producer.requiredGroups: foo
+ spring.cloud.stream.bindings.output.destination: foo.time
+ spring.cloud.dataflow.stream.app.type: source
+ deploymentProperties:
+ spring.cloud.deployer.group: foo
+----
+
+. Let's update `log-sink` from 1.1.0.RELEASE to 1.2.0.RELEASE
+
++
+[source,console,options=nowrap]
+----
+dataflow:>stream skipper update --name foo --properties version.log=1.2.0.RELEASE
+Update request has been sent for stream 'foo'
+----
++
+
+. List apps.
+
++
+[source,console,options=nowrap]
+----
+± cf apps [1h] ✭
+Getting apps in org ORG / space SPACE as email@pivotal.io...
+
+Getting apps in org scdf-ci / space space-sabby as sanandan@pivotal.io...
+OK
+
+name requested state instances memory disk urls
+foo-log-v2 started 1/1 1G 1G foo-log-v2.cfapps.io
+foo-log-v1 stopped 0/1 1G 1G
+foo-time-v1 started 1/1 1G 1G foo-time-v1.cfapps.io
+skipper-server started 1/1 1G 1G skipper-server.cfapps.io
+dataflow-server started 1/1 1G 1G dataflow-server.cfapps.io
+----
++
+
+[NOTE]
+====
+Notice that there are two versions of the `log-sink` applications. The `foo-log-v1` application instance is going down
+(route already removed) and the newly spawned `foo-log-v2` application is bootstrapping. The version number is incremented and
+the version-number (`v2`) is included in the new application name.
+====
+
+. Once the new application is up and running, let's verify the logs.
+
++
+[source,console,options=nowrap]
+----
+$ cf logs foo-log-v2
+...
+...
+2017-11-20T18:38:35.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:35.003 INFO 18 --- [foo.time.foo-1] foo-log-v2 : 11/21/17 02:38:34
+2017-11-20T18:38:36.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:36.004 INFO 18 --- [foo.time.foo-1] foo-log-v2 : 11/21/17 02:38:35
+2017-11-20T18:38:37.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:37.005 INFO 18 --- [foo.time.foo-1] foo-log-v2 : 11/21/17 02:38:36
+----
++
+
+. Let's look at the updated package manifest in Skipper. We should now be seeing `log-sink` at 1.2.0.RELEASE.
+
++
+[source,yml,options=nowrap]
+----
+skipper:>manifest get --release-name foo
+
+---
+# Source: log.yml
+apiVersion: skipper.spring.io/v1
+kind: SpringCloudDeployerApplication
+metadata:
+ name: log
+spec:
+ resource: maven://org.springframework.cloud.stream.app:log-sink-rabbit
+ version: 1.2.0.RELEASE
+ applicationProperties:
+ spring.cloud.dataflow.stream.app.label: log
+ spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
+ spring.cloud.stream.bindings.applicationMetrics.destination: metrics
+ spring.cloud.dataflow.stream.name: foo
+ spring.metrics.export.triggers.application.includes: integration**
+ spring.cloud.stream.metrics.key: foo.log.${spring.cloud.application.guid}
+ spring.cloud.stream.bindings.input.group: foo
+ spring.cloud.dataflow.stream.app.type: sink
+ spring.cloud.stream.bindings.input.destination: foo.time
+ deploymentProperties:
+ spring.cloud.deployer.indexed: true
+ spring.cloud.deployer.group: foo
+ spring.cloud.deployer.count: 1
+
+---
+# Source: time.yml
+apiVersion: skipper.spring.io/v1
+kind: SpringCloudDeployerApplication
+metadata:
+ name: time
+spec:
+ resource: maven://org.springframework.cloud.stream.app:time-source-rabbit
+ version: 1.2.0.RELEASE
+ applicationProperties:
+ spring.cloud.dataflow.stream.app.label: time
+ spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
+ spring.cloud.stream.bindings.applicationMetrics.destination: metrics
+ spring.cloud.dataflow.stream.name: foo
+ spring.metrics.export.triggers.application.includes: integration**
+ spring.cloud.stream.metrics.key: foo.time.${spring.cloud.application.guid}
+ spring.cloud.stream.bindings.output.producer.requiredGroups: foo
+ spring.cloud.stream.bindings.output.destination: foo.time
+ spring.cloud.dataflow.stream.app.type: source
+ deploymentProperties:
+ spring.cloud.deployer.group: foo
+----
+
+. Verify history in Skipper.
+
++
+[source,console,options=nowrap]
+----
+skipper:>history --release-name foo
+╔═══════╤════════════════════════════╤════════╤════════════╤═══════════════╤════════════════╗
+║Version│ Last updated │ Status │Package Name│Package Version│ Description ║
+╠═══════╪════════════════════════════╪════════╪════════════╪═══════════════╪════════════════╣
+║2 │Mon Oct 30 16:21:55 PDT 2017│DEPLOYED│foo │1.0.0 │Upgrade complete║
+║1 │Mon Oct 30 16:18:28 PDT 2017│DELETED │foo │1.0.0 │Delete complete ║
+╚═══════╧════════════════════════════╧════════╧════════════╧═══════════════╧════════════════╝
+----
From 3882ef6702ca8f7b976380c78f5b7388e644c099 Mon Sep 17 00:00:00 2001
From: Sabby Anandan <sabby.anandan@gmail.com>
Date: Wed, 29 Nov 2017 11:34:45 -0800
Subject: [PATCH 015/158] Update stream-skipper docs
---
.../src/main/asciidoc/streams-skipper.adoc | 44 ++++++++++++++-----
1 file changed, 32 insertions(+), 12 deletions(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/streams-skipper.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/streams-skipper.adoc
index bb170dc..08787cb 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/streams-skipper.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/streams-skipper.adoc
@@ -1,5 +1,4 @@
[[streams-using-skipper]]
-[[streams-using-skipper]]
= Streams deployed using Skipper
We will proceed with the assumption that Spring Cloud Data Flow, Spring Cloud Skipper, RDBMS, and desired messaging
@@ -20,9 +19,7 @@ Verify the available platforms in Skipper.
[source,console,options=nowrap]
----
-skipper:>config http://skipper-server.cfapps.io/api
-Successfully targeted http://skipper-server.cfapps.io/api
-skipper:>platform list
+dataflow:>stream skipper platform-list
╔═══════╤════════════╤═════════════════════════════════════════════════════════════════════════════════════════════════════════════╗
║ Name │ Type │ Description ║
╠═══════╪════════════╪═════════════════════════════════════════════════════════════════════════════════════════════════════════════╣
@@ -106,12 +103,12 @@ $ cf logs foo-log-v1
----
+
-. Verify history in Skipper.
+. Verify the stream history.
+
[source,console,options=nowrap]
----
-skipper:>history --release-name foo
+dataflow:>stream skipper history --name foo
╔═══════╤════════════════════════════╤════════╤════════════╤═══════════════╤════════════════╗
║Version│ Last updated │ Status │Package Name│Package Version│ Description ║
╠═══════╪════════════════════════════╪════════╪════════════╪═══════════════╪════════════════╣
@@ -125,7 +122,7 @@ skipper:>history --release-name foo
+
[source,yml,options=nowrap]
----
-skipper:>manifest get foo
+dataflow:>stream skipper manifest --name foo
---
# Source: log.yml
@@ -224,7 +221,7 @@ $ cf logs foo-log-v2
----
+
-. Let's look at the updated package manifest in Skipper. We should now be seeing `log-sink` at 1.2.0.RELEASE.
+. Let's look at the updated package manifest persisted in Skipper. We should now be seeing `log-sink` at 1.2.0.RELEASE.
+
[source,yml,options=nowrap]
@@ -277,17 +274,40 @@ spec:
deploymentProperties:
spring.cloud.deployer.group: foo
----
++
-. Verify history in Skipper.
+. Verify stream history for the latest updates.
+
[source,console,options=nowrap]
----
-skipper:>history --release-name foo
+dataflow:>stream skipper history --name foo
+╔═══════╤════════════════════════════╤════════╤════════════╤═══════════════╤════════════════╗
+║Version│ Last updated │ Status │Package Name│Package Version│ Description ║
+╠═══════╪════════════════════════════╪════════╪════════════╪═══════════════╪════════════════╣
+║2 │Mon Nov 20 15:39:37 PST 2017│DEPLOYED│foo │1.0.0 │Upgrade complete║
+║1 │Mon Nov 20 15:34:37 PST 2017│DELETED │foo │1.0.0 │Delete complete ║
+╚═══════╧════════════════════════════╧════════╧════════════╧═══════════════╧════════════════╝
+----
++
+
+. Rolling-back to the previous version is just a command away.
+
++
+[source,console,options=nowrap]
+----
+dataflow:>stream skipper rollback --name foo
+Rollback request has been sent for the stream 'foo'
+
+...
+...
+
+dataflow:>stream skipper history --name foo
╔═══════╤════════════════════════════╤════════╤════════════╤═══════════════╤════════════════╗
║Version│ Last updated │ Status │Package Name│Package Version│ Description ║
╠═══════╪════════════════════════════╪════════╪════════════╪═══════════════╪════════════════╣
-║2 │Mon Oct 30 16:21:55 PDT 2017│DEPLOYED│foo │1.0.0 │Upgrade complete║
-║1 │Mon Oct 30 16:18:28 PDT 2017│DELETED │foo │1.0.0 │Delete complete ║
+║3 │Mon Nov 20 15:41:37 PST 2017│DEPLOYED│foo │1.0.0 │Upgrade complete║
+║2 │Mon Nov 20 15:39:37 PST 2017│DELETED │foo │1.0.0 │Delete complete ║
+║1 │Mon Nov 20 15:34:37 PST 2017│DELETED │foo │1.0.0 │Delete complete ║
╚═══════╧════════════════════════════╧════════╧════════════╧═══════════════╧════════════════╝
----
From 3c3c7a1103ff1b3942aa927af5db0b15c50a589f Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Thu, 30 Nov 2017 11:18:21 +0530
Subject: [PATCH 016/158] Fix doc on Skipper manifest
---
.../src/main/asciidoc/streams-skipper.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/streams-skipper.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/streams-skipper.adoc
index 08787cb..ac125d8 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/streams-skipper.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/streams-skipper.adoc
@@ -226,7 +226,7 @@ $ cf logs foo-log-v2
+
[source,yml,options=nowrap]
----
-skipper:>manifest get --release-name foo
+dataflow:>stream skipper manifest --name foo
---
# Source: log.yml
From f6eea318206c59011e3941b4be9aa9717d7177b4 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Wed, 29 Nov 2017 18:57:01 -0500
Subject: [PATCH 017/158] Restructure docs
---
pom.xml | 2 +-
.../pom.xml | 60 ----
.../src/main/asciidoc/configuration.adoc | 46 +++
.../src/main/asciidoc/getting-started.adoc | 310 +++++-------------
4 files changed, 128 insertions(+), 290 deletions(-)
diff --git a/pom.xml b/pom.xml
index e3f0685..e476359 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
<spring-cloud-deployer-cloudfoundry.version>1.3.0.M4</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.0.M2</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.0.M1</spring-cloud-common-security-config.version>
- <spring-cloud-skipper.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>1.0.0.M2</spring-cloud-skipper.version>
<reactor.version>3.0.7.RELEASE</reactor.version>
</properties>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 740bca4..bfee092 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -113,19 +113,6 @@
</attributes>
</configuration>
<executions>
- <execution>
- <id>generate-docbook</id>
- <phase>generate-resources</phase>
- <goals>
- <goal>process-asciidoc</goal>
- </goals>
- <configuration>
- <backend>docbook5</backend>
- <attributes>
- <docinfo>true</docinfo>
- </attributes>
- </configuration>
- </execution>
<execution>
<id>generate-html5</id>
<phase>generate-resources</phase>
@@ -207,53 +194,6 @@
</postProcess>
</configuration>
</execution>
- <execution>
- <id>pdf</id>
- <goals>
- <goal>generate-pdf</goal>
- </goals>
- <phase>generate-resources</phase>
- <configuration>
- <foCustomization>${basedir}/src/main/docbook/xsl/pdf.xsl</foCustomization>
- <targetDirectory>${basedir}/target/docbook/pdf</targetDirectory>
- <postProcess>
- <copy todir="${basedir}/target/contents/reference">
- <fileset dir="${basedir}/target/docbook">
- <include name="**/*.pdf" />
- </fileset>
- </copy>
- <move file="${basedir}/target/contents/reference/pdf/index.pdf" tofile="${basedir}/target/contents/reference/pdf/spring-cloud-dataflow-server-cloudfoundry-reference.pdf" />
- </postProcess>
- </configuration>
- </execution>
-
- <execution>
- <id>epub</id>
- <goals>
- <goal>generate-epub3</goal>
- </goals>
- <phase>generate-resources</phase>
- <configuration>
- <epubCustomization>${basedir}/src/main/docbook/xsl/epub.xsl</epubCustomization>
- <targetDirectory>${basedir}/target/docbook/epub</targetDirectory>
- <preProcess>
- <copy todir="${basedir}/target/docbook/epub/images">
- <fileset dir="${basedir}/src/main/docbook/images" />
- <fileset dir="${basedir}/src/main/asciidoc/images">
- <exclude name="PLACE_IMAGES_HERE" />
- </fileset>
- </copy>
- </preProcess>
- <postProcess>
- <copy todir="${basedir}/target/contents/reference/epub">
- <fileset dir="${basedir}/target/docbook">
- <include name="**/*.epub" />
- </fileset>
- </copy>
- <move file="${basedir}/target/contents/reference/epub/index.epub" tofile="${basedir}/target/contents/reference/epub/spring-cloud-dataflow-server-cloudfoundry-reference.epub" />
- </postProcess>
- </configuration>
- </execution>
</executions>
</plugin>
<plugin>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
index 97a1b14..2a282c0 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
@@ -29,6 +29,52 @@ Note: Since analytics feature is enabled by default, the Data Flow server is exp
The REST endpoint `/features` provides information on the features enabled/disabled.
+[[configuring-defaults]]
+== Configuring Defaults for Deployed Apps
+You can also set other optional properties that alter the way Spring Cloud Data Flow will deploy stream and task apps:
+
+* The default memory and disk sizes for a deployed application can be configured. By default they are 1024 MB memory
+and 1024 MB disk. To change these, as an example to 512 and 2048 respectively, use
++
+```
+cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_MEMORY 512
+cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_DISK 2048
+```
+
+* The default number of instances to deploy is set to 1, but can be overridden using
++
+```
+cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_INSTANCES 1
+```
+
+* You can set the buildpack that will be used to deploy each application. For example, to use the Java offline buildback,
+set the following environment variable
++
+```
+cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_BUILDPACK java_buildpack_offline
+```
+
+* The health check mechanism used by Cloud Foundry to assert if apps are running can be customized. Current supported options
+are `http` (the default), `port` and `none`. Change the default like so:
++
+```
+cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK port
+```
++
+There are also options for the health check endpoint and timeout, `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK_ENDPOINT` and `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK_TIMEOUT`. These default to `/health` (the Spring Boot default location` and `120` seconds.
+[NOTE]
+====
+These settings can be configured separately for stream and task apps. To alter settings for tasks, simply
+substitute `STREAM` with `TASK` in the property name. As an example,
+
+```
+cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_MEMORY 512
+```
+====
+
+TIP: All the properties mentioned above are `@ConfigurationProperties` of the
+Cloud Foundry deployer. See link:https://github.com/spring-cloud/spring-cloud-deployer-cloudfoundry/blob/{deployer-branch-or-tag}/src/main/java/org/springframework/cloud/deployer/spi/cloudfoundry/CloudFoundryDeploymentProperties.java[CloudFoundryDeploymentProperties.java] for more information.
+
[[getting-started-security]]
== Security
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
index b9b9cbe..394bdf1 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
@@ -1,18 +1,12 @@
[[getting-started]]
= Getting started
-== Deploying on Cloud Foundry
+== System Requirements
-Spring Cloud Data Flow can be used to deploy modules in a Cloud Foundry environment. When doing so, the
-server application can either run itself on Cloud Foundry, or on another installation (e.g. a simple laptop).
+The Spring Cloud Data Flow server deploys streams (collections of long lived applications) and short lived tasks to Cloud Foundry.
+The server can run on Cloud Foundry itself or on your laptop but it is common to run the server in Cloud Foundry.
+This section covers the required services in Cloud Foundry that are needed to support the server and deploying streams and tasks.
-The required configuration amounts to the same in either case, and is merely related to providing credentials to the
-Cloud Foundry instance so that the server can spawn applications itself. Any Spring Boot compatible configuration
-mechanism can be used (passing program arguments, editing configuration files before building the application, using
-link:https://github.com/spring-cloud/spring-cloud-config[Spring Cloud Config], using environment variables, etc.),
-although some may prove more practicable than others when running _on_ Cloud Foundry.
-
-NOTE: By default, the https://github.com/spring-cloud/spring-cloud-dataflow/tree/master/spring-cloud-dataflow-registry[application registry] in Spring Cloud Data Flow's Cloud Foundry server is empty. It is intentionally designed to allow users to have the flexibility of http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#spring-cloud-dataflow-register-stream-apps[choosing and registering] applications, as they find appropriate for the given use-case requirement. Depending on the message-binder of choice, users can register between http://repo.spring.io/libs-snapshot/org/springframework/cloud/stream/app/[RabbitMQ or Apache Kafka] based maven artifacts.
=== Provision a Redis service instance on Cloud Foundry
Use `cf marketplace` to discover which plans are available to you, depending on the details of your Cloud Foundry setup.
@@ -47,9 +41,9 @@ cf create-service cleardb spark my_mysql
An RDBMS is used to persist Data Flow state, such as stream definitions and deployment ids.
It can also be used for tasks to persist execution history.
-=== Running the Data Flow Server
-
-First download the server and shell applications
+[[running-on-cloudfoundry]]
+== Server installation on Cloud Foundry
+Download the server and shell applications
[subs=attributes]
```
@@ -57,25 +51,24 @@ wget http://repo.spring.io/{version-type-lowercase}/org/springframework/cloud/sp
wget http://repo.spring.io/{dataflow-version-type-lowercase}/org/springframework/cloud/spring-cloud-dataflow-shell/{dataflow-project-version}/spring-cloud-dataflow-shell-{dataflow-project-version}.jar
```
-You can either deploy the server application on Cloud Foundry itself or on your local machine.
-The following two sections explain each way of running the server.
+Now you need to configure the server.
+One of the most important configurations is providing providing credentials to the
+Cloud Foundry instance so that the server can spawn applications itself.
+Any Spring Boot compatible configuration mechanism can be used (passing program arguments, editing configuration files before building the application, using
+link:https://github.com/spring-cloud/spring-cloud-config[Spring Cloud Config], using environment variables, etc.), although some may prove more practicable than others when running _on_ Cloud Foundry.
-[[running-on-cloudfoundry]]
-==== Deploying and Running the Server app on Cloud Foundry
+NOTE: If you would like the added features of upgrading and rolling back Streams, download and install the Skipper server.
+Instructions on how to install and deploy Skipper can be found in the <<spring-cloud-skipper-integration>> section.
-Push the server application on Cloud Foundry, configure it (see below) and start it.
+In this next sections we will show how to deploy Data Flow using environment variables or a Cloud Foundry manifest.
+However, there are some general configuration details you should be aware of in either approach.
+
+=== General Configuration
NOTE: You must use a unique name for your app; an app with the same name in the same organization will cause your
deployment to fail
-[subs=attributes]
-```
-cf push dataflow-server -b java_buildpack -m 2G -k 2G --no-start -p spring-cloud-dataflow-server-cloudfoundry-{project-version}.jar
-cf bind-service dataflow-server redis
-cf bind-service dataflow-server my_mysql
-```
-
-IMPORTANT: The recommended minimal memory setting for the server is 2G. Also, to push apps to PCF and obtain
+NOTE: The recommended minimal memory setting for the server is 2G. Also, to push apps to PCF and obtain
application property metadata, the server downloads applications to Maven repository hosted on the local disk. While
you can specify up to 2G as a typical maximum value for disk space on a PCF installation, this can be increased to
10G. Read the xref:getting-started-maximum-disk-quota-configuration[maximum disk quota] section for information on
@@ -85,7 +78,14 @@ free disk space when it falls below a low water mark value.
NOTE: If you are pushing to a space with multiple users, for example on PWS, there may already be a route taken for the
applicaiton name you have chosen. You can use the options `--random-route` to avoid this when pushing the app.
-Now we can configure the app. The following configuration is for Pivotal Web Services. You need to fill in \{org}, \{space},
+NOTE: By default, the https://github.com/spring-cloud/spring-cloud-dataflow/tree/master/spring-cloud-dataflow-registry[application registry] in Spring Cloud Data Flow's Cloud Foundry server is empty. It is intentionally designed to allow users to have the flexibility of http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#spring-cloud-dataflow-register-stream-apps[choosing and registering] applications, as they find appropriate for the given use-case requirement. Depending on the message-binder of choice, users can register between http://repo.spring.io/libs-snapshot/org/springframework/cloud/stream/app/[RabbitMQ or Apache Kafka] based maven artifacts.
+
+NOTE: If you need to configure multiple Maven repositories, a proxy, or authorization for a private repository, see link:http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#getting-started-maven-configuration[Maven Configuration].
+
+
+=== Deploying using environment variables
+
+The following configuration is for Pivotal Web Services. You need to fill in \{org}, \{space},
\{email} and \{password} before running these commands.
```
@@ -117,13 +117,23 @@ cf set-env dataflow-server SPRING_APPLICATION_JSON '{"maven": { "remote-reposito
```
where `repo1` is the alias name for the remote repository.
-[NOTE]
-====
-If you need to configure multiple Maven repositories, a proxy, or authorization for a private repository, see link:http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#getting-started-maven-configuration[Maven Configuration].
-====
+NOTE: If you are going to use `Skipper` to deploy Streams, deploy Skipper first and then configure the uri location of where the Skipper server is running. Instructions on how to deploy Skipper can be found in the <<spring-cloud-skipper-integration>> section.
+
+----
+cf set-env dataflow-server SKIPPER_CLIENT_HOST https://<skipper-host-name>/api
+----
+
+You can issue now `cf push` command and reference the Data Flow server .jar.
+
+[subs=attributes]
+```
+cf push dataflow-server -b java_buildpack -m 2G -k 2G --no-start -p spring-cloud-dataflow-server-cloudfoundry-{project-version}.jar
+cf bind-service dataflow-server redis
+cf bind-service dataflow-server my_mysql
+```
[[sample-manifest-template]]
-===== Sample Manifest Template
+=== Deploying using a Manifest
As an alternative to setting environment variables via `cf set-env` command, you can curate all the relevant env-var's
in `manifest.yml` file and use `cf push` command to provision the server.
@@ -156,65 +166,20 @@ services:
- mysql
----
-Once you're ready with the relevant properties in this file, you can issue `cf push` command from the directory where
-this file is stored.
-
-[[configuring-defaults]]
-===== Configuring Defaults for Deployed Apps
-You can also set other optional properties that alter the way Spring Cloud Data Flow will deploy stream and task apps:
-
-* The default memory and disk sizes for a deployed application can be configured. By default they are 1024 MB memory
-and 1024 MB disk. To change these, as an example to 512 and 2048 respectively, use
-+
-```
-cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_MEMORY 512
-cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_DISK 2048
-```
-
-* The default number of instances to deploy is set to 1, but can be overridden using
-+
-```
-cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_INSTANCES 1
-```
-
-* You can set the buildpack that will be used to deploy each application. For example, to use the Java offline buildback,
-set the following environment variable
-+
-```
-cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_BUILDPACK java_buildpack_offline
-```
-
-* The health check mechanism used by Cloud Foundry to assert if apps are running can be customized. Current supported options
-are `port` (the default) and `none`. Change the default like so:
-+
-```
-cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK none
-```
-
-[NOTE]
-====
-These settings can be configured separately for stream and task apps. To alter settings for tasks, simply
-substitute `STREAM` with `TASK` in the property name. As an example,
-
-```
-cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_MEMORY 512
-```
-====
-
-TIP: All the properties mentioned above are `@ConfigurationProperties` of the
-Cloud Foundry deployer. See link:https://github.com/spring-cloud/spring-cloud-deployer-cloudfoundry/blob/{deployer-branch-or-tag}/src/main/java/org/springframework/cloud/deployer/spi/cloudfoundry/CloudFoundryDeploymentProperties.java[CloudFoundryDeploymentProperties.java] for more information.
-
-We are now ready to start the app.
-
-```
-cf start dataflow-server
-```
-
-Alternatively, you can run the Admin application locally on your machine which is described in the next section.
+NOTE: If you are going to use `Skipper` to deploy Streams, deploy Skipper first and then configure the uri location of where the Skipper server is running. Instructions on how to install and deploy Skipper can be found in the <<spring-cloud-skipper-integration>> section.
+[source,yml]
+----
+applications:
+ env:
+ SPRING_CLIENT_HOST: https://<skipper-host-name>/api
+----
+Once you're ready with the relevant properties in this file, you can issue `cf push` command from the directory where
+this file is stored.
-==== Running the Server app locally
+[[running-on-local-machine]]
+== Server installation on Local Machine
To run the server application locally, targeting your Cloud Foundry installation, you you need to configure the
application either by passing in command line arguments (see below) or setting a number of environment variables.
@@ -257,7 +222,7 @@ NOTE: The current underlying PCF task capabilities are considered experimental f
versions less than 1.9. See http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/enable-disable-specific-features.html[Feature Togglers]
for how to disable task support in Data Flow.
-=== Running Spring Cloud Data Flow Shell locally
+== Running Spring Cloud Data Flow Shell
Run the shell and optionally target the Admin application if not running on the same host (will typically be the case if
deployed on Cloud Foundry as explained xref:running-on-cloudfoundry[here])
@@ -357,7 +322,7 @@ wget http://repo.spring.io/{skipper-version-type-lowercase}/org/springframework/
wget http://repo.spring.io/{skipper-version-type-lowercase}/org/springframework/cloud/spring-cloud-skipper-shell/{skipper-version}/spring-cloud-skipper-shell-{skipper-version}.jar
----
-=== Running the Skipper Server
+==== Running the Skipper Server
Similar to SCDF-server, you can either deploy the skipper-server application on Cloud Foundry or on your local machine.
Let's review the sample `manifest.yml` file to deploy the skipper-server application to Cloud Foundry.
@@ -374,6 +339,8 @@ applications:
path: <PATH TO THE DOWNLOADED SKIPPER SERVER UBER-JAR>
env:
SPRING_APPLICATION_NAME: skipper-server
+ SPRING_CLOUD_SKIPPER_SERVER_ENABLE_LOCAL_PLATFORM: false
+ SPRING_CLOUD_SKIPPER_SERVER_STRATEGIES_HEALTHCHECK.TIMEOUTINMILLIS: 300000
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_URL: https://api.run.pivotal.io
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_ORG: {org}
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_SPACE: {space}
@@ -398,6 +365,29 @@ to `pws` as the platform. This can be modified, and of course, you can have any
More details are in Spring Cloud Skipper reference guide.
====
+==== Running the Skipper Shell
+Run the shell by using `java -jar`, e.g.
+
+[source,bash,subs=attributes]
+----
+$ java -jar $ java -jar spring-cloud-skipper-shell-{skipper-version}.jar
+----
+
+Then run the `config` command point pass the `uri` of where skipper is running.
+You can then see the connection is working by issuing the `platform list` command
+
+[source,bash,options="nowrap"]
+----
+server-unknown:>config --uri https://mlp-skipper.cfapps.io/api
+Successfully targeted https://mlp-skipper.cfapps.io/api
+skipper:>platform list
+╔════╤════════════╤═════════════════════════════════════════════════════════════════════════╗
+║Name│ Type │ Description ║
+╠════╪════════════╪═════════════════════════════════════════════════════════════════════════╣
+║pws │cloudfoundry│org = [scdf-ci], space = [space-mark], url = [https://api.run.pivotal.io]║
+╚════╧════════════╧═════════════════════════════════════════════════════════════════════════╝
+----
+
[[getting-started-app-names-cloud-foundry]]
== Application Names and Prefixes
@@ -421,7 +411,7 @@ custom deployment properties, as such:
----
dataflow:>stream create foo --definition "http | log"
-dataflow:>stream deploy foo --properties "deployer.http.cloudfoundry.domain=mydomain.com,
+sdataflow:>stream deploy foo --properties "deployer.http.cloudfoundry.domain=mydomain.com,
deployer.http.cloudfoundry.host=myhost,
deployer.http.cloudfoundry.route-path=my-path"
----
@@ -512,144 +502,6 @@ stream create fooz --definition "time | log"
stream deploy fooz --properties "app.time.spring.cloud.stream.kafka.binder.brokers=${vcap.services.kafkacups.credentials.brokers},app.time.spring.cloud.stream.kafka.binder.zkNodes=${vcap.services.kafkacups.credentials.zkNodes},app.log.spring.cloud.stream.kafka.binder.brokers=${vcap.services.kafkacups.credentials.brokers},app.log.spring.cloud.stream.kafka.binder.zkNodes=${vcap.services.kafkacups.credentials.zkNodes}"
----
-[[getting-started-service-application-rolling-upgrades]]
-== Application Rolling Upgrades
-Similar to Cloud Foundry's https://docs.pivotal.io/pivotalcf/1-7/devguide/deploy-apps/blue-green.html[blue-green] deployments,
-you can perform rolling upgrades on the applications orchestrated by Spring Cloud Data Flow.
-
-Let's start with the following simple stream definition.
-
-[source]
-----
-dataflow:>stream create --name foo --definition "time | log" --deploy
-----
-
-List Apps.
-
-[source,bash]
-----
-→ cf apps
-Getting apps in org test-org / space development as test@pivotal.io...
-OK
-
-name requested state instances memory disk urls
-foo-log started 1/1 1G 1G foo-log.cfapps.io
-foo-time started 1/1 1G 1G foo-time.cfapps.io
-----
-
-Let's assume you've to make an enhancement to update the "logger" to append extra text in every log statement.
-
-* Download the `Log Sink` application starter with "Rabbit binder starter" from http://start-scs.cfapps.io/
-* Load the downloaded project in an IDE
-* Import the `LogSinkConfiguration.class`
-* Adapt the handler to add extra text: `loggingHandler.setLoggerName("TEST [" + this.properties.getName() + "]");`
-* Build the application locally
-
-[source,java]
-----
-@SpringBootApplication
-@Import(LogSinkConfiguration.class)
-public class DemoApplication {
-
- @Autowired
- private LogSinkProperties properties;
-
- public static void main(String[] args) {
- SpringApplication.run(DemoApplication.class, args);
- }
-
- @Bean
- @ServiceActivator(inputChannel = Sink.INPUT)
- public LoggingHandler logSinkHandler() {
- LoggingHandler loggingHandler = new LoggingHandler(this.properties.getLevel().name());
- loggingHandler.setExpression(this.properties.getExpression());
- loggingHandler.setLoggerName("TEST [" + this.properties.getName() + "]");
- return loggingHandler;
- }
-}
-----
-
-Let's deploy the locally built application to Cloud Foundry
-
-[source,bash]
-----
-→ cf push foo-log-v2 -b java_buildpack -p demo-0.0.1-SNAPSHOT.jar -n foo-log-v2 --no-start
-----
-
-List Apps.
-
-[source,bash]
-----
-→ cf apps
-Getting apps in org test-org / space development as test@pivotal.io...
-OK
-
-name requested state instances memory disk urls
-foo-log started 1/1 1G 1G foo-log.cfapps.io
-foo-time started 1/1 1G 1G foo-time.cfapps.io
-foo-log-v2 stopped 1/1 1G 1G foo-log-v2.cfapps.io
-----
-
-The stream applications do not communicate via (Go)Router, so they aren't generating HTTP traffic. Instead, they
-communicate via the underlying messaging middleware such as Kafka or RabbitMQ. In order to rolling upgrade to route the
-payload from old to the new version of the application, you'd have to replicate the `SPRING_APPLICATION_JSON` environment
-variable from the old application that includes `spring.cloud.stream.bindings.input.destination` and `spring.cloud.stream.bindings.input.group` credentials.
-
-NOTE: You can find the `SPRING_APPLICATION_JSON` of the old application via: `"cf env foo-log"`.
-
-[source,bash]
-----
-cf set-env foo-log-v2 SPRING_APPLICATION_JSON '{"spring.cloud.stream.bindings.input.destination":"foo.time","spring.cloud.stream.bindings.input.group":"foo"}'
-----
-
-Let's start `foo-log-v2` application.
-
-[source,bash]
-----
-cf start foo-log-v2
-----
-
-As soon as the application bootstraps, you'd now notice the payload being load balanced between two log application
-instances running on Cloud Foundry. Since they both share the same "destination" and "consumer group", they are now
-acting as competing consumers.
-
-Old App Logs:
-
-[source]
-----
-2016-08-08T17:11:08.94-0700 [APP/0] OUT 2016-08-09 00:11:08.942 INFO 19 --- [ foo.time.foo-1] log.sink : 08/09/16 00:11:08
-2016-08-08T17:11:10.95-0700 [APP/0] OUT 2016-08-09 00:11:10.954 INFO 19 --- [ foo.time.foo-1] log.sink : 08/09/16 00:11:10
-2016-08-08T17:11:12.94-0700 [APP/0] OUT 2016-08-09 00:11:12.944 INFO 19 --- [ foo.time.foo-1] log.sink : 08/09/16 00:11:12
-----
-
-New App Logs:
-
-[source]
-----
-2016-08-08T17:11:07.94-0700 [APP/0] OUT 2016-08-09 00:11:07.945 INFO 26 --- [ foo.time.foo-1] TEST [log.sink : 08/09/16 00:11:07]
-2016-08-08T17:11:09.92-0700 [APP/0] OUT 2016-08-09 00:11:09.925 INFO 26 --- [ foo.time.foo-1] TEST [log.sink : 08/09/16 00:11:09]
-2016-08-08T17:11:11.94-0700 [APP/0] OUT 2016-08-09 00:11:11.941 INFO 26 --- [ foo.time.foo-1] TEST [log.sink : 08/09/16 00:11:11]
-----
-
-Deleting the old version `foo-log` from the CF CLI would make all the payload consumed by the `foo-log-v2` application. Now,
-you've successfully upgraded an application in the streaming pipeline without bringing it down in entirety to do
-an adjustment in it.
-
-List Apps.
-
-[source,bash]
-----
-→ cf apps
-Getting apps in org test-org / space development as test@pivotal.io...
-OK
-
-name requested state instances memory disk urls
-foo-time started 1/1 1G 1G foo-time.cfapps.io
-foo-log-v2 started 1/1 1G 1G foo-log-v2.cfapps.io
-----
-
-NOTE: A comprehensive canary analysis along with rolling upgrades will be supported via http://www.spinnaker.io/[Spinnaker]
-in future releases.
[[getting-started-maximum-disk-quota-configuration]]
== Maximum Disk Quota Configuration
From 1654a1808f56ec9df9a843f617f48652f6b1be70 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Thu, 30 Nov 2017 17:58:59 -0500
Subject: [PATCH 018/158] Doc restructring
---
pom.xml | 2 +-
.../src/main/asciidoc/configuration.adoc | 229 ++++++++-
.../src/main/asciidoc/getting-started.adoc | 448 +++++-------------
3 files changed, 328 insertions(+), 351 deletions(-)
diff --git a/pom.xml b/pom.xml
index e476359..6e3fd56 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
</parent>
<properties>
- <spring-cloud-dataflow.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.3.0.M3</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.3.0.M4</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.0.M2</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.0.M1</spring-cloud-common-security-config.version>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
index 2a282c0..167183e 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
@@ -29,9 +29,9 @@ Note: Since analytics feature is enabled by default, the Data Flow server is exp
The REST endpoint `/features` provides information on the features enabled/disabled.
-[[configuring-defaults]]
-== Configuring Defaults for Deployed Apps
-You can also set other optional properties that alter the way Spring Cloud Data Flow will deploy stream and task apps:
+[[configuration-app-defaults]]
+== Deployer Properties
+You can also set other optional properties that alter the way Spring Cloud Data Flow will deploy stream and task apps to Cloud Foundry:
* The default memory and disk sizes for a deployed application can be configured. By default they are 1024 MB memory
and 1024 MB disk. To change these, as an example to 512 and 2048 respectively, use
@@ -54,14 +54,10 @@ set the following environment variable
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_BUILDPACK java_buildpack_offline
```
-* The health check mechanism used by Cloud Foundry to assert if apps are running can be customized. Current supported options
-are `http` (the default), `port` and `none`. Change the default like so:
+* The health check mechanism used by Cloud Foundry to assert if apps are running can be customized using the environment variable `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK`. Current supported options
+are `http` (the default), `port` and `none`.
+
-```
-cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK port
-```
-+
-There are also options for the health check endpoint and timeout, `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK_ENDPOINT` and `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK_TIMEOUT`. These default to `/health` (the Spring Boot default location` and `120` seconds.
+There are also environment variables to specify the the http based health check endpoint and timeout, `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK_ENDPOINT` and `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK_TIMEOUT`. These default to `/health` (the Spring Boot default location` and `120` seconds.
[NOTE]
====
These settings can be configured separately for stream and task apps. To alter settings for tasks, simply
@@ -75,6 +71,209 @@ cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_MEMORY 512
TIP: All the properties mentioned above are `@ConfigurationProperties` of the
Cloud Foundry deployer. See link:https://github.com/spring-cloud/spring-cloud-deployer-cloudfoundry/blob/{deployer-branch-or-tag}/src/main/java/org/springframework/cloud/deployer/spi/cloudfoundry/CloudFoundryDeploymentProperties.java[CloudFoundryDeploymentProperties.java] for more information.
+[[configuration-app-names-cloud-foundry]]
+== Application Names and Prefixes
+
+To help avoid clashes with routes across spaces in Cloud Foundry, a naming strategy to provide a random prefix to a
+deployed application is available and is enabled by default. The https://github.com/spring-cloud/spring-cloud-deployer-cloudfoundry#application-name-settings-and-deployments[default configurations]
+are overridable and the respective properties can be set via `cf set-env` commands.
+
+For instance, if you'd like to disable the randomization, you can override it through:
+
+```
+cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_ENABLE_RANDOM_APP_NAME_PREFIX false
+```
+[[configuration-custom-routes]]
+== Custom Routes
+
+As an alternative to random name, or to get even more control over the hostname used by the deployed apps, one can use
+custom deployment properties, as such:
+
+[source]
+----
+dataflow:>stream create foo --definition "http | log"
+
+sdataflow:>stream deploy foo --properties "deployer.http.cloudfoundry.domain=mydomain.com,
+ deployer.http.cloudfoundry.host=myhost,
+ deployer.http.cloudfoundry.route-path=my-path"
+----
+
+This would result in the `http` app being bound to the URL `http://myhost.mydomain.com/my-path`. Note that this is an
+example showing *all* customization options available. One can of course only leverage one or two out of the three.
+
+[[configuration-docker-apps]]
+== Docker Applications
+
+Starting with version 1.2, it is possible to register and deploy Docker based apps as part of streams and tasks using
+Data Flow for Cloud Foundry.
+
+
+If you are using Spring Boot and RabbitMQ based Docker images you can provide a common deployment property
+to facilitate the apps binding to the RabbitMQ service. Assuming your RabbitMQ service is named `rabbit` you can provide the following:
+
+```
+cf set-env dataflow-server SPRING_APPLICATION_JSON '{"spring.cloud.dataflow.applicationProperties.stream.spring.rabbitmq.addresses": "${vcap.services.rabbit.credentials.protocols.amqp.uris}"}'
+```
+For Spring Cloud Task apps, something similar to the following could be used, if using a database service instance named `mysql`:
+
+```
+cf set-env SPRING_DATASOURCE_URL '${vcap.services.mysql.credentials.jdbcUrl}'
+cf set-env SPRING_DATASOURCE_USERNAME '${vcap.services.mysql.credentials.username}'
+cf set-env SPRING_DATASOURCE_PASSWORD '${vcap.services.mysql.credentials.password}'
+cf set-env SPRING_DATASOURCE_DRIVER_CLASS_NAME 'org.mariadb.jdbc.Driver'
+```
+
+
+For non-Java or non-Boot apps, your Docker app would have to parse the `VCAP_SERVICES` variable in order to bind to any available services.
+
+[NOTE]
+.Passing application properties
+====
+When using non-boot apps, chances are that you want the application properties passed to your app using traditional
+environment variables, as opposed to using the special `SPRING_APPLICATION_JSON` variable. To achieve this, set the
+following variables for streams and tasks, respectively:
+
+[source, properties]
+----
+SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_USE_SPRING_APPLICATION_JSON=false
+SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_USE_SPRING_APPLICATION_JSON=false
+----
+====
+
+
+[[configuration-service-binding-at-application-level]]
+== Application Level Service Bindings
+When deploying streams in Cloud Foundry, you can take advantage of application specific service bindings, so not all
+services are globally configured for all the apps orchestrated by Spring Cloud Data Flow.
+
+For instance, if you'd like to provide `mysql` service binding only for the `jdbc` application in the following stream
+definition, you can pass the service binding as a deployment property.
+
+[source]
+----
+dataflow:>stream create --name httptojdbc --definition "http | jdbc"
+dataflow:>stream deploy --name httptojdbc --properties "deployer.jdbc.cloudfoundry.services=mysqlService"
+----
+
+Where, `mysqlService` is the name of the service specifically only bound to `jdbc` application and the `http`
+application wouldn't get the binding by this method.
+If you have more than one service to bind, they can be passed as comma separated items
+(_eg_: `deployer.jdbc.cloudfoundry.services=mysqlService,someService`).
+
+[[configuration-ups]]
+== User Provided Services
+In addition to marketplace services, Cloud Foundry supports
+https://docs.cloudfoundry.org/devguide/services/user-provided.html[User Provided Services] (UPS). Throughout this reference manual,
+regular services have been mentioned, but there is nothing precluding the use of UPSs as well, whether for use as the
+messaging middleware (_e.g._ if you'd like to use an external Apache Kafka installation) or for _ad hoc_ usage by some
+ of the stream apps (_e.g._ an Oracle Database).
+
+Let's review an example of extracting and supplying the connection credentials from an UPS.
+
+* A sample UPS setup for Apache Kafka.
+
+[source,bash]
+----
+cf create-user-provided-service kafkacups -p '{”brokers":"HOST:PORT","zkNodes":"HOST:PORT"}'
+----
+
+* The UPS credentials will be wrapped within `VCAP_SERVICES` and it can be supplied directly in the stream definition like
+the following.
+
+[source]
+----
+stream create fooz --definition "time | log"
+stream deploy fooz --properties "app.time.spring.cloud.stream.kafka.binder.brokers=${vcap.services.kafkacups.credentials.brokers},app.time.spring.cloud.stream.kafka.binder.zkNodes=${vcap.services.kafkacups.credentials.zkNodes},app.log.spring.cloud.stream.kafka.binder.brokers=${vcap.services.kafkacups.credentials.brokers},app.log.spring.cloud.stream.kafka.binder.zkNodes=${vcap.services.kafkacups.credentials.zkNodes}"
+----
+
+
+[[configuration-maximum-disk-quota-configuration]]
+== Maximum Disk Quota
+By default, every application in Cloud Foundry starts with 1G disk quota and this can be adjusted to a default maximum of
+2G. The default maximum can also be overridden up to 10G via Pivotal Cloud Foundry's (PCF) Ops Manager GUI.
+
+This configuration is relevant for Spring Cloud Data Flow because every stream and task deployment is composed of applications
+(typically Spring Boot uber-jar's) and those applications are resolved from a remote maven repository. After resolution,
+the application artifacts are downloaded to the local Maven Repository for caching/reuse. With this happening in the background,
+there is a possibility the default disk quota (_1G_) fills up rapidly; especially, when we are experimenting with streams that
+are made up of unique applications. In order to overcome this disk limitation and depending
+on your scaling requirements,you may want to change the default maximum from 2G to 10G. Let's review the
+steps to change the default maximum disk quota allocation.
+
+=== PCF's Operations Manager
+
+From PCF's Ops Manager, Select "*Pivotal Elastic Runtime*" tile and navigate to "*Application Developer Controls*" tab.
+Change the "*Maximum Disk Quota per App (MB)*" setting from 2048 to 10240 (_10G_). Save the disk quota update and hit
+"Apply Changes" to complete the configuration override.
+
+[[configuration-scaling]]
+== Scale Application
+
+Once the disk quota change is applied successfully and assuming you've a xref:running-on-cloudfoundry[running application],
+you may scale the application with a new `disk_limit` through CF CLI.
+
+[source,bash]
+----
+→ cf scale dataflow-server -k 10GB
+
+Scaling app dataflow-server in org ORG / space SPACE as user...
+OK
+
+....
+....
+....
+....
+
+ state since cpu memory disk details
+#0 running 2016-10-31 03:07:23 PM 1.8% 497.9M of 1.1G 193.9M of 10G
+----
+
+[source,bash]
+----
+→ cf apps
+Getting apps in org ORG / space SPACE as user...
+OK
+
+name requested state instances memory disk urls
+dataflow-server started 1/1 1.1G 10G dataflow-server.apps.io
+----
+
+=== Configuring target free disk percentage
+
+Even when configuring the Data Flow server to use 10G of space, there is the possibility of exhausting
+the available space on the local disk. The server implements a least recently used (LRU) algorithm that
+will remove maven artifacts from the local maven repository. This is configured using the following
+configuration property, the default value is 25.
+
+[source]
+----
+# The low water mark percentage, expressed as in integer between 0 and 100, that triggers cleanup of
+# the local maven repository
+# (for setting env var use SPRING_CLOUD_DATAFLOW_SERVER_CLOUDFOUNDRY_FREE_DISK_SPACE_PERCENTAGE)
+spring.cloud.dataflow.server.cloudfoundry.freeDiskSpacePercentage=25
+----
+
+[[configuration-app-resolution-options]]
+== Application Resolution Alternatives
+Though we highly recommend using Maven Repository for application link:http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#spring-cloud-dataflow-register-stream-apps[resolution and registration]
+in Cloud Foundry, there might be situations where an alternative approach would make sense. Following alternative options
+could come handy for resolving applications when running on Cloud Foundry.
+
+* With the help of Spring Boot, we can serve link:https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-developing-web-applications.html#boot-features-spring-mvc-static-content[static content]
+in Cloud Foundry. A simple Spring Boot application can bundle all the required stream/task applications and by having it
+run on Cloud Foundry, the static application can then serve the Über-jar's. From the Shell, you can, for example, register the
+app with the name `http-source.jar` via `--uri=http://<Route-To-StaticApp>/http-source.jar`.
+
+* The Über-jar's can be hosted on any external server that's reachable via HTTP. They can be resolved from raw GitHub URIs
+as well. From the Shell, you can, for example, register the app with the name `http-source.jar` via `--uri=http://<Raw_GitHub_URI>/http-source.jar`.
+
+* link:http://docs.cloudfoundry.org/buildpacks/staticfile/index.html[Static Buildpack ]support in Cloud Foundry is another
+option. A similar HTTP resolution will work on this model, too.
+
+* link:https://docs.cloudfoundry.org/devguide/services/using-vol-services.html[Volume Services] is another great option.
+The required Über-jar's can be hosted in an external file-system and with the help of volume-services, you can, for
+example, register the app with the name `http-source.jar` via `--uri=file://<Path-To-FileSystem>/http-source.jar`.
+
[[getting-started-security]]
== Security
@@ -258,7 +457,7 @@ as part of an individual deployment request by using the `deployer.<app-name>` s
will deploy the time source with 2048MB of memory, while the log sink will use the default 1024MB.
-=== Understanding what's going on
+== Debugging
If you want to get better insights into what is happening when your streams and tasks are being deployed, you may want
to turn on the following features:
@@ -277,12 +476,12 @@ logging.level.cloudfoundry-client = DEBUG
```
-=== Using Spring Cloud Config Server
+== Spring Cloud Config Server
Spring Cloud Config Server can be used to centralize configuration properties for Spring Boot applications. Likewise,
both Spring Cloud Data Flow and the applications orchestrated using Spring Cloud Data Flow can be integrated with
config-server to leverage the same capabilities.
-==== Stream, Task, and Spring Cloud Config Server
+=== Stream, Task, and Spring Cloud Config Server
Similar to Spring Cloud Data Flow server, it is also possible to configure both the stream and task applications to resolve the centralized properties from config-server.
Setting the property `spring.cloud.config.uri` for the deployed applications is a common way to bind to the Config Server.
See the link:https://cloud.spring.io/spring-cloud-config/spring-cloud-config.html#_spring_cloud_config_client[Spring Cloud Config Client] reference guide for more information.
@@ -313,7 +512,7 @@ environment variable `SPRING_CLOUD_CONFIG_ENABLED=false`.
Another, more drastic option, is to disable the platform health check with the environment variable
`SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK=none`
-==== Sample Manifest Template
+=== Sample Manifest Template
Following `manifest.yml` template includes the required env-var's for the Spring Cloud Data Flow server and deployed
apps/tasks to successfully run on Cloud Foundry and automatically resolve centralized properties from `my-config-server`
at the runtime.
@@ -349,7 +548,7 @@ Where, `my-config-server` is the name of the Spring Cloud Config Service instanc
service to both Spring Cloud Data Flow server as well as all the Spring Cloud Stream and Spring Cloud Task applications
respectively, we can now resolve centralized properties backed by this service.
-==== Self-signed SSL Certificate and Spring Cloud Config Server
+=== Self-signed SSL Certificate and Spring Cloud Config Server
Often, in a development environment, we may not have a valid certificate to enable SSL communication between clients and
the backend services. However, the config-server for Pivotal Cloud Foundry uses HTTPS for all client-to-service communication,
so it is necessary to add a self-signed SSL certificate in environments with no valid certificates.
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
index 394bdf1..51961b2 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
@@ -1,6 +1,7 @@
[[getting-started]]
= Getting started
+[[getting-started-requirements]]
== System Requirements
The Spring Cloud Data Flow server deploys streams (collections of long lived applications) and short lived tasks to Cloud Foundry.
@@ -41,28 +42,66 @@ cf create-service cleardb spark my_mysql
An RDBMS is used to persist Data Flow state, such as stream definitions and deployment ids.
It can also be used for tasks to persist execution history.
-[[running-on-cloudfoundry]]
-== Server installation on Cloud Foundry
-Download the server and shell applications
-
+[[getting-started-cloudfoundry]]
+== Cloud Foundry Installation
+. Download the Data Flow server and shell applications
++
[subs=attributes]
```
wget http://repo.spring.io/{version-type-lowercase}/org/springframework/cloud/spring-cloud-dataflow-server-cloudfoundry/{project-version}/spring-cloud-dataflow-server-cloudfoundry-{project-version}.jar
wget http://repo.spring.io/{dataflow-version-type-lowercase}/org/springframework/cloud/spring-cloud-dataflow-shell/{dataflow-project-version}/spring-cloud-dataflow-shell-{dataflow-project-version}.jar
```
+. Download Skipper if you want the added features of upgrading and rolling back Streams since Data Flow delegates to Skipper for those features.
++
+[source,yaml,options=nowrap,subs=attributes]
+----
+wget http://repo.spring.io/{skipper-version-type-lowercase}/org/springframework/cloud/spring-cloud-skipper-server/{skipper-version}/spring-cloud-skipper-server-{skipper-version}.jar
+wget http://repo.spring.io/{skipper-version-type-lowercase}/org/springframework/cloud/spring-cloud-skipper-shell/{skipper-version}/spring-cloud-skipper-shell-{skipper-version}.jar
+----
+. Run the Skipper Server if you want the added feature set described above.
+Let's review the sample `manifest.yml` file to deploy the skipper-server application to Cloud Foundry.
++
+[source,yaml,options=nowrap]
+----
+---
+applications:
+- name: skipper-server
+ host: skipper-server
+ memory: 1G
+ disk_quota: 1G
+ instances: 1
+ timeout: 180
+ path: <PATH TO THE DOWNLOADED SKIPPER SERVER UBER-JAR>
+env:
+ SPRING_APPLICATION_NAME: skipper-server
+ SPRING_CLOUD_SKIPPER_SERVER_ENABLE_LOCAL_PLATFORM: false
+ SPRING_CLOUD_SKIPPER_SERVER_STRATEGIES_HEALTHCHECK.TIMEOUTINMILLIS: 300000
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_URL: https://api.run.pivotal.io
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_ORG: {org}
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_SPACE: {space}
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_DOMAIN: cfapps.io
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_USERNAME: {email}
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_PASSWORD: {password}
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_SERVICES: rabbit
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_STREAM_ENABLE_RANDOM_APP_NAME_PREFIX: false
+----
++
+You need to fill in \{org}, \{space}, \{email} and \{password} before running these commands. Once you have the desired
+config values in the `manifest.yml`, you can run `cf push` command to provision the skipper-server.
++
+WARNING: Only set 'Skip SSL Validation' to true if you're running on a Cloud Foundry instance using self-signed
+certs (e.g. in development). Do not use for production.
-Now you need to configure the server.
-One of the most important configurations is providing providing credentials to the
-Cloud Foundry instance so that the server can spawn applications itself.
+. Configure and run the Data Flow Server
++
+One of the most important configurations is providing providing credentials to the Cloud Foundry instance so that the server can spawn applications itself.
Any Spring Boot compatible configuration mechanism can be used (passing program arguments, editing configuration files before building the application, using
-link:https://github.com/spring-cloud/spring-cloud-config[Spring Cloud Config], using environment variables, etc.), although some may prove more practicable than others when running _on_ Cloud Foundry.
+link:https://github.com/spring-cloud/spring-cloud-config[Spring Cloud Config], using environment variables, etc.), although some may prove more practicable than others depending how you typically deploy applications to Cloud Foundry.
-NOTE: If you would like the added features of upgrading and rolling back Streams, download and install the Skipper server.
-Instructions on how to install and deploy Skipper can be found in the <<spring-cloud-skipper-integration>> section.
-
-In this next sections we will show how to deploy Data Flow using environment variables or a Cloud Foundry manifest.
+In this next section we will show how to deploy Data Flow using environment variables or a Cloud Foundry manifest.
However, there are some general configuration details you should be aware of in either approach.
+[[getting-started-cloudfoundry-general-configuration]]
=== General Configuration
NOTE: You must use a unique name for your app; an app with the same name in the same organization will cause your
@@ -76,13 +115,13 @@ how to configure this PCF property. Also, the Data Flow server itself implement
free disk space when it falls below a low water mark value.
NOTE: If you are pushing to a space with multiple users, for example on PWS, there may already be a route taken for the
-applicaiton name you have chosen. You can use the options `--random-route` to avoid this when pushing the app.
+applicaiton name you have chosen. You can use the options `--random-route` to avoid this when pushing the server application.
NOTE: By default, the https://github.com/spring-cloud/spring-cloud-dataflow/tree/master/spring-cloud-dataflow-registry[application registry] in Spring Cloud Data Flow's Cloud Foundry server is empty. It is intentionally designed to allow users to have the flexibility of http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#spring-cloud-dataflow-register-stream-apps[choosing and registering] applications, as they find appropriate for the given use-case requirement. Depending on the message-binder of choice, users can register between http://repo.spring.io/libs-snapshot/org/springframework/cloud/stream/app/[RabbitMQ or Apache Kafka] based maven artifacts.
NOTE: If you need to configure multiple Maven repositories, a proxy, or authorization for a private repository, see link:http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#getting-started-maven-configuration[Maven Configuration].
-
+[[getting-started-cloudfoundry-deploying-using-env-vars]]
=== Deploying using environment variables
The following configuration is for Pivotal Web Services. You need to fill in \{org}, \{space},
@@ -117,10 +156,10 @@ cf set-env dataflow-server SPRING_APPLICATION_JSON '{"maven": { "remote-reposito
```
where `repo1` is the alias name for the remote repository.
-NOTE: If you are going to use `Skipper` to deploy Streams, deploy Skipper first and then configure the uri location of where the Skipper server is running. Instructions on how to deploy Skipper can be found in the <<spring-cloud-skipper-integration>> section.
+NOTE: If you are going to use `Skipper` to deploy Streams, deploy Skipper first and then configure the uri location of where the Skipper server is running.
----
-cf set-env dataflow-server SKIPPER_CLIENT_HOST https://<skipper-host-name>/api
+cf set-env dataflow-server SPRING_CLOUD_SKIPPER_CLIENT_URI https://<skipper-host-name>/api
----
You can issue now `cf push` command and reference the Data Flow server .jar.
@@ -132,7 +171,7 @@ cf bind-service dataflow-server redis
cf bind-service dataflow-server my_mysql
```
-[[sample-manifest-template]]
+[[getting-started-cloudfoundry-deploying-using-manifest]]
=== Deploying using a Manifest
As an alternative to setting environment variables via `cf set-env` command, you can curate all the relevant env-var's
@@ -172,14 +211,14 @@ NOTE: If you are going to use `Skipper` to deploy Streams, deploy Skipper first
----
applications:
env:
- SPRING_CLIENT_HOST: https://<skipper-host-name>/api
+ SPRING_CLOUD_SKIPPER_CLIENT_URI: https://<skipper-host-name>/api
----
Once you're ready with the relevant properties in this file, you can issue `cf push` command from the directory where
this file is stored.
-[[running-on-local-machine]]
-== Server installation on Local Machine
+[[getting-started-cloudfoundry-on-local]]
+== Local Machine Installation
To run the server application locally, targeting your Cloud Foundry installation, you you need to configure the
application either by passing in command line arguments (see below) or setting a number of environment variables.
@@ -207,25 +246,27 @@ You need to fill in \{org}, \{space}, \{email} and \{password} before running th
WARNING: Only set 'Skip SSL Validation' to true if you're running on a Cloud Foundry instance using self-signed
certs (e.g. in development). Do not use for production.
+NOTE: If you are going to use `Skipper` to deploy Streams, deploy Skipper first and then configure the uri location of where the Skipper server is running.
+
+----
+export SKIPPER_CLIENT_HOST https://<skipper-host-name>/api
+----
+
Now we are ready to start the server application:
[subs=attributes]
```
-java -jar spring-cloud-dataflow-server-cloudfoundry-{project-version}.jar [--option1=value1] [--option2=value2] [etc.]
+java -jar spring-cloud-dataflow-server-cloudfoundry-{project-version}.jar
```
TIP: Of course, all other parameterization options that were available when running the server _on_ Cloud Foundry are
still available. This is particularly true for xref:configuring-defaults[configuring defaults] for applications. Just
substitute `cf set-env` syntax with `export`.
-NOTE: The current underlying PCF task capabilities are considered experimental for PCF version
-versions less than 1.9. See http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/enable-disable-specific-features.html[Feature Togglers]
-for how to disable task support in Data Flow.
-
-== Running Spring Cloud Data Flow Shell
+[[getting-started-data-flow-shell]]
+== Data Flow Shell
-Run the shell and optionally target the Admin application if not running on the same host (will typically be the case if
-deployed on Cloud Foundry as explained xref:running-on-cloudfoundry[here])
+Run the shell and optionally target the Server application using the `dataflow config` command.
[source,bash,subs=attributes]
----
@@ -238,125 +279,52 @@ Successfully targeted http://dataflow-server.cfapps.io
dataflow:>
```
+[[getting-started-deploying-streams]]
+== Deploying Streams
+
+. Import Apps
++
By default, the application registry will be empty. If you would like to register all out-of-the-box stream applications
built with the RabbitMQ binder in bulk, you can with the following command. For more details, review how to
xref:spring-cloud-dataflow-register-apps[register applications].
-
++
```
-dataflow:>app import --uri http://bit.ly/Avogadro-SR1-stream-applications-rabbit-maven
-
+dataflow:>app import --uri http://bit.ly/Celsius-GA-stream-applications-rabbit-maven
```
-
-[NOTE]
-.A Note about application URIs
-====
-While Spring Cloud Data Flow for Cloud Foundry leverages the core Data Flow project, and as such theoretically supports
-registering apps using any scheme, the use of `file://` URIs does not really make sense on Cloud Foundry. Indeed, the
-local filesystem of the Data Flow server is ephemeral and chances are that you don't want to manually upload your apps there.
-
-When deploying apps using Data Flow for Cloud Foundry, a typical choice is to use `maven://` coordinates, or maybe `http://` URIs.
-
-====
-
-You can now use the shell commands to list available applications (source/processors/sink) and create streams. For example:
-
++
+There are two options for deploying Streams. The "traditional" way that Data Flow has always used and a new way that delegates to the Skipper server. Deploying using Skipper will enable you to update and rollback the streams while the traditional way will not.
++
+. Create Streams without skipper
++
+Create a simple stream with an HTTP source and a log sink.
++
[source]
----
dataflow:> stream create --name httptest --definition "http | log" --deploy
----
-
++
NOTE: You will need to wait a little while until the apps are actually deployed successfully
before posting data. Tail the log file for each application to verify
the application has started.
-
++
Now post some data. The URL will be unique to your deployment, the following is just an example
++
[source]
----
dataflow:> http post --target http://dataflow-AxwwAhK-httptest-http.cfapps.io --data "hello world"
----
Look to see if `hello world` ended up in log files for the `log` application.
-
-To run a simple task application, you can register all the out-of-the-box task applications with the following command.
-
-```
-dataflow:>app import --uri http://bit.ly/Addison-GA-task-applications-maven
-
-```
-
-Now create a simple link:http://docs.spring.io/spring-cloud-task-app-starters/docs/1.0.1.RELEASE/reference/html/_timestamp_task.html[timestamp] task.
-
-```
-dataflow:>task create mytask --definition "timestamp --format='yyyy'"
-```
-
-Tail the logs, e.g. `cf logs mytask` and then launch the task in the UI or in the Data Flow Shell
-
-```
-dataflow:>task launch mytask
-```
-
-You will see the year `2017` printed in the logs. The execution status of the task is stored
-in the database and you can retrieve information about the task execution using the shell commands
-`task execution list` and `task execution status --id <ID_OF_TASK>` or though the Data Flow UI.
-
-[[spring-cloud-skipper-integration]]
-== Spring Cloud Skipper Integration
-
-Skipper is a tool that allows you to discover Spring Boot applications and manage their lifecycle on multiple Cloud Platforms.
-You can use Skipper standalone or integrate it with Continuous Integration pipelines to help achieve Continuous Deployment
-of applications. For more details, review the link:https://docs.spring.io/spring-cloud-skipper/docs/{skipper-version}/reference/htmlsingle/#overview[reference guide]
-for a complete overview and the feature capabilities.
-
-Before we begin setting up Skipper to use with Spring Cloud Data Flow, let's review the basics by understanding foundational
-design by which the relevant infrastructure is provisioned in Kubernetes. The tailormade
-link:https://docs.spring.io/spring-cloud-skipper/docs/{skipper-version}/reference/htmlsingle/#tour-cloud-foundry[three-minute-tour for Cloud Foundry]
-walks through the fundamentals.
-
-Next up, we will review the relevant artifacts to provision Spring Cloud Skipper in Cloud Foundry.
-
-=== Download the Spring Cloud Skipper and Shell apps
-
-[source,yaml,options=nowrap,subs=attributes]
-----
-wget http://repo.spring.io/{skipper-version-type-lowercase}/org/springframework/cloud/spring-cloud-skipper-server/{skipper-version}/spring-cloud-skipper-server-{skipper-version}.jar
-wget http://repo.spring.io/{skipper-version-type-lowercase}/org/springframework/cloud/spring-cloud-skipper-shell/{skipper-version}/spring-cloud-skipper-shell-{skipper-version}.jar
-----
-
-==== Running the Skipper Server
-Similar to SCDF-server, you can either deploy the skipper-server application on Cloud Foundry or on your local machine.
-
-Let's review the sample `manifest.yml` file to deploy the skipper-server application to Cloud Foundry.
-
-[source,yaml,options=nowrap]
++
+. Create Streams with Skipper
++
+[source]
----
----
-applications:
-- name: skipper-server
- host: skipper-server
- memory: 1G
- disk_quota: 1G
- instances: 1
- path: <PATH TO THE DOWNLOADED SKIPPER SERVER UBER-JAR>
-env:
- SPRING_APPLICATION_NAME: skipper-server
- SPRING_CLOUD_SKIPPER_SERVER_ENABLE_LOCAL_PLATFORM: false
- SPRING_CLOUD_SKIPPER_SERVER_STRATEGIES_HEALTHCHECK.TIMEOUTINMILLIS: 300000
- SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_URL: https://api.run.pivotal.io
- SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_ORG: {org}
- SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_SPACE: {space}
- SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_DOMAIN: cfapps.io
- SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_USERNAME: {email}
- SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_PASSWORD: {password}
- SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_SERVICES: rabbit
- SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_STREAM_ENABLE_RANDOM_APP_NAME_PREFIX: false
+dataflow:> stream create --name httptest --definition "http | log"
+dataflow:> stream skipper deploy --name httptest --platformName pws
----
-
-You need to fill in \{org}, \{space}, \{email} and \{password} before running these commands. Once you have the desired
-config values in the `manifest.yml`, you can run `cf push` command to provision the skipper-server.
-
-WARNING: Only set 'Skip SSL Validation' to true if you're running on a Cloud Foundry instance using self-signed
-certs (e.g. in development). Do not use for production.
-
++
+Look to see if `hello world` ended up in log files for the `log` application.
++
[NOTE]
====
Skipper includes the concept of link:https://docs.spring.io/spring-cloud-skipper/docs/current/reference/htmlsingle/#platforms[platforms],
@@ -364,227 +332,37 @@ so it is important to define the "accounts" based on the project preferences. In
to `pws` as the platform. This can be modified, and of course, you can have any number of platform definitions.
More details are in Spring Cloud Skipper reference guide.
====
++
+You can read more about the general features of using Skipper to deploy streams in the section <<spring-cloud-dataflow-stream-lifecycle-skipper>> and how to upgrade and rollback streams in the section <<spring-cloud-dataflow-streams-skipper>>.
-==== Running the Skipper Shell
-Run the shell by using `java -jar`, e.g.
-
-[source,bash,subs=attributes]
-----
-$ java -jar $ java -jar spring-cloud-skipper-shell-{skipper-version}.jar
-----
-
-Then run the `config` command point pass the `uri` of where skipper is running.
-You can then see the connection is working by issuing the `platform list` command
-
-[source,bash,options="nowrap"]
-----
-server-unknown:>config --uri https://mlp-skipper.cfapps.io/api
-Successfully targeted https://mlp-skipper.cfapps.io/api
-skipper:>platform list
-╔════╤════════════╤═════════════════════════════════════════════════════════════════════════╗
-║Name│ Type │ Description ║
-╠════╪════════════╪═════════════════════════════════════════════════════════════════════════╣
-║pws │cloudfoundry│org = [scdf-ci], space = [space-mark], url = [https://api.run.pivotal.io]║
-╚════╧════════════╧═════════════════════════════════════════════════════════════════════════╝
-----
+[[getting-started-deploying-tasks]]
+== Deploying Tasks
-[[getting-started-app-names-cloud-foundry]]
-== Application Names and Prefixes
-
-To help avoid clashes with routes across spaces in Cloud Foundry, a naming strategy to provide a random prefix to a
-deployed application is available and is enabled by default. The https://github.com/spring-cloud/spring-cloud-deployer-cloudfoundry#application-name-settings-and-deployments[default configurations]
-are overridable and the respective properties can be set via `cf set-env` commands.
-
-For instance, if you'd like to disable the randomization, you can override it through:
+To run a simple task application, you can register all the out-of-the-box task applications with the following command.
```
-cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_ENABLE_RANDOM_APP_NAME_PREFIX false
-```
-
-=== Using Custom Routes
-
-As an alternative to random name, or to get even more control over the hostname used by the deployed apps, one can use
-custom deployment properties, as such:
-
-[source]
-----
-dataflow:>stream create foo --definition "http | log"
-
-sdataflow:>stream deploy foo --properties "deployer.http.cloudfoundry.domain=mydomain.com,
- deployer.http.cloudfoundry.host=myhost,
- deployer.http.cloudfoundry.route-path=my-path"
-----
-
-This would result in the `http` app being bound to the URL `http://myhost.mydomain.com/my-path`. Note that this is an
-example showing *all* customization options available. One can of course only leverage one or two out of the three.
-
-== Deploying Docker Applications
+dataflow:>app import --uri http://bit.ly/Addison-GA-task-applications-maven
-Starting with version 1.2, it is possible to register and deploy Docker based apps as part of streams and tasks using
-Data Flow for Cloud Foundry.
+```
-If you are using Spring Boot and RabbitMQ based Docker images you can provide a common deployment property
-to facilitate the apps binding to the RabbitMQ service. Assuming your RabbitMQ service is named `rabbit` you can provide the following:
+Now create a simple link:http://docs.spring.io/spring-cloud-task-app-starters/docs/1.0.1.RELEASE/reference/html/_timestamp_task.html[timestamp] task.
```
-cf set-env dataflow-server SPRING_APPLICATION_JSON '{"spring.cloud.dataflow.applicationProperties.stream.spring.rabbitmq.addresses": "${vcap.services.rabbit.credentials.protocols.amqp.uris}"}'
+dataflow:>task create mytask --definition "timestamp --format='yyyy'"
```
-For Spring Cloud Task apps, something similar to the following could be used, if using a database service instance named `mysql`:
+
+Tail the logs, e.g. `cf logs mytask` and then launch the task in the UI or in the Data Flow Shell
```
-cf set-env SPRING_DATASOURCE_URL '${vcap.services.mysql.credentials.jdbcUrl}'
-cf set-env SPRING_DATASOURCE_USERNAME '${vcap.services.mysql.credentials.username}'
-cf set-env SPRING_DATASOURCE_PASSWORD '${vcap.services.mysql.credentials.password}'
-cf set-env SPRING_DATASOURCE_DRIVER_CLASS_NAME 'org.mariadb.jdbc.Driver'
+dataflow:>task launch mytask
```
+You will see the year `2017` printed in the logs. The execution status of the task is stored
+in the database and you can retrieve information about the task execution using the shell commands
+`task execution list` and `task execution status --id <ID_OF_TASK>` or though the Data Flow UI.
-For non-Java or non-Boot apps, your Docker app would have to parse the `VCAP_SERVICES` variable in order to bind to any available services.
-
-[NOTE]
-.Passing application properties
-====
-When using non-boot apps, chances are that you want the application properties passed to your app using traditional
-environment variables, as opposed to using the special `SPRING_APPLICATION_JSON` variable. To achieve this, set the
-following variables for streams and tasks, respectively:
-
-[source, properties]
-----
-SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_USE_SPRING_APPLICATION_JSON=false
-SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_USE_SPRING_APPLICATION_JSON=false
-----
-====
-
-
-[[getting-started-service-binding-at-application-level]]
-== Application Level Service Bindings
-When deploying streams in Cloud Foundry, you can take advantage of application specific service bindings, so not all
-services are globally configured for all the apps orchestrated by Spring Cloud Data Flow.
-
-For instance, if you'd like to provide `mysql` service binding only for the `jdbc` application in the following stream
-definition, you can pass the service binding as a deployment property.
-
-[source]
-----
-dataflow:>stream create --name httptojdbc --definition "http | jdbc"
-dataflow:>stream deploy --name httptojdbc --properties "deployer.jdbc.cloudfoundry.services=mysqlService"
-----
-
-Where, `mysqlService` is the name of the service specifically only bound to `jdbc` application and the `http`
-application wouldn't get the binding by this method.
-If you have more than one service to bind, they can be passed as comma separated items
-(_eg_: `deployer.jdbc.cloudfoundry.services=mysqlService,someService`).
-
-[[getting-started-ups]]
-== A Note About User Provided Services
-In addition to marketplace services, Cloud Foundry supports
-https://docs.cloudfoundry.org/devguide/services/user-provided.html[User Provided Services] (UPS). Throughout this reference manual,
-regular services have been mentioned, but there is nothing precluding the use of UPSs as well, whether for use as the
-messaging middleware (_e.g._ if you'd like to use an external Apache Kafka installation) or for _ad hoc_ usage by some
- of the stream apps (_e.g._ an Oracle Database).
-
-Let's review an example of extracting and supplying the connection credentials from an UPS.
-
-* A sample UPS setup for Apache Kafka.
-
-[source,bash]
-----
-cf create-user-provided-service kafkacups -p '{”brokers":"HOST:PORT","zkNodes":"HOST:PORT"}'
-----
-
-* The UPS credentials will be wrapped within `VCAP_SERVICES` and it can be supplied directly in the stream definition like
-the following.
-
-[source]
-----
-stream create fooz --definition "time | log"
-stream deploy fooz --properties "app.time.spring.cloud.stream.kafka.binder.brokers=${vcap.services.kafkacups.credentials.brokers},app.time.spring.cloud.stream.kafka.binder.zkNodes=${vcap.services.kafkacups.credentials.zkNodes},app.log.spring.cloud.stream.kafka.binder.brokers=${vcap.services.kafkacups.credentials.brokers},app.log.spring.cloud.stream.kafka.binder.zkNodes=${vcap.services.kafkacups.credentials.zkNodes}"
-----
-
-
-[[getting-started-maximum-disk-quota-configuration]]
-== Maximum Disk Quota Configuration
-By default, every application in Cloud Foundry starts with 1G disk quota and this can be adjusted to a default maximum of
-2G. The default maximum can also be overridden up to 10G via Pivotal Cloud Foundry's (PCF) Ops Manager GUI.
-
-This configuration is relevant for Spring Cloud Data Flow because every stream and task deployment is composed of applications
-(typically Spring Boot uber-jar's) and those applications are resolved from a remote maven repository. After resolution,
-the application artifacts are downloaded to the local Maven Repository for caching/reuse. With this happening in the background,
-there is a possibility the default disk quota (_1G_) fills up rapidly; especially, when we are experimenting with streams that
-are made up of unique applications. In order to overcome this disk limitation and depending
-on your scaling requirements,you may want to change the default maximum from 2G to 10G. Let's review the
-steps to change the default maximum disk quota allocation.
-
-=== PCF's Operations Manager Configuration
-
-From PCF's Ops Manager, Select "*Pivotal Elastic Runtime*" tile and navigate to "*Application Developer Controls*" tab.
-Change the "*Maximum Disk Quota per App (MB)*" setting from 2048 to 10240 (_10G_). Save the disk quota update and hit
-"Apply Changes" to complete the configuration override.
-
-=== Scale Application
-
-Once the disk quota change is applied successfully and assuming you've a xref:running-on-cloudfoundry[running application],
-you may scale the application with a new `disk_limit` through CF CLI.
-
-[source,bash]
-----
-→ cf scale dataflow-server -k 10GB
-
-Scaling app dataflow-server in org ORG / space SPACE as user...
-OK
-
-....
-....
-....
-....
-
- state since cpu memory disk details
-#0 running 2016-10-31 03:07:23 PM 1.8% 497.9M of 1.1G 193.9M of 10G
-----
-
-[source,bash]
-----
-→ cf apps
-Getting apps in org ORG / space SPACE as user...
-OK
-
-name requested state instances memory disk urls
-dataflow-server started 1/1 1.1G 10G dataflow-server.apps.io
-----
-
-=== Configuring target free disk percentage
-
-Even when configuring the Data Flow server to use 10G of space, there is the possibility of exhausting
-the available space on the local disk. The server implements a least recently used (LRU) algorithm that
-will remove maven artifacts from the local maven repository. This is configured using the following
-configuration property, the default value is 25.
-
-[source]
-----
-# The low water mark percentage, expressed as in integer between 0 and 100, that triggers cleanup of
-# the local maven repository
-# (for setting env var use SPRING_CLOUD_DATAFLOW_SERVER_CLOUDFOUNDRY_FREE_DISK_SPACE_PERCENTAGE)
-spring.cloud.dataflow.server.cloudfoundry.freeDiskSpacePercentage=25
-----
-
-[[getting-started-app-resolution-options]]
-== Application Resolution Alternatives
-Though we highly recommend using Maven Repository for application link:http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#spring-cloud-dataflow-register-stream-apps[resolution and registration]
-in Cloud Foundry, there might be situations where an alternative approach would make sense. Following alternative options
-could come handy for resolving applications when running on Cloud Foundry.
-
-* With the help of Spring Boot, we can serve link:https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-developing-web-applications.html#boot-features-spring-mvc-static-content[static content]
-in Cloud Foundry. A simple Spring Boot application can bundle all the required stream/task applications and by having it
-run on Cloud Foundry, the static application can then serve the Über-jar's. From the Shell, you can, for example, register the
-app with the name `http-source.jar` via `--uri=http://<Route-To-StaticApp>/http-source.jar`.
-
-* The Über-jar's can be hosted on any external server that's reachable via HTTP. They can be resolved from raw GitHub URIs
-as well. From the Shell, you can, for example, register the app with the name `http-source.jar` via `--uri=http://<Raw_GitHub_URI>/http-source.jar`.
-
-* link:http://docs.cloudfoundry.org/buildpacks/staticfile/index.html[Static Buildpack ]support in Cloud Foundry is another
-option. A similar HTTP resolution will work on this model, too.
+NOTE: The current underlying PCF task capabilities are considered experimental for PCF version
+versions less than 1.9. See http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/enable-disable-specific-features.html[Feature Togglers]
+for how to disable task support in Data Flow.
-* link:https://docs.cloudfoundry.org/devguide/services/using-vol-services.html[Volume Services] is another great option.
-The required Über-jar's can be hosted in an external file-system and with the help of volume-services, you can, for
-example, register the app with the name `http-source.jar` via `--uri=file://<Path-To-FileSystem>/http-source.jar`.
From adc14cec1323ed37e8a9fe77edc16b6d3c30d788 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Thu, 30 Nov 2017 18:02:22 -0500
Subject: [PATCH 019/158] Add deployment_services to docs
---
.../src/main/asciidoc/getting-started.adoc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
index 51961b2..2162f51 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
@@ -29,7 +29,7 @@ cf create-service cloudamqp lemur rabbit
```
Rabbit is typically used as a messaging middleware between streaming apps and would be bound to each deployed app
-thanks to the `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES` setting (see below).
+thanks to the `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES` setting in Data Flow configuration or `SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_SERVICES` setting in Skipper.
=== Provision a MySQL service instance on Cloud Foundry
Use `cf marketplace` to discover which plans are available to you, depending on the details of your Cloud Foundry setup.
@@ -82,11 +82,11 @@ env:
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_DOMAIN: cfapps.io
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_USERNAME: {email}
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_PASSWORD: {password}
- SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_SERVICES: rabbit
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_SERVICES: {middlewareServiceName}
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_STREAM_ENABLE_RANDOM_APP_NAME_PREFIX: false
----
+
-You need to fill in \{org}, \{space}, \{email} and \{password} before running these commands. Once you have the desired
+You need to fill in \{org}, \{space}, \{email}, \{password} and {middlewareServiceName} before running these commands. Once you have the desired
config values in the `manifest.yml`, you can run `cf push` command to provision the skipper-server.
+
WARNING: Only set 'Skip SSL Validation' to true if you're running on a Cloud Foundry instance using self-signed
From 322dcc7322f7dfd0fbbef6b2ae504fde57d3fccf Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Thu, 30 Nov 2017 22:43:19 -0500
Subject: [PATCH 020/158] Doc updates and update to cf-deployer 1.3 M5
---
pom.xml | 2 +-
.../src/main/asciidoc/getting-started.adoc | 18 +--
.../src/main/asciidoc/streams-skipper.adoc | 135 +++++++++---------
3 files changed, 77 insertions(+), 78 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6e3fd56..62c1c54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<properties>
<spring-cloud-dataflow.version>1.3.0.M3</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.3.0.M4</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-deployer-cloudfoundry.version>1.3.0.M5</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.0.M2</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.0.M1</spring-cloud-common-security-config.version>
<spring-cloud-skipper.version>1.0.0.M2</spring-cloud-skipper.version>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
index 2162f51..b377b47 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
@@ -51,14 +51,14 @@ It can also be used for tasks to persist execution history.
wget http://repo.spring.io/{version-type-lowercase}/org/springframework/cloud/spring-cloud-dataflow-server-cloudfoundry/{project-version}/spring-cloud-dataflow-server-cloudfoundry-{project-version}.jar
wget http://repo.spring.io/{dataflow-version-type-lowercase}/org/springframework/cloud/spring-cloud-dataflow-shell/{dataflow-project-version}/spring-cloud-dataflow-shell-{dataflow-project-version}.jar
```
-. Download Skipper if you want the added features of upgrading and rolling back Streams since Data Flow delegates to Skipper for those features.
+. Optionally, download http://cloud.spring.io/spring-cloud-skipper/[Skipper] if you want the added features of upgrading and rolling back Streams since Data Flow delegates to Skipper for those features.
+
[source,yaml,options=nowrap,subs=attributes]
----
wget http://repo.spring.io/{skipper-version-type-lowercase}/org/springframework/cloud/spring-cloud-skipper-server/{skipper-version}/spring-cloud-skipper-server-{skipper-version}.jar
wget http://repo.spring.io/{skipper-version-type-lowercase}/org/springframework/cloud/spring-cloud-skipper-shell/{skipper-version}/spring-cloud-skipper-shell-{skipper-version}.jar
----
-. Run the Skipper Server if you want the added feature set described above.
+. Optionally, run the Skipper Server if you want the added feature set described above.
Let's review the sample `manifest.yml` file to deploy the skipper-server application to Cloud Foundry.
+
[source,yaml,options=nowrap]
@@ -83,6 +83,7 @@ env:
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_USERNAME: {email}
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_PASSWORD: {password}
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_SERVICES: {middlewareServiceName}
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_SKIP_SSL_VALIDATION: false
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_STREAM_ENABLE_RANDOM_APP_NAME_PREFIX: false
----
+
@@ -218,12 +219,10 @@ Once you're ready with the relevant properties in this file, you can issue `cf p
this file is stored.
[[getting-started-cloudfoundry-on-local]]
-== Local Machine Installation
+== Local Installation
-To run the server application locally, targeting your Cloud Foundry installation, you you need to configure the
-application either by passing in command line arguments (see below) or setting a number of environment variables.
-
-To use environment variables set the following:
+To run the server application locally, on your laptop or desktop, and target your Cloud Foundry installation, configure the
+Data Flow server by setting the following environment variables.
```
export SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_URL=https://api.run.pivotal.io
@@ -248,6 +247,8 @@ certs (e.g. in development). Do not use for production.
NOTE: If you are going to use `Skipper` to deploy Streams, deploy Skipper first and then configure the uri location of where the Skipper server is running.
+NOTE: Since Skipper is a Spring Boot application, you can also pass the configuration properties as command line options instead of environment variables. `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES` becomes `--spring.cloud.deployer.cloudfoundry.stream.services`.
+
----
export SKIPPER_CLIENT_HOST https://<skipper-host-name>/api
----
@@ -266,7 +267,7 @@ substitute `cf set-env` syntax with `export`.
[[getting-started-data-flow-shell]]
== Data Flow Shell
-Run the shell and optionally target the Server application using the `dataflow config` command.
+Run the shell target the Server application using the `dataflow config` command if the shell is not running on the same machine as the Data Flow Server.
[source,bash,subs=attributes]
----
@@ -316,6 +317,7 @@ dataflow:> http post --target http://dataflow-AxwwAhK-httptest-http.cfapps.io --
Look to see if `hello world` ended up in log files for the `log` application.
+
. Create Streams with Skipper
+This section assumes you have deployed Skipper and configured the Data Flow server's `SPRING_CLOUD_SKIPPER_CLIENT_URI` property to reference the Skipper server.
+
[source]
----
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/streams-skipper.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/streams-skipper.adoc
index ac125d8..0fca53f 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/streams-skipper.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/streams-skipper.adoc
@@ -6,7 +6,7 @@ middleware is up and running in PWS.
[source,console,options=nowrap]
----
-± cf apps [1h] ✭
+$ cf apps ✭
Getting apps in org ORG / space SPACE as email@pivotal.io...
OK
@@ -20,24 +20,22 @@ Verify the available platforms in Skipper.
[source,console,options=nowrap]
----
dataflow:>stream skipper platform-list
-╔═══════╤════════════╤═════════════════════════════════════════════════════════════════════════════════════════════════════════════╗
-║ Name │ Type │ Description ║
-╠═══════╪════════════╪═════════════════════════════════════════════════════════════════════════════════════════════════════════════╣
-║default│local │ShutdownTimeout = [30], EnvVarsToInherit = [TMP,LANG,LANGUAGE,LC_.*,PATH], JavaCmd = ║
-║ │ │[/home/vcap/app/.java-buildpack/open_jdk_jre/bin/java], WorkingDirectoriesRoot = [/home/vcap/tmp], ║
-║ │ │DeleteFilesOnExit = [true] ║
-║pws │cloudfoundry│org = [scdf-ci], space = [space-sabby], url = [https://api.run.pivotal.io] ║
-╚═══════╧════════════╧═════════════════════════════════════════════════════════════════════════════════════════════════════════════╝
+╔═══════╤════════════╤═════════════════════════════════════════════════════════════════════════════════════╗
+║ Name │ Type │ Description ║
+╠═══════╪════════════╪═════════════════════════════════════════════════════════════════════════════════════╣
+║pws │cloudfoundry│org = [scdf-ci], space = [space-sabby], url = [https://api.run.pivotal.io] ║
+╚═══════╧════════════╧═════════════════════════════════════════════════════════════════════════════════════╝
----
Let's start with deploying a stream with the `time-source` pointing to 1.2.0.RELEASE and `log-sink` pointing
to 1.1.0.RELEASE. The goal is to rolling upgrade the `log-sink` application to 1.2.0.RELEASE.
-```
-dataflow:>app register --name time --type source --uri maven://org.springframework.cloud.stream.app:time-source-rabbit:1.2.0.RELEASE
+[source,console,options=nowrap]
+----
+dataflow:>app register --name time --type source --uri maven://org.springframework.cloud.stream.app:time-source-rabbit:1.2.0.RELEASE --force
Successfully registered application 'source:time'
-dataflow:>app register --name log --type sink --uri maven://org.springframework.cloud.stream.app:log-sink-rabbit:1.1.0.RELEASE
+dataflow:>app register --name log --type sink --uri maven://org.springframework.cloud.stream.app:log-sink-rabbit:1.1.0.RELEASE --force
Successfully registered application 'sink:log'
dataflow:>app info source:time
@@ -47,14 +45,14 @@ Resource URI: maven://org.springframework.cloud.stream.app:time-source-rabbit:1.
dataflow:>app info sink:log
Information about sink application 'log':
Resource URI: maven://org.springframework.cloud.stream.app:log-sink-rabbit:1.1.0.RELEASE
-```
+----
. Create stream.
-
+
+Use a unique name, one that might not be taken by another application on PCF/PWS.
```
-dataflow:>stream create foo --definition "time | log"
-Created new stream 'foo'
+dataflow:>stream create ticker-314 --definition "time | log"
+Created new stream 'ticker-314'
```
+
@@ -62,8 +60,8 @@ Created new stream 'foo'
+
```
-dataflow:>stream skipper deploy foo --platformName pws
-Deployment request has been sent for stream 'foo'
+dataflow:>stream skipper deploy ticker-314 --platformName pws
+Deployment request has been sent for stream 'ticker-314'
```
+
@@ -82,8 +80,8 @@ $ cf apps
Getting apps in org ORG / space SPACE as email@pivotal.io...
name requested state instances memory disk urls
-foo-log-v1 started 1/1 1G 1G foo-log-v1.cfapps.io
-foo-time-v1 started 1/1 1G 1G foo-time-v1.cfapps.io
+ticker-314-log-v1 started 1/1 1G 1G ticker-314-log-v1.cfapps.io
+ticker-314-time-v1 started 1/1 1G 1G ticker-314-time-v1.cfapps.io
skipper-server started 1/1 1G 1G skipper-server.cfapps.io
dataflow-server started 1/1 1G 1G dataflow-server.cfapps.io
----
@@ -94,12 +92,12 @@ dataflow-server started 1/1 1G 1G dataf
+
[source,console,options=nowrap]
----
-$ cf logs foo-log-v1
+$ cf logs ticker-314-log-v1
...
...
-2017-11-20T15:39:43.76-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:43.761 INFO 12 --- [ foo.time.foo-1] log-sink : 11/20/17 23:39:43
-2017-11-20T15:39:44.75-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:44.757 INFO 12 --- [ foo.time.foo-1] log-sink : 11/20/17 23:39:44
-2017-11-20T15:39:45.75-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:45.757 INFO 12 --- [ foo.time.foo-1] log-sink : 11/20/17 23:39:45
+2017-11-20T15:39:43.76-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:43.761 INFO 12 --- [ ticker-314.time.ticker-314-1] log-sink : 11/20/17 23:39:43
+2017-11-20T15:39:44.75-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:44.757 INFO 12 --- [ ticker-314.time.ticker-314-1] log-sink : 11/20/17 23:39:44
+2017-11-20T15:39:45.75-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:45.757 INFO 12 --- [ ticker-314.time.ticker-314-1] log-sink : 11/20/17 23:39:45
----
+
@@ -108,11 +106,11 @@ $ cf logs foo-log-v1
+
[source,console,options=nowrap]
----
-dataflow:>stream skipper history --name foo
+dataflow:>stream skipper history --name ticker-314
╔═══════╤════════════════════════════╤════════╤════════════╤═══════════════╤════════════════╗
║Version│ Last updated │ Status │Package Name│Package Version│ Description ║
╠═══════╪════════════════════════════╪════════╪════════════╪═══════════════╪════════════════╣
-║1 │Mon Nov 20 15:34:37 PST 2017│DEPLOYED│foo │1.0.0 │Install complete║
+║1 │Mon Nov 20 15:34:37 PST 2017│DEPLOYED│ticker-314 │1.0.0 │Install complete║
╚═══════╧════════════════════════════╧════════╧════════════╧═══════════════╧════════════════╝
----
+
@@ -122,7 +120,7 @@ dataflow:>stream skipper history --name foo
+
[source,yml,options=nowrap]
----
-dataflow:>stream skipper manifest --name foo
+dataflow:>stream skipper manifest --name ticker-314
---
# Source: log.yml
@@ -137,15 +135,15 @@ spec:
spring.cloud.dataflow.stream.app.label: log
spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
spring.cloud.stream.bindings.applicationMetrics.destination: metrics
- spring.cloud.dataflow.stream.name: foo
+ spring.cloud.dataflow.stream.name: ticker-314
spring.metrics.export.triggers.application.includes: integration**
- spring.cloud.stream.metrics.key: foo.log.${spring.cloud.application.guid}
- spring.cloud.stream.bindings.input.group: foo
+ spring.cloud.stream.metrics.key: ticker-314.log.${spring.cloud.application.guid}
+ spring.cloud.stream.bindings.input.group: ticker-314
spring.cloud.dataflow.stream.app.type: sink
- spring.cloud.stream.bindings.input.destination: foo.time
+ spring.cloud.stream.bindings.input.destination: ticker-314.time
deploymentProperties:
spring.cloud.deployer.indexed: true
- spring.cloud.deployer.group: foo
+ spring.cloud.deployer.group: ticker-314
---
# Source: time.yml
@@ -160,14 +158,14 @@ spec:
spring.cloud.dataflow.stream.app.label: time
spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
spring.cloud.stream.bindings.applicationMetrics.destination: metrics
- spring.cloud.dataflow.stream.name: foo
+ spring.cloud.dataflow.stream.name: ticker-314
spring.metrics.export.triggers.application.includes: integration**
- spring.cloud.stream.metrics.key: foo.time.${spring.cloud.application.guid}
- spring.cloud.stream.bindings.output.producer.requiredGroups: foo
- spring.cloud.stream.bindings.output.destination: foo.time
+ spring.cloud.stream.metrics.key: ticker-314.time.${spring.cloud.application.guid}
+ spring.cloud.stream.bindings.output.producer.requiredGroups: ticker-314
+ spring.cloud.stream.bindings.output.destination: ticker-314.time
spring.cloud.dataflow.stream.app.type: source
deploymentProperties:
- spring.cloud.deployer.group: foo
+ spring.cloud.deployer.group: ticker-314
----
. Let's update `log-sink` from 1.1.0.RELEASE to 1.2.0.RELEASE
@@ -175,8 +173,8 @@ spec:
+
[source,console,options=nowrap]
----
-dataflow:>stream skipper update --name foo --properties version.log=1.2.0.RELEASE
-Update request has been sent for stream 'foo'
+dataflow:>stream skipper update --name ticker-314 --properties version.log=1.2.0.RELEASE
+Update request has been sent for stream 'ticker-314'
----
+
@@ -192,9 +190,9 @@ Getting apps in org scdf-ci / space space-sabby as sanandan@pivotal.io...
OK
name requested state instances memory disk urls
-foo-log-v2 started 1/1 1G 1G foo-log-v2.cfapps.io
-foo-log-v1 stopped 0/1 1G 1G
-foo-time-v1 started 1/1 1G 1G foo-time-v1.cfapps.io
+ticker-314-log-v2 started 1/1 1G 1G ticker-314-log-v2.cfapps.io
+ticker-314-log-v1 stopped 0/1 1G 1G
+ticker-314-time-v1 started 1/1 1G 1G ticker-314-time-v1.cfapps.io
skipper-server started 1/1 1G 1G skipper-server.cfapps.io
dataflow-server started 1/1 1G 1G dataflow-server.cfapps.io
----
@@ -202,8 +200,8 @@ dataflow-server started 1/1 1G 1G dataf
[NOTE]
====
-Notice that there are two versions of the `log-sink` applications. The `foo-log-v1` application instance is going down
-(route already removed) and the newly spawned `foo-log-v2` application is bootstrapping. The version number is incremented and
+Notice that there are two versions of the `log-sink` applications. The `ticker-314-log-v1` application instance is going down
+(route already removed) and the newly spawned `ticker-314-log-v2` application is bootstrapping. The version number is incremented and
the version-number (`v2`) is included in the new application name.
====
@@ -212,12 +210,12 @@ the version-number (`v2`) is included in the new application name.
+
[source,console,options=nowrap]
----
-$ cf logs foo-log-v2
+$ cf logs ticker-314-log-v2
...
...
-2017-11-20T18:38:35.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:35.003 INFO 18 --- [foo.time.foo-1] foo-log-v2 : 11/21/17 02:38:34
-2017-11-20T18:38:36.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:36.004 INFO 18 --- [foo.time.foo-1] foo-log-v2 : 11/21/17 02:38:35
-2017-11-20T18:38:37.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:37.005 INFO 18 --- [foo.time.foo-1] foo-log-v2 : 11/21/17 02:38:36
+2017-11-20T18:38:35.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:35.003 INFO 18 --- [ticker-314.time.ticker-314-1] ticker-314-log-v2 : 11/21/17 02:38:34
+2017-11-20T18:38:36.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:36.004 INFO 18 --- [ticker-314.time.ticker-314-1] ticker-314-log-v2 : 11/21/17 02:38:35
+2017-11-20T18:38:37.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:37.005 INFO 18 --- [ticker-314.time.ticker-314-1] ticker-314-log-v2 : 11/21/17 02:38:36
----
+
@@ -226,8 +224,7 @@ $ cf logs foo-log-v2
+
[source,yml,options=nowrap]
----
-dataflow:>stream skipper manifest --name foo
-
+skipper:>stream skipper manifest --name ticker-314
---
# Source: log.yml
apiVersion: skipper.spring.io/v1
@@ -241,15 +238,15 @@ spec:
spring.cloud.dataflow.stream.app.label: log
spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
spring.cloud.stream.bindings.applicationMetrics.destination: metrics
- spring.cloud.dataflow.stream.name: foo
+ spring.cloud.dataflow.stream.name: ticker-314
spring.metrics.export.triggers.application.includes: integration**
- spring.cloud.stream.metrics.key: foo.log.${spring.cloud.application.guid}
- spring.cloud.stream.bindings.input.group: foo
+ spring.cloud.stream.metrics.key: ticker-314.log.${spring.cloud.application.guid}
+ spring.cloud.stream.bindings.input.group: ticker-314
spring.cloud.dataflow.stream.app.type: sink
- spring.cloud.stream.bindings.input.destination: foo.time
+ spring.cloud.stream.bindings.input.destination: ticker-314.time
deploymentProperties:
spring.cloud.deployer.indexed: true
- spring.cloud.deployer.group: foo
+ spring.cloud.deployer.group: ticker-314
spring.cloud.deployer.count: 1
---
@@ -265,14 +262,14 @@ spec:
spring.cloud.dataflow.stream.app.label: time
spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
spring.cloud.stream.bindings.applicationMetrics.destination: metrics
- spring.cloud.dataflow.stream.name: foo
+ spring.cloud.dataflow.stream.name: ticker-314
spring.metrics.export.triggers.application.includes: integration**
- spring.cloud.stream.metrics.key: foo.time.${spring.cloud.application.guid}
- spring.cloud.stream.bindings.output.producer.requiredGroups: foo
- spring.cloud.stream.bindings.output.destination: foo.time
+ spring.cloud.stream.metrics.key: ticker-314.time.${spring.cloud.application.guid}
+ spring.cloud.stream.bindings.output.producer.requiredGroups: ticker-314
+ spring.cloud.stream.bindings.output.destination: ticker-314.time
spring.cloud.dataflow.stream.app.type: source
deploymentProperties:
- spring.cloud.deployer.group: foo
+ spring.cloud.deployer.group: ticker-314
----
+
@@ -281,12 +278,12 @@ spec:
+
[source,console,options=nowrap]
----
-dataflow:>stream skipper history --name foo
+dataflow:>stream skipper history --name ticker-314
╔═══════╤════════════════════════════╤════════╤════════════╤═══════════════╤════════════════╗
║Version│ Last updated │ Status │Package Name│Package Version│ Description ║
╠═══════╪════════════════════════════╪════════╪════════════╪═══════════════╪════════════════╣
-║2 │Mon Nov 20 15:39:37 PST 2017│DEPLOYED│foo │1.0.0 │Upgrade complete║
-║1 │Mon Nov 20 15:34:37 PST 2017│DELETED │foo │1.0.0 │Delete complete ║
+║2 │Mon Nov 20 15:39:37 PST 2017│DEPLOYED│ticker-314 │1.0.0 │Upgrade complete║
+║1 │Mon Nov 20 15:34:37 PST 2017│DELETED │ticker-314 │1.0.0 │Delete complete ║
╚═══════╧════════════════════════════╧════════╧════════════╧═══════════════╧════════════════╝
----
+
@@ -296,18 +293,18 @@ dataflow:>stream skipper history --name foo
+
[source,console,options=nowrap]
----
-dataflow:>stream skipper rollback --name foo
-Rollback request has been sent for the stream 'foo'
+dataflow:>stream skipper rollback --name ticker-314
+Rollback request has been sent for the stream 'ticker-314'
...
...
-dataflow:>stream skipper history --name foo
+dataflow:>stream skipper history --name ticker-314
╔═══════╤════════════════════════════╤════════╤════════════╤═══════════════╤════════════════╗
║Version│ Last updated │ Status │Package Name│Package Version│ Description ║
╠═══════╪════════════════════════════╪════════╪════════════╪═══════════════╪════════════════╣
-║3 │Mon Nov 20 15:41:37 PST 2017│DEPLOYED│foo │1.0.0 │Upgrade complete║
-║2 │Mon Nov 20 15:39:37 PST 2017│DELETED │foo │1.0.0 │Delete complete ║
-║1 │Mon Nov 20 15:34:37 PST 2017│DELETED │foo │1.0.0 │Delete complete ║
+║3 │Mon Nov 20 15:41:37 PST 2017│DEPLOYED│ticker-314 │1.0.0 │Upgrade complete║
+║2 │Mon Nov 20 15:39:37 PST 2017│DELETED │ticker-314 │1.0.0 │Delete complete ║
+║1 │Mon Nov 20 15:34:37 PST 2017│DELETED │ticker-314 │1.0.0 │Delete complete ║
╚═══════╧════════════════════════════╧════════╧════════════╧═══════════════╧════════════════╝
----
From 4acc3cb8a402d2fa87bb7c6df0e76c4d309f8c0a Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Thu, 30 Nov 2017 22:54:26 -0500
Subject: [PATCH 021/158] Update spring-cloud-dataflow-parent to 1.3.0.M3
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 62c1c54..51e52f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M3</version>
<relativePath />
</parent>
From 6ac308ee32c6e6de9fa322454231dfbc16ce91c6 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Fri, 1 Dec 2017 03:56:27 +0000
Subject: [PATCH 022/158] [artifactory-release] Release version 1.3.0.M3
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 51e52f7..91b385e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M3</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index e4e4bef..e826e24 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M3</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index bfee092..503a31d 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M3</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M3</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M3</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 51fff3f..de9c3cd 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M3</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.M3</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 4ffe8209eda6d95ef0394d05447259aad31bed12 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Fri, 1 Dec 2017 03:56:27 +0000
Subject: [PATCH 023/158] [artifactory-release] Next development version
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 91b385e..51e52f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.M3</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index e826e24..e4e4bef 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.M3</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 503a31d..bfee092 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.M3</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.3.0.M3</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.M3</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index de9c3cd..51fff3f 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.M3</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.M3</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From df0d75c75aac61455046bc82cfd242d447a2a122 Mon Sep 17 00:00:00 2001
From: Sabby Anandan <sabby.anandan@gmail.com>
Date: Wed, 20 Dec 2017 06:34:49 -0800
Subject: [PATCH 024/158] Flip SCDF-core back to snapshots
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 51e52f7..ae2c078 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,12 +8,12 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.3.0.M3</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.3.0.M3</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.3.0.M5</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.0.M2</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.0.M1</spring-cloud-common-security-config.version>
From 85d4f28ce0c150685d0636b8640c35ab3d4e8cfe Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Tue, 9 Jan 2018 16:25:57 -0500
Subject: [PATCH 025/158] Update deployer-cf,deployer-spi to 1.3 snapshot and
common-security to 1.0 snap
---
pom.xml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index ae2c078..e178b7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,10 +14,11 @@
<properties>
<spring-cloud-dataflow.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.3.0.M5</spring-cloud-deployer-cloudfoundry.version>
- <spring-cloud-deployer-spi.version>1.3.0.M2</spring-cloud-deployer-spi.version>
- <spring-cloud-common-security-config.version>1.0.0.M1</spring-cloud-common-security-config.version>
- <spring-cloud-skipper.version>1.0.0.M2</spring-cloud-skipper.version>
+ <spring-cloud-deployer-cloudfoundry.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-deployer-spi.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-deployer-spi.version>
+ <spring-cloud-common-security-config.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-common-security-config.version>
+ <!-- skipper version used only in doc generation -->
+ <spring-cloud-skipper.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-skipper.version>
<reactor.version>3.0.7.RELEASE</reactor.version>
</properties>
From 89074923233cb3467ed87adebbbfa1c66e3d5d5b Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Mon, 8 Jan 2018 23:56:32 -0500
Subject: [PATCH 026/158] Remove LRU cache in server project, adopt LRU cache
in deployer
Fixes #369
---
...oudFoundryDataFlowServerConfiguration.java | 16 +-
.../resource/LRUCleaningResourceLoader.java | 140 ------------------
...eaningResourceLoaderBeanPostProcessor.java | 55 -------
3 files changed, 7 insertions(+), 204 deletions(-)
delete mode 100644 spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/resource/LRUCleaningResourceLoader.java
delete mode 100644 spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/resource/LRUCleaningResourceLoaderBeanPostProcessor.java
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryDataFlowServerConfiguration.java b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryDataFlowServerConfiguration.java
index 971022d..6fa673c 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryDataFlowServerConfiguration.java
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryDataFlowServerConfiguration.java
@@ -16,29 +16,27 @@
package org.springframework.cloud.dataflow.server.cloudfoundry.config;
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.annotation.PostConstruct;
-
-import reactor.core.publisher.Hooks;
-
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.dataflow.server.cloudfoundry.config.security.CloudFoundryOAuthSecurityConfiguration;
-import org.springframework.cloud.dataflow.server.cloudfoundry.resource.LRUCleaningResourceLoaderBeanPostProcessor;
import org.springframework.cloud.deployer.resource.docker.DockerResource;
import org.springframework.cloud.deployer.resource.docker.DockerResourceLoader;
import org.springframework.cloud.deployer.resource.maven.MavenProperties;
import org.springframework.cloud.deployer.resource.maven.MavenResource;
import org.springframework.cloud.deployer.resource.maven.MavenResourceLoader;
import org.springframework.cloud.deployer.resource.support.DelegatingResourceLoader;
+import org.springframework.cloud.deployer.resource.support.LRUCleaningResourceLoaderBeanPostProcessor;
import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryConnectionProperties;
import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryDeploymentProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.core.io.ResourceLoader;
+import reactor.core.publisher.Hooks;
+
+import javax.annotation.PostConstruct;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
/**
* Configuration class for customizing Cloud Foundry deployer.
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/resource/LRUCleaningResourceLoader.java b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/resource/LRUCleaningResourceLoader.java
deleted file mode 100644
index 3dd3a2c..0000000
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/resource/LRUCleaningResourceLoader.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.dataflow.server.cloudfoundry.resource;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import org.springframework.cloud.deployer.resource.support.DelegatingResourceLoader;
-import org.springframework.core.io.Resource;
-import org.springframework.core.io.ResourceLoader;
-import org.springframework.util.Assert;
-import org.springframework.util.FileSystemUtils;
-
-/**
- * A wrapper around a {@link org.springframework.core.io.ResourceLoader} that deletes returned Resources (assumed to
- * be on the file system) once disk space is getting low. Least Recently Used entries are removed first.
- *
- * <p>This wrapper is typically meant to be used to clean Maven {@literal .m2/repository} entries, but also works
- * with other files. For the former case, if entries are under the configured {@link #repositoryCache} path (typically
- * the {@literal .m2/repository} path), then the whole parent directory of the resource is removed. Otherwise, the sole
- * resource file is deleted.</p>
- *
- * @author Eric Bottard
- */
-// NOTE: extends DelegatingResourceLoader as a
-// work around https://github.com/spring-cloud/spring-cloud-dataflow/issues/1064 for now
-/*default*/ class LRUCleaningResourceLoader extends DelegatingResourceLoader {
-
- private static final Logger logger = LoggerFactory.getLogger(LRUCleaningResourceLoader.class);
-
- private final File repositoryCache;
-
- private final ResourceLoader delegate;
-
- private final Map<File, Void> lruCache = this.new LRUCache();
-
- private final float targetFreeSpaceRatio;
-
- /**
- * Instantiates a new LRUCleaning resource loader.
- * @param delegate the ResourceLoader to wrap, assumed to be file system based.
- * @param targetFreeSpaceRatio The target free disk space ratio, between 0 and 1.
- * @param repositoryCache The directory location of the maven cache.
- */
- public LRUCleaningResourceLoader(ResourceLoader delegate, float targetFreeSpaceRatio, File repositoryCache) {
- Assert.notNull(delegate, "delegate cannot be null");
- Assert.isTrue(0 <= targetFreeSpaceRatio && targetFreeSpaceRatio <= 1, "targetFreeSpaceRatio should between [0,1] inclusive.");
- this.delegate = delegate;
- this.targetFreeSpaceRatio = targetFreeSpaceRatio;
- this.repositoryCache = repositoryCache;
- }
-
- @Override
- public Resource getResource(String location) {
- Resource resource = delegate.getResource(location);
- try {
- File file = resource.getFile();
- synchronized (lruCache) {
- lruCache.put(file, null);
- }
- return resource;
- }
- catch (IOException e) {
- logger.debug("{} is not stored on the local filesystem, skipping", resource);
- return resource;
- }
- }
-
- @Override
- public ClassLoader getClassLoader() {
- return delegate.getClassLoader();
- }
-
- private class LRUCache extends LinkedHashMap<File, Void> {
-
- LRUCache() {
- super(5, .75f, true); // true here makes it LRU cache
- }
-
- @Override
- protected boolean removeEldestEntry(Map.Entry<File, Void> eldest) {
- // freeSpace / totalSpace is per-partition, which may not always be the same for all entries
- // Use totalSpace as a rough identifier of the partition and only log.info() once
- long lastTotalSpaceSeen = -1;
- for (Iterator<File> it = keySet().iterator(); it.hasNext(); ) {
- File file = it.next();
- if (file.getTotalSpace() != lastTotalSpaceSeen) {
- String percentFreeSpace = String.format(java.util.Locale.US,"%.2f", 100f * file.getFreeSpace() / file.getTotalSpace());
- logger.info("Free Disk Space = {}%, Target Free Space >{}%", percentFreeSpace, String.format(java.util.Locale.US,"%.2f", 100f * targetFreeSpaceRatio));
- lastTotalSpaceSeen = file.getTotalSpace();
- }
- logger.debug("Looking at LRU entry {}, Free Space = {} bytes, Total Space = {} bytes", file, file.getFreeSpace(), file.getTotalSpace());
- if (shouldDelete(file) && it.hasNext()) { // never delete the most recent entry
- cleanup(file);
- it.remove();
- } else {
- logger.debug("No action taken for LRU entry {}", file);
- }
- }
- return false; // We already did some cleanup, don't let superclass do its logic
- }
-
- private void cleanup(File file) {
- if (repositoryCache != null && file.getPath().startsWith(repositoryCache.getPath())) {
- boolean success = FileSystemUtils.deleteRecursively(file.getParentFile());
- logger.info("[{}] Deleting {} parent directory to regain free disk space.", success ? "SUCCESS" : "FAILED", file);
- }
- else {
- boolean success = file.delete();
- logger.info("[{}] Deleting {} to regain free disk space", success ? "SUCCESS" : "FAILED", file);
- }
- }
- }
-
- private boolean shouldDelete(File file) {
- boolean shouldDelete = ((float) file.getFreeSpace()) / file.getTotalSpace() < targetFreeSpaceRatio;
- logger.trace("Should Delete {} ? [{}]", file, shouldDelete);
- return shouldDelete;
- }
-}
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/resource/LRUCleaningResourceLoaderBeanPostProcessor.java b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/resource/LRUCleaningResourceLoaderBeanPostProcessor.java
deleted file mode 100644
index b40afe2..0000000
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/resource/LRUCleaningResourceLoaderBeanPostProcessor.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cloud.dataflow.server.cloudfoundry.resource;
-
-import java.io.File;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.cloud.deployer.resource.support.DelegatingResourceLoader;
-import org.springframework.core.io.ResourceLoader;
-
-/**
- * Decorates the default ResourceLoader with a {@link LRUCleaningResourceLoader} when running
- * <em>in</em> Cloud Foundry.
- *
- * @author Eric Bottard
- */
-public class LRUCleaningResourceLoaderBeanPostProcessor implements BeanPostProcessor {
-
- private final float targetFreeSpaceRatio;
-
- private final File repositoryCache;
-
- public LRUCleaningResourceLoaderBeanPostProcessor(float targetFreeSpaceRatio, File repositoryCache) {
- this.targetFreeSpaceRatio = targetFreeSpaceRatio;
- this.repositoryCache = repositoryCache;
- }
-
- @Override
- public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
- return bean;
- }
-
- @Override
- public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
- if (bean instanceof DelegatingResourceLoader) {
- return new LRUCleaningResourceLoader((ResourceLoader) bean, targetFreeSpaceRatio, repositoryCache);
- }
- return bean;
- }
-}
From 9626cc3bd32f2424cd1c46348b99bba1086b07f5 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Wed, 10 Jan 2018 19:15:28 -0500
Subject: [PATCH 027/158] Update to spring-cloud-deployer and
deployer-cloudfoundry 1.3.0.RC1
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index e178b7b..d1004a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,8 +14,8 @@
<properties>
<spring-cloud-dataflow.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-deployer-cloudfoundry.version>
- <spring-cloud-deployer-spi.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-deployer-spi.version>
+ <spring-cloud-deployer-cloudfoundry.version>1.3.0.RC1</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-deployer-spi.version>1.3.0.RC1</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-common-security-config.version>
<!-- skipper version used only in doc generation -->
<spring-cloud-skipper.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-skipper.version>
From 9b379dfc8aa8549fa7c7472d5cb413637855ed1e Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Thu, 11 Jan 2018 13:44:32 -0500
Subject: [PATCH 028/158] Updae to deployer-cloudfoundry 1.3.0.RC2 and
common-security 1.0.0.RC1
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index d1004a8..5c091b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,9 +14,9 @@
<properties>
<spring-cloud-dataflow.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.3.0.RC1</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-deployer-cloudfoundry.version>1.3.0.RC2</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.0.RC1</spring-cloud-deployer-spi.version>
- <spring-cloud-common-security-config.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-common-security-config.version>
+ <spring-cloud-common-security-config.version>1.0.0.RC1</spring-cloud-common-security-config.version>
<!-- skipper version used only in doc generation -->
<spring-cloud-skipper.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-skipper.version>
<reactor.version>3.0.7.RELEASE</reactor.version>
From 07c1e093958d621a5af86917216e36d5cbe1587a Mon Sep 17 00:00:00 2001
From: Gunnar Hillert <ghillert@pivotal.io>
Date: Fri, 19 Jan 2018 10:59:44 -1000
Subject: [PATCH 029/158] gh-381 Fix broken security links in the reference
guide
---
.../src/main/asciidoc/configuration.adoc | 4 ++--
.../src/main/asciidoc/getting-started.adoc | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
index 167183e..1c38989 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
@@ -282,7 +282,7 @@ By default, the Data Flow server is unsecured and runs on an unencrypted HTTP co
as well as the Data Flow Dashboard by enabling HTTPS and requiring clients to authenticate.
For more details about securing the
REST endpoints and configuring to authenticate against an OAUTH backend (_i.e: UAA/SSO running on Cloud Foundry_), please
-review the security section from the core http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/html/getting-started-security.html[reference guide]. The security configurations can be configured in `dataflow-server.yml` or passed as environment variables through `cf set-env` commands.
+review the security section from the core http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#configuration-security[reference guide]. The security configurations can be configured in `dataflow-server.yml` or passed as environment variables through `cf set-env` commands.
[[getting-started-security-cloud-foundry]]
=== Authentication and Cloud Foundry
@@ -303,7 +303,7 @@ Simply bind the _Pivotal Single Sign-On Service_ to your Data Flow Server app an
Single Sign-On (SSO) via OAuth2 will be enabled by default.
Authorization is similarly support as for non-Cloud Foundry security scenarios.
-Please refer to the security section from the core Data Flow http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/html/getting-started-security.html[reference guide].
+Please refer to the security section from the core Data Flow http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#configuration-security[reference guide].
As the provisioning of roles can vary widely across environments, we assign by
default all Spring Cloud Data Flow roles to users.
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
index b377b47..56e37ed 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
@@ -365,6 +365,6 @@ in the database and you can retrieve information about the task execution using
`task execution list` and `task execution status --id <ID_OF_TASK>` or though the Data Flow UI.
NOTE: The current underlying PCF task capabilities are considered experimental for PCF version
-versions less than 1.9. See http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/enable-disable-specific-features.html[Feature Togglers]
+versions less than 1.9. See http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#enable-disable-specific-features[Feature Togglers]
for how to disable task support in Data Flow.
From 9e3564a0e438073814c05fc3c3e0fe8a6d7d3a47 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Tue, 23 Jan 2018 22:55:10 -0500
Subject: [PATCH 030/158] Update deps to latest releases, document skipper mode
Fixes #384
Fixes #386
---
pom.xml | 6 +-
.../pom.xml | 1 +
.../src/main/asciidoc/getting-started.adoc | 63 +++++++++++--------
3 files changed, 42 insertions(+), 28 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5c091b2..c6c4f00 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,12 +13,12 @@
</parent>
<properties>
- <spring-cloud-dataflow.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.3.0.RC1</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.3.0.RC2</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.0.RC1</spring-cloud-deployer-spi.version>
- <spring-cloud-common-security-config.version>1.0.0.RC1</spring-cloud-common-security-config.version>
+ <spring-cloud-common-security-config.version>1.0.0.RC2</spring-cloud-common-security-config.version>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>1.0.0.RC4</spring-cloud-skipper.version>
<reactor.version>3.0.7.RELEASE</reactor.version>
</properties>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index bfee092..94af873 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -99,6 +99,7 @@
<dataflow-branch-or-tag>${dataflow-branch-or-tag}</dataflow-branch-or-tag>
<dataflow-asciidoc>https://raw.githubusercontent.com/spring-cloud/spring-cloud-dataflow/${dataflow-branch-or-tag}/spring-cloud-dataflow-docs/src/main/asciidoc</dataflow-asciidoc>
<deployer-branch-or-tag>${deployer-branch-or-tag}</deployer-branch-or-tag>
+ <skipper-version>${spring-cloud-skipper.version}</skipper-version>
<skipper-branch-or-tag>${skipper-branch-or-tag}</skipper-branch-or-tag>
<!-- The following two are deps of this project and set automatically.-->
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
index 56e37ed..e4bccc7 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
@@ -44,11 +44,16 @@ It can also be used for tasks to persist execution history.
[[getting-started-cloudfoundry]]
== Cloud Foundry Installation
+Starting 1.3.x, the Data Flow Server can run in either `skipper` or `classic` (non-skipper) modes.
+The modes can be specified when starting the Data Flow server using the property `spring.cloud.dataflow.features.skipper-enabled`.
+By default, the `classic` mode is enabled.
+
. Download the Data Flow server and shell applications
+
[subs=attributes]
```
wget http://repo.spring.io/{version-type-lowercase}/org/springframework/cloud/spring-cloud-dataflow-server-cloudfoundry/{project-version}/spring-cloud-dataflow-server-cloudfoundry-{project-version}.jar
+
wget http://repo.spring.io/{dataflow-version-type-lowercase}/org/springframework/cloud/spring-cloud-dataflow-shell/{dataflow-project-version}/spring-cloud-dataflow-shell-{dataflow-project-version}.jar
```
. Optionally, download http://cloud.spring.io/spring-cloud-skipper/[Skipper] if you want the added features of upgrading and rolling back Streams since Data Flow delegates to Skipper for those features.
@@ -56,10 +61,9 @@ wget http://repo.spring.io/{dataflow-version-type-lowercase}/org/springframework
[source,yaml,options=nowrap,subs=attributes]
----
wget http://repo.spring.io/{skipper-version-type-lowercase}/org/springframework/cloud/spring-cloud-skipper-server/{skipper-version}/spring-cloud-skipper-server-{skipper-version}.jar
-wget http://repo.spring.io/{skipper-version-type-lowercase}/org/springframework/cloud/spring-cloud-skipper-shell/{skipper-version}/spring-cloud-skipper-shell-{skipper-version}.jar
----
-. Optionally, run the Skipper Server if you want the added feature set described above.
-Let's review the sample `manifest.yml` file to deploy the skipper-server application to Cloud Foundry.
++
+Push Skipper to Cloud Foundry only if you want to run Spring Cloud Data Flow server in `skipper` mode. Here is a sample manifest for Skipper.
+
[source,yaml,options=nowrap]
----
@@ -140,28 +144,27 @@ cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_PASSWORD {password
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATION false
```
-WARNING: Only set 'Skip SSL Validation' to true if you're running on a Cloud Foundry instance using self-signed
-certs (e.g. in development). Do not use for production.
+NOTE: If you are going to use `Skipper` to deploy Streams, deploy Skipper first and then configure the uri location of where the Skipper server is running and set the server to be in 'skipper mode
-NOTE: If you are deploying in an environment that requires you to sign on using the Pivotal Single Sign-On Service,
-refer to the section <<getting-started-security-cloud-foundry>> for information on how to configure the server.
+----
+cf set-env dataflow-server SPRING_CLOUD_SKIPPER_CLIENT_URI https://<skipper-host-name>/api
+cf set-env dataflow-server SPRING_CLOUD_DATAFLOW_FEATURES_ENABLED true
+----
-Spring Cloud Data Flow server implementations (be it for Cloud Foundry, Mesos, YARN, or Kubernetes) do not have
-_any_ default remote maven repository configured. This is intentionally designed to provide the flexibility for
-the users, so they can override and point to a remote repository of their choice. The out-of-the-box
-applications that are supported by Spring Cloud Data Flow are available in Spring's repository,
-so if you want to use them, set it as the remote repository as listed below.
+The Spring Cloud Data Flow server does not have _any_ default remote maven repository configured.
+This is intentionally designed to provide the flexibility the users, so they can override and point to a remote repository of their choice.
+The out-of-the-box applications that are supported by Spring Cloud Data Flow are available in Spring's repository, so if you want to use them, set it as the remote repository as listed below.
```
cf set-env dataflow-server SPRING_APPLICATION_JSON '{"maven": { "remote-repositories": { "repo1": { "url": "https://repo.spring.io/libs-release" } } } }'
```
where `repo1` is the alias name for the remote repository.
-NOTE: If you are going to use `Skipper` to deploy Streams, deploy Skipper first and then configure the uri location of where the Skipper server is running.
+WARNING: Only set 'Skip SSL Validation' to true if you're running on a Cloud Foundry instance using self-signed
+certs (e.g. in development). Do not use for production.
-----
-cf set-env dataflow-server SPRING_CLOUD_SKIPPER_CLIENT_URI https://<skipper-host-name>/api
-----
+NOTE: If you are deploying in an environment that requires you to sign on using the Pivotal Single Sign-On Service,
+refer to the section <<getting-started-security-cloud-foundry>> for information on how to configure the server.
You can issue now `cf push` command and reference the Data Flow server .jar.
@@ -206,13 +209,14 @@ services:
- mysql
----
-NOTE: If you are going to use `Skipper` to deploy Streams, deploy Skipper first and then configure the uri location of where the Skipper server is running. Instructions on how to install and deploy Skipper can be found in the <<spring-cloud-skipper-integration>> section.
+NOTE: If you are going to use `Skipper` to deploy Streams, deploy Skipper first and then configure the uri location of where the Skipper server is running and set the feature toggle to use skipper.
[source,yml]
----
applications:
env:
SPRING_CLOUD_SKIPPER_CLIENT_URI: https://<skipper-host-name>/api
+ SPRING_CLOUD_DATAFLOW_FEATURES_SKIPPER_ENABLED: true
----
Once you're ready with the relevant properties in this file, you can issue `cf push` command from the directory where
@@ -221,8 +225,7 @@ this file is stored.
[[getting-started-cloudfoundry-on-local]]
== Local Installation
-To run the server application locally, on your laptop or desktop, and target your Cloud Foundry installation, configure the
-Data Flow server by setting the following environment variables.
+To run the server application locally, on your laptop or desktop, and target your Cloud Foundry installation, configure the Data Flow server by setting the following environment variables.
```
export SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_URL=https://api.run.pivotal.io
@@ -245,12 +248,13 @@ You need to fill in \{org}, \{space}, \{email} and \{password} before running th
WARNING: Only set 'Skip SSL Validation' to true if you're running on a Cloud Foundry instance using self-signed
certs (e.g. in development). Do not use for production.
-NOTE: If you are going to use `Skipper` to deploy Streams, deploy Skipper first and then configure the uri location of where the Skipper server is running.
+NOTE: If you are going to use `Skipper` to deploy Streams, deploy Skipper first and then configure the uri location of where the Skipper server is running and enable the Skipper feature toggle..
NOTE: Since Skipper is a Spring Boot application, you can also pass the configuration properties as command line options instead of environment variables. `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES` becomes `--spring.cloud.deployer.cloudfoundry.stream.services`.
----
export SKIPPER_CLIENT_HOST https://<skipper-host-name>/api
+export SPRING_CLOUD_DATAFLOW_FEATURES_SKIPPER_ENABLED true
----
Now we are ready to start the server application:
@@ -266,19 +270,28 @@ substitute `cf set-env` syntax with `export`.
[[getting-started-data-flow-shell]]
== Data Flow Shell
-
-Run the shell target the Server application using the `dataflow config` command if the shell is not running on the same machine as the Data Flow Server.
+Launching the Data Flow shell requires the appropriate data flow server mode to be specified.
+To start the Data Flow Shell for the Data Flow server running in `classic` mode:
[source,bash,subs=attributes]
----
$ java -jar spring-cloud-dataflow-shell-{dataflow-project-version}.jar
----
+To start the Data Flow Shell for the Data Flow server running in `skipper` mode:
+
+[source,bash,subs=attributes]
+----
+$ java -jar spring-cloud-dataflow-shell-{project-version}.jar --dataflow.mode=skipper
+----
+If the Data Flow Server and shell are not running on the same host, point the shell to the Data Flow server URL:
```
server-unknown:>dataflow config server http://dataflow-server.cfapps.io
Successfully targeted http://dataflow-server.cfapps.io
dataflow:>
```
+Alternatively, pass in the command line option `--dataflow.uri`. The shell's command line option `--help1 shows what is available.
+
[[getting-started-deploying-streams]]
== Deploying Streams
@@ -290,7 +303,7 @@ built with the RabbitMQ binder in bulk, you can with the following command. For
xref:spring-cloud-dataflow-register-apps[register applications].
+
```
-dataflow:>app import --uri http://bit.ly/Celsius-GA-stream-applications-rabbit-maven
+dataflow:>app import --uri http://bit.ly/Celsius-SR1-stream-applications-rabbit-maven
```
+
There are two options for deploying Streams. The "traditional" way that Data Flow has always used and a new way that delegates to the Skipper server. Deploying using Skipper will enable you to update and rollback the streams while the traditional way will not.
@@ -344,11 +357,11 @@ You can read more about the general features of using Skipper to deploy streams
To run a simple task application, you can register all the out-of-the-box task applications with the following command.
```
-dataflow:>app import --uri http://bit.ly/Addison-GA-task-applications-maven
+dataflow:>app import --uri http://bit.ly/Clark-GA-task-applications-maven
```
-Now create a simple link:http://docs.spring.io/spring-cloud-task-app-starters/docs/1.0.1.RELEASE/reference/html/_timestamp_task.html[timestamp] task.
+Now create a simple link:https://docs.spring.io/spring-cloud-task-app-starters/docs/Clark.RELEASE/reference/html/_timestamp_task.html[timestamp] task.
```
dataflow:>task create mytask --definition "timestamp --format='yyyy'"
From 63610a1ecb827ae95b99e4a4bc2138299bcfe408 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Tue, 23 Jan 2018 23:02:16 -0500
Subject: [PATCH 031/158] Update parent pom to refernce dataflow 1.3 RC1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index c6c4f00..aa2f04f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC1</version>
<relativePath />
</parent>
From d1bd956b1a1543394b21db5b2c001e6f568f2e88 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Wed, 24 Jan 2018 04:05:54 +0000
Subject: [PATCH 032/158] [artifactory-release] Release version 1.3.0.RC1
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index aa2f04f..d0cea68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC1</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index e4e4bef..3b2b667 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC1</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 94af873..60b278b 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC1</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC1</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 51fff3f..52a6d5a 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC1</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC1</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 2b03ef5f94a03cc3e46564ee3f6805b079d7e2cc Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Wed, 24 Jan 2018 04:05:55 +0000
Subject: [PATCH 033/158] [artifactory-release] Next development version
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index d0cea68..aa2f04f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.RC1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 3b2b667..e4e4bef 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.RC1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 60b278b..94af873 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.RC1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.3.0.RC1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.RC1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 52a6d5a..51fff3f 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.RC1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.RC1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 5cb34d1c2466159d223627a2f3eb9aa93a28ef57 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Wed, 24 Jan 2018 14:51:30 -0500
Subject: [PATCH 034/158] Move skipper getting started section into main
getting started section
* Align getting started with current code base
---
.../src/main/asciidoc/getting-started.adoc | 373 +++++++++++++++++-
.../src/main/asciidoc/index.adoc | 2 -
.../src/main/asciidoc/overview.adoc | 2 +-
.../src/main/asciidoc/streams-skipper.adoc | 310 ---------------
4 files changed, 354 insertions(+), 333 deletions(-)
delete mode 100644 spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/streams-skipper.adoc
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
index e4bccc7..a242de3 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
@@ -147,7 +147,7 @@ cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATIO
NOTE: If you are going to use `Skipper` to deploy Streams, deploy Skipper first and then configure the uri location of where the Skipper server is running and set the server to be in 'skipper mode
----
-cf set-env dataflow-server SPRING_CLOUD_SKIPPER_CLIENT_URI https://<skipper-host-name>/api
+cf set-env dataflow-server SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI https://<skipper-host-name>/api
cf set-env dataflow-server SPRING_CLOUD_DATAFLOW_FEATURES_ENABLED true
----
@@ -215,7 +215,7 @@ NOTE: If you are going to use `Skipper` to deploy Streams, deploy Skipper first
----
applications:
env:
- SPRING_CLOUD_SKIPPER_CLIENT_URI: https://<skipper-host-name>/api
+ SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI: https://<skipper-host-name>/api
SPRING_CLOUD_DATAFLOW_FEATURES_SKIPPER_ENABLED: true
----
@@ -278,21 +278,6 @@ To start the Data Flow Shell for the Data Flow server running in `classic` mode:
$ java -jar spring-cloud-dataflow-shell-{dataflow-project-version}.jar
----
-To start the Data Flow Shell for the Data Flow server running in `skipper` mode:
-
-[source,bash,subs=attributes]
-----
-$ java -jar spring-cloud-dataflow-shell-{project-version}.jar --dataflow.mode=skipper
-----
-If the Data Flow Server and shell are not running on the same host, point the shell to the Data Flow server URL:
-```
-server-unknown:>dataflow config server http://dataflow-server.cfapps.io
-Successfully targeted http://dataflow-server.cfapps.io
-dataflow:>
-```
-Alternatively, pass in the command line option `--dataflow.uri`. The shell's command line option `--help1 shows what is available.
-
-
[[getting-started-deploying-streams]]
== Deploying Streams
@@ -330,12 +315,12 @@ dataflow:> http post --target http://dataflow-AxwwAhK-httptest-http.cfapps.io --
Look to see if `hello world` ended up in log files for the `log` application.
+
. Create Streams with Skipper
-This section assumes you have deployed Skipper and configured the Data Flow server's `SPRING_CLOUD_SKIPPER_CLIENT_URI` property to reference the Skipper server.
+This section assumes you have deployed Skipper and configured the Data Flow server's `SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI` property to reference the Skipper server.
+
[source]
----
dataflow:> stream create --name httptest --definition "http | log"
-dataflow:> stream skipper deploy --name httptest --platformName pws
+dataflow:> stream deploy --name httptest --platformName pws
----
+
Look to see if `hello world` ended up in log files for the `log` application.
@@ -348,7 +333,355 @@ to `pws` as the platform. This can be modified, and of course, you can have any
More details are in Spring Cloud Skipper reference guide.
====
+
-You can read more about the general features of using Skipper to deploy streams in the section <<spring-cloud-dataflow-stream-lifecycle-skipper>> and how to upgrade and rollback streams in the section <<spring-cloud-dataflow-streams-skipper>>.
+You can read more about the general features of using Skipper to deploy streams in the section <<spring-cloud-dataflow-stream-lifecycle-skipper>> and how to upgrade a streams in the section <<spring-cloud-dataflow-stream-lifecycle-skipper-update>>.
+
+
+[[streams-using-skipper]]
+== Deploying Streams using Skipper
+
+We will proceed with the assumption that Spring Cloud Data Flow, Spring Cloud Skipper, RDBMS, and desired messaging
+middleware is up and running in PWS.
+
+[source,console,options=nowrap]
+----
+$ cf apps ✭
+Getting apps in org ORG / space SPACE as email@pivotal.io...
+OK
+
+name requested state instances memory disk urls
+skipper-server started 1/1 1G 1G skipper-server.cfapps.io
+dataflow-server started 1/1 1G 1G dataflow-server.cfapps.io
+----
+
+Start the Data Flow Shell for the Data Flow server running in `skipper` mode:
+
+[source,bash,subs=attributes]
+----
+$ java -jar spring-cloud-dataflow-shell-{dataflow-project-version}.jar --dataflow.mode=skipper
+----
+If the Data Flow Server and shell are not running on the same host, point the shell to the Data Flow server URL:
+```
+server-unknown:>dataflow config server http://dataflow-server.cfapps.io
+Successfully targeted http://dataflow-server.cfapps.io
+dataflow:>
+```
+Alternatively, pass in the command line option `--dataflow.uri`. The shell's command line option `--help` shows what options are available.
+
+Verify the available platforms in Skipper.
+
+[source,console,options=nowrap]
+----
+dataflow:>stream platform-list
+╔═══════╤════════════╤═════════════════════════════════════════════════════════════════════════════════════╗
+║ Name │ Type │ Description ║
+╠═══════╪════════════╪═════════════════════════════════════════════════════════════════════════════════════╣
+║pws │cloudfoundry│org = [scdf-ci], space = [space-sabby], url = [https://api.run.pivotal.io] ║
+╚═══════╧════════════╧═════════════════════════════════════════════════════════════════════════════════════╝
+----
+
+Let's start with deploying a stream with the `time-source` pointing to 1.2.0.RELEASE and `log-sink` pointing
+to 1.1.0.RELEASE. The goal is to rolling upgrade the `log-sink` application to 1.2.0.RELEASE.
+
+[source,console,options=nowrap]
+----
+dataflow:>app register --name time --type source --uri maven://org.springframework.cloud.stream.app:time-source-rabbit:1.2.0.RELEASE --force
+Successfully registered application 'source:time'
+
+dataflow:>app register --name log --type sink --uri maven://org.springframework.cloud.stream.app:log-sink-rabbit:1.1.0.RELEASE --force
+Successfully registered application 'sink:log'
+
+dataflow:>app info source:time
+Information about source application 'time':
+Resource URI: maven://org.springframework.cloud.stream.app:time-source-rabbit:1.2.0.RELEASE
+
+dataflow:>app info sink:log
+Information about sink application 'log':
+Resource URI: maven://org.springframework.cloud.stream.app:log-sink-rabbit:1.1.0.RELEASE
+----
+
+. Create stream.
++
+Use a unique name, one that might not be taken by another application on PCF/PWS.
+```
+dataflow:>stream create ticker-314 --definition "time | log"
+Created new stream 'ticker-314'
+```
++
+
+. Deploy stream.
+
++
+```
+dataflow:>stream deploy ticker-314 --platformName pws
+Deployment request has been sent for stream 'ticker-314'
+```
++
+
+[NOTE]
+====
+While deploying the stream, we are supplying `--platformName` and that indicates the platform repository (i.e., `pws`) to
+use when deploying the stream applications via Skipper.
+====
+
+. List apps.
+
++
+[source,console,options=nowrap]
+----
+$ cf apps [1h] ✭
+Getting apps in org ORG / space SPACE as email@pivotal.io...
+
+name requested state instances memory disk urls
+ticker-314-log-v1 started 1/1 1G 1G ticker-314-log-v1.cfapps.io
+ticker-314-time-v1 started 1/1 1G 1G ticker-314-time-v1.cfapps.io
+skipper-server started 1/1 1G 1G skipper-server.cfapps.io
+dataflow-server started 1/1 1G 1G dataflow-server.cfapps.io
+----
++
+
+. Verify logs.
+
++
+[source,console,options=nowrap]
+----
+$ cf logs ticker-314-log-v1
+...
+...
+2017-11-20T15:39:43.76-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:43.761 INFO 12 --- [ ticker-314.time.ticker-314-1] log-sink : 11/20/17 23:39:43
+2017-11-20T15:39:44.75-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:44.757 INFO 12 --- [ ticker-314.time.ticker-314-1] log-sink : 11/20/17 23:39:44
+2017-11-20T15:39:45.75-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:45.757 INFO 12 --- [ ticker-314.time.ticker-314-1] log-sink : 11/20/17 23:39:45
+----
++
+
+. Verify the stream history.
+
++
+[source,console,options=nowrap]
+----
+dataflow:>stream history --name ticker-314
+╔═══════╤════════════════════════════╤════════╤════════════╤═══════════════╤════════════════╗
+║Version│ Last updated │ Status │Package Name│Package Version│ Description ║
+╠═══════╪════════════════════════════╪════════╪════════════╪═══════════════╪════════════════╣
+║1 │Mon Nov 20 15:34:37 PST 2017│DEPLOYED│ticker-314 │1.0.0 │Install complete║
+╚═══════╧════════════════════════════╧════════╧════════════╧═══════════════╧════════════════╝
+----
++
+
+. Verify the package manifest in Skipper. The `log-sink` should be at 1.1.0.RELEASE.
+
++
+[source,yml,options=nowrap]
+----
+dataflow:>stream manifest --name ticker-314
+
+---
+# Source: log.yml
+apiVersion: skipper.spring.io/v1
+kind: SpringCloudDeployerApplication
+metadata:
+ name: log
+spec:
+ resource: maven://org.springframework.cloud.stream.app:log-sink-rabbit
+ version: 1.1.0.RELEASE
+ applicationProperties:
+ spring.cloud.dataflow.stream.app.label: log
+ spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
+ spring.cloud.stream.bindings.applicationMetrics.destination: metrics
+ spring.cloud.dataflow.stream.name: ticker-314
+ spring.metrics.export.triggers.application.includes: integration**
+ spring.cloud.stream.metrics.key: ticker-314.log.${spring.cloud.application.guid}
+ spring.cloud.stream.bindings.input.group: ticker-314
+ spring.cloud.dataflow.stream.app.type: sink
+ spring.cloud.stream.bindings.input.destination: ticker-314.time
+ deploymentProperties:
+ spring.cloud.deployer.indexed: true
+ spring.cloud.deployer.group: ticker-314
+
+---
+# Source: time.yml
+apiVersion: skipper.spring.io/v1
+kind: SpringCloudDeployerApplication
+metadata:
+ name: time
+spec:
+ resource: maven://org.springframework.cloud.stream.app:time-source-rabbit
+ version: 1.2.0.RELEASE
+ applicationProperties:
+ spring.cloud.dataflow.stream.app.label: time
+ spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
+ spring.cloud.stream.bindings.applicationMetrics.destination: metrics
+ spring.cloud.dataflow.stream.name: ticker-314
+ spring.metrics.export.triggers.application.includes: integration**
+ spring.cloud.stream.metrics.key: ticker-314.time.${spring.cloud.application.guid}
+ spring.cloud.stream.bindings.output.producer.requiredGroups: ticker-314
+ spring.cloud.stream.bindings.output.destination: ticker-314.time
+ spring.cloud.dataflow.stream.app.type: source
+ deploymentProperties:
+ spring.cloud.deployer.group: ticker-314
+----
+
+. Let's update `log-sink` from 1.1.0.RELEASE to 1.2.0.RELEASE. First we need to register the version 1.2.0.RELEASE.
++
+[source,console,options=nowrap]
+----
+dataflow:>app register --name log --type sink --uri maven://org.springframework.cloud.stream.app:log-sink-rabbit:1.1.0.RELEASE --force
+Successfully registered application 'sink:log'
+----
++
+If you execute the `app list` command for the log sink, you will now see that two versions are registered.
+
++
+[source,console,options=nowrap]
+----
+dataflow:>app list --id sink:log
+╔══════╤═════════╤═════════════════════╤════╗
+║source│processor│ sink │task║
+╠══════╪═════════╪═════════════════════╪════╣
+║ │ │> log-1.1.0.RELEASE <│ ║
+║ │ │log-1.2.0.RELEASE │ ║
+╚══════╧═════════╧═════════════════════╧════╝
+----
++
+The greater than and less than signs, `> log-1.1.0.RELEASE <` indicate that this is the default version that will be used when matching `log` in the DSL for a stream definition.
+You can change the default version using the command `app default`
++
+[source,console,options=nowrap]
+----
+dataflow:>stream update --name ticker-314 --properties version.log=1.2.0.RELEASE
+Update request has been sent for stream 'ticker-314'
+----
++
+
+. List apps.
+
++
+[source,console,options=nowrap]
+----
+± cf apps [1h] ✭
+Getting apps in org ORG / space SPACE as email@pivotal.io...
+
+Getting apps in org scdf-ci / space space-sabby as sanandan@pivotal.io...
+OK
+
+name requested state instances memory disk urls
+ticker-314-log-v2 started 1/1 1G 1G ticker-314-log-v2.cfapps.io
+ticker-314-log-v1 stopped 0/1 1G 1G
+ticker-314-time-v1 started 1/1 1G 1G ticker-314-time-v1.cfapps.io
+skipper-server started 1/1 1G 1G skipper-server.cfapps.io
+dataflow-server started 1/1 1G 1G dataflow-server.cfapps.io
+----
++
+
+[NOTE]
+====
+Notice that there are two versions of the `log-sink` applications. The `ticker-314-log-v1` application instance is going down
+(route already removed) and the newly spawned `ticker-314-log-v2` application is bootstrapping. The version number is incremented and
+the version-number (`v2`) is included in the new application name.
+====
+
+. Once the new application is up and running, let's verify the logs.
+
++
+[source,console,options=nowrap]
+----
+$ cf logs ticker-314-log-v2
+...
+...
+2017-11-20T18:38:35.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:35.003 INFO 18 --- [ticker-314.time.ticker-314-1] ticker-314-log-v2 : 11/21/17 02:38:34
+2017-11-20T18:38:36.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:36.004 INFO 18 --- [ticker-314.time.ticker-314-1] ticker-314-log-v2 : 11/21/17 02:38:35
+2017-11-20T18:38:37.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:37.005 INFO 18 --- [ticker-314.time.ticker-314-1] ticker-314-log-v2 : 11/21/17 02:38:36
+----
++
+
+. Let's look at the updated package manifest persisted in Skipper. We should now be seeing `log-sink` at 1.2.0.RELEASE.
+
++
+[source,yml,options=nowrap]
+----
+skipper:>stream manifest --name ticker-314
+---
+# Source: log.yml
+apiVersion: skipper.spring.io/v1
+kind: SpringCloudDeployerApplication
+metadata:
+ name: log
+spec:
+ resource: maven://org.springframework.cloud.stream.app:log-sink-rabbit
+ version: 1.2.0.RELEASE
+ applicationProperties:
+ spring.cloud.dataflow.stream.app.label: log
+ spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
+ spring.cloud.stream.bindings.applicationMetrics.destination: metrics
+ spring.cloud.dataflow.stream.name: ticker-314
+ spring.metrics.export.triggers.application.includes: integration**
+ spring.cloud.stream.metrics.key: ticker-314.log.${spring.cloud.application.guid}
+ spring.cloud.stream.bindings.input.group: ticker-314
+ spring.cloud.dataflow.stream.app.type: sink
+ spring.cloud.stream.bindings.input.destination: ticker-314.time
+ deploymentProperties:
+ spring.cloud.deployer.indexed: true
+ spring.cloud.deployer.group: ticker-314
+ spring.cloud.deployer.count: 1
+
+---
+# Source: time.yml
+apiVersion: skipper.spring.io/v1
+kind: SpringCloudDeployerApplication
+metadata:
+ name: time
+spec:
+ resource: maven://org.springframework.cloud.stream.app:time-source-rabbit
+ version: 1.2.0.RELEASE
+ applicationProperties:
+ spring.cloud.dataflow.stream.app.label: time
+ spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
+ spring.cloud.stream.bindings.applicationMetrics.destination: metrics
+ spring.cloud.dataflow.stream.name: ticker-314
+ spring.metrics.export.triggers.application.includes: integration**
+ spring.cloud.stream.metrics.key: ticker-314.time.${spring.cloud.application.guid}
+ spring.cloud.stream.bindings.output.producer.requiredGroups: ticker-314
+ spring.cloud.stream.bindings.output.destination: ticker-314.time
+ spring.cloud.dataflow.stream.app.type: source
+ deploymentProperties:
+ spring.cloud.deployer.group: ticker-314
+----
++
+
+. Verify stream history for the latest updates.
+
++
+[source,console,options=nowrap]
+----
+dataflow:>stream history --name ticker-314
+╔═══════╤════════════════════════════╤════════╤════════════╤═══════════════╤════════════════╗
+║Version│ Last updated │ Status │Package Name│Package Version│ Description ║
+╠═══════╪════════════════════════════╪════════╪════════════╪═══════════════╪════════════════╣
+║2 │Mon Nov 20 15:39:37 PST 2017│DEPLOYED│ticker-314 │1.0.0 │Upgrade complete║
+║1 │Mon Nov 20 15:34:37 PST 2017│DELETED │ticker-314 │1.0.0 │Delete complete ║
+╚═══════╧════════════════════════════╧════════╧════════════╧═══════════════╧════════════════╝
+----
++
+
+. Rolling-back to the previous version is just a command away.
+
++
+[source,console,options=nowrap]
+----
+dataflow:>stream rollback --name ticker-314
+Rollback request has been sent for the stream 'ticker-314'
+
+...
+...
+
+dataflow:>stream history --name ticker-314
+╔═══════╤════════════════════════════╤════════╤════════════╤═══════════════╤════════════════╗
+║Version│ Last updated │ Status │Package Name│Package Version│ Description ║
+╠═══════╪════════════════════════════╪════════╪════════════╪═══════════════╪════════════════╣
+║3 │Mon Nov 20 15:41:37 PST 2017│DEPLOYED│ticker-314 │1.0.0 │Upgrade complete║
+║2 │Mon Nov 20 15:39:37 PST 2017│DELETED │ticker-314 │1.0.0 │Delete complete ║
+║1 │Mon Nov 20 15:34:37 PST 2017│DELETED │ticker-314 │1.0.0 │Delete complete ║
+╚═══════╧════════════════════════════╧════════╧════════════╧═══════════════╧════════════════╝
+----
[[getting-started-deploying-tasks]]
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc
index 63b0d28..157b234 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc
@@ -39,8 +39,6 @@ include::{dataflow-asciidoc}/shell.adoc[]
include::{dataflow-asciidoc}/streams.adoc[]
-include::streams-skipper.adoc[]
-
include::{dataflow-asciidoc}/tasks.adoc[]
include::cf-tasks.adoc[]
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/overview.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/overview.adoc
index f43d316..ede96bb 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/overview.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/overview.adoc
@@ -1,4 +1,4 @@
-[[spring-cloud-data-flow-overview]]
+streams[[spring-cloud-data-flow-overview]]
== Spring Cloud Data Flow
Spring Cloud Data Flow is a cloud-native orchestration service for composable microservice applications on modern runtimes.
With Spring Cloud Data Flow, developers can create and orchestrate data pipelines for common use cases such as data ingest,
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/streams-skipper.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/streams-skipper.adoc
deleted file mode 100644
index 0fca53f..0000000
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/streams-skipper.adoc
+++ /dev/null
@@ -1,310 +0,0 @@
-[[streams-using-skipper]]
-= Streams deployed using Skipper
-
-We will proceed with the assumption that Spring Cloud Data Flow, Spring Cloud Skipper, RDBMS, and desired messaging
-middleware is up and running in PWS.
-
-[source,console,options=nowrap]
-----
-$ cf apps ✭
-Getting apps in org ORG / space SPACE as email@pivotal.io...
-OK
-
-name requested state instances memory disk urls
-skipper-server started 1/1 1G 1G skipper-server.cfapps.io
-dataflow-server started 1/1 1G 1G dataflow-server.cfapps.io
-----
-
-Verify the available platforms in Skipper.
-
-[source,console,options=nowrap]
-----
-dataflow:>stream skipper platform-list
-╔═══════╤════════════╤═════════════════════════════════════════════════════════════════════════════════════╗
-║ Name │ Type │ Description ║
-╠═══════╪════════════╪═════════════════════════════════════════════════════════════════════════════════════╣
-║pws │cloudfoundry│org = [scdf-ci], space = [space-sabby], url = [https://api.run.pivotal.io] ║
-╚═══════╧════════════╧═════════════════════════════════════════════════════════════════════════════════════╝
-----
-
-Let's start with deploying a stream with the `time-source` pointing to 1.2.0.RELEASE and `log-sink` pointing
-to 1.1.0.RELEASE. The goal is to rolling upgrade the `log-sink` application to 1.2.0.RELEASE.
-
-[source,console,options=nowrap]
-----
-dataflow:>app register --name time --type source --uri maven://org.springframework.cloud.stream.app:time-source-rabbit:1.2.0.RELEASE --force
-Successfully registered application 'source:time'
-
-dataflow:>app register --name log --type sink --uri maven://org.springframework.cloud.stream.app:log-sink-rabbit:1.1.0.RELEASE --force
-Successfully registered application 'sink:log'
-
-dataflow:>app info source:time
-Information about source application 'time':
-Resource URI: maven://org.springframework.cloud.stream.app:time-source-rabbit:1.2.0.RELEASE
-
-dataflow:>app info sink:log
-Information about sink application 'log':
-Resource URI: maven://org.springframework.cloud.stream.app:log-sink-rabbit:1.1.0.RELEASE
-----
-
-. Create stream.
-+
-Use a unique name, one that might not be taken by another application on PCF/PWS.
-```
-dataflow:>stream create ticker-314 --definition "time | log"
-Created new stream 'ticker-314'
-```
-+
-
-. Deploy stream.
-
-+
-```
-dataflow:>stream skipper deploy ticker-314 --platformName pws
-Deployment request has been sent for stream 'ticker-314'
-```
-+
-
-[NOTE]
-====
-While deploying the stream, we are supplying `--platformName` and that indicates the platform repository (i.e., `pws`) to
-use when deploying the stream applications via Skipper.
-====
-
-. List apps.
-
-+
-[source,console,options=nowrap]
-----
-$ cf apps [1h] ✭
-Getting apps in org ORG / space SPACE as email@pivotal.io...
-
-name requested state instances memory disk urls
-ticker-314-log-v1 started 1/1 1G 1G ticker-314-log-v1.cfapps.io
-ticker-314-time-v1 started 1/1 1G 1G ticker-314-time-v1.cfapps.io
-skipper-server started 1/1 1G 1G skipper-server.cfapps.io
-dataflow-server started 1/1 1G 1G dataflow-server.cfapps.io
-----
-+
-
-. Verify logs.
-
-+
-[source,console,options=nowrap]
-----
-$ cf logs ticker-314-log-v1
-...
-...
-2017-11-20T15:39:43.76-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:43.761 INFO 12 --- [ ticker-314.time.ticker-314-1] log-sink : 11/20/17 23:39:43
-2017-11-20T15:39:44.75-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:44.757 INFO 12 --- [ ticker-314.time.ticker-314-1] log-sink : 11/20/17 23:39:44
-2017-11-20T15:39:45.75-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:45.757 INFO 12 --- [ ticker-314.time.ticker-314-1] log-sink : 11/20/17 23:39:45
-----
-+
-
-. Verify the stream history.
-
-+
-[source,console,options=nowrap]
-----
-dataflow:>stream skipper history --name ticker-314
-╔═══════╤════════════════════════════╤════════╤════════════╤═══════════════╤════════════════╗
-║Version│ Last updated │ Status │Package Name│Package Version│ Description ║
-╠═══════╪════════════════════════════╪════════╪════════════╪═══════════════╪════════════════╣
-║1 │Mon Nov 20 15:34:37 PST 2017│DEPLOYED│ticker-314 │1.0.0 │Install complete║
-╚═══════╧════════════════════════════╧════════╧════════════╧═══════════════╧════════════════╝
-----
-+
-
-. Verify the package manifest in Skipper. The `log-sink` should be at 1.1.0.RELEASE.
-
-+
-[source,yml,options=nowrap]
-----
-dataflow:>stream skipper manifest --name ticker-314
-
----
-# Source: log.yml
-apiVersion: skipper.spring.io/v1
-kind: SpringCloudDeployerApplication
-metadata:
- name: log
-spec:
- resource: maven://org.springframework.cloud.stream.app:log-sink-rabbit
- version: 1.1.0.RELEASE
- applicationProperties:
- spring.cloud.dataflow.stream.app.label: log
- spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
- spring.cloud.stream.bindings.applicationMetrics.destination: metrics
- spring.cloud.dataflow.stream.name: ticker-314
- spring.metrics.export.triggers.application.includes: integration**
- spring.cloud.stream.metrics.key: ticker-314.log.${spring.cloud.application.guid}
- spring.cloud.stream.bindings.input.group: ticker-314
- spring.cloud.dataflow.stream.app.type: sink
- spring.cloud.stream.bindings.input.destination: ticker-314.time
- deploymentProperties:
- spring.cloud.deployer.indexed: true
- spring.cloud.deployer.group: ticker-314
-
----
-# Source: time.yml
-apiVersion: skipper.spring.io/v1
-kind: SpringCloudDeployerApplication
-metadata:
- name: time
-spec:
- resource: maven://org.springframework.cloud.stream.app:time-source-rabbit
- version: 1.2.0.RELEASE
- applicationProperties:
- spring.cloud.dataflow.stream.app.label: time
- spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
- spring.cloud.stream.bindings.applicationMetrics.destination: metrics
- spring.cloud.dataflow.stream.name: ticker-314
- spring.metrics.export.triggers.application.includes: integration**
- spring.cloud.stream.metrics.key: ticker-314.time.${spring.cloud.application.guid}
- spring.cloud.stream.bindings.output.producer.requiredGroups: ticker-314
- spring.cloud.stream.bindings.output.destination: ticker-314.time
- spring.cloud.dataflow.stream.app.type: source
- deploymentProperties:
- spring.cloud.deployer.group: ticker-314
-----
-
-. Let's update `log-sink` from 1.1.0.RELEASE to 1.2.0.RELEASE
-
-+
-[source,console,options=nowrap]
-----
-dataflow:>stream skipper update --name ticker-314 --properties version.log=1.2.0.RELEASE
-Update request has been sent for stream 'ticker-314'
-----
-+
-
-. List apps.
-
-+
-[source,console,options=nowrap]
-----
-± cf apps [1h] ✭
-Getting apps in org ORG / space SPACE as email@pivotal.io...
-
-Getting apps in org scdf-ci / space space-sabby as sanandan@pivotal.io...
-OK
-
-name requested state instances memory disk urls
-ticker-314-log-v2 started 1/1 1G 1G ticker-314-log-v2.cfapps.io
-ticker-314-log-v1 stopped 0/1 1G 1G
-ticker-314-time-v1 started 1/1 1G 1G ticker-314-time-v1.cfapps.io
-skipper-server started 1/1 1G 1G skipper-server.cfapps.io
-dataflow-server started 1/1 1G 1G dataflow-server.cfapps.io
-----
-+
-
-[NOTE]
-====
-Notice that there are two versions of the `log-sink` applications. The `ticker-314-log-v1` application instance is going down
-(route already removed) and the newly spawned `ticker-314-log-v2` application is bootstrapping. The version number is incremented and
-the version-number (`v2`) is included in the new application name.
-====
-
-. Once the new application is up and running, let's verify the logs.
-
-+
-[source,console,options=nowrap]
-----
-$ cf logs ticker-314-log-v2
-...
-...
-2017-11-20T18:38:35.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:35.003 INFO 18 --- [ticker-314.time.ticker-314-1] ticker-314-log-v2 : 11/21/17 02:38:34
-2017-11-20T18:38:36.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:36.004 INFO 18 --- [ticker-314.time.ticker-314-1] ticker-314-log-v2 : 11/21/17 02:38:35
-2017-11-20T18:38:37.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:37.005 INFO 18 --- [ticker-314.time.ticker-314-1] ticker-314-log-v2 : 11/21/17 02:38:36
-----
-+
-
-. Let's look at the updated package manifest persisted in Skipper. We should now be seeing `log-sink` at 1.2.0.RELEASE.
-
-+
-[source,yml,options=nowrap]
-----
-skipper:>stream skipper manifest --name ticker-314
----
-# Source: log.yml
-apiVersion: skipper.spring.io/v1
-kind: SpringCloudDeployerApplication
-metadata:
- name: log
-spec:
- resource: maven://org.springframework.cloud.stream.app:log-sink-rabbit
- version: 1.2.0.RELEASE
- applicationProperties:
- spring.cloud.dataflow.stream.app.label: log
- spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
- spring.cloud.stream.bindings.applicationMetrics.destination: metrics
- spring.cloud.dataflow.stream.name: ticker-314
- spring.metrics.export.triggers.application.includes: integration**
- spring.cloud.stream.metrics.key: ticker-314.log.${spring.cloud.application.guid}
- spring.cloud.stream.bindings.input.group: ticker-314
- spring.cloud.dataflow.stream.app.type: sink
- spring.cloud.stream.bindings.input.destination: ticker-314.time
- deploymentProperties:
- spring.cloud.deployer.indexed: true
- spring.cloud.deployer.group: ticker-314
- spring.cloud.deployer.count: 1
-
----
-# Source: time.yml
-apiVersion: skipper.spring.io/v1
-kind: SpringCloudDeployerApplication
-metadata:
- name: time
-spec:
- resource: maven://org.springframework.cloud.stream.app:time-source-rabbit
- version: 1.2.0.RELEASE
- applicationProperties:
- spring.cloud.dataflow.stream.app.label: time
- spring.cloud.stream.metrics.properties: spring.application.name,spring.application.index,spring.cloud.application.*,spring.cloud.dataflow.*
- spring.cloud.stream.bindings.applicationMetrics.destination: metrics
- spring.cloud.dataflow.stream.name: ticker-314
- spring.metrics.export.triggers.application.includes: integration**
- spring.cloud.stream.metrics.key: ticker-314.time.${spring.cloud.application.guid}
- spring.cloud.stream.bindings.output.producer.requiredGroups: ticker-314
- spring.cloud.stream.bindings.output.destination: ticker-314.time
- spring.cloud.dataflow.stream.app.type: source
- deploymentProperties:
- spring.cloud.deployer.group: ticker-314
-----
-+
-
-. Verify stream history for the latest updates.
-
-+
-[source,console,options=nowrap]
-----
-dataflow:>stream skipper history --name ticker-314
-╔═══════╤════════════════════════════╤════════╤════════════╤═══════════════╤════════════════╗
-║Version│ Last updated │ Status │Package Name│Package Version│ Description ║
-╠═══════╪════════════════════════════╪════════╪════════════╪═══════════════╪════════════════╣
-║2 │Mon Nov 20 15:39:37 PST 2017│DEPLOYED│ticker-314 │1.0.0 │Upgrade complete║
-║1 │Mon Nov 20 15:34:37 PST 2017│DELETED │ticker-314 │1.0.0 │Delete complete ║
-╚═══════╧════════════════════════════╧════════╧════════════╧═══════════════╧════════════════╝
-----
-+
-
-. Rolling-back to the previous version is just a command away.
-
-+
-[source,console,options=nowrap]
-----
-dataflow:>stream skipper rollback --name ticker-314
-Rollback request has been sent for the stream 'ticker-314'
-
-...
-...
-
-dataflow:>stream skipper history --name ticker-314
-╔═══════╤════════════════════════════╤════════╤════════════╤═══════════════╤════════════════╗
-║Version│ Last updated │ Status │Package Name│Package Version│ Description ║
-╠═══════╪════════════════════════════╪════════╪════════════╪═══════════════╪════════════════╣
-║3 │Mon Nov 20 15:41:37 PST 2017│DEPLOYED│ticker-314 │1.0.0 │Upgrade complete║
-║2 │Mon Nov 20 15:39:37 PST 2017│DELETED │ticker-314 │1.0.0 │Delete complete ║
-║1 │Mon Nov 20 15:34:37 PST 2017│DELETED │ticker-314 │1.0.0 │Delete complete ║
-╚═══════╧════════════════════════════╧════════╧════════════╧═══════════════╧════════════════╝
-----
From 9bebf1edb1bdd95091962deaf1cdb05e13cdb013 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Wed, 24 Jan 2018 15:33:53 -0500
Subject: [PATCH 035/158] Fix typo for env-var to enable skipper
---
.../src/main/asciidoc/getting-started.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
index a242de3..9aaaa75 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
@@ -148,7 +148,7 @@ NOTE: If you are going to use `Skipper` to deploy Streams, deploy Skipper first
----
cf set-env dataflow-server SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI https://<skipper-host-name>/api
-cf set-env dataflow-server SPRING_CLOUD_DATAFLOW_FEATURES_ENABLED true
+cf set-env dataflow-server SPRING_CLOUD_DATAFLOW_FEATURES_SKIPPER_ENABLED true
----
The Spring Cloud Data Flow server does not have _any_ default remote maven repository configured.
From 32c8aa93456829d954bf54b0f1895ff80467cc14 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Wed, 24 Jan 2018 22:22:09 +0000
Subject: [PATCH 036/158] [artifactory-release] Release version 1.3.0.RC1
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index aa2f04f..d0cea68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC1</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index e4e4bef..3b2b667 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC1</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 94af873..60b278b 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC1</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC1</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 51fff3f..52a6d5a 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC1</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC1</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From c64d1d89e6bf0019dcce7cf01f7097b57b8719d7 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Wed, 24 Jan 2018 22:22:13 +0000
Subject: [PATCH 037/158] [artifactory-release] Next development version
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index d0cea68..aa2f04f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.RC1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 3b2b667..e4e4bef 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.RC1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 60b278b..94af873 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.RC1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.3.0.RC1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.RC1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 52a6d5a..51fff3f 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.RC1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.RC1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 6ff49853687bb69440961d728fa1c389e6b19823 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Wed, 24 Jan 2018 17:50:24 -0500
Subject: [PATCH 038/158] Switch to dataflow 1.3 snapshots
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index aa2f04f..6ea97c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,12 +8,12 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.3.0.RC1</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.3.0.RC1</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.3.0.RC2</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.0.RC1</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.0.RC2</spring-cloud-common-security-config.version>
From 459065892cb3d5b72af753b43fa25f7f51026962 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Mon, 29 Jan 2018 18:30:31 -0500
Subject: [PATCH 039/158] Update to dataflow-core 1.3.0.RC2 and deployer
1.3.0.RELEASE, seuciryt 1.0 RELEASE
---
pom.xml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6ea97c1..63b46e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,17 +8,17 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC2</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.3.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.3.0.RC2</spring-cloud-deployer-cloudfoundry.version>
- <spring-cloud-deployer-spi.version>1.3.0.RC1</spring-cloud-deployer-spi.version>
- <spring-cloud-common-security-config.version>1.0.0.RC2</spring-cloud-common-security-config.version>
+ <spring-cloud-dataflow.version>1.3.0.RC2</spring-cloud-dataflow.version>
+ <spring-cloud-deployer-cloudfoundry.version>1.3.0.RELEASE</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-deployer-spi.version>1.3.0.RELEASE</spring-cloud-deployer-spi.version>
+ <spring-cloud-common-security-config.version>1.0.0.RELEASE</spring-cloud-common-security-config.version>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.0.0.RC4</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>1.0.0.RC5</spring-cloud-skipper.version>
<reactor.version>3.0.7.RELEASE</reactor.version>
</properties>
From 2870fd606edebed0d820ddfd3f7242a2ed0860c2 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Mon, 29 Jan 2018 23:34:22 +0000
Subject: [PATCH 040/158] [artifactory-release] Release version 1.3.0.RC2
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 63b46e1..2656828 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC2</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index e4e4bef..9563160 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC2</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 94af873..d78870f 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC2</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC2</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC2</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 51fff3f..971a496 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC2</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RC2</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 422ebb4c1be16ce072626f41df160cf94830ba4a Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Mon, 29 Jan 2018 23:34:28 +0000
Subject: [PATCH 041/158] [artifactory-release] Next development version
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2656828..63b46e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.RC2</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 9563160..e4e4bef 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.RC2</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index d78870f..94af873 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.RC2</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.3.0.RC2</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.RC2</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 971a496..51fff3f 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.RC2</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.RC2</version>
+ <version>1.3.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From ca737ec2bf4316e7343c21f786ea67caa9d567d2 Mon Sep 17 00:00:00 2001
From: Vinicius Carvalho <viniciusccarvalho@gmail.com>
Date: Tue, 30 Jan 2018 15:00:47 -0500
Subject: [PATCH 042/158] Added DSL deployment properties section
Fixes #380
---
.../src/main/asciidoc/configuration.adoc | 6 ++++++
.../src/main/asciidoc/index.adoc | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
index 1c38989..63c7721 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
@@ -58,6 +58,12 @@ cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_BUILDPACK j
are `http` (the default), `port` and `none`.
+
There are also environment variables to specify the the http based health check endpoint and timeout, `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK_ENDPOINT` and `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK_TIMEOUT`. These default to `/health` (the Spring Boot default location` and `120` seconds.
+
+* You can also specify deployment properties using the dsl. For instance if you want to set the allocated memory for the `http` app to 512m and also bind a mysql service to the `jdbc` application.
+```
+dataflow:> stream create --name mysqlstream --definition "http | jdbc --tableName=names --columns=name"
+dataflow:> stream deploy --name mysqlstream --properties "deployer.http.memory=512, deployer.jdbc.cloudfoundry.services=mysql"
+```
[NOTE]
====
These settings can be configured separately for stream and task apps. To alter settings for tasks, simply
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc
index 157b234..ae49dd5 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc
@@ -1,5 +1,5 @@
= Spring Cloud Data Flow Server for Cloud Foundry
-Sabby Anandan; Eric Bottard; Mark Fisher; Ilayaperumal Gopinathan; Gunnar Hillert; Mark Pollack; Thomas Risberg; Marius Bogoevici; Josh Long ; Michael Minella; David Turanski
+Sabby Anandan; Eric Bottard; Mark Fisher; Ilayaperumal Gopinathan; Gunnar Hillert; Mark Pollack; Thomas Risberg; Marius Bogoevici; Josh Long ; Michael Minella; David Turanski; Vinicius Carvalho
:doctype: book
:toc: left
:toclevels: 4
From 9acbb4aa4a575b704cea920d3173bfd1e99b8d8f Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Wed, 31 Jan 2018 23:51:40 -0500
Subject: [PATCH 043/158] Update to dataflow core 1.3.0.RELEASE
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 63b46e1..668af0a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,17 +8,17 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.3.0.RC2</version>
+ <version>1.3.0.RELEASE</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.3.0.RC2</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.3.0.RELEASE</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.3.0.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.0.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.0.RELEASE</spring-cloud-common-security-config.version>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.0.0.RC5</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>1.0.0.RELEASE</spring-cloud-skipper.version>
<reactor.version>3.0.7.RELEASE</reactor.version>
</properties>
From cd95973234824d6c54aa8ec816f4ab4521eebece Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Thu, 1 Feb 2018 04:54:39 +0000
Subject: [PATCH 044/158] [artifactory-release] Release version 1.3.0.RELEASE
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 668af0a..1a8eeca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RELEASE</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index e4e4bef..b784068 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RELEASE</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 94af873..1e48fa3 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RELEASE</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RELEASE</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 51fff3f..0392a52 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RELEASE</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.BUILD-SNAPSHOT</version>
+ <version>1.3.0.RELEASE</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From e2889d074ae53f1744e86f25ee2d2e7a4cbcac03 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Thu, 1 Feb 2018 04:54:44 +0000
Subject: [PATCH 045/158] [artifactory-release] Next development version
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1a8eeca..91286ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.RELEASE</version>
+ <version>1.3.1.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index b784068..58e685c 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.RELEASE</version>
+ <version>1.3.1.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 1e48fa3..8084665 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.RELEASE</version>
+ <version>1.3.1.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.3.0.RELEASE</version>
+ <version>1.3.1.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.RELEASE</version>
+ <version>1.3.1.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 0392a52..555cf2b 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.0.RELEASE</version>
+ <version>1.3.1.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.0.RELEASE</version>
+ <version>1.3.1.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 958f8111534a98854aef3139e21e17343237bbdc Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Tue, 6 Feb 2018 09:32:21 -0500
Subject: [PATCH 046/158] Update to project snapshot deps
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 91286ff..6258453 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,17 +8,17 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.3.0.RELEASE</version>
+ <version>1.3.1.BUILD-SNAPSHOT</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.3.0.RELEASE</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.3.0.RELEASE</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-dataflow.version>1.3.1.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
+ <spring-cloud-deployer-cloudfoundry.version>1.3.1.BUILD-SNAPSHOT</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.0.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.0.RELEASE</spring-cloud-common-security-config.version>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.0.0.RELEASE</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>1.0.1.BUILD-SNAPSHOT</spring-cloud-skipper.version>
<reactor.version>3.0.7.RELEASE</reactor.version>
</properties>
From 27c543b8e541e6f7d90f3e29848fcb670281b558 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Fri, 23 Feb 2018 14:48:25 -0500
Subject: [PATCH 047/158] Update project version on master to
1.4.0.BUILD-SNAPSHOT
---
pom.xml | 6 +++---
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 6258453..a86652f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,18 +2,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.1.BUILD-SNAPSHOT</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.3.1.BUILD-SNAPSHOT</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.3.1.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.4.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.3.1.BUILD-SNAPSHOT</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.0.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.0.RELEASE</spring-cloud-common-security-config.version>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 58e685c..b701b87 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.1.BUILD-SNAPSHOT</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 8084665..21922f6 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.1.BUILD-SNAPSHOT</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.3.1.BUILD-SNAPSHOT</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.1.BUILD-SNAPSHOT</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 555cf2b..f6a18fb 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.3.1.BUILD-SNAPSHOT</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.3.1.BUILD-SNAPSHOT</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 60b78ab3a721bda2df7543e1a939c691a0e879c4 Mon Sep 17 00:00:00 2001
From: Gunnar Hillert <ghillert@pivotal.io>
Date: Mon, 26 Feb 2018 13:31:45 -1000
Subject: [PATCH 048/158] Upgrade dependency versions for SCDF 1.4.0.M1
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index a86652f..3bdccff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,17 +8,17 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.M1</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.4.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.3.1.BUILD-SNAPSHOT</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-dataflow.version>1.4.0.M1</spring-cloud-dataflow.version>
+ <spring-cloud-deployer-cloudfoundry.version>1.3.0.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.0.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.0.RELEASE</spring-cloud-common-security-config.version>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.0.1.BUILD-SNAPSHOT</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>1.0.1.RELEASE</spring-cloud-skipper.version>
<reactor.version>3.0.7.RELEASE</reactor.version>
</properties>
From 70e8d877a7af942ba0ade825fd56caf8edbacf9a Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Mon, 26 Feb 2018 23:46:33 +0000
Subject: [PATCH 049/158] [artifactory-release] Release version 1.4.0.M1
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3bdccff..2082619 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.M1</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index b701b87..031358d 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.M1</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 21922f6..ee960df 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.M1</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.M1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.M1</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index f6a18fb..d5baa15 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.M1</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.M1</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 7d78281880b60a5d59e6f2a27388edc34e5522c7 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Mon, 26 Feb 2018 23:46:38 +0000
Subject: [PATCH 050/158] [artifactory-release] Next development version
1.4.0.BUILD-SNAPSHOT
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2082619..3bdccff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.M1</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 031358d..b701b87 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.M1</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index ee960df..21922f6 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.M1</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.4.0.M1</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.4.0.M1</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index d5baa15..f6a18fb 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.M1</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.4.0.M1</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 7df78ec5eee01bcbf45202aa34c42b0aa8dbed9b Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Fri, 9 Mar 2018 09:46:29 +0000
Subject: [PATCH 051/158] Update dependency versions
- SCDF core to 1.4.0.RC1
- SCDe CF to 1.3.1.RELEASE
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3bdccff..7f96e94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,13 +8,13 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.4.0.M1</version>
+ <version>1.4.0.RC1</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.4.0.M1</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.3.0.RELEASE</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-dataflow.version>1.4.0.RC1</spring-cloud-dataflow.version>
+ <spring-cloud-deployer-cloudfoundry.version>1.3.1.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.0.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.0.RELEASE</spring-cloud-common-security-config.version>
<!-- skipper version used only in doc generation -->
From 0d845641ac97a5eb7e3056b683b7bfdbc118997d Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Fri, 9 Mar 2018 10:03:37 +0000
Subject: [PATCH 052/158] Fix checkstyle violations for new rules
---
.../CloudFoundryDataFlowServerConfiguration.java | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryDataFlowServerConfiguration.java b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryDataFlowServerConfiguration.java
index 6fa673c..e97c691 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryDataFlowServerConfiguration.java
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryDataFlowServerConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016 the original author or authors.
+ * Copyright 2016-2018 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,6 +16,14 @@
package org.springframework.cloud.dataflow.server.cloudfoundry.config;
+import java.io.File;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+
+import reactor.core.publisher.Hooks;
+
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.dataflow.server.cloudfoundry.config.security.CloudFoundryOAuthSecurityConfiguration;
import org.springframework.cloud.deployer.resource.docker.DockerResource;
@@ -31,12 +39,6 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.core.io.ResourceLoader;
-import reactor.core.publisher.Hooks;
-
-import javax.annotation.PostConstruct;
-import java.io.File;
-import java.util.HashMap;
-import java.util.Map;
/**
* Configuration class for customizing Cloud Foundry deployer.
From 87bf3f00ac0b768946bb9d3f011d3ed717923581 Mon Sep 17 00:00:00 2001
From: Gunnar Hillert <ghillert@pivotal.io>
Date: Fri, 9 Mar 2018 08:06:30 -1000
Subject: [PATCH 053/158] Update Spring Cloud Common Security to
`1.0.1.RELEASE`
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7f96e94..fb5a6b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,7 +16,7 @@
<spring-cloud-dataflow.version>1.4.0.RC1</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.3.1.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.0.RELEASE</spring-cloud-deployer-spi.version>
- <spring-cloud-common-security-config.version>1.0.0.RELEASE</spring-cloud-common-security-config.version>
+ <spring-cloud-common-security-config.version>1.0.1.RELEASE</spring-cloud-common-security-config.version>
<!-- skipper version used only in doc generation -->
<spring-cloud-skipper.version>1.0.1.RELEASE</spring-cloud-skipper.version>
<reactor.version>3.0.7.RELEASE</reactor.version>
From 707ecb7d2bbd9d209b5f2b1871d41b6fb08d50d4 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Fri, 9 Mar 2018 19:24:31 +0000
Subject: [PATCH 054/158] [artifactory-release] Release version 1.4.0.RC1
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index fb5a6b8..b74ad35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.RC1</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index b701b87..4a5fbea 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.RC1</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 21922f6..66df82a 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.RC1</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.RC1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.RC1</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index f6a18fb..51b89f8 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.RC1</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.RC1</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From bdd73d794c9b3576031ddde79c8e41f5beecebe2 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Fri, 9 Mar 2018 19:24:36 +0000
Subject: [PATCH 055/158] [artifactory-release] Next development version
1.4.0.BUILD-SNAPSHOT
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index b74ad35..fb5a6b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.RC1</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 4a5fbea..b701b87 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.RC1</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 66df82a..21922f6 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.RC1</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.4.0.RC1</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.4.0.RC1</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 51b89f8..f6a18fb 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.RC1</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.4.0.RC1</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 6bc2367f7309c17497a723bb341f4d8fd9cc87b2 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Thu, 15 Mar 2018 17:11:00 -0400
Subject: [PATCH 056/158] Update to dataflow 1.4.0 SNAPSHOT
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index fb5a6b8..d8d3411 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,12 +8,12 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.4.0.RC1</version>
+ <version>1.4.0.BUILD-SNAPSHOT</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.4.0.RC1</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.4.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.3.1.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.0.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.1.RELEASE</spring-cloud-common-security-config.version>
From 9dcc9ca2dc5e942d05b75093257fe5234400f17c Mon Sep 17 00:00:00 2001
From: Sabby Anandan <sabby.anandan@gmail.com>
Date: Sat, 17 Mar 2018 16:41:21 -0700
Subject: [PATCH 057/158] Add note about SCDF tile for PCF
---
.../src/main/asciidoc/cf-tasks.adoc | 6 ---
.../src/main/asciidoc/getting-started.adoc | 42 ++++++++++++-------
2 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/cf-tasks.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/cf-tasks.adoc
index 5be976c..88ce548 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/cf-tasks.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/cf-tasks.adoc
@@ -12,12 +12,6 @@ The task functionality depends on the latest versions of PCF for runtime support
release requires PCF version 1.7.12 or higher to run tasks. Tasks are an experimental
feature in PCF 1.7 and 1.8 and a GA feature in PCF 1.9.
-== Tooling
-
-It is important to note that there is no Apps Manager support for tasks as of this release.
-When running applications as tasks through Spring Cloud Data Flow, the only way is to view them
-within the context of CF CLI.
-
== Task Database Schema
The database schema for Task applications was changed slighlty from the 1.0.x to 1.1.x version of
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
index 9aaaa75..c9f1ae8 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
@@ -4,12 +4,24 @@
[[getting-started-requirements]]
== System Requirements
-The Spring Cloud Data Flow server deploys streams (collections of long lived applications) and short lived tasks to Cloud Foundry.
-The server can run on Cloud Foundry itself or on your laptop but it is common to run the server in Cloud Foundry.
-This section covers the required services in Cloud Foundry that are needed to support the server and deploying streams and tasks.
+The Spring Cloud Data Flow server deploys streams (long-lived applications) and tasks (short-lived applications) to Cloud
+Foundry. The server is a lightweight Spring Boot application and it can run on Cloud Foundry or your laptop, but it is
+common to run the server in Cloud Foundry.
+Spring Cloud Data Flow requires a few data services to perform streaming, task/batch processing, and analytics. There are
+two options to provisioning Spring Cloud Data Flow and related services on Cloud Foundry.
+
+- The simplest and the automated method is to use the link:https://network.pivotal.io/products/p-dataflow[Spring Cloud Data Flow for PCF]
+tile. This is an opinionated tile for Pivotal Cloud Foundry and the tile automatically provisions the server and the required
+data services, thus simplifying the overall getting-started experience. You can read more about the installation
+link:http://docs.pivotal.io/scdf/[here].
+- Alternatively, you can provision all the components manually. The following section goes into the specifics on how it
+is done.
=== Provision a Redis service instance on Cloud Foundry
+A Redis instance is required for analytics apps, and would typically be bound to such apps when you create an analytics
+stream using the <<getting-started.adoc#getting-started-service-binding-at-application-level,per-app-binding>> feature.
+
Use `cf marketplace` to discover which plans are available to you, depending on the details of your Cloud Foundry setup.
For example when using link:https://run.pivotal.io/[Pivotal Web Services]:
@@ -17,10 +29,12 @@ For example when using link:https://run.pivotal.io/[Pivotal Web Services]:
cf create-service rediscloud 30mb redis
```
-A redis instance is required for analytics apps, and would typically be bound to such apps when you create an analytics
-stream using the <<getting-started.adoc#getting-started-service-binding-at-application-level,per-app-binding>> feature.
-
=== Provision a Rabbit service instance on Cloud Foundry
+RabbitMQ is used as a messaging middleware between streaming apps and would be bound to each deployed streaming
+apps. Apache Kafka is the other option. We can use `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES` setting in Data
+Flow configuration or `SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_SERVICES` setting in
+Skipper, which will automatically bind RabbitMQ to the deployed streaming applications.
+
Use `cf marketplace` to discover which plans are available to you, depending on the details of your Cloud Foundry setup.
For example when using link:https://run.pivotal.io/[Pivotal Web Services]:
@@ -28,10 +42,9 @@ For example when using link:https://run.pivotal.io/[Pivotal Web Services]:
cf create-service cloudamqp lemur rabbit
```
-Rabbit is typically used as a messaging middleware between streaming apps and would be bound to each deployed app
-thanks to the `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES` setting in Data Flow configuration or `SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_SERVICES` setting in Skipper.
-
=== Provision a MySQL service instance on Cloud Foundry
+An RDBMS is used to persist Data Flow state, such as stream/task definitions, deployments, and executions.
+
Use `cf marketplace` to discover which plans are available to you, depending on the details of your Cloud Foundry setup.
For example when using link:https://run.pivotal.io/[Pivotal Web Services]:
@@ -39,13 +52,10 @@ For example when using link:https://run.pivotal.io/[Pivotal Web Services]:
cf create-service cleardb spark my_mysql
```
-An RDBMS is used to persist Data Flow state, such as stream definitions and deployment ids.
-It can also be used for tasks to persist execution history.
-
[[getting-started-cloudfoundry]]
== Cloud Foundry Installation
-Starting 1.3.x, the Data Flow Server can run in either `skipper` or `classic` (non-skipper) modes.
-The modes can be specified when starting the Data Flow server using the property `spring.cloud.dataflow.features.skipper-enabled`.
+Starting with 1.3.x, the Data Flow Server can run in either `skipper` or `classic` (non-skipper) modes. The modes can be
+specified when starting the Data Flow server using the property `spring.cloud.dataflow.features.skipper-enabled`.
By default, the `classic` mode is enabled.
. Download the Data Flow server and shell applications
@@ -63,7 +73,8 @@ wget http://repo.spring.io/{dataflow-version-type-lowercase}/org/springframework
wget http://repo.spring.io/{skipper-version-type-lowercase}/org/springframework/cloud/spring-cloud-skipper-server/{skipper-version}/spring-cloud-skipper-server-{skipper-version}.jar
----
+
-Push Skipper to Cloud Foundry only if you want to run Spring Cloud Data Flow server in `skipper` mode. Here is a sample manifest for Skipper.
+Push Skipper to Cloud Foundry only if you want to run Spring Cloud Data Flow server in `skipper` mode. Here is a sample
+manifest for Skipper.
+
[source,yaml,options=nowrap]
----
@@ -90,6 +101,7 @@ env:
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_SKIP_SSL_VALIDATION: false
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_STREAM_ENABLE_RANDOM_APP_NAME_PREFIX: false
----
+
+
You need to fill in \{org}, \{space}, \{email}, \{password} and {middlewareServiceName} before running these commands. Once you have the desired
config values in the `manifest.yml`, you can run `cf push` command to provision the skipper-server.
From 211f68f351bb3e0bcbd4ffde855b48682eb75703 Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Mon, 19 Mar 2018 16:28:36 +0000
Subject: [PATCH 058/158] Update to scdf 1.4.0.RELEASE
- Change parent and property.
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index d8d3411..728897f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,12 +8,12 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.RELEASE</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.4.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.4.0.RELEASE</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.3.1.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.0.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.1.RELEASE</spring-cloud-common-security-config.version>
From db6c4a9eac7206520fdbc14dc02d9c5289e803a2 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Mon, 19 Mar 2018 16:37:28 +0000
Subject: [PATCH 059/158] [artifactory-release] Release version 1.4.0.RELEASE
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 728897f..2ef6b68 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.RELEASE</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index b701b87..2a7be70 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.RELEASE</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 21922f6..8cc978b 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.RELEASE</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.RELEASE</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index f6a18fb..1bdf8ae 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.RELEASE</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.4.0.BUILD-SNAPSHOT</version>
+ <version>1.4.0.RELEASE</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 9dd283331cd223a26f52993cb770984fde1c7c94 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Mon, 19 Mar 2018 16:37:32 +0000
Subject: [PATCH 060/158] [artifactory-release] Next development version
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2ef6b68..673f84a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.RELEASE</version>
+ <version>1.4.1.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 2a7be70..c1a4b28 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.RELEASE</version>
+ <version>1.4.1.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 8cc978b..f07bbe3 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.RELEASE</version>
+ <version>1.4.1.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.4.0.RELEASE</version>
+ <version>1.4.1.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.4.0.RELEASE</version>
+ <version>1.4.1.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 1bdf8ae..af7f542 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.0.RELEASE</version>
+ <version>1.4.1.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.4.0.RELEASE</version>
+ <version>1.4.1.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From cf26266729ce405f0121e6082f895cde417bd446 Mon Sep 17 00:00:00 2001
From: Gunnar Hillert <ghillert@pivotal.io>
Date: Mon, 19 Mar 2018 10:55:25 -1000
Subject: [PATCH 061/158] Switching to 1.5.0.BUILD-SNAPSHOT
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 673f84a..5e32f42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,18 +2,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.1.BUILD-SNAPSHOT</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.4.0.RELEASE</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.4.0.RELEASE</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.5.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.3.1.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.0.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.1.RELEASE</spring-cloud-common-security-config.version>
From caff2ad9f12d71ba290d494b7f53bea688348011 Mon Sep 17 00:00:00 2001
From: Gunnar Hillert <ghillert@pivotal.io>
Date: Thu, 22 Mar 2018 08:03:34 -1000
Subject: [PATCH 062/158] Fix dependency versions
---
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index c1a4b28..0b5fdd3 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.1.BUILD-SNAPSHOT</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index f07bbe3..f214c98 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.1.BUILD-SNAPSHOT</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.4.1.BUILD-SNAPSHOT</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.4.1.BUILD-SNAPSHOT</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index af7f542..30fb17c 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.4.1.BUILD-SNAPSHOT</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.4.1.BUILD-SNAPSHOT</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 3d699e3f9e6e2f10801770f49613766562cddb3b Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Tue, 27 Mar 2018 17:57:09 -0400
Subject: [PATCH 063/158] Update to cf-deployer 1.4.0.BUILD-SNAPSHOT
(cf-java/reactor updates)
Fixes #400
---
pom.xml | 4 ++--
.../config/CloudFoundryDataFlowServerConfiguration.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5e32f42..4e82996 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,12 +14,12 @@
<properties>
<spring-cloud-dataflow.version>1.5.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.3.1.RELEASE</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-deployer-cloudfoundry.version>1.4.0.BUILD-SNAPSHOT</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.0.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.1.RELEASE</spring-cloud-common-security-config.version>
<!-- skipper version used only in doc generation -->
<spring-cloud-skipper.version>1.0.1.RELEASE</spring-cloud-skipper.version>
- <reactor.version>3.0.7.RELEASE</reactor.version>
+ <reactor.version>3.1.5.RELEASE</reactor.version>
</properties>
<modules>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryDataFlowServerConfiguration.java b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryDataFlowServerConfiguration.java
index e97c691..284625a 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryDataFlowServerConfiguration.java
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryDataFlowServerConfiguration.java
@@ -88,7 +88,7 @@ public LRUCleaningResourceLoaderBeanPostProcessor lruCleaningResourceLoaderInsta
@PostConstruct
public void afterPropertiesSet() {
if (cloudFoundryServerConfigurationProperties().isDebugReactor()) {
- Hooks.onOperator(op -> op.operatorStacktrace());
+ Hooks.onOperatorDebug();
}
}
From b224694d2c42eb1ea9a49412a2f801e97e0ebb58 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Tue, 27 Mar 2018 18:06:58 -0400
Subject: [PATCH 064/158] clean up extraneous deps in autoconfig pom
---
.../pom.xml | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 0b5fdd3..f3947d6 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -13,11 +13,6 @@
<version>1.5.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
- <dependency>
- <!-- See https://github.com/spring-cloud/spring-cloud-dataflow-server-cloudfoundry/issues/314 -->
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-core</artifactId>
@@ -28,11 +23,6 @@
<artifactId>spring-cloud-starter-common-security-config-web</artifactId>
<version>${spring-cloud-common-security-config.version}</version>
</dependency>
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-deployer-cloudfoundry</artifactId>
@@ -43,15 +33,6 @@
<artifactId>spring-cloud-deployer-resource-docker</artifactId>
<version>${spring-cloud-deployer-spi.version}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <scope>runtime</scope>
- </dependency>
<dependency>
<groupId>io.projectreactor</groupId>
<artifactId>reactor-core</artifactId>
From 2b274231f68269e049cc4e9835bee9dce671ede2 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Tue, 10 Apr 2018 10:32:48 -0400
Subject: [PATCH 065/158] Update deployer spi version to 1.3.2 BUILD-SNAPSHOT
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 4e82996..7b2bcf1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
<properties>
<spring-cloud-dataflow.version>1.5.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.0.BUILD-SNAPSHOT</spring-cloud-deployer-cloudfoundry.version>
- <spring-cloud-deployer-spi.version>1.3.0.RELEASE</spring-cloud-deployer-spi.version>
+ <spring-cloud-deployer-spi.version>1.3.2.BUILD-SNAPSHOT</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.1.RELEASE</spring-cloud-common-security-config.version>
<!-- skipper version used only in doc generation -->
<spring-cloud-skipper.version>1.0.1.RELEASE</spring-cloud-skipper.version>
From b9d022e29a42762b949518e9dd33458f0b818e4f Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Wed, 18 Apr 2018 15:17:10 -0400
Subject: [PATCH 066/158] Update deployer-spi/deployer-cf/boot deps
Fixes #403
Update to
* deployer 1.3.2.RELEASE
* deployer-cf 1.4.0.M1
* skipper 1.0.2 (just for docs)
* boot 1.5.12
---
pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 11 +++++++++++
2 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7b2bcf1..5c11a17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,11 +14,11 @@
<properties>
<spring-cloud-dataflow.version>1.5.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.4.0.BUILD-SNAPSHOT</spring-cloud-deployer-cloudfoundry.version>
- <spring-cloud-deployer-spi.version>1.3.2.BUILD-SNAPSHOT</spring-cloud-deployer-spi.version>
+ <spring-cloud-deployer-cloudfoundry.version>1.4.0.M1</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-deployer-spi.version>1.3.2.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.1.RELEASE</spring-cloud-common-security-config.version>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.0.1.RELEASE</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>1.0.2.RELEASE</spring-cloud-skipper.version>
<reactor.version>3.1.5.RELEASE</reactor.version>
</properties>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 30fb17c..1106372 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -13,6 +13,17 @@
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
</properties>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-dependencies</artifactId>
+ <version>1.5.12.RELEASE</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
From 4e56d6a11f90babe7320f2c9b9889ecd1b2eb5e6 Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Tue, 17 Apr 2018 16:47:36 +0530
Subject: [PATCH 067/158] Doc for passing JAVA_OPTS
- as deployment property for stream/task app or as a global stream/task level property
Resolves #401
---
.../src/main/asciidoc/cf-tasks.adoc | 29 +++++++++++++++++++
.../src/main/asciidoc/configuration.adoc | 9 ++++++
2 files changed, 38 insertions(+)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/cf-tasks.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/cf-tasks.adoc
index 88ce548..cfb0019 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/cf-tasks.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/cf-tasks.adoc
@@ -69,6 +69,35 @@ dataflow:>task launch foo
Launched task 'foo'
----
+=== Launch a Task with arguments and properties
+
+When a task is launched, any properties that need to be passed as command line arguments to the task application can be set when launching the task, as follows:
+
+```
+dataflow:>task launch mytask --arguments "--key1=value1,--key2=value2"
+
+```
+
+Additional properties meant for a `TaskLauncher` itself can be passed in by using a `--properties` option.
+The format of this option is a comma-separated string of properties prefixed with `app.<task definition name>.<property>`.
+Properties are passed to `TaskLauncher` as application properties.
+It is up to an implementation to choose how those are passed into an actual task application.
+If the property is prefixed with `deployer` instead of `app`, it is passed to `TaskLauncher` as a deployment property and its meaning may be `TaskLauncher` implementation specific.
+
+```
+dataflow:>task launch mytask --properties "deployer.timestamp.custom1=value1,app.timestamp.custom2=value2"
+
+```
+
+One can also pass JAVA_OPTS as the CF deployer property when the task is launched.
+
+```
+task launch --name mytask --properties "deployer.mytask.cloudfoundry.javaOpts=-Duser.timezone=America/New_York"
+```
+
+The JAVA_OPTS can also be set as the global property for all the tasks using
+`SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_JAVA_OPTS`
+
=== View Task Logs
As previously mentioned, the CL CLI is the way to interact with tasks on PCF,
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
index 63c7721..24d5f92 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
@@ -463,6 +463,15 @@ as part of an individual deployment request by using the `deployer.<app-name>` s
will deploy the time source with 2048MB of memory, while the log sink will use the default 1024MB.
+One can also pass JAVA_OPTS as a deployment property when deploying a stream.
+
+```
+>stream deploy --name ticktock --properties "deployer.time.cloudfoundry.javaOpts=-Duser.timezone=America/New_York"
+```
+
+This property can also be set at the global level for all the streams as applicable to any deployment property using
+`SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_JAVA_OPTS` as the server level property.
+
== Debugging
If you want to get better insights into what is happening when your streams and tasks are being deployed, you may want
to turn on the following features:
From 08d4defd9b5fff84686c9307d3f0b4c82c4eb59d Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Thu, 19 Apr 2018 15:40:36 -0400
Subject: [PATCH 068/158] prepare for release
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5c11a17..9e1273e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,12 +8,12 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.M1</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.5.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.5.0.M1</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.0.M1</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.2.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.1.RELEASE</spring-cloud-common-security-config.version>
From ed462e86a24229ece1c1c139618f30d88cc63961 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Thu, 19 Apr 2018 19:42:48 +0000
Subject: [PATCH 069/158] [artifactory-release] Release version 1.5.0.M1
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9e1273e..21940fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.M1</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index f3947d6..9ea50a1 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.M1</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index f214c98..85ae209 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.M1</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.M1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.M1</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 1106372..bb35ca0 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.M1</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.M1</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 0fa14fba130d009cd201df7ab435e93ff95fb011 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Thu, 19 Apr 2018 19:42:56 +0000
Subject: [PATCH 070/158] [artifactory-release] Next development version
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 21940fe..9e1273e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.M1</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 9ea50a1..f3947d6 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.M1</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 85ae209..f214c98 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.M1</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.5.0.M1</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.5.0.M1</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index bb35ca0..1106372 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.M1</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.5.0.M1</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 50f923e2ab36aa46573b3a4917a256c9c909e991 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Thu, 26 Apr 2018 17:31:27 -0400
Subject: [PATCH 071/158] Update to snapshot version
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9e1273e..3f498b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,17 +8,17 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.5.0.M1</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.5.0.M1</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.4.0.M1</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-dataflow.version>1.5.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
+ <spring-cloud-deployer-cloudfoundry.version>1.4.0.BUILD-SNAPSHOT</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.2.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.1.RELEASE</spring-cloud-common-security-config.version>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.0.2.RELEASE</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>1.0.3.BUILD-SNAPSHOT</spring-cloud-skipper.version>
<reactor.version>3.1.5.RELEASE</reactor.version>
</properties>
From c4414dd55cdf88d4ac441955ca1054f617914739 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Wed, 9 May 2018 09:09:45 -0400
Subject: [PATCH 072/158] Update to common-security 1.0.2.RELEASE and skipper
1.0.3.RELEASE
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3f498b5..21c96a7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,9 +16,9 @@
<spring-cloud-dataflow.version>1.5.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.0.BUILD-SNAPSHOT</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.2.RELEASE</spring-cloud-deployer-spi.version>
- <spring-cloud-common-security-config.version>1.0.1.RELEASE</spring-cloud-common-security-config.version>
+ <spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.0.3.BUILD-SNAPSHOT</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>1.0.3.RELEASE</spring-cloud-skipper.version>
<reactor.version>3.1.5.RELEASE</reactor.version>
</properties>
From 255147e24ea29f2601850ae91a8ca5f6cb08e351 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Wed, 9 May 2018 10:50:47 -0400
Subject: [PATCH 073/158] Update to dataflow-core 1.5.0.RC1 and deployer CF
1.4.0.RELEASE
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 21c96a7..54a4bba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,13 +8,13 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.RC1</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.5.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.4.0.BUILD-SNAPSHOT</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-dataflow.version>1.5.0.RC1</spring-cloud-dataflow.version>
+ <spring-cloud-deployer-cloudfoundry.version>1.4.0.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.2.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
<!-- skipper version used only in doc generation -->
From a3de8b1e72de1696ead937163b5fea371ceab051 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Wed, 9 May 2018 17:40:30 +0000
Subject: [PATCH 074/158] [artifactory-release] Release version 1.5.0.RC1
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 54a4bba..4b5145b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.RC1</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index f3947d6..1e6845a 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.RC1</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index f214c98..994cbff 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.RC1</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.RC1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.RC1</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 1106372..bb09811 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.RC1</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.RC1</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From e1b05a731234e40180b3a2739d8cd2b81f807edd Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Wed, 9 May 2018 17:40:36 +0000
Subject: [PATCH 075/158] [artifactory-release] Next development version
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 4b5145b..54a4bba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.RC1</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 1e6845a..f3947d6 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.RC1</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 994cbff..f214c98 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.RC1</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.5.0.RC1</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.5.0.RC1</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index bb09811..1106372 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.RC1</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.5.0.RC1</version>
+ <version>1.5.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From fadec06d8c14a21d9511fe5dfc3b6054497d7b14 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Mon, 14 May 2018 17:11:32 -0400
Subject: [PATCH 076/158] Update to skipper 1.0.4.BUILD-SNAPSHOT
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 54a4bba..0a9b611 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<spring-cloud-deployer-spi.version>1.3.2.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.0.3.RELEASE</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>1.0.4.BUILD-SNAPSHOT</spring-cloud-skipper.version>
<reactor.version>3.1.5.RELEASE</reactor.version>
</properties>
From 2c2eda6c76ff49bfb6c50f886a1f4c0a889f130a Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Mon, 14 May 2018 21:49:07 -0400
Subject: [PATCH 077/158] Update to skipper 1.0.4.RELEASE
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 0a9b611..7abfe51 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,7 +18,7 @@
<spring-cloud-deployer-spi.version>1.3.2.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.0.4.BUILD-SNAPSHOT</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>1.0.4.RELEASE</spring-cloud-skipper.version>
<reactor.version>3.1.5.RELEASE</reactor.version>
</properties>
From f49b2a35e62bbd210f5fb4e3717670c92b691177 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Tue, 15 May 2018 15:47:11 -0400
Subject: [PATCH 078/158] Update to Data Flow 1.5.0.RELEASE
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7abfe51..9d6eba6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,12 +8,12 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.5.0.RC1</version>
+ <version>1.5.0.RELEASE</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.5.0.RC1</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.5.0.RELEASE</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.0.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.2.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
From 1e96e98b9e6cf564f3e57d1ef4c38a6f01e5e0b6 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Tue, 15 May 2018 19:51:53 +0000
Subject: [PATCH 079/158] Release version 1.5.0.RELEASE
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9d6eba6..7910d9a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.RELEASE</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index f3947d6..cfaaaf5 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.RELEASE</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index f214c98..518b411 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.RELEASE</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.RELEASE</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 1106372..04c41c4 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.RELEASE</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.5.0.BUILD-SNAPSHOT</version>
+ <version>1.5.0.RELEASE</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 81710d94a022d70ce241ac4485505bffaacca2b9 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Tue, 15 May 2018 19:51:58 +0000
Subject: [PATCH 080/158] Next development version
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7910d9a..54762c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.RELEASE</version>
+ <version>1.5.1.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index cfaaaf5..82f328a 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.RELEASE</version>
+ <version>1.5.1.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 518b411..8c72146 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.RELEASE</version>
+ <version>1.5.1.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.5.0.RELEASE</version>
+ <version>1.5.1.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.5.0.RELEASE</version>
+ <version>1.5.1.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 04c41c4..e16ed80 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.0.RELEASE</version>
+ <version>1.5.1.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.5.0.RELEASE</version>
+ <version>1.5.1.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From fd9617f2896390c254de69018255a2121b7df515 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Sat, 26 May 2018 12:36:39 -0400
Subject: [PATCH 081/158] Update to 1.5.1 snapshot of scdf and 1.0.5 snapshot
of skipper
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 54762c1..62f0c82 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,17 +8,17 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.5.0.RELEASE</version>
+ <version>1.5.1.BUILD-SNAPSHOT</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.5.0.RELEASE</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.5.1.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.0.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.2.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.0.4.RELEASE</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>1.0.5.BUILD-SNAPSHOT</spring-cloud-skipper.version>
<reactor.version>3.1.5.RELEASE</reactor.version>
</properties>
From a1a941b8688a676bedce5c98df36ef10834230db Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Tue, 5 Jun 2018 17:45:12 +0530
Subject: [PATCH 082/158] Update SCDF and Skipper versions
SCDF to 1.5.1.RELEASE
Skipper to 1.0.5.RELEASE
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 62f0c82..59f8257 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,17 +8,17 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.5.1.BUILD-SNAPSHOT</version>
+ <version>1.5.1.RELEASE</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.5.1.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.5.1.RELEASE</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.0.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.2.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.0.5.BUILD-SNAPSHOT</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>1.0.5.RELEASE</spring-cloud-skipper.version>
<reactor.version>3.1.5.RELEASE</reactor.version>
</properties>
From 1ae276ec8f1c0c7ac89393b056522e5c0c81d996 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Fri, 1 Jun 2018 10:39:12 -0400
Subject: [PATCH 083/158] Update connector library to support config of Hikari
CP
* Update starter-config-clinet to 1.6.3
* Update cloudfoundry-connector and spring-service-connector to 2.0.2
* Use @SpringBootApplication(exclude = SessionAutoConfiguration.class) to disable autoconfiguration as exclude in YAML does not seem to work reliably.
Fixes #415
---
pom.xml | 1 +
.../pom.xml | 12 +++++++++++-
.../CloudFoundryServerConfigurationProperties.java | 1 +
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 10 ++++++++++
.../cloudfoundry/CloudFoundryDataFlowServer.java | 3 ++-
5 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 59f8257..c24a88c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,6 +17,7 @@
<spring-cloud-deployer-cloudfoundry.version>1.4.0.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.2.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
+ <spring-cloud-cloudfoundry-connector>2.0.2.RELEASE</spring-cloud-cloudfoundry-connector>
<!-- skipper version used only in doc generation -->
<spring-cloud-skipper.version>1.0.5.RELEASE</spring-cloud-skipper.version>
<reactor.version>3.1.5.RELEASE</reactor.version>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 82f328a..700d206 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -41,8 +41,18 @@
<dependency>
<groupId>io.pivotal.spring.cloud</groupId>
<artifactId>spring-cloud-services-starter-config-client</artifactId>
- <version>1.4.1.RELEASE</version>
+ <version>1.6.3.RELEASE</version>
<scope>runtime</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-cloudfoundry-connector</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-spring-service-connector</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>io.pivotal.spring.cloud</groupId>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryServerConfigurationProperties.java b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryServerConfigurationProperties.java
index 45bbf04..cca37f6 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryServerConfigurationProperties.java
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryServerConfigurationProperties.java
@@ -61,4 +61,5 @@ public boolean isDebugReactor() {
public void setDebugReactor(boolean debugReactor) {
this.debugReactor = debugReactor;
}
+
}
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index e16ed80..fdf66c4 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -35,6 +35,16 @@
<artifactId>reactor-core</artifactId>
<version>${reactor.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-cloudfoundry-connector</artifactId>
+ <version>${spring-cloud-cloudfoundry-connector}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-spring-service-connector</artifactId>
+ <version>${spring-cloud-cloudfoundry-connector}</version>
+ </dependency>
</dependencies>
<build>
<resources>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/CloudFoundryDataFlowServer.java b/spring-cloud-dataflow-server-cloudfoundry/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/CloudFoundryDataFlowServer.java
index ee62343..b3fc61d 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/CloudFoundryDataFlowServer.java
+++ b/spring-cloud-dataflow-server-cloudfoundry/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/CloudFoundryDataFlowServer.java
@@ -18,6 +18,7 @@
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.session.SessionAutoConfiguration;
import org.springframework.cloud.dataflow.server.EnableDataFlowServer;
/**
@@ -25,7 +26,7 @@
*
* @author Eric Bottard
*/
-@SpringBootApplication
+@SpringBootApplication(exclude = SessionAutoConfiguration.class)
@EnableDataFlowServer
public class CloudFoundryDataFlowServer {
From 858750154b16552b4278ce24bdd4ec49648ad8cc Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Tue, 5 Jun 2018 12:04:06 -0400
Subject: [PATCH 084/158] Update bit.ly links to latest
---
.../src/main/asciidoc/getting-started.adoc | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
index c9f1ae8..e3c077d 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
@@ -300,7 +300,7 @@ built with the RabbitMQ binder in bulk, you can with the following command. For
xref:spring-cloud-dataflow-register-apps[register applications].
+
```
-dataflow:>app import --uri http://bit.ly/Celsius-SR1-stream-applications-rabbit-maven
+dataflow:>app import --uri https://bit.ly/Celsius-SR2-stream-applications-rabbit-maven
```
+
There are two options for deploying Streams. The "traditional" way that Data Flow has always used and a new way that delegates to the Skipper server. Deploying using Skipper will enable you to update and rollback the streams while the traditional way will not.
@@ -702,7 +702,7 @@ dataflow:>stream history --name ticker-314
To run a simple task application, you can register all the out-of-the-box task applications with the following command.
```
-dataflow:>app import --uri http://bit.ly/Clark-GA-task-applications-maven
+dataflow:>app import --uri https://bit.ly/Clark-GA-task-applications-maven
```
From 2c91a602f1705c1c458512b4ef8b82b62031c302 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Tue, 5 Jun 2018 16:08:38 +0000
Subject: [PATCH 085/158] Release version 1.5.1.RELEASE
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index c24a88c..c731b6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.1.BUILD-SNAPSHOT</version>
+ <version>1.5.1.RELEASE</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 700d206..6c8a4ac 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.1.BUILD-SNAPSHOT</version>
+ <version>1.5.1.RELEASE</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 8c72146..08b4ff0 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.1.BUILD-SNAPSHOT</version>
+ <version>1.5.1.RELEASE</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.5.1.BUILD-SNAPSHOT</version>
+ <version>1.5.1.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.5.1.BUILD-SNAPSHOT</version>
+ <version>1.5.1.RELEASE</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index fdf66c4..df84625 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.1.BUILD-SNAPSHOT</version>
+ <version>1.5.1.RELEASE</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.5.1.BUILD-SNAPSHOT</version>
+ <version>1.5.1.RELEASE</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 306a010f68621e53c4dc99d9061e6ae5c1e2aa35 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Tue, 5 Jun 2018 16:08:44 +0000
Subject: [PATCH 086/158] Next development version
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index c731b6c..9129b32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.1.RELEASE</version>
+ <version>1.5.2.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 6c8a4ac..55bb568 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.1.RELEASE</version>
+ <version>1.5.2.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 08b4ff0..85038ff 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.1.RELEASE</version>
+ <version>1.5.2.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.5.1.RELEASE</version>
+ <version>1.5.2.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.5.1.RELEASE</version>
+ <version>1.5.2.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index df84625..48e6181 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.1.RELEASE</version>
+ <version>1.5.2.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.5.1.RELEASE</version>
+ <version>1.5.2.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From e14d75ead475c2008c3b9334d8e4a01cf55015bc Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Fri, 8 Jun 2018 11:58:01 -0400
Subject: [PATCH 087/158] Update master to 1.6.0.BUILD-SNAPSHOT
* Update to skipper 1.1.0.BUILD-SNAPSHOT
---
pom.xml | 8 ++++----
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9129b32..a7f4725 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,24 +2,24 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.2.BUILD-SNAPSHOT</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.5.1.RELEASE</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.5.1.RELEASE</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.6.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.0.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.2.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
<spring-cloud-cloudfoundry-connector>2.0.2.RELEASE</spring-cloud-cloudfoundry-connector>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.0.5.RELEASE</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-skipper.version>
<reactor.version>3.1.5.RELEASE</reactor.version>
</properties>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 55bb568..cf20417 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.2.BUILD-SNAPSHOT</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 85038ff..bd134be 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.2.BUILD-SNAPSHOT</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.5.2.BUILD-SNAPSHOT</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.5.2.BUILD-SNAPSHOT</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 48e6181..b4b4966 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.5.2.BUILD-SNAPSHOT</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -28,7 +28,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.5.2.BUILD-SNAPSHOT</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 2f1135b879cdd4ff88b35e83c53b8ef7ca533e74 Mon Sep 17 00:00:00 2001
From: Christian Tzolov <christian.tzolov@gmail.com>
Date: Thu, 28 Jun 2018 13:59:10 +0200
Subject: [PATCH 088/158] Remove SpringBoot dependency override
Depends on https://github.com/spring-cloud/spring-cloud-dataflow/pull/2285
- #2285 sets the correct boot version as well as the required MariaDB 2.2.5
- Current SB override forces Maria 1.5.9 (as Spring 1.5.x dependecy)
---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index b4b4966..666335f 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -13,17 +13,6 @@
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-dependencies</artifactId>
- <version>1.5.12.RELEASE</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
From b47e08e16ec0751d9f344417ec4fbc0476553b81 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Mon, 4 Jun 2018 18:34:06 -0400
Subject: [PATCH 089/158] Add declarative configuration of DataSource in cloud
profile
Fixes #417
---
.../pom.xml | 1 -
...dFoundryServerConfigurationProperties.java | 20 +++++++++
.../config/DataSourceCloudConfig.java | 45 +++++++++++++++++++
.../src/main/asciidoc/configuration.adoc | 5 +++
4 files changed, 70 insertions(+), 1 deletion(-)
create mode 100644 spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/DataSourceCloudConfig.java
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index cf20417..94fb7ea 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -58,7 +58,6 @@
<groupId>io.pivotal.spring.cloud</groupId>
<artifactId>spring-cloud-sso-connector</artifactId>
<version>1.1.0.RELEASE</version>
- <scope>runtime</scope>
</dependency>
</dependencies>
</project>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryServerConfigurationProperties.java b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryServerConfigurationProperties.java
index cca37f6..4c1fbb2 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryServerConfigurationProperties.java
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryServerConfigurationProperties.java
@@ -44,6 +44,10 @@ public class CloudFoundryServerConfigurationProperties {
*/
private int freeDiskSpacePercentage = 25;
+ private int maxPoolSize = 4;
+
+ int maxWaitTime = 30000;
+
@Min(0)
@Max(100)
public int getFreeDiskSpacePercentage() {
@@ -62,4 +66,20 @@ public void setDebugReactor(boolean debugReactor) {
this.debugReactor = debugReactor;
}
+ public int getMaxPoolSize() {
+ return maxPoolSize;
+ }
+
+ public void setMaxPoolSize(int maxPoolSize) {
+ this.maxPoolSize = maxPoolSize;
+ }
+
+ public int getMaxWaitTime() {
+ return maxWaitTime;
+ }
+
+ public void setMaxWaitTime(int maxWaitTime) {
+ this.maxWaitTime = maxWaitTime;
+ }
+
}
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/DataSourceCloudConfig.java b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/DataSourceCloudConfig.java
new file mode 100644
index 0000000..5a68278
--- /dev/null
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/DataSourceCloudConfig.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.cloud.dataflow.server.cloudfoundry.config;
+
+import javax.sql.DataSource;
+
+import org.springframework.cloud.config.java.AbstractCloudConfig;
+import org.springframework.cloud.service.PooledServiceConnectorConfig;
+import org.springframework.cloud.service.relational.DataSourceConfig;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Profile;
+
+/**
+ * Add declarative configuration of the max pool side and max wait time when using the connector library.
+ *
+ * @author Mark Pollack
+ */
+@Profile("cloud")
+@Configuration
+public class DataSourceCloudConfig extends AbstractCloudConfig {
+
+ @Bean
+ public DataSource dataSource(CloudFoundryServerConfigurationProperties cloudFoundryServerConfigurationProperties) {
+ PooledServiceConnectorConfig.PoolConfig poolConfig =
+ new PooledServiceConnectorConfig.PoolConfig(cloudFoundryServerConfigurationProperties.getMaxPoolSize(),
+ cloudFoundryServerConfigurationProperties.getMaxWaitTime());
+ DataSourceConfig dbConfig = new DataSourceConfig(poolConfig, null);
+ return connectionFactory().dataSource(dbConfig);
+ }
+
+}
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
index 24d5f92..22356a6 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
@@ -280,6 +280,11 @@ option. A similar HTTP resolution will work on this model, too.
The required Über-jar's can be hosted in an external file-system and with the help of volume-services, you can, for
example, register the app with the name `http-source.jar` via `--uri=file://<Path-To-FileSystem>/http-source.jar`.
+[[getting-started-connection-pool]]
+== Database Connection Pool
+The Data Flow Server uses the Spring Cloud Connector library to create the DataSource with a default connection pool size of 4.
+To change the connection pool size and maximum wait time, set the following two properties `spring.cloud.dataflow.server.cloudfoundry.maxPoolSize` and `spring.cloud.dataflow.server.cloudfoundry.maxWaitTime`.
+The wait time is specified in milliseconds.
[[getting-started-security]]
== Security
From 5cfab5a9e524525285ef96e0cc6e3431222d95fa Mon Sep 17 00:00:00 2001
From: Christian Tzolov <christian.tzolov@gmail.com>
Date: Tue, 3 Jul 2018 11:29:50 +0200
Subject: [PATCH 090/158] Prepare for 1.6.0.M1 release
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index a7f4725..bddee86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,18 +8,18 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.M1</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.6.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.6.0.M1</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.0.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.2.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
<spring-cloud-cloudfoundry-connector>2.0.2.RELEASE</spring-cloud-cloudfoundry-connector>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>1.0.6.RELEASE</spring-cloud-skipper.version>
<reactor.version>3.1.5.RELEASE</reactor.version>
</properties>
From 9991bc91bd6cfd0676e67388611794c191506505 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Tue, 3 Jul 2018 16:03:46 -0400
Subject: [PATCH 091/158] update ref to skipper 1.0.7
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index bddee86..7ac52ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
<spring-cloud-cloudfoundry-connector>2.0.2.RELEASE</spring-cloud-cloudfoundry-connector>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.0.6.RELEASE</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>1.0.7.RELEASE</spring-cloud-skipper.version>
<reactor.version>3.1.5.RELEASE</reactor.version>
</properties>
From bd179114cafd4e1b58821f74825334ac20de34bf Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Tue, 3 Jul 2018 17:14:20 -0400
Subject: [PATCH 092/158] Use Darwin GA release for stream import statement in
docs
---
.../src/main/asciidoc/getting-started.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
index e3c077d..ed9c4ee 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
@@ -300,7 +300,7 @@ built with the RabbitMQ binder in bulk, you can with the following command. For
xref:spring-cloud-dataflow-register-apps[register applications].
+
```
-dataflow:>app import --uri https://bit.ly/Celsius-SR2-stream-applications-rabbit-maven
+dataflow:>app import --uri http://bit.ly/Darwin-GA-stream-applications-rabbit-maven
```
+
There are two options for deploying Streams. The "traditional" way that Data Flow has always used and a new way that delegates to the Skipper server. Deploying using Skipper will enable you to update and rollback the streams while the traditional way will not.
From 1aa562ce1bdfec563a33dacbcdb2cdefb4c4bbc8 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Tue, 3 Jul 2018 21:19:37 +0000
Subject: [PATCH 093/158] Release version 1.6.0.M1
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7ac52ca..2456242 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.M1</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 94fb7ea..4ee97db 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.M1</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index bd134be..480d958 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.M1</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.M1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.M1</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 666335f..34d0bf6 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.M1</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.M1</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 9e2996e68e93da5c8b25a8263d2362d416f76a81 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Tue, 3 Jul 2018 21:19:42 +0000
Subject: [PATCH 094/158] Next development version
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2456242..7ac52ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.M1</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 4ee97db..94fb7ea 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.M1</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 480d958..bd134be 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.M1</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.6.0.M1</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.6.0.M1</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 34d0bf6..666335f 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.M1</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.6.0.M1</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From fb1478c6b4a43cdf3156b1506de72a9f61942d4a Mon Sep 17 00:00:00 2001
From: Glenn Renfro <grenfro@pivotal.io>
Date: Tue, 3 Jul 2018 08:55:40 -0400
Subject: [PATCH 095/158] Updated dependencies to include Scheduler
resolves #418
Updated to latest release of CF server
---
pom.xml | 9 +++++----
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 5 +++++
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7ac52ca..7b38d22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,19 +8,20 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.6.0.M1</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.6.0.M1</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.4.0.RELEASE</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-dataflow.version>1.6.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
+ <spring-cloud-deployer-cloudfoundry.version>1.4.1.BUILD-SNAPSHOT</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.2.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
<spring-cloud-cloudfoundry-connector>2.0.2.RELEASE</spring-cloud-cloudfoundry-connector>
<!-- skipper version used only in doc generation -->
<spring-cloud-skipper.version>1.0.7.RELEASE</spring-cloud-skipper.version>
- <reactor.version>3.1.5.RELEASE</reactor.version>
+ <spring-cloud-scheduler-cloudfoundry>1.0.0.BUILD-SNAPSHOT</spring-cloud-scheduler-cloudfoundry>
+ <reactor.version>3.1.8.RELEASE</reactor.version>
</properties>
<modules>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 666335f..e69af4d 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -34,6 +34,11 @@
<artifactId>spring-cloud-spring-service-connector</artifactId>
<version>${spring-cloud-cloudfoundry-connector}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-scheduler-cloudfoundry</artifactId>
+ <version>${spring-cloud-scheduler-cloudfoundry}</version>
+ </dependency>
</dependencies>
<build>
<resources>
From 2c2fb840b719fd00d037481fc3b119e6fe46afc6 Mon Sep 17 00:00:00 2001
From: Glenn Renfro <grenfro@pivotal.io>
Date: Mon, 9 Jul 2018 15:21:35 -0400
Subject: [PATCH 096/158] Added baseline docs for schedule config
resolves #424
---
.../src/main/asciidoc/configuration.adoc | 38 +++++++++++++++++++
1 file changed, 38 insertions(+)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
index 22356a6..8ee4d55 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
@@ -614,3 +614,41 @@ services:
- mysql
- my-config-server #this is for the server
----
+
+[[getting-started-scheduling-configuration]]
+== Configure Scheduling
+In this section we will discuss how to configure Spring Cloud Data Flow to connect to the https://www.cloudfoundry.org/the-foundry/scheduler/[PCF-Scheduler] as its agent to execute tasks.
+
+The 2 environment variables that have to be added or updated in your environment for Scheduling to be configured are the following:
+
+. Enable scheduling for Spring Cloud Data Flow by setting `spring.cloud.dataflow.features.schedules-enabled` to true
+. Binding the task deployer to your instance of PCF-Scheduler by adding the PCF-Scheduler service name to the `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES` environment variable.
+
+The sample manifest shown below displays both the environment properties configured, assuming you have a PCF-Scheduler service available with the name `myscheduler`.
+
+[source,yml]
+----
+---
+applications:
+- name: data-flow-server
+ host: data-flow-server
+ memory: 2G
+ disk_quota: 2G
+ instances: 1
+ path: {PATH TO SERVER UBER-JAR}
+ env:
+ SPRING_APPLICATION_NAME: data-flow-server
+ SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_URL: https://api.local.pcfdev.io
+ SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_ORG: pcfdev-org
+ SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SPACE: pcfdev-space
+ SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_DOMAIN: local.pcfdev.io
+ SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_USERNAME: admin
+ SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_PASSWORD: admin
+ SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES: rabbit
+ SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES: mysql,myscheduler
+ SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATION: true
+ SPRING_CLOUD_DATAFLOW_FEATURES_SCHEDULES_ENABLED: true
+ SPRING_APPLICATION_JSON {"maven": { "remote-repositories": { "repo1": { "url": "https://repo.spring.io/libs-release"} } } }
+services:
+- mysql
+----
From c05e8c455f107b0d8bc5b3210260fe2924c11a32 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Wed, 11 Jul 2018 11:53:06 -0400
Subject: [PATCH 097/158] Conditionally bootstrap SchedulerAutoConfiguration
only when Scheduler is enabled
Updated to remove SpringCloudShedulerAutoConfig
---
pom.xml | 1 +
.../pom.xml | 15 ++++
.../CloudFoundrySchedulerConfiguration.java | 72 +++++++++++++++++++
.../pom.xml | 5 --
4 files changed, 88 insertions(+), 5 deletions(-)
create mode 100644 spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundrySchedulerConfiguration.java
diff --git a/pom.xml b/pom.xml
index 7b38d22..468a4d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,6 +21,7 @@
<!-- skipper version used only in doc generation -->
<spring-cloud-skipper.version>1.0.7.RELEASE</spring-cloud-skipper.version>
<spring-cloud-scheduler-cloudfoundry>1.0.0.BUILD-SNAPSHOT</spring-cloud-scheduler-cloudfoundry>
+ <pivotal-cf-client-reactor.version>1.1.0.RELEASE</pivotal-cf-client-reactor.version>
<reactor.version>3.1.8.RELEASE</reactor.version>
</properties>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 94fb7ea..c66a71e 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -59,5 +59,20 @@
<artifactId>spring-cloud-sso-connector</artifactId>
<version>1.1.0.RELEASE</version>
</dependency>
+ <dependency>
+ <groupId>io.pivotal</groupId>
+ <artifactId>pivotal-cloudfoundry-client-reactor</artifactId>
+ <version>${pivotal-cf-client-reactor.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-scheduler-spi</artifactId>
+ <version>${spring-cloud-scheduler-spi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-scheduler-cloudfoundry</artifactId>
+ <version>${spring-cloud-scheduler-cloudfoundry}</version>
+ </dependency>
</dependencies>
</project>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundrySchedulerConfiguration.java b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundrySchedulerConfiguration.java
new file mode 100644
index 0000000..b692a79
--- /dev/null
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundrySchedulerConfiguration.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright 2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.cloud.dataflow.server.cloudfoundry.config;
+
+import io.pivotal.reactor.scheduler.ReactorSchedulerClient;
+import org.cloudfoundry.operations.CloudFoundryOperations;
+import org.cloudfoundry.reactor.ConnectionContext;
+import org.cloudfoundry.reactor.TokenProvider;
+import reactor.core.publisher.Mono;
+
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.cloud.dataflow.server.config.features.SchedulerConfiguration;
+import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundry2630AndLaterTaskLauncher;
+import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryConnectionProperties;
+import org.springframework.cloud.deployer.spi.task.TaskLauncher;
+import org.springframework.cloud.scheduler.spi.cloudfoundry.CloudFoundryAppScheduler;
+import org.springframework.cloud.scheduler.spi.cloudfoundry.CloudFoundrySchedulerProperties;
+import org.springframework.cloud.scheduler.spi.core.Scheduler;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author Mark Pollack
+ */
+@Configuration
+@Conditional({ SchedulerConfiguration.SchedulerConfigurationPropertyChecker.class })
+public class CloudFoundrySchedulerConfiguration {
+
+ @Bean
+ @ConditionalOnMissingBean
+ public ReactorSchedulerClient reactorSchedulerClient(ConnectionContext context,
+ TokenProvider passwordGrantTokenProvider,
+ CloudFoundrySchedulerProperties properties) {
+ return ReactorSchedulerClient.builder()
+ .connectionContext(context)
+ .tokenProvider(passwordGrantTokenProvider)
+ .root(Mono.just(properties.getSchedulerUrl()))
+ .build();
+ }
+
+ @Bean
+ @ConditionalOnMissingBean
+ public Scheduler scheduler(ReactorSchedulerClient client,
+ CloudFoundryOperations operations,
+ CloudFoundryConnectionProperties properties,
+ TaskLauncher taskLauncher,
+ CloudFoundrySchedulerProperties schedulerProperties) {
+ return new CloudFoundryAppScheduler(client, operations, properties,
+ (CloudFoundry2630AndLaterTaskLauncher) taskLauncher,
+ schedulerProperties);
+ }
+
+ @Bean
+ @ConditionalOnMissingBean
+ public CloudFoundrySchedulerProperties cloudFoundrySchedulerProperties() {
+ return new CloudFoundrySchedulerProperties();
+ }
+}
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index e69af4d..666335f 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -34,11 +34,6 @@
<artifactId>spring-cloud-spring-service-connector</artifactId>
<version>${spring-cloud-cloudfoundry-connector}</version>
</dependency>
- <dependency>
- <groupId>org.springframework.cloud</groupId>
- <artifactId>spring-cloud-scheduler-cloudfoundry</artifactId>
- <version>${spring-cloud-scheduler-cloudfoundry}</version>
- </dependency>
</dependencies>
<build>
<resources>
From a1b30eb7009fedfbc78065f3649c58e55919d1e4 Mon Sep 17 00:00:00 2001
From: Gunnar Hillert <ghillert@pivotal.io>
Date: Tue, 10 Jul 2018 12:35:48 -1000
Subject: [PATCH 098/158] Fix Docs: Manifest incorrect in chapter `Deploying
using a Manifest`
---
.../src/main/asciidoc/getting-started.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
index ed9c4ee..7c9d9ac 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
@@ -216,7 +216,7 @@ applications:
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES: rabbit
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES: mysql
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATION: true
- SPRING_APPLICATION_JSON {"maven": { "remote-repositories": { "repo1": { "url": "https://repo.spring.io/libs-release"} } } }
+ SPRING_APPLICATION_JSON: '{"maven": { "remote-repositories": { "repo1": { "url": "https://repo.spring.io/libs-release"} } } }'
services:
- mysql
----
From 3e1d5cc5fc08a7bec791c2594768e57c1a251071 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Wed, 11 Jul 2018 16:15:30 -0400
Subject: [PATCH 099/158] Update to cf-deployer 1.4.1.RELEASE cf-scheduler
1.0.0.M1
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 468a4d0..ab3f1a8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,13 +14,13 @@
<properties>
<spring-cloud-dataflow.version>1.6.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.4.1.BUILD-SNAPSHOT</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-deployer-cloudfoundry.version>1.4.1.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.2.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
<spring-cloud-cloudfoundry-connector>2.0.2.RELEASE</spring-cloud-cloudfoundry-connector>
<!-- skipper version used only in doc generation -->
<spring-cloud-skipper.version>1.0.7.RELEASE</spring-cloud-skipper.version>
- <spring-cloud-scheduler-cloudfoundry>1.0.0.BUILD-SNAPSHOT</spring-cloud-scheduler-cloudfoundry>
+ <spring-cloud-scheduler-cloudfoundry>1.0.0.M1</spring-cloud-scheduler-cloudfoundry>
<pivotal-cf-client-reactor.version>1.1.0.RELEASE</pivotal-cf-client-reactor.version>
<reactor.version>3.1.8.RELEASE</reactor.version>
</properties>
From d0d97996ca02e5a8dd9bc5d014bd4025535a8816 Mon Sep 17 00:00:00 2001
From: Glenn Renfro <grenfro@pivotal.io>
Date: Wed, 11 Jul 2018 19:12:24 -0400
Subject: [PATCH 100/158] Updated to add schedulerUrl to docs
Updated docs based on slack chat
---
.../src/main/asciidoc/configuration.adoc | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
index 8ee4d55..4a64e33 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
@@ -619,10 +619,11 @@ services:
== Configure Scheduling
In this section we will discuss how to configure Spring Cloud Data Flow to connect to the https://www.cloudfoundry.org/the-foundry/scheduler/[PCF-Scheduler] as its agent to execute tasks.
-The 2 environment variables that have to be added or updated in your environment for Scheduling to be configured are the following:
+The 3 environment variables that have to be added or updated in your environment for Scheduling to be configured are the following:
. Enable scheduling for Spring Cloud Data Flow by setting `spring.cloud.dataflow.features.schedules-enabled` to true
. Binding the task deployer to your instance of PCF-Scheduler by adding the PCF-Scheduler service name to the `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES` environment variable.
+. Establish the url to the PCF-Scheduler via the `SPRING_CLOUD_SCHEDULER_CLOUDFOUNDRY_SCHEDULER_URL` environment variable.
The sample manifest shown below displays both the environment properties configured, assuming you have a PCF-Scheduler service available with the name `myscheduler`.
@@ -648,7 +649,10 @@ applications:
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES: mysql,myscheduler
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATION: true
SPRING_CLOUD_DATAFLOW_FEATURES_SCHEDULES_ENABLED: true
+ SPRING_CLOUD_SCHEDULER_CLOUDFOUNDRY_SCHEDULER_URL: <PCF-Scheduler service url>
SPRING_APPLICATION_JSON {"maven": { "remote-repositories": { "repo1": { "url": "https://repo.spring.io/libs-release"} } } }
services:
- mysql
----
+
+NOTE: The SPRING_CLOUD_SCHEDULER_CLOUDFOUNDRY_SCHEDULER_URL has the following format: `scheduler.<Domain-Name>` for example: `https://scheduler.sys.mycf.cf-app.com`.
From 0d250fbab6b547cde23ae7cf4a30f2919fd75f06 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Wed, 11 Jul 2018 19:39:28 -0400
Subject: [PATCH 101/158] Update to scdf-core 1.6.0.M2
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index ab3f1a8..7e81fbc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,12 +8,12 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.M2</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.6.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.6.0.M2</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.1.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.2.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
From 005bb9b2c9df6c3ec9ff21ed2598263dda344476 Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Thu, 12 Jul 2018 06:47:24 +0530
Subject: [PATCH 102/158] Update SCDe to 1.3.3.RELEASE
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 7e81fbc..c34e174 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
<properties>
<spring-cloud-dataflow.version>1.6.0.M2</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.1.RELEASE</spring-cloud-deployer-cloudfoundry.version>
- <spring-cloud-deployer-spi.version>1.3.2.RELEASE</spring-cloud-deployer-spi.version>
+ <spring-cloud-deployer-spi.version>1.3.3.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
<spring-cloud-cloudfoundry-connector>2.0.2.RELEASE</spring-cloud-cloudfoundry-connector>
<!-- skipper version used only in doc generation -->
From 0a1b4330e9b484364eda81a08471865bafdf1a12 Mon Sep 17 00:00:00 2001
From: Glenn Renfro <grenfro@pivotal.io>
Date: Tue, 10 Jul 2018 17:19:15 -0400
Subject: [PATCH 103/158] Re-Added section on setting up the scheduler service
---
.../src/main/asciidoc/configuration.adoc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
index 4a64e33..d3ed770 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
@@ -619,6 +619,8 @@ services:
== Configure Scheduling
In this section we will discuss how to configure Spring Cloud Data Flow to connect to the https://www.cloudfoundry.org/the-foundry/scheduler/[PCF-Scheduler] as its agent to execute tasks.
+NOTE: Before following the instructions below, be sure to have an instance of the PCF-Scheduler service running in your Cloud Foundry space. To create a PCF-Scheduler in your space (assuming it is in your Market Place) execute the following from the cf CLI: `cf create-service scheduler-for-pcf standard <name of service>`
+
The 3 environment variables that have to be added or updated in your environment for Scheduling to be configured are the following:
. Enable scheduling for Spring Cloud Data Flow by setting `spring.cloud.dataflow.features.schedules-enabled` to true
From 535326f906c10e84add5764ecbcb54c05418c1a5 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Thu, 12 Jul 2018 05:25:27 +0000
Subject: [PATCH 104/158] [artifactory-release] Release version 1.6.0.M2
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index c34e174..5c112b2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.M2</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index c66a71e..fc25020 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.M2</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index bd134be..8943165 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.M2</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.M2</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.M2</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 666335f..44ea362 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.M2</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.M2</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From f571e298eb3aa28833e9f277e8c986605e7e457a Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Thu, 12 Jul 2018 05:25:33 +0000
Subject: [PATCH 105/158] [artifactory-release] Next development version
1.6.0.BUILD-SNAPSHOT
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5c112b2..c34e174 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.M2</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index fc25020..c66a71e 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.M2</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 8943165..bd134be 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.M2</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.6.0.M2</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.6.0.M2</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 44ea362..666335f 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.M2</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.6.0.M2</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 288025b1b781596d450c8508daebc2db06e8351a Mon Sep 17 00:00:00 2001
From: Glenn Renfro <grenfro@pivotal.io>
Date: Wed, 18 Jul 2018 17:45:38 -0400
Subject: [PATCH 106/158] Added note on task definition creation for scheduling
---
.../src/main/asciidoc/configuration.adoc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
index d3ed770..341e3b7 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
@@ -627,6 +627,8 @@ The 3 environment variables that have to be added or updated in your environment
. Binding the task deployer to your instance of PCF-Scheduler by adding the PCF-Scheduler service name to the `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES` environment variable.
. Establish the url to the PCF-Scheduler via the `SPRING_CLOUD_SCHEDULER_CLOUDFOUNDRY_SCHEDULER_URL` environment variable.
+NOTE: Any task definitions that need to be scheduled, must be created after the above configurations have been configured.
+
The sample manifest shown below displays both the environment properties configured, assuming you have a PCF-Scheduler service available with the name `myscheduler`.
[source,yml]
From 723a3edc082683e517548103bb0f9ff2033087fd Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Tue, 17 Jul 2018 16:58:30 -0400
Subject: [PATCH 107/158] Remove use of LRU and update documentation
Fixes #433
---
...oudFoundryDataFlowServerConfiguration.java | 12 ----------
.../src/main/asciidoc/configuration.adoc | 22 ++++++++++---------
2 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryDataFlowServerConfiguration.java b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryDataFlowServerConfiguration.java
index 284625a..c5cb9df 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryDataFlowServerConfiguration.java
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryDataFlowServerConfiguration.java
@@ -16,7 +16,6 @@
package org.springframework.cloud.dataflow.server.cloudfoundry.config;
-import java.io.File;
import java.util.HashMap;
import java.util.Map;
@@ -32,7 +31,6 @@
import org.springframework.cloud.deployer.resource.maven.MavenResource;
import org.springframework.cloud.deployer.resource.maven.MavenResourceLoader;
import org.springframework.cloud.deployer.resource.support.DelegatingResourceLoader;
-import org.springframework.cloud.deployer.resource.support.LRUCleaningResourceLoaderBeanPostProcessor;
import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryConnectionProperties;
import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryDeploymentProperties;
import org.springframework.context.annotation.Bean;
@@ -75,16 +73,6 @@ public DelegatingResourceLoader delegatingResourceLoader(MavenProperties mavenPr
return new DelegatingResourceLoader(loaders);
}
-
- @Bean
- public LRUCleaningResourceLoaderBeanPostProcessor lruCleaningResourceLoaderInstaller(
- CloudFoundryServerConfigurationProperties serverConfiguration,
- MavenProperties mavenProperties) {
- File repositoryCache = new File(mavenProperties.getLocalRepository());
- float fRatio = serverConfiguration.getFreeDiskSpacePercentage() / 100F;
- return new LRUCleaningResourceLoaderBeanPostProcessor(fRatio, repositoryCache);
- }
-
@PostConstruct
public void afterPropertiesSet() {
if (cloudFoundryServerConfigurationProperties().isDebugReactor()) {
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
index 341e3b7..f7fc46a 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
@@ -243,20 +243,22 @@ OK
name requested state instances memory disk urls
dataflow-server started 1/1 1.1G 10G dataflow-server.apps.io
----
-
-=== Configuring target free disk percentage
+[[managing-disk-utilization]]
+== Managing disk utilization
Even when configuring the Data Flow server to use 10G of space, there is the possibility of exhausting
-the available space on the local disk. The server implements a least recently used (LRU) algorithm that
-will remove maven artifacts from the local maven repository. This is configured using the following
-configuration property, the default value is 25.
-
+the available space on the local disk.
+If you deploy the Data Flow server using the default `port` health check type, you will have to monitor the disk space on the server explicitly in order to avoid running out space.
+If you deploy the server using the `http` health check type (see below) the Data Flow server will be restarted if there is low disk space.
+This is due to Spring Boot's link:https://github.com/spring-projects/spring-boot/blob/v1.5.14.RELEASE/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicator.java[Disk Space Health Indicator].
+You can link:https://docs.spring.io/spring-boot/docs/1.5.14.RELEASE/reference/htmlsingle/#common-application-properties[configure] the settings of the Disk Space Health Indicator using the properties with the prefix `management.health.diskspace`.
+Use of link:https://docs.cloudfoundry.org/devguide/services/using-vol-services.html[Volume Services] for the Data Flow server to store `.jar` artifacts before pushing them to Cloud Foundry is being investigated for version 1.7.
[source]
----
-# The low water mark percentage, expressed as in integer between 0 and 100, that triggers cleanup of
-# the local maven repository
-# (for setting env var use SPRING_CLOUD_DATAFLOW_SERVER_CLOUDFOUNDRY_FREE_DISK_SPACE_PERCENTAGE)
-spring.cloud.dataflow.server.cloudfoundry.freeDiskSpacePercentage=25
+---
+ ...
+ health-check-type: http
+ health-check-http-endpoint: /management/health
----
[[configuration-app-resolution-options]]
From d267b6177b7762c308d1a9f8abc8832584f59a81 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Fri, 20 Jul 2018 16:30:34 +0100
Subject: [PATCH 108/158] Fix issue creating redis connection factory
- Fixes #436
---
pom.xml | 4 ++--
.../config/DataSourceCloudConfig.java | 21 ++++++++++++++-----
.../CloudFoundryDataFlowServer.java | 2 +-
3 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/pom.xml b/pom.xml
index c34e174..fa89a30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,12 +8,12 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.6.0.M2</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.6.0.M2</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.6.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.1.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.3.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/DataSourceCloudConfig.java b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/DataSourceCloudConfig.java
index 5a68278..aa513cd 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/DataSourceCloudConfig.java
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/DataSourceCloudConfig.java
@@ -17,15 +17,19 @@
import javax.sql.DataSource;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.cloud.config.java.AbstractCloudConfig;
+import org.springframework.cloud.dataflow.server.config.features.FeaturesProperties;
import org.springframework.cloud.service.PooledServiceConnectorConfig;
import org.springframework.cloud.service.relational.DataSourceConfig;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Profile;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
/**
- * Add declarative configuration of the max pool side and max wait time when using the connector library.
+ * Add declarative configuration of the max pool side and max wait time when using the
+ * connector library.
*
* @author Mark Pollack
*/
@@ -34,12 +38,19 @@
public class DataSourceCloudConfig extends AbstractCloudConfig {
@Bean
- public DataSource dataSource(CloudFoundryServerConfigurationProperties cloudFoundryServerConfigurationProperties) {
- PooledServiceConnectorConfig.PoolConfig poolConfig =
- new PooledServiceConnectorConfig.PoolConfig(cloudFoundryServerConfigurationProperties.getMaxPoolSize(),
- cloudFoundryServerConfigurationProperties.getMaxWaitTime());
+ public DataSource scdfCloudDataSource(
+ CloudFoundryServerConfigurationProperties cloudFoundryServerConfigurationProperties) {
+ PooledServiceConnectorConfig.PoolConfig poolConfig = new PooledServiceConnectorConfig.PoolConfig(
+ cloudFoundryServerConfigurationProperties.getMaxPoolSize(),
+ cloudFoundryServerConfigurationProperties.getMaxWaitTime());
DataSourceConfig dbConfig = new DataSourceConfig(poolConfig, null);
return connectionFactory().dataSource(dbConfig);
}
+ @Bean
+ @ConditionalOnProperty(prefix = FeaturesProperties.FEATURES_PREFIX, name = FeaturesProperties.ANALYTICS_ENABLED, matchIfMissing = true)
+ public RedisConnectionFactory redisFactory() {
+ return connectionFactory().redisConnectionFactory();
+ }
+
}
diff --git a/spring-cloud-dataflow-server-cloudfoundry/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/CloudFoundryDataFlowServer.java b/spring-cloud-dataflow-server-cloudfoundry/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/CloudFoundryDataFlowServer.java
index b3fc61d..7d5a71b 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/CloudFoundryDataFlowServer.java
+++ b/spring-cloud-dataflow-server-cloudfoundry/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/CloudFoundryDataFlowServer.java
@@ -26,7 +26,7 @@
*
* @author Eric Bottard
*/
-@SpringBootApplication(exclude = SessionAutoConfiguration.class)
+@SpringBootApplication(exclude = {SessionAutoConfiguration.class})
@EnableDataFlowServer
public class CloudFoundryDataFlowServer {
From 70eb939b8618acf3ec111cd273fa49954256778c Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Fri, 20 Jul 2018 16:55:10 -0400
Subject: [PATCH 109/158] Update deps
- Data Flow 1.6.0.RC1
- Skipper 1.0.8.RELEASE
- Scheduler CF - 1.0.0.RC1
---
pom.xml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index fa89a30..b5e78f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,19 +8,19 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.RC1</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.6.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.6.0.RC1</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.1.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.3.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
<spring-cloud-cloudfoundry-connector>2.0.2.RELEASE</spring-cloud-cloudfoundry-connector>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.0.7.RELEASE</spring-cloud-skipper.version>
- <spring-cloud-scheduler-cloudfoundry>1.0.0.M1</spring-cloud-scheduler-cloudfoundry>
+ <spring-cloud-skipper.version>1.0.8.RELEASE</spring-cloud-skipper.version>
+ <spring-cloud-scheduler-cloudfoundry>1.0.0.RC1</spring-cloud-scheduler-cloudfoundry>
<pivotal-cf-client-reactor.version>1.1.0.RELEASE</pivotal-cf-client-reactor.version>
<reactor.version>3.1.8.RELEASE</reactor.version>
</properties>
From 35e799794d8adaa5afd3c3b882463c42bc7d7bd6 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Fri, 20 Jul 2018 17:01:16 -0400
Subject: [PATCH 110/158] Update links to app starters to be latest
---
.../src/main/asciidoc/getting-started.adoc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
index 7c9d9ac..c44a2ab 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
@@ -300,7 +300,7 @@ built with the RabbitMQ binder in bulk, you can with the following command. For
xref:spring-cloud-dataflow-register-apps[register applications].
+
```
-dataflow:>app import --uri http://bit.ly/Darwin-GA-stream-applications-rabbit-maven
+dataflow:>app import --uri http://bit.ly/Darwin-SR1-stream-applications-rabbit-maven
```
+
There are two options for deploying Streams. The "traditional" way that Data Flow has always used and a new way that delegates to the Skipper server. Deploying using Skipper will enable you to update and rollback the streams while the traditional way will not.
@@ -702,11 +702,11 @@ dataflow:>stream history --name ticker-314
To run a simple task application, you can register all the out-of-the-box task applications with the following command.
```
-dataflow:>app import --uri https://bit.ly/Clark-GA-task-applications-maven
+dataflow:>app import --uri http://bit.ly/Dearborn-GA-task-applications-maven
```
-Now create a simple link:https://docs.spring.io/spring-cloud-task-app-starters/docs/Clark.RELEASE/reference/html/_timestamp_task.html[timestamp] task.
+Now create a simple link:https://docs.spring.io/spring-cloud-task-app-starters/docs/Dearborn.RELEASE/reference/htmlsingle/#spring-cloud-task-modules-tasks[timestamp] task.
```
dataflow:>task create mytask --definition "timestamp --format='yyyy'"
From d69c6a67fbf9da7d6df06bc5c9787b229e32394b Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Fri, 20 Jul 2018 21:15:41 +0000
Subject: [PATCH 111/158] Release version 1.6.0.RC1
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index b5e78f9..47b1dac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.RC1</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index c66a71e..4105ab8 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.RC1</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index bd134be..99708b3 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.RC1</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.RC1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.RC1</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 666335f..8d42b46 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.RC1</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.RC1</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 6f947eae67c734074a70df76775278fdac4cc6e4 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Fri, 20 Jul 2018 21:15:47 +0000
Subject: [PATCH 112/158] Next development version
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 47b1dac..b5e78f9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.RC1</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 4105ab8..c66a71e 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.RC1</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 99708b3..bd134be 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.RC1</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.6.0.RC1</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.6.0.RC1</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 8d42b46..666335f 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.RC1</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.6.0.RC1</version>
+ <version>1.6.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 0ccb8110ef96c9c4552b22e9a8e7f51cb434b104 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Thu, 26 Jul 2018 13:57:56 -0400
Subject: [PATCH 113/158] Update to scheduler-cf 1.0.0.RELEASE and scdf-core
1.6.0.RELEASE
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index b5e78f9..d98e5ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,19 +8,19 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.6.0.RC1</version>
+ <version>1.6.0.RELEASE</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.6.0.RC1</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.6.0.RELEASE</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.1.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.3.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
<spring-cloud-cloudfoundry-connector>2.0.2.RELEASE</spring-cloud-cloudfoundry-connector>
<!-- skipper version used only in doc generation -->
<spring-cloud-skipper.version>1.0.8.RELEASE</spring-cloud-skipper.version>
- <spring-cloud-scheduler-cloudfoundry>1.0.0.RC1</spring-cloud-scheduler-cloudfoundry>
+ <spring-cloud-scheduler-cloudfoundry>1.0.0.RELEASE</spring-cloud-scheduler-cloudfoundry>
<pivotal-cf-client-reactor.version>1.1.0.RELEASE</pivotal-cf-client-reactor.version>
<reactor.version>3.1.8.RELEASE</reactor.version>
</properties>
From c5516ad057cef2c069860a01d36d756be5ac553a Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Thu, 26 Jul 2018 18:20:25 +0000
Subject: [PATCH 114/158] Release version 1.6.0.RELEASE
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index d98e5ff..28525b9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.RELEASE</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index c66a71e..be0776c 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.RELEASE</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index bd134be..9ebace2 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.RELEASE</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.RELEASE</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 666335f..22a7489 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.RELEASE</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.6.0.BUILD-SNAPSHOT</version>
+ <version>1.6.0.RELEASE</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 25fde88e0697d9f403c53dad5c93de9018358714 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Thu, 26 Jul 2018 18:20:30 +0000
Subject: [PATCH 115/158] Next development version
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 28525b9..8d880ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.RELEASE</version>
+ <version>1.6.1.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index be0776c..49f7a59 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.RELEASE</version>
+ <version>1.6.1.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 9ebace2..67c331d 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.RELEASE</version>
+ <version>1.6.1.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.6.0.RELEASE</version>
+ <version>1.6.1.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.6.0.RELEASE</version>
+ <version>1.6.1.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 22a7489..cf2ac31 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.0.RELEASE</version>
+ <version>1.6.1.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.6.0.RELEASE</version>
+ <version>1.6.1.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From bfd9ae09898db866c7d1f210552e41c0b1e38211 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Thu, 2 Aug 2018 11:48:23 -0400
Subject: [PATCH 116/158] Update to 1.7.0.BUILD-SNAPSHOT
---
pom.xml | 6 +++---
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8d880ec..3c4c5e1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,18 +2,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.1.BUILD-SNAPSHOT</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.6.0.RELEASE</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.6.0.RELEASE</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.7.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.1.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.3.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 49f7a59..dd26b92 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.1.BUILD-SNAPSHOT</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 67c331d..59bb9dd 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.1.BUILD-SNAPSHOT</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.6.1.BUILD-SNAPSHOT</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.6.1.BUILD-SNAPSHOT</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index cf2ac31..8266585 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.6.1.BUILD-SNAPSHOT</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.6.1.BUILD-SNAPSHOT</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 0793cb24fbfa4c7d0e6f57dc56fab902ecb0b491 Mon Sep 17 00:00:00 2001
From: Jay Bryant <jbryant@pivotal.io>
Date: Mon, 30 Jul 2018 16:56:14 -0500
Subject: [PATCH 117/158] Full editing pass
I checked spelling, grammar, punctuation, and usage.
Accounted for Glenn Renfro's feedback
Glenn caught a number of minor errors and one big problem. The big problem was that I tried to change the heading level down one (there should be only one first-level heading in the book). I can't do it in all the files without changing a lot of stuff in other projects, so that will have to wait for a separate effort. Consequently, I reduced the headings by one (back to their original depth).
Accounted for Sabby Anandan's comments
Sabby caught some old content and asked for a link to be done with a variable rather than /current. I fixed up those issues. Thanks, Sabby.
---
.../src/main/asciidoc/api-guide-link.adoc | 4 +-
.../src/main/asciidoc/appendix.adoc | 8 +-
.../src/main/asciidoc/cf-tasks.adoc | 149 ++---
.../src/main/asciidoc/configuration.adoc | 548 ++++++++++--------
.../src/main/asciidoc/getting-started.adoc | 513 +++++++++-------
.../src/main/asciidoc/index.adoc | 12 +-
6 files changed, 693 insertions(+), 541 deletions(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/api-guide-link.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/api-guide-link.adoc
index cef8fdc..595f6ea 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/api-guide-link.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/api-guide-link.adoc
@@ -1,5 +1,5 @@
-// The API Guide adoc source file residing in SCDF core can't be included here, because it depends on generated
-// REST Docs snippets that aren't versionned (and are heavyweight to regenerate for each flavor). Hence, we do a
+// The API Guide asciidoc source file residing in SCDF core cannot be included here, because it depends on generated
+// REST Docs snippets that are not versioned (and are heavyweight to regenerate for each flavor). Hence, we do a
// simple link to the correct SCDF core version:
:spring-cloud-dataflow-docs-rest: http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/index.html#api-guide
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/appendix.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/appendix.adoc
index 41ddc6c..f97b909 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/appendix.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/appendix.adoc
@@ -1,15 +1,11 @@
[[appendix]]
= Appendices
-[partintro]
---
-Having trouble with Spring Cloud Data Flow, We'd like to help!
+Having trouble with Spring Cloud Data Flow? We'd like to help!
-* Ask a question - we monitor http://stackoverflow.com[stackoverflow.com] for questions
- tagged with http://stackoverflow.com/tags/spring-cloud-dataflow[`spring-cloud-dataflow`].
+* Ask a question. We monitor http://stackoverflow.com[stackoverflow.com] for questions tagged with http://stackoverflow.com/tags/spring-cloud-dataflow[`spring-cloud-dataflow`].
* Report bugs with Spring Cloud Data Flow at https://github.com/spring-cloud/spring-cloud-dataflow/issues.
* Report bugs with Spring Cloud Data Flow for Cloud Foundry at https://github.com/spring-cloud/spring-cloud-dataflow-server-cloudfoundry/issues.
---
include::{dataflow-asciidoc}/appendix-dataflow-template.adoc[]
include::{dataflow-asciidoc}/appendix-migration-guide.adoc[]
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/cf-tasks.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/cf-tasks.adoc
index cfb0019..eb6874a 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/cf-tasks.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/cf-tasks.adoc
@@ -2,112 +2,109 @@
= Tasks on Cloud Foundry
Spring Cloud Data Flow's task functionality exposes new task capabilities within
-the Pivotal Cloud Foundry runtime. It is important to note that the current underlying PCF
-task capabilities are considered experimental for PCF version versions less than 1.9. See
- <<enable-disable-specific-features>> for how to disable task support in Data Flow.
+the Pivotal Cloud Foundry runtime.
== Version Compatibility
The task functionality depends on the latest versions of PCF for runtime support. This
-release requires PCF version 1.7.12 or higher to run tasks. Tasks are an experimental
+release requires PCF version 1.7.12 or higher to run tasks. Tasks are an experimental
feature in PCF 1.7 and 1.8 and a GA feature in PCF 1.9.
-== Task Database Schema
-
-The database schema for Task applications was changed slighlty from the 1.0.x to 1.1.x version of
-Spring Cloud Task. Since Spring Cloud Data Flow automatically creates the database schema if it is
-not present upon server startup, you may need to update the schema if you ran a 1.0.x version of the
-Data Flow server and now are upgrading to the 1.1.x version. You can find the migration scripts
-link:https://github.com/spring-cloud/spring-cloud-task/tree/1.1.0.RELEASE/spring-cloud-task-core/src/main/resources/org/springframework/cloud/task/migration[here]
-in the Spring Cloud Task Github repository. The documentation for
-link:https://docs.cloudfoundry.org/devguide/deploy-apps/ssh-services.html[Accessing Services with Diego SSH]
-and this link:http://pivotaljourney.blogspot.com/2016/05/connecting-gui-tool-to-mysql-service-in.html[blog entry]
-for connecting a GUI tools to the MySQL Service in PCF should help you to update the schema.
-
== Running Task Applications
Running a task application within Spring Cloud Data Flow goes through a slightly different
lifecycle than running a stream application. Both types of applications need to be registered
-with the appropriate artifact coordinates. Both need a definition created via the SCDF DSL.
-However, that's where the similarities end.
+with the appropriate artifact coordinates. Both need a definition created with the SCDF DSL.
+However, the similarities end there.
-With stream based applications, you "deploy" them with the intent that they run until they
+With stream-based applications, you "`deploy`" them with the intent that they run until they
are undeployed. A stream definition is only deployed once (it can be scaled, but only
-deployed as one instance of the stream as a whole). However, tasks are _launched_. A single
-task definition can be launched many times. With each launch, they will start, execute,
-and shut down with PCF cleaning up the resources once the shutdown has occurred. The
+deployed as one instance of the stream as a whole). However, tasks are "`launched`". A single
+task definition can be launched many times. With each launch, the task starts, runs,
+and shuts down, with PCF cleaning up the resources once the shutdown has occurred. The
following sections outline the process of creating, launching, destroying, and viewing tasks.
-=== Create a Task
+=== Creating a Task
-Similar to streams, creating a task application is done via the SCDF DSL or through the
-dashboard. To create a task definition in SCDF, you've to either develop a task
+Similar to streams, creating a task application is done by using the SCDF DSL or through the
+dashboard. To create a task definition in SCDF, you must either develop a task
application or use one of the out-of-the-box link:http://docs.spring.io/spring-cloud-task-app-starters/docs/{sct-starters-core-version}/reference/htmlsingle[task app-starters].
The maven coordinates of the task application should be registered in SCDF. For more
-details on how to register task applications, review <<_registering_a_task_application,register task applications>>
-section from the core docs.
+details on how to register task applications, see link:https://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#spring-cloud-dataflow-register-task-apps[Registering a Task Application]
+in the core docs.
-Let's see an example that uses the out-of-the-box `timestamp` task application.
+The following example uses the out-of-the-box `timestamp` task application:
+====
[source]
----
dataflow:>task create --name foo --definition "timestamp"
Created new task 'foo'
----
+====
-NOTE: Tasks in SCDF do not require explicit deployment. They are required to be launched
-and with that there are different ways to launch them - refer to <<spring-cloud-dataflow-launch-tasks-from-stream,this section>>
-for more details.
+NOTE: Tasks in SCDF do not require explicit deployment. They are required to be launched,
+and there are different ways to launch them - see https://docs.spring.io/spring-cloud-task/docs/current/reference/htmlsingle/#stream-integration-launching-sink[Launching Tasks from a Spring Cloud Stream] for more details.
-=== Launch a Task
+=== Launching a Task
-Unlike streams, tasks in SCDF requires an explicit launch trigger or it can be manually kicked-off.
+Unlike streams, tasks in SCDF require an explicit launch trigger or can be manually kicked-off. The following example shows how to launch a task called `mytask`
+====
[source]
----
-dataflow:>task launch foo
-Launched task 'foo'
+dataflow:>task launch mytask
+Launched task 'mytask'
----
+====
-=== Launch a Task with arguments and properties
+=== Launching a Task with Arguments and Properties
-When a task is launched, any properties that need to be passed as command line arguments to the task application can be set when launching the task, as follows:
+When you launch a task, you can set any properties that need to be passed as command line arguments to the task application when launching the task as follows:
-```
+====
+[source,bash]
+----
dataflow:>task launch mytask --arguments "--key1=value1,--key2=value2"
+----
+====
-```
-
-Additional properties meant for a `TaskLauncher` itself can be passed in by using a `--properties` option.
+You can pass in additional properties meant for a `TaskLauncher` itself by using a `--properties` option.
The format of this option is a comma-separated string of properties prefixed with `app.<task definition name>.<property>`.
Properties are passed to `TaskLauncher` as application properties.
It is up to an implementation to choose how those are passed into an actual task application.
-If the property is prefixed with `deployer` instead of `app`, it is passed to `TaskLauncher` as a deployment property and its meaning may be `TaskLauncher` implementation specific.
+If the property is prefixed with `deployer` instead of `app`, it is passed to `TaskLauncher` as a deployment property and its meaning may be specific to the `TaskLauncher` implementation. The following example shows how to pass in application properties:
-```
+====
+[source,bash]
+----
dataflow:>task launch mytask --properties "deployer.timestamp.custom1=value1,app.timestamp.custom2=value2"
+----
+====
-```
-
-One can also pass JAVA_OPTS as the CF deployer property when the task is launched.
+You can also pass JAVA_OPTS values as the CF deployer property when the task is launched, as the following example shows
-```
+====
+[source,bash]
+----
task launch --name mytask --properties "deployer.mytask.cloudfoundry.javaOpts=-Duser.timezone=America/New_York"
-```
+----
+====
-The JAVA_OPTS can also be set as the global property for all the tasks using
+You can also set the JAVA_OPTS values as the global property for all the tasks by using
`SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_JAVA_OPTS`
-=== View Task Logs
+=== Viewing Task Logs
-As previously mentioned, the CL CLI is the way to interact with tasks on PCF,
-including viewing the logs. In order to view the logs as a task is executing use the
-following command where `foo` is the name of the task you are executing:
+The CF CLI is the way to interact with tasks on PCF,
+including viewing the logs. In order to view the logs as a task is executing, you can use the
+following command, where `mytask` is the name of the task you are executing:
+====
[source,bash]
----
-cf v3-logs foo
-Tailing logs for app foo...
+cf v3-logs mytask
+Tailing logs for app mytask...
....
....
@@ -119,14 +116,16 @@ Tailing logs for app foo...
2016-08-19T09:44:49.19-0700 [APP/TASK/bar1/0]OUT Destroying container
2016-08-19T09:44:50.41-0700 [APP/TASK/bar1/0]OUT Successfully destroyed container
----
+====
-NOTE: Logs are only viewable through the CF CLI as the app is running. Historic
+NOTE: Logs are viewable only through the CF CLI as the app is running. Historic
logs are not available.
-=== List Tasks
+=== Listing Tasks
-Listing tasks is as simple as:
+Listing tasks is as simple as the following example (which includes output):
+====
[source]
----
dataflow:>task list
@@ -136,11 +135,13 @@ dataflow:>task list
║foo │timestamp │complete ║
╚══════════════════════╧═════════════════════════╧═══════════╝
----
+====
-=== List Task Executions
+=== Listing Task Executions
-If you'd like to view the execution details of the launched task, you could do the following.
+If you want to view the execution details of the launched task, you could run the following:
+====
[source]
----
dataflow:>task execution list
@@ -151,30 +152,32 @@ dataflow:>task execution list
║foo:cloud: │1 │ Fri Aug 19 09:44:49 PDT │Fri Aug 19 09:44:49 PDT │0 ║
╚════════════════════════╧══╧═════════════════════════╧═════════════════════════╧════════╝
----
+====
-=== Destroy a Task
+=== Destroying a Task
-Destroying the task application from SCDF removes the task definition from task repository.
+Destroying the task application from SCDF removes the task definition from the task repository. The following listing (which includes output) shows how to destroy a task named `mytask` and verify that it has been removed from the task list:
[source]
----
-dataflow:>task destroy foo
-Destroyed task 'foo'
+dataflow:>task destroy mytask
+Destroyed task 'mytask'
dataflow:>task list
╔═════════╤═══════════════╤═══════════╗
║Task Name│Task Definition│Task Status║
╚═════════╧═══════════════╧═══════════╝
----
-=== Deleting Task From Cloud Foundry
-Currently Spring Cloud Data Flow does not delete tasks deployed on a Cloud
-Foundry instance once they have been pushed. The only way to do this now is via
-CLI on a Cloud Foundry instance version 1.9 or above.
-This is done in 2 steps:
+=== Deleting a Task From Cloud Foundry
+
+Currently, Spring Cloud Data Flow does not delete tasks deployed on a Cloud
+Foundry instance once they have been pushed. The only way to do this now is through the
+CLI on a Cloud Foundry instance, version 1.9 or above.
+This is done in two steps:
-. Obtain a list of the apps via the `cf apps` command.
-. Identify the task app to be deleted and execute the `cf delete <task-name>`
+. Obtain a list of the apps by using the `cf apps` command.
+. Identify the task application to be deleted and run the `cf delete <task-name>`
command.
-NOTE: The `task destroy <task-name>` only deletes the definition and not the task
-deployed on Cloud Foundry.
\ No newline at end of file
+NOTE: The `task destroy <task-name>` deletes only the definition and not the task
+deployed on Cloud Foundry.
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
index f7fc46a..5868792 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
@@ -1,78 +1,90 @@
[[configuration]]
= Server Configuration
-[partintro]
---
-In this section you will learn how to configure Spring Cloud Data Flow server's features such as the relational database to use and security.
-You will also learn how to configure Spring Cloud Data Flow shell's features.
---
+This section describes how to configure Spring Cloud Data Flow server's features, such as security and which relational database to use.
+It also describes how to configure Spring Cloud Data Flow shell's features.
[[enable-disable-specific-features]]
== Feature Toggles
-Data Flow server offers specific set of features that can be enabled/disabled when launching. These features include all the lifecycle operations, REST endpoints (server, client implementations including Shell and the UI) for:
+Data Flow server offers a specific set of features that you can enable or disable when launching. These features include all the lifecycle operations and REST endpoints (server, client implementations including Shell and the UI) for:
-. Streams
-. Tasks
-. Analytics
+* Streams
+* Tasks
+* Analytics
-One can enable, disable these features by setting the following boolean properties when launching the Data Flow server:
+You can enable or disable these features by setting the following boolean properties when you launch the Data Flow server:
* `spring.cloud.dataflow.features.streams-enabled`
* `spring.cloud.dataflow.features.tasks-enabled`
* `spring.cloud.dataflow.features.analytics-enabled`
-By default, all the features are enabled.
-Note: Since analytics feature is enabled by default, the Data Flow server is expected to have a valid Redis store available as analytic repository as we provide a default implementation of analytics based on Redis.
- This also means that the Data Flow server's `health` depends on the redis store availability as well.
- If you do not want to enabled HTTP endpoints to read analytics data written to Redis, then disable the analytics feature using the property mentioned above.
+By default, all features are enabled.
+Note: Since the analytics feature is enabled by default, the Data Flow server is expected to have a valid Redis store available as its analytic repository (we provide a default implementation of analytics based on Redis). This also means that the Data Flow server's `health` depends on the redis store availability as well. If you do not want to enable HTTP endpoints to read analytics data written to Redis, you can disable the analytics feature by using the `spring.cloud.dataflow.features.analytics-enabled` property to `false`.
-The REST endpoint `/features` provides information on the features enabled/disabled.
+The REST endpoint (`/features`) provides information on the enabled and disabled features.
[[configuration-app-defaults]]
== Deployer Properties
-You can also set other optional properties that alter the way Spring Cloud Data Flow will deploy stream and task apps to Cloud Foundry:
+You can also set other optional properties that alter the way Spring Cloud Data Flow deploys stream and task apps to Cloud Foundry:
-* The default memory and disk sizes for a deployed application can be configured. By default they are 1024 MB memory
-and 1024 MB disk. To change these, as an example to 512 and 2048 respectively, use
+* You can configure the default memory and disk sizes for a deployed application. By default, they are 1024 MB memory
+and 1024 MB disk. To change these to (for example) 512 and 2048 respectively, use the following commands:
+
-```
+====
+[source]\
+----
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_MEMORY 512
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_DISK 2048
-```
+----
+====
-* The default number of instances to deploy is set to 1, but can be overridden using
+* The default number of instances to deploy is set to 1, but you can override it by using the following command:
+
-```
+====
+[source]
+----
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_INSTANCES 1
-```
+----
+====
-* You can set the buildpack that will be used to deploy each application. For example, to use the Java offline buildback,
-set the following environment variable
+* You can set the buildpack that is used to deploy each application. For example, to use the Java offline buildback,
+set the following environment variable:
+
-```
+====
+[source]
+----
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_BUILDPACK java_buildpack_offline
-```
+----
+====
-* The health check mechanism used by Cloud Foundry to assert if apps are running can be customized using the environment variable `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK`. Current supported options
-are `http` (the default), `port` and `none`.
+* You can customize the health check mechanism used by Cloud Foundry to assert whether apps are running by using the `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK` environment variable. The current supported options
+are `http` (the default), `port`, and `none`.
+
-There are also environment variables to specify the the http based health check endpoint and timeout, `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK_ENDPOINT` and `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK_TIMEOUT`. These default to `/health` (the Spring Boot default location` and `120` seconds.
+You can also set environment variables that specify the the HTTP-based health check endpoint and timeout: `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK_ENDPOINT` and `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK_TIMEOUT`, respectively. These default to `/health` (the Spring Boot default location) and `120` seconds.
-* You can also specify deployment properties using the dsl. For instance if you want to set the allocated memory for the `http` app to 512m and also bind a mysql service to the `jdbc` application.
-```
+* You can also specify deployment properties by using the DSL. For instance, if you want to set the allocated memory for the `http` application to 512m and also bind a mysql service to the `jdbc` application, you can run the following commands:
++
+====
+[source]
+----
dataflow:> stream create --name mysqlstream --definition "http | jdbc --tableName=names --columns=name"
dataflow:> stream deploy --name mysqlstream --properties "deployer.http.memory=512, deployer.jdbc.cloudfoundry.services=mysql"
-```
-[NOTE]
+----
====
-These settings can be configured separately for stream and task apps. To alter settings for tasks, simply
-substitute `STREAM` with `TASK` in the property name. As an example,
++
+[NOTE]
+=====
+You can configure these settings separately for stream and task apps. To alter settings for tasks,
+substitute `TASK` for `STREAM` in the property name, as the following example shows:
-```
+====
+[source]
+----
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_MEMORY 512
-```
+----
====
+=====
TIP: All the properties mentioned above are `@ConfigurationProperties` of the
Cloud Foundry deployer. See link:https://github.com/spring-cloud/spring-cloud-deployer-cloudfoundry/blob/{deployer-branch-or-tag}/src/main/java/org/springframework/cloud/deployer/spi/cloudfoundry/CloudFoundryDeploymentProperties.java[CloudFoundryDeploymentProperties.java] for more information.
@@ -80,21 +92,26 @@ Cloud Foundry deployer. See link:https://github.com/spring-cloud/spring-cloud-de
[[configuration-app-names-cloud-foundry]]
== Application Names and Prefixes
-To help avoid clashes with routes across spaces in Cloud Foundry, a naming strategy to provide a random prefix to a
-deployed application is available and is enabled by default. The https://github.com/spring-cloud/spring-cloud-deployer-cloudfoundry#application-name-settings-and-deployments[default configurations]
-are overridable and the respective properties can be set via `cf set-env` commands.
+To help avoid clashes with routes across spaces in Cloud Foundry, a naming strategy that provides a random prefix to a
+deployed application is available and is enabled by default. You can override the https://github.com/spring-cloud/spring-cloud-deployer-cloudfoundry#application-name-settings-and-deployments[default configurations]
+and set the respective properties by using `cf set-env` commands.
-For instance, if you'd like to disable the randomization, you can override it through:
+For instance, if you want to disable the randomization, you can override it by using the following command:
-```
+====
+[source]
+----
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_ENABLE_RANDOM_APP_NAME_PREFIX false
-```
+----
+====
+
[[configuration-custom-routes]]
== Custom Routes
-As an alternative to random name, or to get even more control over the hostname used by the deployed apps, one can use
-custom deployment properties, as such:
+As an alternative to a random name or to get even more control over the hostname used by the deployed apps, you can use
+custom deployment properties, as the following example shows:
+====
[source]
----
dataflow:>stream create foo --definition "http | log"
@@ -103,121 +120,137 @@ sdataflow:>stream deploy foo --properties "deployer.http.cloudfoundry.domain=myd
deployer.http.cloudfoundry.host=myhost,
deployer.http.cloudfoundry.route-path=my-path"
----
+====
-This would result in the `http` app being bound to the URL `http://myhost.mydomain.com/my-path`. Note that this is an
-example showing *all* customization options available. One can of course only leverage one or two out of the three.
+The preceding example binds the `http` app to the `http://myhost.mydomain.com/my-path` URL. Note that this
+example shows *all* of the available customization options. In practice, you can use only one or two out of the three.
[[configuration-docker-apps]]
== Docker Applications
-Starting with version 1.2, it is possible to register and deploy Docker based apps as part of streams and tasks using
+Starting with version 1.2, it is possible to register and deploy Docker based apps as part of streams and tasks by using
Data Flow for Cloud Foundry.
+If you use Spring Boot and RabbitMQ-based Docker images, you can provide a common deployment property
+to facilitate binding the apps to the RabbitMQ service. Assuming your RabbitMQ service is named `rabbit`, you can provide the following:
-If you are using Spring Boot and RabbitMQ based Docker images you can provide a common deployment property
-to facilitate the apps binding to the RabbitMQ service. Assuming your RabbitMQ service is named `rabbit` you can provide the following:
-
-```
+====
+[source]
+----
cf set-env dataflow-server SPRING_APPLICATION_JSON '{"spring.cloud.dataflow.applicationProperties.stream.spring.rabbitmq.addresses": "${vcap.services.rabbit.credentials.protocols.amqp.uris}"}'
-```
-For Spring Cloud Task apps, something similar to the following could be used, if using a database service instance named `mysql`:
+----
+====
-```
+For Spring Cloud Task apps, you can use something similar to the following, if you use a database service instance named `mysql`:
+
+====
+[source]
+----
cf set-env SPRING_DATASOURCE_URL '${vcap.services.mysql.credentials.jdbcUrl}'
cf set-env SPRING_DATASOURCE_USERNAME '${vcap.services.mysql.credentials.username}'
cf set-env SPRING_DATASOURCE_PASSWORD '${vcap.services.mysql.credentials.password}'
cf set-env SPRING_DATASOURCE_DRIVER_CLASS_NAME 'org.mariadb.jdbc.Driver'
-```
-
+----
+====
-For non-Java or non-Boot apps, your Docker app would have to parse the `VCAP_SERVICES` variable in order to bind to any available services.
+For non-Java or non-Boot applications, your Docker app must parse the `VCAP_SERVICES` variable in order to bind to any available services.
[NOTE]
.Passing application properties
-====
-When using non-boot apps, chances are that you want the application properties passed to your app using traditional
-environment variables, as opposed to using the special `SPRING_APPLICATION_JSON` variable. To achieve this, set the
+=====
+When using non-Boot applications, chances are that you want to pass the application properties by using traditional
+environment variables, as opposed to using the special `SPRING_APPLICATION_JSON` variable. To do so, set the
following variables for streams and tasks, respectively:
+====
[source, properties]
----
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_USE_SPRING_APPLICATION_JSON=false
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_USE_SPRING_APPLICATION_JSON=false
----
====
-
+=====
[[configuration-service-binding-at-application-level]]
-== Application Level Service Bindings
-When deploying streams in Cloud Foundry, you can take advantage of application specific service bindings, so not all
+== Application-level Service Bindings
+
+When deploying streams in Cloud Foundry, you can take advantage of application-specific service bindings, so not all
services are globally configured for all the apps orchestrated by Spring Cloud Data Flow.
-For instance, if you'd like to provide `mysql` service binding only for the `jdbc` application in the following stream
-definition, you can pass the service binding as a deployment property.
+For instance, if you want to provide a `mysql` service binding only for the `jdbc` application in the following stream
+definition, you can pass the service binding as a deployment property:
+====
[source]
----
dataflow:>stream create --name httptojdbc --definition "http | jdbc"
dataflow:>stream deploy --name httptojdbc --properties "deployer.jdbc.cloudfoundry.services=mysqlService"
----
-Where, `mysqlService` is the name of the service specifically only bound to `jdbc` application and the `http`
-application wouldn't get the binding by this method.
-If you have more than one service to bind, they can be passed as comma separated items
-(_eg_: `deployer.jdbc.cloudfoundry.services=mysqlService,someService`).
+
+where `mysqlService` is the name of the service specifically bound only to the `jdbc` application and the `http`
+application does not get the binding by this method.
+====
+
+If you have more than one service to bind, they can be passed as comma-separated items
+(for example: `deployer.jdbc.cloudfoundry.services=mysqlService,someService`).
[[configuration-ups]]
-== User Provided Services
+== User-provided Services
In addition to marketplace services, Cloud Foundry supports
-https://docs.cloudfoundry.org/devguide/services/user-provided.html[User Provided Services] (UPS). Throughout this reference manual,
-regular services have been mentioned, but there is nothing precluding the use of UPSs as well, whether for use as the
-messaging middleware (_e.g._ if you'd like to use an external Apache Kafka installation) or for _ad hoc_ usage by some
- of the stream apps (_e.g._ an Oracle Database).
+https://docs.cloudfoundry.org/devguide/services/user-provided.html[User-provided Services] (UPS). Throughout this reference manual,
+regular services have been mentioned, but there is nothing precluding the use of User-provided Services as well, whether for use as the
+messaging middleware (for example, if you want to use an external Apache Kafka installation) or for use by some
+of the stream applications (for example, an Oracle Database).
-Let's review an example of extracting and supplying the connection credentials from an UPS.
+Now we review an example of extracting and supplying the connection credentials from a UPS.
-* A sample UPS setup for Apache Kafka.
+The following example shows a sample UPS setup for Apache Kafka:
+====
[source,bash]
----
cf create-user-provided-service kafkacups -p '{”brokers":"HOST:PORT","zkNodes":"HOST:PORT"}'
----
+====
-* The UPS credentials will be wrapped within `VCAP_SERVICES` and it can be supplied directly in the stream definition like
-the following.
+The UPS credentials are wrapped within `VCAP_SERVICES`, and they can be supplied directly in the stream definition, as
+the following example shows.
+====
[source]
----
stream create fooz --definition "time | log"
stream deploy fooz --properties "app.time.spring.cloud.stream.kafka.binder.brokers=${vcap.services.kafkacups.credentials.brokers},app.time.spring.cloud.stream.kafka.binder.zkNodes=${vcap.services.kafkacups.credentials.zkNodes},app.log.spring.cloud.stream.kafka.binder.brokers=${vcap.services.kafkacups.credentials.brokers},app.log.spring.cloud.stream.kafka.binder.zkNodes=${vcap.services.kafkacups.credentials.zkNodes}"
----
-
+====
[[configuration-maximum-disk-quota-configuration]]
== Maximum Disk Quota
By default, every application in Cloud Foundry starts with 1G disk quota and this can be adjusted to a default maximum of
-2G. The default maximum can also be overridden up to 10G via Pivotal Cloud Foundry's (PCF) Ops Manager GUI.
+2G. The default maximum can also be overridden up to 10G by using Pivotal Cloud Foundry's (PCF) Ops Manager GUI.
This configuration is relevant for Spring Cloud Data Flow because every stream and task deployment is composed of applications
-(typically Spring Boot uber-jar's) and those applications are resolved from a remote maven repository. After resolution,
-the application artifacts are downloaded to the local Maven Repository for caching/reuse. With this happening in the background,
-there is a possibility the default disk quota (_1G_) fills up rapidly; especially, when we are experimenting with streams that
-are made up of unique applications. In order to overcome this disk limitation and depending
-on your scaling requirements,you may want to change the default maximum from 2G to 10G. Let's review the
+(typically Spring Boot uber-jar's), and those applications are resolved from a remote maven repository. After resolution,
+the application artifacts are downloaded to the local Maven Repository for caching and reuse. With this happening in the background,
+the default disk quota (1G) can fill up rapidly, especially when we experiment with streams that
+are made up of unique applications. In order to overcome this disk limitation and depending
+on your scaling requirements, you may want to change the default maximum from 2G to 10G. Let's review the
steps to change the default maximum disk quota allocation.
=== PCF's Operations Manager
-From PCF's Ops Manager, Select "*Pivotal Elastic Runtime*" tile and navigate to "*Application Developer Controls*" tab.
-Change the "*Maximum Disk Quota per App (MB)*" setting from 2048 to 10240 (_10G_). Save the disk quota update and hit
-"Apply Changes" to complete the configuration override.
+From PCF's Ops Manager, select the "`Pivotal Elastic Runtime`" tile and navigate to the "`Application Developer Controls`" tab.
+Change the "`Maximum Disk Quota per App (MB)`" setting from 2048 (2G) to 10240 (10G). Save the disk quota update and click
+"`Apply Changes`" to complete the configuration override.
[[configuration-scaling]]
== Scale Application
-Once the disk quota change is applied successfully and assuming you've a xref:running-on-cloudfoundry[running application],
-you may scale the application with a new `disk_limit` through CF CLI.
+Once the disk quota change has been successfully applied and assuming you have a xref:running-on-cloudfoundry[running application],
+you can scale the application with a new `disk_limit` through the CF CLI, as the following example shows:
+====
[source,bash]
----
→ cf scale dataflow-server -k 10GB
@@ -233,7 +266,11 @@ OK
state since cpu memory disk details
#0 running 2016-10-31 03:07:23 PM 1.8% 497.9M of 1.1G 193.9M of 10G
----
+====
+
+You can then list the applications and see the new maximum disk space, as the following example shows:
+====
[source,bash]
----
→ cf apps
@@ -243,16 +280,23 @@ OK
name requested state instances memory disk urls
dataflow-server started 1/1 1.1G 10G dataflow-server.apps.io
----
+====
+
[[managing-disk-utilization]]
-== Managing disk utilization
+== Managing Disk Use
Even when configuring the Data Flow server to use 10G of space, there is the possibility of exhausting
the available space on the local disk.
-If you deploy the Data Flow server using the default `port` health check type, you will have to monitor the disk space on the server explicitly in order to avoid running out space.
-If you deploy the server using the `http` health check type (see below) the Data Flow server will be restarted if there is low disk space.
+If you deploy the Data Flow server by using the default `port` health check type, you must explicitly monitor the disk space on the server in order to avoid running out space.
+If you deploy the server by using the `http` health check type (see the next example), the Data Flow server is restarted if there is low disk space.
This is due to Spring Boot's link:https://github.com/spring-projects/spring-boot/blob/v1.5.14.RELEASE/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicator.java[Disk Space Health Indicator].
-You can link:https://docs.spring.io/spring-boot/docs/1.5.14.RELEASE/reference/htmlsingle/#common-application-properties[configure] the settings of the Disk Space Health Indicator using the properties with the prefix `management.health.diskspace`.
-Use of link:https://docs.cloudfoundry.org/devguide/services/using-vol-services.html[Volume Services] for the Data Flow server to store `.jar` artifacts before pushing them to Cloud Foundry is being investigated for version 1.7.
+You can link:https://docs.spring.io/spring-boot/docs/1.5.14.RELEASE/reference/htmlsingle/#common-application-properties[configure] the settings of the Disk Space Health Indicator by using the properties that have the `management.health.diskspace` prefix.
+
+For version 1.7, we are investigating the use of link:https://docs.cloudfoundry.org/devguide/services/using-vol-services.html[Volume Services] for the Data Flow server to store `.jar` artifacts before pushing them to Cloud Foundry.
+
+The following example shows how to deploy the `http` health check type to an endpoint called `/management/health`:
+
+====
[source]
----
---
@@ -260,71 +304,74 @@ Use of link:https://docs.cloudfoundry.org/devguide/services/using-vol-services.h
health-check-type: http
health-check-http-endpoint: /management/health
----
+====
[[configuration-app-resolution-options]]
== Application Resolution Alternatives
+
Though we highly recommend using Maven Repository for application link:http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#spring-cloud-dataflow-register-stream-apps[resolution and registration]
-in Cloud Foundry, there might be situations where an alternative approach would make sense. Following alternative options
-could come handy for resolving applications when running on Cloud Foundry.
+in Cloud Foundry, there might be situations where an alternative approach would make sense. The following alternative options
+could help you resolve applications when running on Cloud Foundry.
* With the help of Spring Boot, we can serve link:https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-developing-web-applications.html#boot-features-spring-mvc-static-content[static content]
-in Cloud Foundry. A simple Spring Boot application can bundle all the required stream/task applications and by having it
-run on Cloud Foundry, the static application can then serve the Über-jar's. From the Shell, you can, for example, register the
-app with the name `http-source.jar` via `--uri=http://<Route-To-StaticApp>/http-source.jar`.
+in Cloud Foundry. A simple Spring Boot application can bundle all the required stream and task applications. By having it
+run on Cloud Foundry, the static application can then serve the über-jar's. From the shell, you can, for example, register the
+application with the name `http-source.jar` by using `--uri=http://<Route-To-StaticApp>/http-source.jar`.
-* The Über-jar's can be hosted on any external server that's reachable via HTTP. They can be resolved from raw GitHub URIs
-as well. From the Shell, you can, for example, register the app with the name `http-source.jar` via `--uri=http://<Raw_GitHub_URI>/http-source.jar`.
+* The über-jar's can be hosted on any external server that's reachable over HTTP. They can be resolved from raw GitHub URIs
+as well. From the shell, you can, for example, register the app with the name `http-source.jar` by using `--uri=http://<Raw_GitHub_URI>/http-source.jar`.
-* link:http://docs.cloudfoundry.org/buildpacks/staticfile/index.html[Static Buildpack ]support in Cloud Foundry is another
-option. A similar HTTP resolution will work on this model, too.
+* link:http://docs.cloudfoundry.org/buildpacks/staticfile/index.html[Static Buildpack] support in Cloud Foundry is another
+option. A similar HTTP resolution works on this model, too.
* link:https://docs.cloudfoundry.org/devguide/services/using-vol-services.html[Volume Services] is another great option.
-The required Über-jar's can be hosted in an external file-system and with the help of volume-services, you can, for
-example, register the app with the name `http-source.jar` via `--uri=file://<Path-To-FileSystem>/http-source.jar`.
+The required über-jars can be hosted in an external file system. With the help of volume-services, you can, for
+example, register the application with the name `http-source.jar` by using `--uri=file://<Path-To-FileSystem>/http-source.jar`.
[[getting-started-connection-pool]]
== Database Connection Pool
-The Data Flow Server uses the Spring Cloud Connector library to create the DataSource with a default connection pool size of 4.
+The Data Flow server uses the Spring Cloud Connector library to create the DataSource with a default connection pool size of `4`.
To change the connection pool size and maximum wait time, set the following two properties `spring.cloud.dataflow.server.cloudfoundry.maxPoolSize` and `spring.cloud.dataflow.server.cloudfoundry.maxWaitTime`.
The wait time is specified in milliseconds.
[[getting-started-security]]
== Security
-By default, the Data Flow server is unsecured and runs on an unencrypted HTTP connection. You can secure your REST endpoints,
-as well as the Data Flow Dashboard by enabling HTTPS and requiring clients to authenticate.
+By default, the Data Flow server is unsecured and runs on an unencrypted HTTP connection. You can secure your REST endpoints
+(as well as the Data Flow Dashboard) by enabling HTTPS and requiring clients to authenticate.
For more details about securing the
-REST endpoints and configuring to authenticate against an OAUTH backend (_i.e: UAA/SSO running on Cloud Foundry_), please
-review the security section from the core http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#configuration-security[reference guide]. The security configurations can be configured in `dataflow-server.yml` or passed as environment variables through `cf set-env` commands.
+REST endpoints and configuring to authenticate against an OAUTH backend (UAA and SSO running on Cloud Foundry),
+see the security section from the core http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#configuration-security[reference guide]. You can configure the security details in `dataflow-server.yml` or pass them as environment variables through `cf set-env` commands.
[[getting-started-security-cloud-foundry]]
=== Authentication and Cloud Foundry
-Spring Cloud Data Flow can either integrate with _Pivotal Single Sign-On Service_
-(E.g. on PWS) or _Cloud Foundry User Account and Authentication_ (UAA) Server.
+Spring Cloud Data Flow can either integrate with Pivotal Single Sign-On Service
+(for example, on PWS) or Cloud Foundry User Account and Authentication (UAA) Server.
[[getting-started-security-cloud-foundry-sso]]
==== Pivotal Single Sign-On Service
-When deploying Spring Cloud Data Flow to Cloud Foundry you can simply bind the
-application to the _Pivotal Single Sign-On Service_. By doing so, Spring Cloud
+When deploying Spring Cloud Data Flow to Cloud Foundry, you can bind the
+application to the Pivotal Single Sign-On Service. By doing so, Spring Cloud
Data Flow takes advantage of the
- https://github.com/pivotal-cf/spring-cloud-sso-connector[_Spring Cloud Single Sign-On Connector_],
- which provides Cloud Foundry specific auto-configuration support for OAuth 2.0.
+https://github.com/pivotal-cf/spring-cloud-sso-connector[Spring Cloud Single Sign-On Connector],
+which provides Cloud Foundry-specific auto-configuration support for OAuth 2.0.
-Simply bind the _Pivotal Single Sign-On Service_ to your Data Flow Server app and
-Single Sign-On (SSO) via OAuth2 will be enabled by default.
+To do so, bind the Pivotal Single Sign-On Service to your Data Flow Server application and
+Single Sign-On (SSO) over OAuth2 will be enabled by default.
-Authorization is similarly support as for non-Cloud Foundry security scenarios.
-Please refer to the security section from the core Data Flow http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#configuration-security[reference guide].
+Authorization is similarly supported for non-Cloud Foundry security scenarios.
+See the security section from the core Data Flow http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#configuration-security[reference guide].
-As the provisioning of roles can vary widely across environments, we assign by
-default all Spring Cloud Data Flow roles to users.
+As the provisioning of roles can vary widely across environments, we by
+default assign all Spring Cloud Data Flow roles to users.
-This can be customized by providing your own http://docs.spring.io/spring-boot/docs/current/api/org/springframework/boot/autoconfigure/security/oauth2/resource/AuthoritiesExtractor.html[AuthoritiesExtractor].
+You can customize this behavior by providing your own http://docs.spring.io/spring-boot/docs/current/api/org/springframework/boot/autoconfigure/security/oauth2/resource/AuthoritiesExtractor.html[`AuthoritiesExtractor`].
-One possible approach to set the custom `AuthoritiesExtractor` on the `UserInfoTokenServices` could be this:
+The following example shows one possible approach to set the custom `AuthoritiesExtractor` on the `UserInfoTokenServices`:
+====
[source,java]
----
public class MyUserInfoTokenServicesPostProcessor
@@ -345,9 +392,11 @@ public class MyUserInfoTokenServicesPostProcessor
}
}
----
+====
-And you simply declare it in your configuration class:
+Then you can declare it in your configuration class as follows:
+====
[source,java]
----
@Bean
@@ -356,15 +405,19 @@ public BeanPostProcessor myUserInfoTokenServicesPostProcessor() {
return postProcessor;
}
----
+====
[[getting-started-security-cloud-foundry-uaa]]
==== Cloud Foundry UAA
-The availability of this option depends on the used Cloud Foundry environment.
+The availability of Cloud Foundry User Account and Authentication (UAA) depends on the Cloud Foundry environment.
In order to provide UAA integration, you have to manually provide the necessary
-OAuth2 configuration properties, for instance via the `SPRING_APPLICATION_JSON`
-property.
+OAuth2 configuration properties (for example, by setting the `SPRING_APPLICATION_JSON`
+property).
+The following JSON example shows how to create a security configuration:
+
+====
[source,json]
----
{
@@ -375,19 +428,19 @@ property.
"security.oauth2.resource.user-info-uri": "https://login.cf.myhost.com/userinfo"
}
----
+====
-By default, the property `spring.cloud.dataflow.security.cf-use-uaa` is set to `true`. This property will activate a special
-
-http://docs.spring.io/spring-boot/docs/current/api/org/springframework/boot/autoconfigure/security/oauth2/resource/AuthoritiesExtractor.html[AuthoritiesExtractor] **CloudFoundryDataflowAuthoritiesExtractor**.
+By default, the `spring.cloud.dataflow.security.cf-use-uaa` property is set to `true`. This property activates a special
+http://docs.spring.io/spring-boot/docs/current/api/org/springframework/boot/autoconfigure/security/oauth2/resource/AuthoritiesExtractor.html[`AuthoritiesExtractor`] called `CloudFoundryDataflowAuthoritiesExtractor`.
-If CloudFoundry UAA is not used, then make sure to set `spring.cloud.dataflow.security.cf-use-uaa` to `false`.
+If you do not use CloudFoundry UAA, you should set `spring.cloud.dataflow.security.cf-use-uaa` to `false`.
-Under the covers this _AuthoritiesExtractor_ will call out to the
+Under the covers, this `AuthoritiesExtractor` calls out to the
https://apidocs.cloudfoundry.org/253/apps/retrieving_permissions_on_a_app.html[Cloud Foundry
-Apps API] and ensure that users are in fact _Space Developers_.
+Apps API] and ensure that users are in fact Space Developers.
-If the authenticated user is verified as _Space Developer_, all roles will be assigned,
-otherwise no roles whatsoever will be assigned. In that case you may see the following
+If the authenticated user is verified as a Space Developer, all roles are assigned.
+Otherwise, no roles whatsoever are assigned. In that case, you may see the following
Dashboard screen:
.Accessing the Data Flow Dashboard without Roles
@@ -395,124 +448,138 @@ image::cf-getting-started-security-no-roles.png[Dashboard without roles, scaledw
== Configuration Reference
-The following pieces of configuration must be provided. These are Spring Boot `@ConfigurationProperties` so you can set
-them as environment variables or by any other means that Spring Boot supports. Here is a listing in environment
-variable format as that is an easy way to get started configuring Boot applications in Cloud Foundry.
+You must provide several pieces of configuration. These are Spring Boot `@ConfigurationProperties`, so you can set
+them as environment variables or by any other means that Spring Boot supports. The following listing is in environment
+variable format, as that is an easy way to get started configuring Boot applications in Cloud Foundry:
-```
-# Default values cited after the equal sign.
-# Example values, typical for Pivotal Web Services, cited as a comment
+====
+[source,bash]
+----
+# Default values appear after the equal signs.
+# Example values, typical for Pivotal Web Services, are included as comments.
-# url of the CF API (used when using cf login -a for example), e.g. https://api.run.pivotal.io
-# (for setting env var use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_URL)
+# URL of the CF API (used when using cf login -a for example) - for example, https://api.run.pivotal.io
+# (to set the environment variable, use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_URL).
spring.cloud.deployer.cloudfoundry.url=
-# name of the organization that owns the space above, e.g. youruser-org
-# (For Setting Env var use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_ORG)
+# The name of the organization that owns the space above - for example, youruser-org
+# (To set the environment variable, use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_ORG).
spring.cloud.deployer.cloudfoundry.org=
-# name of the space into which modules will be deployed, e.g. development
-# (for setting env var use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SPACE)
+# The name of the space into which modules will be deployed - for example, development
+# (to set the environment variable, use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SPACE).
spring.cloud.deployer.cloudfoundry.space=
-# the root domain to use when mapping routes, e.g. cfapps.io
-# (for setting env var use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_DOMAIN)
+# The root domain to use when mapping routes - for example, cfapps.io
+# (to set the environment variable, use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_DOMAIN).
spring.cloud.deployer.cloudfoundry.domain=
-# username and password of the user to use to create apps
-# (for setting env var use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_USERNAME and SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_PASSWORD)
+# The user name and password of the user to use to create applications
+# (to set the environment variables, use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_USERNAME
+# and SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_PASSWORD).
spring.cloud.deployer.cloudfoundry.username=
spring.cloud.deployer.cloudfoundry.password=
-# Whether to allow self-signed certificates during SSL validation
-# (for setting env var use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATION)
+# Whether to allow self-signed certificates during SSL validation (you should NOT do so in production)
+# (to set the environment variable, use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATION).
spring.cloud.deployer.cloudfoundry.skipSslValidation=false
-# Comma separated set of service instance names to bind to every stream app deployed.
-# Amongst other things, this should include a service that will be used
-# for Spring Cloud Stream binding, e.g. rabbit
-# (for setting env var use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES)
+# A comma-separated set of service instance names to bind to every deployed stream application.
+# Among other things, this should include a service that is used
+# for Spring Cloud Stream binding, such as Rabbit
+# (to set the environment variable, use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES).
spring.cloud.deployer.cloudfoundry.stream.services=
-# Health check type to use for stream apps. Accepts 'none' and 'port'
+# The health check type to use for stream apps. Accepts 'none' and 'port'.
spring.cloud.deployer.cloudfoundry.stream.health-check=
-# Comma separated set of service instance names to bind to every task app deployed.
-# Amongst other things, this should include an RDBMS service that will be used
-# for Spring Cloud Task execution reporting, e.g. my_mysql
-# (for setting env var use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES)
+# A comma-separated set of service instance names to bind to every deployed task application.
+# Among other things, this should include an RDBMS service that is used
+# for Spring Cloud Task execution reporting, such as my_mysql
+# (to set the environment variable, use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES).
spring.cloud.deployer.cloudfoundry.task.services=
-# Timeout to use, in seconds, when doing blocking API calls to Cloud Foundry.
-# (for setting env var use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_API_TIMEOUT
-# and SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_API_TIMEOUT)
+# Timeout, in seconds, to use when doing blocking API calls to Cloud Foundry
+# (to set the environment variable, use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_API_TIMEOUT
+# and SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_API_TIMEOUT).
spring.cloud.deployer.cloudfoundry.stream.apiTimeout=360
spring.cloud.deployer.cloudfoundry.task.apiTimeout=360
-# Timeout to use, in milliseconds, when querying the Cloud Foundry API to compute app status.
-# (for setting env var use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_STATUS_TIMEOUT
-# and SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_STATUS_TIMEOUT)
+# Timeout, in milliseconds, to use when querying the Cloud Foundry API to compute app status
+# (to set the environment variable, use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_STATUS_TIMEOUT
+# and SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_STATUS_TIMEOUT).
spring.cloud.deployer.cloudfoundry.stream.statusTimeout=5000
spring.cloud.deployer.cloudfoundry.task.statusTimeout=5000
+----
+====
-```
-
-Note that you can set the following properties `spring.cloud.deployer.cloudfoundry.services`,
-`spring.cloud.deployer.cloudfoundry.buildpack` or the Spring Cloud Deployer standard
+Note that you can set `spring.cloud.deployer.cloudfoundry.services`,
+`spring.cloud.deployer.cloudfoundry.buildpack`, or the Spring Cloud Deployer-standard
`spring.cloud.deployer.memory` and `spring.cloud.deployer.disk`
-as part of an individual deployment request by using the `deployer.<app-name>` shortcut. For example
+as part of an individual deployment request by using the `deployer.<app-name>` shortcut, as the following example shows:
-```
->stream create --name ticktock --definition "time | log"
->stream deploy --name ticktock --properties "deployer.time.memory=2g"
-```
+====
+[source]
+----
+stream create --name ticktock --definition "time | log"
+stream deploy --name ticktock --properties "deployer.time.memory=2g"
+----
+====
-will deploy the time source with 2048MB of memory, while the log sink will use the default 1024MB.
+The commands in the preceding example deploy the time source with 2048MB of memory, while the log sink uses the default 1024MB.
-One can also pass JAVA_OPTS as a deployment property when deploying a stream.
+When you deploy a stream, you can also pass `JAVA_OPTS` as a deployment property, as the following example shows:
-```
->stream deploy --name ticktock --properties "deployer.time.cloudfoundry.javaOpts=-Duser.timezone=America/New_York"
-```
+====
+[source,bash]
+----
+stream deploy --name ticktock --properties "deployer.time.cloudfoundry.javaOpts=-Duser.timezone=America/New_York"
+----
+====
-This property can also be set at the global level for all the streams as applicable to any deployment property using
+You can also set this property at the global level for all the streams as applicable to any deployment property by setting
`SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_JAVA_OPTS` as the server level property.
== Debugging
If you want to get better insights into what is happening when your streams and tasks are being deployed, you may want
to turn on the following features:
-* Reactor "stacktraces", showing which operators were involved before an error occurred. This is helpful as the deployer
+* Reactor "`stacktraces`", showing which operators were involved before an error occurred. This feature is helpful, as the deployer
relies on project reactor and regular stacktraces may not always allow understanding the flow before an error happened.
-Note that this comes with a performance penalty, so is disabled by default.
+Note that this comes with a performance penalty, so it is disabled by default.
+
-```
+====
+[source,bash]
+----
spring.cloud.dataflow.server.cloudfoundry.debugReactor = true
-```
-* Deployer and Cloud Foundry client library request/response logs. This allows seeing detailed conversation between
+----
+====
+* Deployer and Cloud Foundry client library request and response logs. This feature allows seeing a detailed conversation between
the Data Flow server and the Cloud Foundry Cloud Controller.
+
-```
+====
+[source,data]
+----
logging.level.cloudfoundry-client = DEBUG
-
-```
+----
+====
== Spring Cloud Config Server
-Spring Cloud Config Server can be used to centralize configuration properties for Spring Boot applications. Likewise,
-both Spring Cloud Data Flow and the applications orchestrated using Spring Cloud Data Flow can be integrated with
-config-server to leverage the same capabilities.
+You can use Spring Cloud Config Server to centralize configuration properties for Spring Boot applications. Likewise,
+both Spring Cloud Data Flow and the applications orchestrated by Spring Cloud Data Flow can be integrated with
+a configuration server to use the same capabilities.
=== Stream, Task, and Spring Cloud Config Server
-Similar to Spring Cloud Data Flow server, it is also possible to configure both the stream and task applications to resolve the centralized properties from config-server.
-Setting the property `spring.cloud.config.uri` for the deployed applications is a common way to bind to the Config Server.
+Similar to Spring Cloud Data Flow server, you can configure both the stream and task applications to resolve the centralized properties from the configuration server.
+Setting the `spring.cloud.config.uri` property for the deployed applications is a common way to bind to the configuration server.
See the link:https://cloud.spring.io/spring-cloud-config/spring-cloud-config.html#_spring_cloud_config_client[Spring Cloud Config Client] reference guide for more information.
-Since this property is likely to be used across all applications deployed by the Data Flow server, the Data Flow Server's property `spring.cloud.dataflow.applicationProperties.stream` for stream apps and `spring.cloud.dataflow.applicationProperties.task` for task apps can be used to pass the `uri` of the Config Server to each deployed stream or task application. Refer to the section on Common application properties for more information.
+Since this property is likely to be used across all applications deployed by the Data Flow server, the Data Flow server's `spring.cloud.dataflow.applicationProperties.stream` property for stream applications and `spring.cloud.dataflow.applicationProperties.task` property for task applications can be used to pass the `uri` of the Config Server to each deployed stream or task application. See the section on http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#spring-cloud-dataflow-global-properties[common application properties] for more information.
+Note that, if you use applications from the link:http://cloud.spring.io/spring-cloud-stream-app-starters/[App Starters project], these applications already embed the `spring-cloud-services-starter-config-client` dependency.
+If you build your application from scratch and want to add the client side support for config server, you can add a dependency reference to the config server client library. The following snippet shows a Maven example:
-If you're using applications from the link:http://cloud.spring.io/spring-cloud-stream-app-starters/[App Starters project], note that these applications already embed the `spring-cloud-services-starter-config-client` dependency.
-If you're building your application from scratch and want to add the client side support for config server, simply add a reference dependency reference to the config server client library. A maven example snippet follows:
-
+====
[source,xml]
----
...
@@ -524,21 +591,24 @@ If you're building your application from scratch and want to add the client side
...
----
-Where, `CONFIG_CLIENT_VERSION` can be the latest release of https://github.com/pivotal-cf/spring-cloud-services-connector/releases[Spring Cloud Config Server]
+where `CONFIG_CLIENT_VERSION` can be the latest release of the https://github.com/pivotal-cf/spring-cloud-services-connector/releases[Spring Cloud Config Server]
client for Pivotal Cloud Foundry.
+====
-NOTE: You will observe a `WARN` logging message if the application that uses this library can not connect to the config
-server when the applicaiton starts and whenever the `/health` endpoint is accessed.
-You can disable the client library if you know that you are not using config server functionality by setting the
-environment variable `SPRING_CLOUD_CONFIG_ENABLED=false`.
-Another, more drastic option, is to disable the platform health check with the environment variable
-`SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK=none`
+NOTE: You may see a `WARN` logging message if the application that uses this library cannot connect to the configuration
+server when the application starts and whenever the `/health` endpoint is accessed.
+If you know that you are not using config server functionality, you can disable the client library by setting the
+`SPRING_CLOUD_CONFIG_ENABLED` environment variable to `false`.
+Another, more drastic, option is to disable the platform health check by setting the
+`SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_HEALTH_CHECK` environment variable to `none`.
=== Sample Manifest Template
-Following `manifest.yml` template includes the required env-var's for the Spring Cloud Data Flow server and deployed
-apps/tasks to successfully run on Cloud Foundry and automatically resolve centralized properties from `my-config-server`
-at the runtime.
+The following `manifest.yml` template includes the required environment variables for the Spring Cloud Data Flow server and deployed
+applications and tasks to successfully run on Cloud Foundry and automatically resolve centralized properties from `my-config-server`
+at runtime:
+
+====
[source,yml]
----
---
@@ -566,26 +636,31 @@ services:
- my-config-server
----
-Where, `my-config-server` is the name of the Spring Cloud Config Service instance running on Cloud Foundry. By binding the
-service to both Spring Cloud Data Flow server as well as all the Spring Cloud Stream and Spring Cloud Task applications
+where `my-config-server` is the name of the Spring Cloud Config Service instance running on Cloud Foundry.
+====
+
+By binding the
+service to both Spring Cloud Data Flow server and all the Spring Cloud Stream and Spring Cloud Task applications
respectively, we can now resolve centralized properties backed by this service.
=== Self-signed SSL Certificate and Spring Cloud Config Server
+
Often, in a development environment, we may not have a valid certificate to enable SSL communication between clients and
-the backend services. However, the config-server for Pivotal Cloud Foundry uses HTTPS for all client-to-service communication,
-so it is necessary to add a self-signed SSL certificate in environments with no valid certificates.
+the backend services. However, the configuration server for Pivotal Cloud Foundry uses HTTPS for all client-to-service communication,
+so we need to add a self-signed SSL certificate in environments with no valid certificates.
-Using the same `manifest.yml` template listed in the previous section, for the server, we can provide the self-signed
-SSL certificate via: `TRUST_CERTS: <API_ENDPOINT>`.
+By using the same `manifest.yml` template listed in the previous section for the server, we can provide the self-signed
+SSL certificate by setting `TRUST_CERTS: <API_ENDPOINT>`.
-However, the deployed applications __also__ require `TRUST_CERTS` as a _flat env-var_ (as opposed to being wrapped inside
-`SPRING_APPLICATION_JSON`), so we will have to instruct the server with yet another set of tokens `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_USE_SPRING_APPLICATION_JSON: false`
-and `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_USE_SPRING_APPLICATION_JSON: false` for stream and task applications
-respectively. With this setup, the applications will receive their application properties as regular environment variables
+However, the deployed applications also require `TRUST_CERTS` as a flat environment variable (as opposed to being wrapped inside
+`SPRING_APPLICATION_JSON`), so we must instruct the server with yet another set of tokens (`SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_USE_SPRING_APPLICATION_JSON: false`
+and `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_USE_SPRING_APPLICATION_JSON: false`) for stream and task applications,
+respectively. With this setup, the applications receive their application properties as regular environment variables.
-Let's review the updated `manifest.yml` with the required changes. Both the Data Flow server and deployed applications
-would get their config from the `my-config-server` Cloud Config server (deployed as a Cloud Foundry service)
+The following listing shows the updated `manifest.yml` with the required changes. Both the Data Flow server and deployed applications
+get their configuration from the `my-config-server` Cloud Config server (deployed as a Cloud Foundry service).
+====
[source,yml]
----
---
@@ -616,23 +691,25 @@ services:
- mysql
- my-config-server #this is for the server
----
+====
[[getting-started-scheduling-configuration]]
== Configure Scheduling
-In this section we will discuss how to configure Spring Cloud Data Flow to connect to the https://www.cloudfoundry.org/the-foundry/scheduler/[PCF-Scheduler] as its agent to execute tasks.
+This section discusses how to configure Spring Cloud Data Flow to connect to the https://www.cloudfoundry.org/the-foundry/scheduler/[PCF-Scheduler] as its agent to execute tasks.
-NOTE: Before following the instructions below, be sure to have an instance of the PCF-Scheduler service running in your Cloud Foundry space. To create a PCF-Scheduler in your space (assuming it is in your Market Place) execute the following from the cf CLI: `cf create-service scheduler-for-pcf standard <name of service>`
+NOTE: Before following these instructions, be sure to have an instance of the PCF-Scheduler service running in your Cloud Foundry space. To create a PCF-Scheduler in your space (assuming it is in your Market Place) execute the following from the CF CLI: `cf create-service scheduler-for-pcf standard <name of service>`
-The 3 environment variables that have to be added or updated in your environment for Scheduling to be configured are the following:
+For scheduling, you must add (or update) the following environment variables in your environment:
-. Enable scheduling for Spring Cloud Data Flow by setting `spring.cloud.dataflow.features.schedules-enabled` to true
-. Binding the task deployer to your instance of PCF-Scheduler by adding the PCF-Scheduler service name to the `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES` environment variable.
-. Establish the url to the PCF-Scheduler via the `SPRING_CLOUD_SCHEDULER_CLOUDFOUNDRY_SCHEDULER_URL` environment variable.
+* Enable scheduling for Spring Cloud Data Flow by setting `spring.cloud.dataflow.features.schedules-enabled` to `true`.
+* Bind the task deployer to your instance of PCF-Scheduler by adding the PCF-Scheduler service name to the `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES` environment variable.
+* Establish the URL to the PCF-Scheduler by setting the `SPRING_CLOUD_SCHEDULER_CLOUDFOUNDRY_SCHEDULER_URL` environment variable.
-NOTE: Any task definitions that need to be scheduled, must be created after the above configurations have been configured.
+NOTE: After creating the preceding configurations, you must create any task definitions that need to be scheduled.
-The sample manifest shown below displays both the environment properties configured, assuming you have a PCF-Scheduler service available with the name `myscheduler`.
+The following sample manifest shows both environment properties configured (assuming you have a PCF-Scheduler service available with the name `myscheduler`):
+====
[source,yml]
----
---
@@ -660,5 +737,6 @@ applications:
services:
- mysql
----
+====
-NOTE: The SPRING_CLOUD_SCHEDULER_CLOUDFOUNDRY_SCHEDULER_URL has the following format: `scheduler.<Domain-Name>` for example: `https://scheduler.sys.mycf.cf-app.com`.
+NOTE: The `SPRING_CLOUD_SCHEDULER_CLOUDFOUNDRY_SCHEDULER_URL` has the following format: `scheduler.<Domain-Name>` (for example, `https://scheduler.sys.mycf.cf-app.com`).
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
index c44a2ab..6ed838c 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
@@ -1,81 +1,95 @@
[[getting-started]]
-= Getting started
+= Getting Started
[[getting-started-requirements]]
== System Requirements
The Spring Cloud Data Flow server deploys streams (long-lived applications) and tasks (short-lived applications) to Cloud
-Foundry. The server is a lightweight Spring Boot application and it can run on Cloud Foundry or your laptop, but it is
+Foundry. The server is a lightweight Spring Boot application. It can run on Cloud Foundry or your laptop, but it is more
common to run the server in Cloud Foundry.
-Spring Cloud Data Flow requires a few data services to perform streaming, task/batch processing, and analytics. There are
-two options to provisioning Spring Cloud Data Flow and related services on Cloud Foundry.
+Spring Cloud Data Flow requires a few data services to perform streaming, task/batch processing, and analytics. You have
+two options when you provision Spring Cloud Data Flow and related services on Cloud Foundry:
-- The simplest and the automated method is to use the link:https://network.pivotal.io/products/p-dataflow[Spring Cloud Data Flow for PCF]
-tile. This is an opinionated tile for Pivotal Cloud Foundry and the tile automatically provisions the server and the required
+* The simplest (and automated) method is to use the link:https://network.pivotal.io/products/p-dataflow[Spring Cloud Data Flow for PCF]
+tile. This is an opinionated tile for Pivotal Cloud Foundry. It automatically provisions the server and the required
data services, thus simplifying the overall getting-started experience. You can read more about the installation
link:http://docs.pivotal.io/scdf/[here].
-- Alternatively, you can provision all the components manually. The following section goes into the specifics on how it
-is done.
+* Alternatively, you can provision all the components manually. The following section goes into the specifics of how to
+do so.
-=== Provision a Redis service instance on Cloud Foundry
-A Redis instance is required for analytics apps, and would typically be bound to such apps when you create an analytics
-stream using the <<getting-started.adoc#getting-started-service-binding-at-application-level,per-app-binding>> feature.
+=== Provision a Redis Service Instance on Cloud Foundry
+A Redis instance is required for analytics apps and is typically bound to such apps when you create an analytics
+stream by using the <<getting-started.adoc#getting-started-service-binding-at-application-level,per-app-binding>> feature.
-Use `cf marketplace` to discover which plans are available to you, depending on the details of your Cloud Foundry setup.
-For example when using link:https://run.pivotal.io/[Pivotal Web Services]:
+You can use `cf marketplace` to discover which plans are available to you, depending on the details of your Cloud Foundry setup.
+For example, you can use link:https://run.pivotal.io/[Pivotal Web Services], as the following example shows:
-```
+====
+[source]
+----
cf create-service rediscloud 30mb redis
-```
+----
+====
-=== Provision a Rabbit service instance on Cloud Foundry
-RabbitMQ is used as a messaging middleware between streaming apps and would be bound to each deployed streaming
-apps. Apache Kafka is the other option. We can use `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES` setting in Data
-Flow configuration or `SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_SERVICES` setting in
-Skipper, which will automatically bind RabbitMQ to the deployed streaming applications.
+=== Provision a Rabbit Service Instance on Cloud Foundry
+RabbitMQ is used as a messaging middleware between streaming apps and is bound to each deployed streaming
+app. Apache Kafka is the other option. We can use the `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES` setting in Data
+Flow configuration or use the `SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_SERVICES` setting in
+Skipper, which automatically binds RabbitMQ to the deployed streaming applications.
-Use `cf marketplace` to discover which plans are available to you, depending on the details of your Cloud Foundry setup.
-For example when using link:https://run.pivotal.io/[Pivotal Web Services]:
+You can use `cf marketplace` to discover which plans are available to you, depending on the details of your Cloud Foundry setup.
+For example, you can use link:https://run.pivotal.io/[Pivotal Web Services]:
-```
+====
+[source]
+----
cf create-service cloudamqp lemur rabbit
-```
+----
+====
-=== Provision a MySQL service instance on Cloud Foundry
-An RDBMS is used to persist Data Flow state, such as stream/task definitions, deployments, and executions.
+=== Provision a MySQL Service Instance on Cloud Foundry
+An RDBMS is used to persist Data Flow state, such as stream and task definitions, deployments, and executions.
-Use `cf marketplace` to discover which plans are available to you, depending on the details of your Cloud Foundry setup.
-For example when using link:https://run.pivotal.io/[Pivotal Web Services]:
+You can use `cf marketplace` to discover which plans are available to you, depending on the details of your Cloud Foundry setup.
+For example, you can use link:https://run.pivotal.io/[Pivotal Web Services]:
-```
+====
+[source]
+----
cf create-service cleardb spark my_mysql
-```
+----
+====
[[getting-started-cloudfoundry]]
== Cloud Foundry Installation
-Starting with 1.3.x, the Data Flow Server can run in either `skipper` or `classic` (non-skipper) modes. The modes can be
-specified when starting the Data Flow server using the property `spring.cloud.dataflow.features.skipper-enabled`.
+Starting with 1.3.x, the Data Flow Server can run in either `skipper` or `classic` (non-skipper) mode. You can specify the mode
+when you start the Data Flow server by setting the `spring.cloud.dataflow.features.skipper-enabled` property.
By default, the `classic` mode is enabled.
-. Download the Data Flow server and shell applications
+. Download the Data Flow server and shell applications, as the following example shows:
+
-[subs=attributes]
-```
+====
+[source,yaml,subs=attributes]
+----
wget http://repo.spring.io/{version-type-lowercase}/org/springframework/cloud/spring-cloud-dataflow-server-cloudfoundry/{project-version}/spring-cloud-dataflow-server-cloudfoundry-{project-version}.jar
wget http://repo.spring.io/{dataflow-version-type-lowercase}/org/springframework/cloud/spring-cloud-dataflow-shell/{dataflow-project-version}/spring-cloud-dataflow-shell-{dataflow-project-version}.jar
-```
-. Optionally, download http://cloud.spring.io/spring-cloud-skipper/[Skipper] if you want the added features of upgrading and rolling back Streams since Data Flow delegates to Skipper for those features.
+----
+====
+. Optionally, download http://cloud.spring.io/spring-cloud-skipper/[Skipper] if you want the added features of upgrading and rolling back Streams since Data Flow delegates to Skipper for those features. The following example shows how to do so:
+
+====
[source,yaml,options=nowrap,subs=attributes]
----
wget http://repo.spring.io/{skipper-version-type-lowercase}/org/springframework/cloud/spring-cloud-skipper-server/{skipper-version}/spring-cloud-skipper-server-{skipper-version}.jar
----
+====
+
-Push Skipper to Cloud Foundry only if you want to run Spring Cloud Data Flow server in `skipper` mode. Here is a sample
+Push Skipper to Cloud Foundry only if you want to run Spring Cloud Data Flow server in `skipper` mode. The following example shows a
manifest for Skipper.
+
+====
[source,yaml,options=nowrap]
----
---
@@ -101,50 +115,50 @@ env:
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_SKIP_SSL_VALIDATION: false
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_STREAM_ENABLE_RANDOM_APP_NAME_PREFIX: false
----
-
+====
+
-You need to fill in \{org}, \{space}, \{email}, \{password} and {middlewareServiceName} before running these commands. Once you have the desired
-config values in the `manifest.yml`, you can run `cf push` command to provision the skipper-server.
+You need to fill in `\{org}`, `\{space}`, `\{email}`, `\{password}` and `{middlewareServiceName}` before running these commands. Once you have the desired config values in `manifest.yml`, you can run the `cf push` command to provision the skipper-server.
++
+WARNING: Only set 'Skip SSL Validation' to `true` if you run on a Cloud Foundry instance by using self-signed
+certificates (for example, in development). Do not use self-signed certificates for production.
+
-WARNING: Only set 'Skip SSL Validation' to true if you're running on a Cloud Foundry instance using self-signed
-certs (e.g. in development). Do not use for production.
-
. Configure and run the Data Flow Server
+
-One of the most important configurations is providing providing credentials to the Cloud Foundry instance so that the server can spawn applications itself.
-Any Spring Boot compatible configuration mechanism can be used (passing program arguments, editing configuration files before building the application, using
-link:https://github.com/spring-cloud/spring-cloud-config[Spring Cloud Config], using environment variables, etc.), although some may prove more practicable than others depending how you typically deploy applications to Cloud Foundry.
+One of the most important configuration details is providing credentials to the Cloud Foundry instance so that the server can itself spawn applications.
+You can use any Spring Boot-compatible configuration mechanism (passing program arguments, editing configuration files before building the application, using
+link:https://github.com/spring-cloud/spring-cloud-config[Spring Cloud Config], using environment variables, and others), although some may prove more practicable than others, depending on how you typically deploy applications to Cloud Foundry.
-In this next section we will show how to deploy Data Flow using environment variables or a Cloud Foundry manifest.
+In later sections, we show how to deploy Data Flow by using <<getting-started-cloudfoundry-deploying-using-env-vars,environment variables>> or a <<getting-started-cloudfoundry-deploying-using-manifest,Cloud Foundry manifest>>.
However, there are some general configuration details you should be aware of in either approach.
[[getting-started-cloudfoundry-general-configuration]]
=== General Configuration
-NOTE: You must use a unique name for your app; an app with the same name in the same organization will cause your
-deployment to fail
+NOTE: You must use a unique name for your app. An application with the same name in the same organization causes your
+deployment to fail.
-NOTE: The recommended minimal memory setting for the server is 2G. Also, to push apps to PCF and obtain
-application property metadata, the server downloads applications to Maven repository hosted on the local disk. While
-you can specify up to 2G as a typical maximum value for disk space on a PCF installation, this can be increased to
-10G. Read the xref:getting-started-maximum-disk-quota-configuration[maximum disk quota] section for information on
-how to configure this PCF property. Also, the Data Flow server itself implements a Last Recently Used algorithm to
-free disk space when it falls below a low water mark value.
+NOTE: The recommended minimum memory setting for the server is 2G. Also, to push apps to PCF and obtain
+application property metadata, the server downloads applications to a Maven repository hosted on the local disk. While
+you can specify up to 2G as a typical maximum value for disk space on a PCF installation, you can increase this to
+10G. Read the xref:getting-started-maximum-disk-quota-configuration[maximum disk quota] section for information on
+how to configure this PCF property. Also, the Data Flow server itself implements a Last-Recently-Used algorithm to
+free disk space when it falls below a low-water-mark value.
-NOTE: If you are pushing to a space with multiple users, for example on PWS, there may already be a route taken for the
-applicaiton name you have chosen. You can use the options `--random-route` to avoid this when pushing the server application.
+NOTE: If you are pushing to a space with multiple users (for example, on PWS), the route you chose for your application name may already be taken. You can use the `--random-route` option to avoid this when you push the server application.
-NOTE: By default, the https://github.com/spring-cloud/spring-cloud-dataflow/tree/master/spring-cloud-dataflow-registry[application registry] in Spring Cloud Data Flow's Cloud Foundry server is empty. It is intentionally designed to allow users to have the flexibility of http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#spring-cloud-dataflow-register-stream-apps[choosing and registering] applications, as they find appropriate for the given use-case requirement. Depending on the message-binder of choice, users can register between http://repo.spring.io/libs-snapshot/org/springframework/cloud/stream/app/[RabbitMQ or Apache Kafka] based maven artifacts.
+NOTE: By default, the https://github.com/spring-cloud/spring-cloud-dataflow/tree/master/spring-cloud-dataflow-registry[application registry] in Spring Cloud Data Flow's Cloud Foundry server is empty. It is intentionally designed to let you have the flexibility of http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#spring-cloud-dataflow-register-stream-apps[choosing and registering] applications as you find appropriate for the given use-case requirement. Depending on the message-binder you choose, you can register between http://repo.spring.io/libs-snapshot/org/springframework/cloud/stream/app/[RabbitMQ- or Apache Kafka-based] Maven artifacts.
NOTE: If you need to configure multiple Maven repositories, a proxy, or authorization for a private repository, see link:http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#getting-started-maven-configuration[Maven Configuration].
[[getting-started-cloudfoundry-deploying-using-env-vars]]
-=== Deploying using environment variables
+=== Deploying by Using Environment Variables
-The following configuration is for Pivotal Web Services. You need to fill in \{org}, \{space},
-\{email} and \{password} before running these commands.
+The following configuration is for Pivotal Web Services. You need to fill in `\{org}`, `\{space}`,
+`\{email}` and `\{password}` before running these commands.
-```
+====
+[source]
+----
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_URL https://api.run.pivotal.io
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_ORG {org}
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SPACE {space}
@@ -154,47 +168,60 @@ cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES my_m
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_USERNAME {email}
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_PASSWORD {password}
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATION false
-```
+----
+====
-NOTE: If you are going to use `Skipper` to deploy Streams, deploy Skipper first and then configure the uri location of where the Skipper server is running and set the server to be in 'skipper mode
+[NOTE]
+=====
+If you are going to use Skipper to deploy Streams, deploy Skipper first and then configure the URI location where the Skipper server runs and set the server to be in `skipper` mode. The following example shows how to do so:
+====
+[source]
----
cf set-env dataflow-server SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI https://<skipper-host-name>/api
cf set-env dataflow-server SPRING_CLOUD_DATAFLOW_FEATURES_SKIPPER_ENABLED true
----
+====
+=====
-The Spring Cloud Data Flow server does not have _any_ default remote maven repository configured.
-This is intentionally designed to provide the flexibility the users, so they can override and point to a remote repository of their choice.
-The out-of-the-box applications that are supported by Spring Cloud Data Flow are available in Spring's repository, so if you want to use them, set it as the remote repository as listed below.
+The Spring Cloud Data Flow server does not have any default remote maven repository configured.
+This is intentionally designed to provide the flexibility, so you can override and point to a remote repository of your choice.
+The out-of-the-box applications that are supported by Spring Cloud Data Flow are available in Spring's repository. If you want to use them, set it as the remote repository, as the following example shows:
-```
+====
+[source]
+----
cf set-env dataflow-server SPRING_APPLICATION_JSON '{"maven": { "remote-repositories": { "repo1": { "url": "https://repo.spring.io/libs-release" } } } }'
-```
-where `repo1` is the alias name for the remote repository.
+----
+where `repo1` is the alias name for the remote repository
+====
-WARNING: Only set 'Skip SSL Validation' to true if you're running on a Cloud Foundry instance using self-signed
-certs (e.g. in development). Do not use for production.
+WARNING: Only set 'Skip SSL Validation' to true if you run on a Cloud Foundry instance using self-signed
+certificates (for example, in development). Do not use self-signed certificates for production.
NOTE: If you are deploying in an environment that requires you to sign on using the Pivotal Single Sign-On Service,
-refer to the section <<getting-started-security-cloud-foundry>> for information on how to configure the server.
+see <<getting-started-security-cloud-foundry>> for information on how to configure the server.
-You can issue now `cf push` command and reference the Data Flow server .jar.
+You can now issue a `cf push` command and reference the Data Flow server .jar file, as the following example shows:
-[subs=attributes]
-```
+====
+[source, subs=attributes]
+----
cf push dataflow-server -b java_buildpack -m 2G -k 2G --no-start -p spring-cloud-dataflow-server-cloudfoundry-{project-version}.jar
cf bind-service dataflow-server redis
cf bind-service dataflow-server my_mysql
-```
+----
+====
[[getting-started-cloudfoundry-deploying-using-manifest]]
-=== Deploying using a Manifest
+=== Deploying by Using a Manifest
-As an alternative to setting environment variables via `cf set-env` command, you can curate all the relevant env-var's
-in `manifest.yml` file and use `cf push` command to provision the server.
+As an alternative to setting environment variables with the `cf set-env` command, you can curate all the relevant env-var's
+in a `manifest.yml` file and use the `cf push` command to provision the server.
-Following is a sample template to provision the server on PCFDev.
+The following example template provisions the server on PCFDev:
+====
[source,yml]
----
---
@@ -220,9 +247,13 @@ applications:
services:
- mysql
----
+====
-NOTE: If you are going to use `Skipper` to deploy Streams, deploy Skipper first and then configure the uri location of where the Skipper server is running and set the feature toggle to use skipper.
+[NOTE]
+=====
+If you are going to use `Skipper` to deploy Streams, deploy Skipper first and then configure the URI location where the Skipper server runs and set the feature toggle to use skipper, as the following example shows:
+====
[source,yml]
----
applications:
@@ -230,16 +261,20 @@ applications:
SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI: https://<skipper-host-name>/api
SPRING_CLOUD_DATAFLOW_FEATURES_SKIPPER_ENABLED: true
----
+====
+=====
-Once you're ready with the relevant properties in this file, you can issue `cf push` command from the directory where
+Once you are ready with the relevant properties in this file, you can issue a `cf push` command from the directory where
this file is stored.
[[getting-started-cloudfoundry-on-local]]
== Local Installation
-To run the server application locally, on your laptop or desktop, and target your Cloud Foundry installation, configure the Data Flow server by setting the following environment variables.
+To run the server application locally (on your laptop or desktop) and target your Cloud Foundry installation, configure the Data Flow server by setting the following environment variables.
-```
+====
+[source]
+----
export SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_URL=https://api.run.pivotal.io
export SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_ORG={org}
export SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SPACE={space}
@@ -253,107 +288,129 @@ export SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES=rabbit
# Note however that when the *server* is running locally, it can't access that db
# task related commands that show executions won't work then
export SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES=my_mysql
-```
-
-You need to fill in \{org}, \{space}, \{email} and \{password} before running these commands.
+----
+====
-WARNING: Only set 'Skip SSL Validation' to true if you're running on a Cloud Foundry instance using self-signed
-certs (e.g. in development). Do not use for production.
+You need to fill in `\{org}`, `\{space}`, `\{email}` and `\{password}` before running these commands.
-NOTE: If you are going to use `Skipper` to deploy Streams, deploy Skipper first and then configure the uri location of where the Skipper server is running and enable the Skipper feature toggle..
+WARNING: Only set 'Skip SSL Validation' to true if you run on a Cloud Foundry instance using self-signed
+certificates (for example, in development). Do not use self-signed certificates for production.
-NOTE: Since Skipper is a Spring Boot application, you can also pass the configuration properties as command line options instead of environment variables. `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES` becomes `--spring.cloud.deployer.cloudfoundry.stream.services`.
+[NOTE]
+=====
+If you are going to use `Skipper` to deploy Streams, deploy Skipper first and then configure the URI location of where the Skipper server is running and enable the Skipper feature toggle.
+====
+[source]
----
export SKIPPER_CLIENT_HOST https://<skipper-host-name>/api
export SPRING_CLOUD_DATAFLOW_FEATURES_SKIPPER_ENABLED true
----
+====
+=====
+
+NOTE: Since Skipper is a Spring Boot application, you can also pass the configuration properties as command line options instead of environment variables. For example, `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES` becomes `--spring.cloud.deployer.cloudfoundry.stream.services`.
-Now we are ready to start the server application:
+Now we are ready to start the server application, as follows:
-[subs=attributes]
-```
+====
+[source, subs=attributes]
+----
java -jar spring-cloud-dataflow-server-cloudfoundry-{project-version}.jar
-```
+----
+====
-TIP: Of course, all other parameterization options that were available when running the server _on_ Cloud Foundry are
-still available. This is particularly true for xref:configuring-defaults[configuring defaults] for applications. Just
+TIP: All other parameterization options that were available when running the server on Cloud Foundry are
+still available. This is particularly true for xref:configuring-defaults[configuring defaults] for applications. To use them,
substitute `cf set-env` syntax with `export`.
[[getting-started-data-flow-shell]]
== Data Flow Shell
-Launching the Data Flow shell requires the appropriate data flow server mode to be specified.
-To start the Data Flow Shell for the Data Flow server running in `classic` mode:
+Launching the Data Flow shell requires that you specify the appropriate data flow server mode.
+The following example shows how to start the Data Flow Shell for the Data Flow server running in `classic` mode:
+====
[source,bash,subs=attributes]
----
$ java -jar spring-cloud-dataflow-shell-{dataflow-project-version}.jar
----
+====
[[getting-started-deploying-streams]]
== Deploying Streams
-. Import Apps
-+
-By default, the application registry will be empty. If you would like to register all out-of-the-box stream applications
-built with the RabbitMQ binder in bulk, you can with the following command. For more details, review how to
-xref:spring-cloud-dataflow-register-apps[register applications].
-+
-```
+By default, the application registry is empty. If you would like to register all out-of-the-box stream applications
+built with the RabbitMQ binder in bulk, run the following command:
+
+====
+[source]
+----
dataflow:>app import --uri http://bit.ly/Darwin-SR1-stream-applications-rabbit-maven
-```
-+
-There are two options for deploying Streams. The "traditional" way that Data Flow has always used and a new way that delegates to the Skipper server. Deploying using Skipper will enable you to update and rollback the streams while the traditional way will not.
-+
-. Create Streams without skipper
-+
-Create a simple stream with an HTTP source and a log sink.
-+
+----
+====
+
+For more details, review how to
+xref:spring-cloud-dataflow-register-apps[register applications].
+
+You have two options for deploying Streams: the "`traditional`" way that Data Flow has always used and a new way that delegates to the Skipper server. Deploying by using Skipper lets you update and rollback the streams, while the traditional way does not.
+
+=== Creating Streams without Skipper
+
+The following example shows how to create a simple stream with an HTTP source and a log sink:
+
+====
[source]
----
dataflow:> stream create --name httptest --definition "http | log" --deploy
----
-+
-NOTE: You will need to wait a little while until the apps are actually deployed successfully
-before posting data. Tail the log file for each application to verify
+====
+
+NOTE: You need to wait a little while until the applications are actually deployed
+before posting data. Tail the log file for each application to verify that
the application has started.
-+
-Now post some data. The URL will be unique to your deployment, the following is just an example
-+
+
+Now you can post some data. The URL is unique to your deployment. The following example shows how to post data:
+
+====
[source]
----
dataflow:> http post --target http://dataflow-AxwwAhK-httptest-http.cfapps.io --data "hello world"
----
-Look to see if `hello world` ended up in log files for the `log` application.
-+
-. Create Streams with Skipper
-This section assumes you have deployed Skipper and configured the Data Flow server's `SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI` property to reference the Skipper server.
-+
+====
+
+Now you can see whether `hello world` is in the log files for the `log` application.
+
+=== Creating Streams with Skipper
+
+This section assumes you have deployed Skipper and have configured the Data Flow server's `SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI` property to reference the Skipper server.
+
+The following example shows how to create and deploy a stream with Skipper:
+
+====
[source]
----
dataflow:> stream create --name httptest --definition "http | log"
dataflow:> stream deploy --name httptest --platformName pws
----
-+
-Look to see if `hello world` ended up in log files for the `log` application.
-+
-[NOTE]
-====
-Skipper includes the concept of link:https://docs.spring.io/spring-cloud-skipper/docs/current/reference/htmlsingle/#platforms[platforms],
-so it is important to define the "accounts" based on the project preferences. In the above YAML file, the accounts map
-to `pws` as the platform. This can be modified, and of course, you can have any number of platform definitions.
-More details are in Spring Cloud Skipper reference guide.
====
-+
-You can read more about the general features of using Skipper to deploy streams in the section <<spring-cloud-dataflow-stream-lifecycle-skipper>> and how to upgrade a streams in the section <<spring-cloud-dataflow-stream-lifecycle-skipper-update>>.
+Now you can see whether `hello world` is in the log files for the `log` application.
+
+NOTE: Skipper includes the concept of link:https://docs.spring.io/spring-cloud-skipper/docs/current/reference/htmlsingle/#platforms[platforms],
+so it is important to define the "`accounts`" based on the project preferences. In the preceding YAML file, the accounts map
+to `pws` as the platform. You can modify this, and you can have any number of platform definitions.
+The https://docs.spring.io/spring-cloud-skipper/docs/current/reference/htmlsingle/[Spring Cloud Skipper reference guide] has more details.
+
+
+You can read more about the general features of using Skipper to deploy streams in the <<spring-cloud-dataflow-stream-lifecycle-skipper>> section and how to upgrade a streams in the <<spring-cloud-dataflow-stream-lifecycle-skipper-update>> section.
[[streams-using-skipper]]
-== Deploying Streams using Skipper
+== Deploying Streams by Using Skipper
-We will proceed with the assumption that Spring Cloud Data Flow, Spring Cloud Skipper, RDBMS, and desired messaging
-middleware is up and running in PWS.
+This section proceeds with the assumption that Spring Cloud Data Flow, Spring Cloud Skipper, RDBMS, and your desired messaging
+middleware are all running in PWS. The following listing shows the apps running in a sample org and space:
+====
[source,console,options=nowrap]
----
$ cf apps ✭
@@ -364,23 +421,33 @@ name requested state instances memory disk urls
skipper-server started 1/1 1G 1G skipper-server.cfapps.io
dataflow-server started 1/1 1G 1G dataflow-server.cfapps.io
----
+====
-Start the Data Flow Shell for the Data Flow server running in `skipper` mode:
+The following example shows how to start the Data Flow Shell for the Data Flow server running in `skipper` mode:
+====
[source,bash,subs=attributes]
----
$ java -jar spring-cloud-dataflow-shell-{dataflow-project-version}.jar --dataflow.mode=skipper
----
-If the Data Flow Server and shell are not running on the same host, point the shell to the Data Flow server URL:
-```
+====
+
+If the Data Flow Server and shell are not running on the same host, you can point the shell to the Data Flow server URL, as follows:
+
+====
+[source]
+----
server-unknown:>dataflow config server http://dataflow-server.cfapps.io
Successfully targeted http://dataflow-server.cfapps.io
dataflow:>
-```
-Alternatively, pass in the command line option `--dataflow.uri`. The shell's command line option `--help` shows what options are available.
+----
+====
+
+Alternatively, you can pass in the `--dataflow.uri` command line option. The shell'sx `--help` command line option shows what options are available.
-Verify the available platforms in Skipper.
+You can verify the available platforms in Skipper, as follows:
+====
[source,console,options=nowrap]
----
dataflow:>stream platform-list
@@ -390,10 +457,12 @@ dataflow:>stream platform-list
║pws │cloudfoundry│org = [scdf-ci], space = [space-sabby], url = [https://api.run.pivotal.io] ║
╚═══════╧════════════╧═════════════════════════════════════════════════════════════════════════════════════╝
----
+====
-Let's start with deploying a stream with the `time-source` pointing to 1.2.0.RELEASE and `log-sink` pointing
-to 1.1.0.RELEASE. The goal is to rolling upgrade the `log-sink` application to 1.2.0.RELEASE.
+We start by deploying a stream with the `time-source` pointing to `1.2.0.RELEASE` and `log-sink` pointing
+to `1.1.0.RELEASE`. The goal is to perform a rolling upgrade of the `log-sink` application to `1.2.0.RELEASE`.
+====
[source,console,options=nowrap]
----
dataflow:>app register --name time --type source --uri maven://org.springframework.cloud.stream.app:time-source-rabbit:1.2.0.RELEASE --force
@@ -410,34 +479,28 @@ dataflow:>app info sink:log
Information about sink application 'log':
Resource URI: maven://org.springframework.cloud.stream.app:log-sink-rabbit:1.1.0.RELEASE
----
+====
-. Create stream.
-+
-Use a unique name, one that might not be taken by another application on PCF/PWS.
-```
-dataflow:>stream create ticker-314 --definition "time | log"
-Created new stream 'ticker-314'
-```
-+
+When you create a stream, use a unique name (one that might not be taken by another application on PCF/PWS).
-. Deploy stream.
+The following example shows how to create a deploy a stream
-+
-```
+====
+[source]
+----
+dataflow:>stream create ticker-314 --definition "time | log"
+Created new stream 'ticker-314'
dataflow:>stream deploy ticker-314 --platformName pws
Deployment request has been sent for stream 'ticker-314'
-```
-+
-
-[NOTE]
-====
-While deploying the stream, we are supplying `--platformName` and that indicates the platform repository (i.e., `pws`) to
-use when deploying the stream applications via Skipper.
+----
====
-. List apps.
+NOTE: While deploying the stream, we supply `--platformName`, which indicates the platform repository (`pws`) to
+use when deploying the stream applications with Skipper.
-+
+Now you can list the running applications again and see your applications in the list, as the following example shows:
+
+====
[source,console,options=nowrap]
----
$ cf apps [1h] ✭
@@ -449,11 +512,11 @@ ticker-314-time-v1 started 1/1 1G 1G ticke
skipper-server started 1/1 1G 1G skipper-server.cfapps.io
dataflow-server started 1/1 1G 1G dataflow-server.cfapps.io
----
-+
+====
-. Verify logs.
+Now you an verify the logs, as the following example shows:
-+
+====
[source,console,options=nowrap]
----
$ cf logs ticker-314-log-v1
@@ -463,11 +526,11 @@ $ cf logs ticker-314-log-v1
2017-11-20T15:39:44.75-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:44.757 INFO 12 --- [ ticker-314.time.ticker-314-1] log-sink : 11/20/17 23:39:44
2017-11-20T15:39:45.75-0800 [APP/PROC/WEB/0] OUT 2017-11-20 23:39:45.757 INFO 12 --- [ ticker-314.time.ticker-314-1] log-sink : 11/20/17 23:39:45
----
-+
+====
-. Verify the stream history.
+Now you can verify the stream history, as the following example shows:
-+
+====
[source,console,options=nowrap]
----
dataflow:>stream history --name ticker-314
@@ -477,11 +540,11 @@ dataflow:>stream history --name ticker-314
║1 │Mon Nov 20 15:34:37 PST 2017│DEPLOYED│ticker-314 │1.0.0 │Install complete║
╚═══════╧════════════════════════════╧════════╧════════════╧═══════════════╧════════════════╝
----
-+
+====
-. Verify the package manifest in Skipper. The `log-sink` should be at 1.1.0.RELEASE.
+Now you can verify the package manifest in Skipper. The `log-sink` should be at `1.1.0.RELEASE`. The following example shows both the command to use and its output:
-+
+====
[source,yml,options=nowrap]
----
dataflow:>stream manifest --name ticker-314
@@ -531,18 +594,21 @@ spec:
deploymentProperties:
spring.cloud.deployer.group: ticker-314
----
+====
-. Let's update `log-sink` from 1.1.0.RELEASE to 1.2.0.RELEASE. First we need to register the version 1.2.0.RELEASE.
-+
+Now you can update `log-sink` from `1.1.0.RELEASE` to `1.2.0.RELEASE`. First we need to register the version 1.2.0.RELEASE. The following example shows how to do so:
+
+====
[source,console,options=nowrap]
----
dataflow:>app register --name log --type sink --uri maven://org.springframework.cloud.stream.app:log-sink-rabbit:1.1.0.RELEASE --force
Successfully registered application 'sink:log'
----
-+
-If you execute the `app list` command for the log sink, you will now see that two versions are registered.
+====
-+
+If you run the `app list` command for the log sink, you can now see that two versions are registered, as the following example shows:
+
+====
[source,console,options=nowrap]
----
dataflow:>app list --id sink:log
@@ -553,20 +619,22 @@ dataflow:>app list --id sink:log
║ │ │log-1.2.0.RELEASE │ ║
╚══════╧═════════╧═════════════════════╧════╝
----
-+
-The greater than and less than signs, `> log-1.1.0.RELEASE <` indicate that this is the default version that will be used when matching `log` in the DSL for a stream definition.
-You can change the default version using the command `app default`
-+
+====
+
+The greater-than and less-than signs around `> log-1.1.0.RELEASE <` indicate that this is the default version that is used when matching `log` in the DSL for a stream definition.
+You can change the default version by using the `app default` command.
+
+====
[source,console,options=nowrap]
----
dataflow:>stream update --name ticker-314 --properties version.log=1.2.0.RELEASE
Update request has been sent for stream 'ticker-314'
----
-+
+====
-. List apps.
+Now you can list the applications again to see the two versions of the `ticker-314-log` application, as the following example shows:
-+
+====
[source,console,options=nowrap]
----
± cf apps [1h] ✭
@@ -582,18 +650,15 @@ ticker-314-time-v1 started 1/1 1G 1G ticke
skipper-server started 1/1 1G 1G skipper-server.cfapps.io
dataflow-server started 1/1 1G 1G dataflow-server.cfapps.io
----
-+
-
-[NOTE]
====
-Notice that there are two versions of the `log-sink` applications. The `ticker-314-log-v1` application instance is going down
+
+NOTE: There are two versions of the `log-sink` applications. The `ticker-314-log-v1` application instance is going down
(route already removed) and the newly spawned `ticker-314-log-v2` application is bootstrapping. The version number is incremented and
the version-number (`v2`) is included in the new application name.
-====
-. Once the new application is up and running, let's verify the logs.
+. Once the new application is up and running, you can verify the logs, as the following example shows:
-+
+====
[source,console,options=nowrap]
----
$ cf logs ticker-314-log-v2
@@ -603,11 +668,11 @@ $ cf logs ticker-314-log-v2
2017-11-20T18:38:36.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:36.004 INFO 18 --- [ticker-314.time.ticker-314-1] ticker-314-log-v2 : 11/21/17 02:38:35
2017-11-20T18:38:37.00-0800 [APP/PROC/WEB/0] OUT 2017-11-21 02:38:37.005 INFO 18 --- [ticker-314.time.ticker-314-1] ticker-314-log-v2 : 11/21/17 02:38:36
----
-+
+====
-. Let's look at the updated package manifest persisted in Skipper. We should now be seeing `log-sink` at 1.2.0.RELEASE.
+Now you can look at the updated package manifest persisted in Skipper. You should now be seeing `log-sink` at 1.2.0.RELEASE. The following example shows the command to use and its output:
-+
+====
[source,yml,options=nowrap]
----
skipper:>stream manifest --name ticker-314
@@ -657,11 +722,11 @@ spec:
deploymentProperties:
spring.cloud.deployer.group: ticker-314
----
-+
+====
-. Verify stream history for the latest updates.
+Now you can verify stream history for the latest updates.
-+
+====
[source,console,options=nowrap]
----
dataflow:>stream history --name ticker-314
@@ -672,11 +737,11 @@ dataflow:>stream history --name ticker-314
║1 │Mon Nov 20 15:34:37 PST 2017│DELETED │ticker-314 │1.0.0 │Delete complete ║
╚═══════╧════════════════════════════╧════════╧════════════╧═══════════════╧════════════════╝
----
-+
+====
-. Rolling-back to the previous version is just a command away.
+Rolling-back to the previous version is just a command away. The following example shows how to do so and the resulting output:
-+
+====
[source,console,options=nowrap]
----
dataflow:>stream rollback --name ticker-314
@@ -694,35 +759,43 @@ dataflow:>stream history --name ticker-314
║1 │Mon Nov 20 15:34:37 PST 2017│DELETED │ticker-314 │1.0.0 │Delete complete ║
╚═══════╧════════════════════════════╧════════╧════════════╧═══════════════╧════════════════╝
----
+====
[[getting-started-deploying-tasks]]
== Deploying Tasks
-To run a simple task application, you can register all the out-of-the-box task applications with the following command.
+To run a simple task application, you can register all the out-of-the-box task applications with the following command:
-```
+====
+[source]
+----
dataflow:>app import --uri http://bit.ly/Dearborn-GA-task-applications-maven
+----
+====
-```
-
-Now create a simple link:https://docs.spring.io/spring-cloud-task-app-starters/docs/Dearborn.RELEASE/reference/htmlsingle/#spring-cloud-task-modules-tasks[timestamp] task.
+Now you can create a simple link:https://docs.spring.io/spring-cloud-task-app-starters/docs/Dearborn.RELEASE/reference/htmlsingle/#spring-cloud-task-modules-tasks[timestamp] task, as the following example shows:
-```
+====
+[source]
+----
dataflow:>task create mytask --definition "timestamp --format='yyyy'"
-```
+----
+====
-Tail the logs, e.g. `cf logs mytask` and then launch the task in the UI or in the Data Flow Shell
+Now you can examine the tail of the logs (for example, `cf logs mytask`) and then launch the task in the UI or in the Data Flow Shell, as the following example shows:
-```
+====
+[source]
+----
dataflow:>task launch mytask
-```
+----
+====
-You will see the year `2017` printed in the logs. The execution status of the task is stored
-in the database and you can retrieve information about the task execution using the shell commands
-`task execution list` and `task execution status --id <ID_OF_TASK>` or though the Data Flow UI.
+You will see the year (`2018` at the time of this writing) printed in the logs. The execution status of the task is stored
+in the database, and you can retrieve information about the task execution by using the
+`task execution list` and `task execution status --id <ID_OF_TASK>` shell commands or though the Data Flow UI.
NOTE: The current underlying PCF task capabilities are considered experimental for PCF version
versions less than 1.9. See http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#enable-disable-specific-features[Feature Togglers]
for how to disable task support in Data Flow.
-
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc
index ae49dd5..3a076ff 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc
@@ -1,5 +1,5 @@
= Spring Cloud Data Flow Server for Cloud Foundry
-Sabby Anandan; Eric Bottard; Mark Fisher; Ilayaperumal Gopinathan; Gunnar Hillert; Mark Pollack; Thomas Risberg; Marius Bogoevici; Josh Long ; Michael Minella; David Turanski; Vinicius Carvalho
+Sabby Anandan; Eric Bottard; Mark Fisher; Ilayaperumal Gopinathan; Gunnar Hillert; Mark Pollack; Thomas Risberg; Marius Bogoevici; Josh Long; Michael Minella; David Turanski; Vinicius Carvalho; Jay Bryant; Glenn Renfro
:doctype: book
:toc: left
:toclevels: 4
@@ -8,20 +8,22 @@ Sabby Anandan; Eric Bottard; Mark Fisher; Ilayaperumal Gopinathan; Gunnar Hiller
:icons: font
:hide-uri-scheme:
:docinfo: shared
+:sectanchors:
+
:spring-cloud-stream-docs: http://docs.spring.io/spring-cloud-stream/docs/{scst-core-version}/reference/htmlsingle/index.html
:github-code: https://github.com/spring-cloud/spring-cloud-dataflow-server-cloudfoundry
ifdef::backend-html5[]
-Version {project-version}
+Version: {project-version}
-(C) 2012-2017 Pivotal Software, Inc.
+(C) 2012-2018 Pivotal Software, Inc.
-_Copies of this document may be made for your own use and for distribution to
+Copies of this document may be made for your own use and for distribution to
others, provided that you do not charge any fee for such copies and further
provided that each copy contains this Copyright Notice, whether distributed in
-print or electronically._
+print or electronically.
endif::backend-html5[]
From cb052a61d5bec966fa62dfd5a5d989369ffbb169 Mon Sep 17 00:00:00 2001
From: Mike Heath <mheath@pivotal.io>
Date: Wed, 15 Aug 2018 16:45:13 -0600
Subject: [PATCH 118/158] Make Scheduler auto-configurable
---
.../src/main/resources/META-INF/spring.factories | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/resources/META-INF/spring.factories b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/resources/META-INF/spring.factories
index 8805e70..6fa7a32 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/resources/META-INF/spring.factories
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/resources/META-INF/spring.factories
@@ -1,4 +1,5 @@
org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
- org.springframework.cloud.dataflow.server.cloudfoundry.config.CloudFoundryDataFlowServerConfiguration
+ org.springframework.cloud.dataflow.server.cloudfoundry.config.CloudFoundryDataFlowServerConfiguration,\
+ org.springframework.cloud.dataflow.server.cloudfoundry.config.CloudFoundrySchedulerConfiguration
org.springframework.boot.env.EnvironmentPostProcessor=\
org.springframework.cloud.dataflow.server.cloudfoundry.config.TaskFeatureAutoToggleEnvironmentPostProcessor
From 7cfb7ab8f6cbc5ca27f7f881f7bd267ef4c3c542 Mon Sep 17 00:00:00 2001
From: Sabby Anandan <sabby.anandan@gmail.com>
Date: Thu, 16 Aug 2018 10:23:46 -0700
Subject: [PATCH 119/158] Fix incorrect property listing in skipper manifest
---
.../src/main/asciidoc/getting-started.adoc | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
index 6ed838c..ed1e409 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
@@ -108,12 +108,12 @@ env:
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_URL: https://api.run.pivotal.io
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_ORG: {org}
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_SPACE: {space}
- SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_DOMAIN: cfapps.io
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_USERNAME: {email}
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_PASSWORD: {password}
- SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_SERVICES: {middlewareServiceName}
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_SKIP_SSL_VALIDATION: false
- SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_STREAM_ENABLE_RANDOM_APP_NAME_PREFIX: false
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_DOMAIN: cfapps.io
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_SERVICES: {middlewareServiceName}
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_STREAM_ENABLE_RANDOM_APP_NAME_PREFIX: false
----
====
+
From e009b185f89d423e4aea3b7b96b811b73577ccb5 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Wed, 12 Sep 2018 11:42:57 -0400
Subject: [PATCH 120/158] Add connection pool docs
Fixes #443
---
.../src/main/asciidoc/configuration.adoc | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
index 5868792..cddf3df 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
@@ -225,6 +225,11 @@ stream deploy fooz --properties "app.time.spring.cloud.stream.kafka.binder.broke
----
====
+[[configuration-db-connection-pool]]
+== Database Connection Pool
+The Data Flow server uses the Spring Cloud Connector library to create the DataSource with a default connection pool size of 4.
+To change the connection pool size and maximum wait time, set the following two properties `spring.cloud.skipper.server.cloudfoundry.maxPoolSize` and `spring.cloud.skipper.server.cloudfoundry.maxWaitTime`. The wait time is specified in milliseconds.
+
[[configuration-maximum-disk-quota-configuration]]
== Maximum Disk Quota
By default, every application in Cloud Foundry starts with 1G disk quota and this can be adjusted to a default maximum of
From c317cb29ef5f0b25ce575300c0f29db4ba71da6c Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Fri, 14 Sep 2018 18:03:01 +0530
Subject: [PATCH 121/158] Version updates for 1.7.0.M1
- CF deployer version 1.4.2.RELEASE
- SCDF core 1.7.0.M1
- Skipper for docs 1.1.0.RC1
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3c4c5e1..b200b2c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,13 +13,13 @@
</parent>
<properties>
- <spring-cloud-dataflow.version>1.7.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.4.1.RELEASE</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-dataflow.version>1.7.0.M1</spring-cloud-dataflow.version>
+ <spring-cloud-deployer-cloudfoundry.version>1.4.2.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.3.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
<spring-cloud-cloudfoundry-connector>2.0.2.RELEASE</spring-cloud-cloudfoundry-connector>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.0.8.RELEASE</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>1.1.0.RC1</spring-cloud-skipper.version>
<spring-cloud-scheduler-cloudfoundry>1.0.0.RELEASE</spring-cloud-scheduler-cloudfoundry>
<pivotal-cf-client-reactor.version>1.1.0.RELEASE</pivotal-cf-client-reactor.version>
<reactor.version>3.1.8.RELEASE</reactor.version>
From eb191339993e5ac1481ec650caba0725ea4e74c4 Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Fri, 14 Sep 2018 18:14:09 +0530
Subject: [PATCH 122/158] Update SCDF parent to 1.7.0.M1
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index b200b2c..8bedba2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.M1</version>
<relativePath />
</parent>
From 36afbb9c564db8601a29ab1d37e29d7bb9bfbc3f Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Fri, 14 Sep 2018 12:50:03 +0000
Subject: [PATCH 123/158] [artifactory-release] Release version 1.7.0.M1
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8bedba2..37839cf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.M1</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index dd26b92..902a4ba 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.M1</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 59bb9dd..ee13228 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.M1</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.M1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.M1</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 8266585..abbd854 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.M1</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.M1</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From a66dae9252ed539786d073abede74da32055eeaa Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Fri, 14 Sep 2018 12:50:09 +0000
Subject: [PATCH 124/158] [artifactory-release] Next development version
1.7.0.BUILD-SNAPSHOT
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 37839cf..8bedba2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.M1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 902a4ba..dd26b92 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.M1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index ee13228..59bb9dd 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.M1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.7.0.M1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.0.M1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index abbd854..8266585 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.M1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.0.M1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 17cde007894f81a13f5f4d324226cf047af0a754 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Mon, 1 Oct 2018 17:22:07 -0400
Subject: [PATCH 125/158] Update connector library to 2.0.3
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 8bedba2..21fbbd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
<spring-cloud-deployer-cloudfoundry.version>1.4.2.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.3.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
- <spring-cloud-cloudfoundry-connector>2.0.2.RELEASE</spring-cloud-cloudfoundry-connector>
+ <spring-cloud-cloudfoundry-connector>2.0.3.RELEASE</spring-cloud-cloudfoundry-connector>
<!-- skipper version used only in doc generation -->
<spring-cloud-skipper.version>1.1.0.RC1</spring-cloud-skipper.version>
<spring-cloud-scheduler-cloudfoundry>1.0.0.RELEASE</spring-cloud-scheduler-cloudfoundry>
From b1e523f8022f5e77f33c4d6f54019ff0b4484c32 Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Thu, 11 Oct 2018 14:16:23 +0100
Subject: [PATCH 126/158] Use scdf core snapshots and cf scheduler 1.0.1
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 21fbbd6..372c398 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,19 +8,19 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.7.0.M1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.7.0.M1</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.7.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.2.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.3.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
<spring-cloud-cloudfoundry-connector>2.0.3.RELEASE</spring-cloud-cloudfoundry-connector>
<!-- skipper version used only in doc generation -->
<spring-cloud-skipper.version>1.1.0.RC1</spring-cloud-skipper.version>
- <spring-cloud-scheduler-cloudfoundry>1.0.0.RELEASE</spring-cloud-scheduler-cloudfoundry>
+ <spring-cloud-scheduler-cloudfoundry>1.0.1.RELEASE</spring-cloud-scheduler-cloudfoundry>
<pivotal-cf-client-reactor.version>1.1.0.RELEASE</pivotal-cf-client-reactor.version>
<reactor.version>3.1.8.RELEASE</reactor.version>
</properties>
From eda263f0facb245e0c431638465cc16310343b51 Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Thu, 11 Oct 2018 16:39:24 +0100
Subject: [PATCH 127/158] Polish scheduler docs
---
.../src/main/asciidoc/configuration.adoc | 33 ++++++++++++++-----
1 file changed, 24 insertions(+), 9 deletions(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
index cddf3df..4b13b21 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
@@ -700,19 +700,32 @@ services:
[[getting-started-scheduling-configuration]]
== Configure Scheduling
-This section discusses how to configure Spring Cloud Data Flow to connect to the https://www.cloudfoundry.org/the-foundry/scheduler/[PCF-Scheduler] as its agent to execute tasks.
+This section discusses how to configure Spring Cloud Data Flow to connect to the
+https://www.cloudfoundry.org/the-foundry/scheduler/[PCF-Scheduler] as its agent to execute tasks.
-NOTE: Before following these instructions, be sure to have an instance of the PCF-Scheduler service running in your Cloud Foundry space. To create a PCF-Scheduler in your space (assuming it is in your Market Place) execute the following from the CF CLI: `cf create-service scheduler-for-pcf standard <name of service>`
+[NOTE]
+====
+Before following these instructions, be sure to have an instance of the PCF-Scheduler service running in your Cloud
+Foundry space. To create a PCF-Scheduler in your space (assuming it is in your Market Place) execute the following
+from the CF CLI: `cf create-service scheduler-for-pcf standard <name of service>`. Name of a service
+is later used to bound running application in _PCF_.
+====
For scheduling, you must add (or update) the following environment variables in your environment:
* Enable scheduling for Spring Cloud Data Flow by setting `spring.cloud.dataflow.features.schedules-enabled` to `true`.
-* Bind the task deployer to your instance of PCF-Scheduler by adding the PCF-Scheduler service name to the `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES` environment variable.
-* Establish the URL to the PCF-Scheduler by setting the `SPRING_CLOUD_SCHEDULER_CLOUDFOUNDRY_SCHEDULER_URL` environment variable.
+* Bind the task deployer to your instance of PCF-Scheduler by adding the PCF-Scheduler service name to the
+ `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES` environment variable.
+* Establish the URL to the PCF-Scheduler by setting the `SPRING_CLOUD_SCHEDULER_CLOUDFOUNDRY_SCHEDULER_URL` environment
+ variable.
-NOTE: After creating the preceding configurations, you must create any task definitions that need to be scheduled.
+[NOTE]
+====
+After creating the preceding configurations, you must create any task definitions that need to be scheduled.
+====
-The following sample manifest shows both environment properties configured (assuming you have a PCF-Scheduler service available with the name `myscheduler`):
+The following sample manifest shows both environment properties configured (assuming you have a PCF-Scheduler service
+available with the name `myscheduler`):
====
[source,yml]
@@ -737,11 +750,13 @@ applications:
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES: mysql,myscheduler
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATION: true
SPRING_CLOUD_DATAFLOW_FEATURES_SCHEDULES_ENABLED: true
- SPRING_CLOUD_SCHEDULER_CLOUDFOUNDRY_SCHEDULER_URL: <PCF-Scheduler service url>
- SPRING_APPLICATION_JSON {"maven": { "remote-repositories": { "repo1": { "url": "https://repo.spring.io/libs-release"} } } }
+ SPRING_CLOUD_SCHEDULER_CLOUDFOUNDRY_SCHEDULER_URL: https://scheduler.local.pcfdev.io
+ SPRING_APPLICATION_JSON: '{"maven": { "remote-repositories": { "repo1": { "url": "https://repo.spring.io/libs-release"} } } }'
services:
- mysql
----
+
+Where the `SPRING_CLOUD_SCHEDULER_CLOUDFOUNDRY_SCHEDULER_URL` has the following format: `scheduler.<Domain-Name>` (for
+example, `https://scheduler.local.pcfdev.io`). Check the actual address from your _PCF_ environment.
====
-NOTE: The `SPRING_CLOUD_SCHEDULER_CLOUDFOUNDRY_SCHEDULER_URL` has the following format: `scheduler.<Domain-Name>` (for example, `https://scheduler.sys.mycf.cf-app.com`).
From dafc9064895a91faa5371eada231342c369a6f7f Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Fri, 12 Oct 2018 14:14:43 +0530
Subject: [PATCH 128/158] Update latest deployer release versions
- Skipper to use the latest snapshot for tests
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 372c398..c70891b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,12 +14,12 @@
<properties>
<spring-cloud-dataflow.version>1.7.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.4.2.RELEASE</spring-cloud-deployer-cloudfoundry.version>
- <spring-cloud-deployer-spi.version>1.3.3.RELEASE</spring-cloud-deployer-spi.version>
+ <spring-cloud-deployer-cloudfoundry.version>1.4.3.RELEASE</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-deployer-spi.version>1.3.4.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
<spring-cloud-cloudfoundry-connector>2.0.3.RELEASE</spring-cloud-cloudfoundry-connector>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.1.0.RC1</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-skipper.version>
<spring-cloud-scheduler-cloudfoundry>1.0.1.RELEASE</spring-cloud-scheduler-cloudfoundry>
<pivotal-cf-client-reactor.version>1.1.0.RELEASE</pivotal-cf-client-reactor.version>
<reactor.version>3.1.8.RELEASE</reactor.version>
From 89bd33b0bfd3dab608972c60fb335df071774877 Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Wed, 17 Oct 2018 18:21:59 +0530
Subject: [PATCH 129/158] Update latest SCDF/Skipper
- SCDF 1.7.0.RC1
- Skipper 1.1.0.RELEASE
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index c70891b..c013a3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,18 +8,18 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RC1</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.7.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.7.0.RC1</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.3.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.4.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
<spring-cloud-cloudfoundry-connector>2.0.3.RELEASE</spring-cloud-cloudfoundry-connector>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>1.1.0.RELEASE</spring-cloud-skipper.version>
<spring-cloud-scheduler-cloudfoundry>1.0.1.RELEASE</spring-cloud-scheduler-cloudfoundry>
<pivotal-cf-client-reactor.version>1.1.0.RELEASE</pivotal-cf-client-reactor.version>
<reactor.version>3.1.8.RELEASE</reactor.version>
From 24d7f6f17e88c07ac437109bd3b853b0079b49ad Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Wed, 17 Oct 2018 19:19:19 +0530
Subject: [PATCH 130/158] Update max pool size to 10
- This will especially help certain use cases where one runs out of connections easily (file ingest scenario)
---
.../config/CloudFoundryServerConfigurationProperties.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryServerConfigurationProperties.java b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryServerConfigurationProperties.java
index 4c1fbb2..4a2abd9 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryServerConfigurationProperties.java
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryServerConfigurationProperties.java
@@ -44,7 +44,7 @@ public class CloudFoundryServerConfigurationProperties {
*/
private int freeDiskSpacePercentage = 25;
- private int maxPoolSize = 4;
+ private int maxPoolSize = 10;
int maxWaitTime = 30000;
From acb4d6eeefe01e626da6fc1181534f7f0326af30 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Wed, 17 Oct 2018 14:03:02 +0000
Subject: [PATCH 131/158] [artifactory-release] Release version 1.7.0.RC1
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index c013a3e..defc99f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RC1</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index dd26b92..ecca116 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RC1</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 59bb9dd..1ef61ab 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RC1</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RC1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RC1</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 8266585..6ebd738 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RC1</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RC1</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 6b263613fd3512b46d4f258984dcd10e43d3f185 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Wed, 17 Oct 2018 14:03:08 +0000
Subject: [PATCH 132/158] [artifactory-release] Next development version
1.7.0.BUILD-SNAPSHOT
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index defc99f..c013a3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.RC1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index ecca116..dd26b92 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.RC1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 1ef61ab..59bb9dd 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.RC1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.7.0.RC1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.0.RC1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 6ebd738..8266585 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.RC1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.0.RC1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From bdccac420ed0b462c81609f5c3886d5b9ccaaf95 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Wed, 17 Oct 2018 14:10:44 -0400
Subject: [PATCH 133/158] Go back to snapshot deps of core scdf
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index c013a3e..a2f34fe 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,12 +8,12 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.7.0.RC1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.7.0.RC1</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.7.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.3.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.4.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
From fcb5c6d22a56717730d0d19f454c9cb05b98c0b7 Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Thu, 18 Oct 2018 10:09:25 +0530
Subject: [PATCH 134/158] Update SCDF parent to be 1.7.0.RC1
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index a2f34fe..c013a3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,12 +8,12 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RC1</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.7.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.7.0.RC1</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.3.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.4.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
From d90fe54e80bf3ae8a6777bff865443ed394f41da Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Thu, 18 Oct 2018 04:50:03 +0000
Subject: [PATCH 135/158] [artifactory-release] Release version v1.7.0.RC1
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index c013a3e..defc99f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RC1</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index dd26b92..ecca116 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RC1</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 59bb9dd..1ef61ab 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RC1</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RC1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RC1</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 8266585..6ebd738 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RC1</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RC1</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 784a477ec5d8edd2f947928151cfd3b0660a261c Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Thu, 18 Oct 2018 04:50:09 +0000
Subject: [PATCH 136/158] [artifactory-release] Next development version
1.7.0.BUILD-SNAPSHOT
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index defc99f..c013a3e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.RC1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index ecca116..dd26b92 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.RC1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 1ef61ab..59bb9dd 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.RC1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.7.0.RC1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.0.RC1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 6ebd738..8266585 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.RC1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.0.RC1</version>
+ <version>1.7.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 67f4157d8dac4da8d2190063f534a9cf4974763c Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Fri, 19 Oct 2018 16:54:02 -0400
Subject: [PATCH 137/158] add notice file
---
NOTICE | 15 +++++++++++++++
1 file changed, 15 insertions(+)
create mode 100644 NOTICE
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..0c53bc4
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,15 @@
+spring-cloud-dataflow-server-cloudfoundry
+
+Copyright (c) 2016-Present Pivotal Software, Inc. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
\ No newline at end of file
From abe979b07baa4c4d7f109d7374a7699b08d70cd2 Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Wed, 24 Oct 2018 13:24:27 +0530
Subject: [PATCH 138/158] Update SCDF 1.7.0.RELEASE
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index c013a3e..d38b5cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,12 +8,12 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.7.0.RC1</version>
+ <version>1.7.0.RELEASE</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.7.0.RC1</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.7.0.RELEASE</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.3.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.4.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
From 315e77d1e66a614b0d789d8e850148f6217e9867 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Wed, 24 Oct 2018 08:04:31 +0000
Subject: [PATCH 139/158] [artifactory-release] Release version 1.7.0.RELEASE
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index d38b5cd..7433f86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RELEASE</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index dd26b92..c63ef08 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RELEASE</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index 59bb9dd..d91a99f 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RELEASE</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RELEASE</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 8266585..958f35f 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RELEASE</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.0.BUILD-SNAPSHOT</version>
+ <version>1.7.0.RELEASE</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 789a3659a03bd0f6f40629df720f483277cc0f9c Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Wed, 24 Oct 2018 08:04:36 +0000
Subject: [PATCH 140/158] [artifactory-release] Next development version
1.7.1.BUILD-SNAPSHOT
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7433f86..72702ab 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.RELEASE</version>
+ <version>1.7.1.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index c63ef08..1b8e1b1 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.RELEASE</version>
+ <version>1.7.1.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index d91a99f..bb39c61 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.RELEASE</version>
+ <version>1.7.1.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.7.0.RELEASE</version>
+ <version>1.7.1.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.0.RELEASE</version>
+ <version>1.7.1.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 958f35f..6729e9c 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.0.RELEASE</version>
+ <version>1.7.1.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.0.RELEASE</version>
+ <version>1.7.1.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 9e02c04f1bacefccb287060d9bf48b245e0b2690 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Fri, 2 Nov 2018 16:05:29 -0400
Subject: [PATCH 141/158] Update to cf-deployer 1.4.4.RELEASE
Fixes #448
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 72702ab..c6a8318 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
<properties>
<spring-cloud-dataflow.version>1.7.0.RELEASE</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.4.3.RELEASE</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-deployer-cloudfoundry.version>1.4.4.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.4.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
<spring-cloud-cloudfoundry-connector>2.0.3.RELEASE</spring-cloud-cloudfoundry-connector>
From 8d8ee7d3eeb0c5954f318f702f06018016a485a7 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Mon, 5 Nov 2018 16:43:31 -0500
Subject: [PATCH 142/158] Update to 1.7.1.BS of scdf core
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index c6a8318..181b0f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,12 +8,12 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.7.0.RELEASE</version>
+ <version>1.7.1.BUILD-SNAPSHOT</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.7.0.RELEASE</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.7.1.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.4.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.4.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
From 23537424c8de62ac031404bb34c54c84d16830cb Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Tue, 6 Nov 2018 13:18:25 -0500
Subject: [PATCH 143/158] Fix cross-link to security section
Fixes #449
---
.../src/main/asciidoc/configuration.adoc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
index 4b13b21..8ba61a6 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
@@ -339,7 +339,7 @@ The Data Flow server uses the Spring Cloud Connector library to create the DataS
To change the connection pool size and maximum wait time, set the following two properties `spring.cloud.dataflow.server.cloudfoundry.maxPoolSize` and `spring.cloud.dataflow.server.cloudfoundry.maxWaitTime`.
The wait time is specified in milliseconds.
-[[getting-started-security]]
+[[configuration-security]]
== Security
By default, the Data Flow server is unsecured and runs on an unencrypted HTTP connection. You can secure your REST endpoints
From df0f8c63a53c7042701f2f40b06ac81745462294 Mon Sep 17 00:00:00 2001
From: Janne Valkealahti <janne.valkealahti@gmail.com>
Date: Wed, 7 Nov 2018 16:03:37 +0000
Subject: [PATCH 144/158] Upgrade to scdf 1.7.1.RELEASE and skipper
1.1.1.RELEASE
---
pom.xml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index 181b0f2..cd79c99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,18 +8,18 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.7.1.BUILD-SNAPSHOT</version>
+ <version>1.7.1.RELEASE</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.7.1.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>1.7.1.RELEASE</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.4.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.4.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
<spring-cloud-cloudfoundry-connector>2.0.3.RELEASE</spring-cloud-cloudfoundry-connector>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.1.0.RELEASE</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>1.1.1.RELEASE</spring-cloud-skipper.version>
<spring-cloud-scheduler-cloudfoundry>1.0.1.RELEASE</spring-cloud-scheduler-cloudfoundry>
<pivotal-cf-client-reactor.version>1.1.0.RELEASE</pivotal-cf-client-reactor.version>
<reactor.version>3.1.8.RELEASE</reactor.version>
From fd9cb721f5e578953c8c1ca2aee0629321d1f8d8 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Wed, 7 Nov 2018 16:16:24 +0000
Subject: [PATCH 145/158] Release version 1.7.1.RELEASE
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index cd79c99..3c42c47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.1.BUILD-SNAPSHOT</version>
+ <version>1.7.1.RELEASE</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 1b8e1b1..48648be 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.1.BUILD-SNAPSHOT</version>
+ <version>1.7.1.RELEASE</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index bb39c61..fed0ecf 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.1.BUILD-SNAPSHOT</version>
+ <version>1.7.1.RELEASE</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.7.1.BUILD-SNAPSHOT</version>
+ <version>1.7.1.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.1.BUILD-SNAPSHOT</version>
+ <version>1.7.1.RELEASE</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 6729e9c..1efbdbc 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.1.BUILD-SNAPSHOT</version>
+ <version>1.7.1.RELEASE</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.1.BUILD-SNAPSHOT</version>
+ <version>1.7.1.RELEASE</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From ed79dda24f5a1a265413b75a48e3056871dc6e13 Mon Sep 17 00:00:00 2001
From: Spring Buildmaster <buildmaster@springframework.org>
Date: Wed, 7 Nov 2018 16:16:28 +0000
Subject: [PATCH 146/158] Next development version
---
pom.xml | 2 +-
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3c42c47..9d7efc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.1.RELEASE</version>
+ <version>1.7.2.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index 48648be..cf3d332 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.1.RELEASE</version>
+ <version>1.7.2.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index fed0ecf..b003004 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.1.RELEASE</version>
+ <version>1.7.2.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.7.1.RELEASE</version>
+ <version>1.7.2.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.1.RELEASE</version>
+ <version>1.7.2.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 1efbdbc..98815e3 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.1.RELEASE</version>
+ <version>1.7.2.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.1.RELEASE</version>
+ <version>1.7.2.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 15e3f2d88c9d67881800c965b83bdaae41845521 Mon Sep 17 00:00:00 2001
From: Chris Schaefer <cschaefer@pivotal.io>
Date: Thu, 15 Nov 2018 10:19:35 -0500
Subject: [PATCH 147/158] Bump to 2.0.0.BUILD-SNAPSHOT
---
pom.xml | 6 +++---
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml | 6 +++---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/pom.xml b/pom.xml
index 9d7efc6..1b4df30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,18 +2,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.2.BUILD-SNAPSHOT</version>
+ <version>2.0.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-parent</artifactId>
- <version>1.7.1.RELEASE</version>
+ <version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath />
</parent>
<properties>
- <spring-cloud-dataflow.version>1.7.1.RELEASE</spring-cloud-dataflow.version>
+ <spring-cloud-dataflow.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.4.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.4.RELEASE</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index cf3d332..f56fed0 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -10,7 +10,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.2.BUILD-SNAPSHOT</version>
+ <version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<dependencies>
<dependency>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
index b003004..00c1393 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.2.BUILD-SNAPSHOT</version>
+ <version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<description>Spring Cloud Data Flow Server CloudFoundry</description>
<properties>
@@ -15,12 +15,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry</artifactId>
- <version>1.7.2.BUILD-SNAPSHOT</version>
+ <version>2.0.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.2.BUILD-SNAPSHOT</version>
+ <version>2.0.0.BUILD-SNAPSHOT</version>
</dependency>
</dependencies>
<profiles>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 98815e3..acd458e 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-parent</artifactId>
- <version>1.7.2.BUILD-SNAPSHOT</version>
+ <version>2.0.0.BUILD-SNAPSHOT</version>
</parent>
<properties>
<start-class>org.springframework.cloud.dataflow.server.cloudfoundry.CloudFoundryDataFlowServer</start-class>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dataflow-server-cloudfoundry-autoconfig</artifactId>
- <version>1.7.2.BUILD-SNAPSHOT</version>
+ <version>2.0.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>io.projectreactor</groupId>
From 289735a43c420557e97b2af0fb345c8aec087a51 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Tue, 20 Nov 2018 16:11:43 -0500
Subject: [PATCH 148/158] Update connector/sso deps
---
pom.xml | 8 +++++---
.../pom.xml | 2 +-
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 4 ++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/pom.xml b/pom.xml
index 1b4df30..36651db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,10 +16,12 @@
<spring-cloud-dataflow.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
<spring-cloud-deployer-cloudfoundry.version>1.4.4.RELEASE</spring-cloud-deployer-cloudfoundry.version>
<spring-cloud-deployer-spi.version>1.3.4.RELEASE</spring-cloud-deployer-spi.version>
- <spring-cloud-common-security-config.version>1.0.2.RELEASE</spring-cloud-common-security-config.version>
- <spring-cloud-cloudfoundry-connector>2.0.3.RELEASE</spring-cloud-cloudfoundry-connector>
+ <spring-cloud-common-security-config.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-common-security-config.version>
+ <spring-cloud-cloudfoundry-connector.version>2.0.3.RELEASE</spring-cloud-cloudfoundry-connector.version>
+ <spring-cloud-services-starters.version>2.0.3.RELEASE</spring-cloud-services-starters.version>
+ <spring-cloud-sso-connector.version>2.1.3.RELEASE</spring-cloud-sso-connector.version>
<!-- skipper version used only in doc generation -->
- <spring-cloud-skipper.version>1.1.1.RELEASE</spring-cloud-skipper.version>
+ <spring-cloud-skipper.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-skipper.version>
<spring-cloud-scheduler-cloudfoundry>1.0.1.RELEASE</spring-cloud-scheduler-cloudfoundry>
<pivotal-cf-client-reactor.version>1.1.0.RELEASE</pivotal-cf-client-reactor.version>
<reactor.version>3.1.8.RELEASE</reactor.version>
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
index f56fed0..6754b81 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/pom.xml
@@ -41,7 +41,7 @@
<dependency>
<groupId>io.pivotal.spring.cloud</groupId>
<artifactId>spring-cloud-services-starter-config-client</artifactId>
- <version>1.6.3.RELEASE</version>
+ <version>${spring-cloud-services-starters.version}</version>
<scope>runtime</scope>
<exclusions>
<exclusion>
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index acd458e..7520ebd 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -27,12 +27,12 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-cloudfoundry-connector</artifactId>
- <version>${spring-cloud-cloudfoundry-connector}</version>
+ <version>${spring-cloud-cloudfoundry-connector.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-spring-service-connector</artifactId>
- <version>${spring-cloud-cloudfoundry-connector}</version>
+ <version>${spring-cloud-cloudfoundry-connector.version}</version>
</dependency>
</dependencies>
<build>
From 6fecb085e3da50cd7f8e943b030bc84893bf0e83 Mon Sep 17 00:00:00 2001
From: Christian Tzolov <christian.tzolov@gmail.com>
Date: Tue, 27 Nov 2018 12:23:04 +0100
Subject: [PATCH 149/158] Test Task/Batch workloads on Skipper mode
- Remove classic-mode occurrences in the documentation and use the Skipper as a default and only Stream management option
- Add skipper Uri to all SCDF configurations
Resolves #453
Remove SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES in favor of SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_SERVICES
add blame tag
Address some of the review comments
---
.../src/main/asciidoc/configuration.adoc | 114 ++++++---
.../src/main/asciidoc/getting-started.adoc | 221 +++++++-----------
.../src/main/asciidoc/index.adoc | 2 +-
3 files changed, 162 insertions(+), 175 deletions(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
index 8ba61a6..e67ea45 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
@@ -489,12 +489,6 @@ spring.cloud.deployer.cloudfoundry.password=
# (to set the environment variable, use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATION).
spring.cloud.deployer.cloudfoundry.skipSslValidation=false
-# A comma-separated set of service instance names to bind to every deployed stream application.
-# Among other things, this should include a service that is used
-# for Spring Cloud Stream binding, such as Rabbit
-# (to set the environment variable, use SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES).
-spring.cloud.deployer.cloudfoundry.stream.services=
-
# The health check type to use for stream apps. Accepts 'none' and 'port'.
spring.cloud.deployer.cloudfoundry.stream.health-check=
@@ -609,9 +603,7 @@ Another, more drastic, option is to disable the platform health check by setting
=== Sample Manifest Template
-The following `manifest.yml` template includes the required environment variables for the Spring Cloud Data Flow server and deployed
-applications and tasks to successfully run on Cloud Foundry and automatically resolve centralized properties from `my-config-server`
-at runtime:
+The following SCDF and Skipper `manifest.yml` templates includes the required environment variables for the Skipper and Spring Cloud Data Flow server and deployed applications and tasks to successfully run on Cloud Foundry and automatically resolve centralized properties from `my-config-server` at runtime:
====
[source,yml]
@@ -632,35 +624,57 @@ applications:
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_DOMAIN: local.pcfdev.io
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_USERNAME: admin
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_PASSWORD: admin
- SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES: rabbit,my-config-server
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES: mysql,my-config-server
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATION: true
+ SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI: https://<skipper-host-name>/api
SPRING_APPLICATION_JSON: '{"maven": { "remote-repositories": { "repo1": { "url": "https://repo.spring.io/libs-release"} } } }'
services:
- mysql
- my-config-server
+
+---
+applications:
+- name: skipper-server
+ host: skipper-server
+ memory: 1G
+ disk_quota: 1G
+ instances: 1
+ timeout: 180
+ buildpack: java_buildpack
+ path: <PATH TO THE DOWNLOADED SKIPPER SERVER UBER-JAR>
+ env:
+ SPRING_APPLICATION_NAME: skipper-server
+ SPRING_CLOUD_SKIPPER_SERVER_ENABLE_LOCAL_PLATFORM: false
+ SPRING_CLOUD_SKIPPER_SERVER_STRATEGIES_HEALTHCHECK_TIMEOUTINMILLIS: 300000
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_URL: https://api.local.pcfdev.io
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_ORG: pcfdev-org
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_SPACE: pcfdev-space
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_DOMAIN: cfapps.io
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_USERNAME: admin
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_PASSWORD: admin
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_SKIP_SSL_VALIDATION: false
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_DELETE_ROUTES: false
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_SERVICES: rabbit, my-config-server
+services:
+- mysql
+ my-config-server
+
----
where `my-config-server` is the name of the Spring Cloud Config Service instance running on Cloud Foundry.
====
-By binding the
-service to both Spring Cloud Data Flow server and all the Spring Cloud Stream and Spring Cloud Task applications
-respectively, we can now resolve centralized properties backed by this service.
+By binding the service to Spring Cloud Data Flow server, Spring Cloud Task and via Skipper to all the Spring Cloud Stream applications respectively, we can now resolve centralized properties backed by this service.
=== Self-signed SSL Certificate and Spring Cloud Config Server
-Often, in a development environment, we may not have a valid certificate to enable SSL communication between clients and
-the backend services. However, the configuration server for Pivotal Cloud Foundry uses HTTPS for all client-to-service communication,
-so we need to add a self-signed SSL certificate in environments with no valid certificates.
+Often, in a development environment, we may not have a valid certificate to enable SSL communication between clients and the backend services.
+However, the configuration server for Pivotal Cloud Foundry uses HTTPS for all client-to-service communication, so we need to add a self-signed SSL certificate in environments with no valid certificates.
-By using the same `manifest.yml` template listed in the previous section for the server, we can provide the self-signed
-SSL certificate by setting `TRUST_CERTS: <API_ENDPOINT>`.
+By using the same `manifest.yml` templates listed in the previous section for the server, we can provide the self-signed SSL certificate by setting `TRUST_CERTS: <API_ENDPOINT>`.
-However, the deployed applications also require `TRUST_CERTS` as a flat environment variable (as opposed to being wrapped inside
-`SPRING_APPLICATION_JSON`), so we must instruct the server with yet another set of tokens (`SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_USE_SPRING_APPLICATION_JSON: false`
-and `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_USE_SPRING_APPLICATION_JSON: false`) for stream and task applications,
-respectively. With this setup, the applications receive their application properties as regular environment variables.
+However, the deployed applications also require `TRUST_CERTS` as a flat environment variable (as opposed to being wrapped inside `SPRING_APPLICATION_JSON`), so we must instruct the server with yet another set of tokens (`SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_USE_SPRING_APPLICATION_JSON: false` and `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_USE_SPRING_APPLICATION_JSON: false`) for stream and task applications, respectively.
+With this setup, the applications receive their application properties as regular environment variables.
The following listing shows the updated `manifest.yml` with the required changes. Both the Data Flow server and deployed applications
get their configuration from the `my-config-server` Cloud Config server (deployed as a Cloud Foundry service).
@@ -684,8 +698,8 @@ applications:
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_DOMAIN: <DOMAIN>
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_USERNAME: <USER>
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_PASSWORD: <PASSWORD>
+ SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI: https://<skipper-host-name>/api
MAVEN_REMOTE_REPOSITORIES_REPO1_URL: https://repo.spring.io/libs-release
- SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES: my-config-server #this is so all stream applications bind to my-config-server
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES: config-server #this for so all task applications bind to my-config-server
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_USE_SPRING_APPLICATION_JSON: false #this is for all the stream applications
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_USE_SPRING_APPLICATION_JSON: false #this is for all the task applications
@@ -698,34 +712,62 @@ services:
----
====
+Also add the `my-config-server` service to the Skipper's manifest environment
+
+====
+[source,yml]
+----
+---
+applications:
+- name: skipper-server
+ host: skipper-server
+ memory: 1G
+ disk_quota: 1G
+ instances: 1
+ timeout: 180
+ buildpack: java_buildpack
+ path: <PATH TO THE DOWNLOADED SKIPPER SERVER UBER-JAR>
+ env:
+ SPRING_APPLICATION_NAME: skipper-server
+ SPRING_CLOUD_SKIPPER_SERVER_ENABLE_LOCAL_PLATFORM: false
+ SPRING_CLOUD_SKIPPER_SERVER_STRATEGIES_HEALTHCHECK_TIMEOUTINMILLIS: 300000
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_URL: <URL>
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_ORG: <ORG>
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_SPACE: <SPACE>
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_DOMAIN: <DOMAIN>
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_USERNAME: <USER>
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_PASSWORD: <PASSWORD>
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_SERVICES: rabbit, my-config-server #this is so all stream applications bind to my-config-server
+services:
+- mysql
+ my-config-server
+
+----
+====
+
[[getting-started-scheduling-configuration]]
== Configure Scheduling
-This section discusses how to configure Spring Cloud Data Flow to connect to the
-https://www.cloudfoundry.org/the-foundry/scheduler/[PCF-Scheduler] as its agent to execute tasks.
+This section discusses how to configure Spring Cloud Data Flow to connect to the https://www.cloudfoundry.org/the-foundry/scheduler/[PCF-Scheduler] as its agent to execute tasks.
[NOTE]
====
-Before following these instructions, be sure to have an instance of the PCF-Scheduler service running in your Cloud
-Foundry space. To create a PCF-Scheduler in your space (assuming it is in your Market Place) execute the following
-from the CF CLI: `cf create-service scheduler-for-pcf standard <name of service>`. Name of a service
-is later used to bound running application in _PCF_.
+Before following these instructions, be sure to have an instance of the PCF-Scheduler service running in your Cloud Foundry space.
+To create a PCF-Scheduler in your space (assuming it is in your Market Place) execute the following from the CF CLI: `cf create-service scheduler-for-pcf standard <name of service>`.
+Name of a service is later used to bound running application in _PCF_.
====
For scheduling, you must add (or update) the following environment variables in your environment:
* Enable scheduling for Spring Cloud Data Flow by setting `spring.cloud.dataflow.features.schedules-enabled` to `true`.
-* Bind the task deployer to your instance of PCF-Scheduler by adding the PCF-Scheduler service name to the
- `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES` environment variable.
-* Establish the URL to the PCF-Scheduler by setting the `SPRING_CLOUD_SCHEDULER_CLOUDFOUNDRY_SCHEDULER_URL` environment
- variable.
+* Bind the task deployer to your instance of PCF-Scheduler by adding the PCF-Scheduler service name to the `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES` environment variable.
+* Establish the URL to the PCF-Scheduler by setting the `SPRING_CLOUD_SCHEDULER_CLOUDFOUNDRY_SCHEDULER_URL` environment variable.
[NOTE]
====
After creating the preceding configurations, you must create any task definitions that need to be scheduled.
====
-The following sample manifest shows both environment properties configured (assuming you have a PCF-Scheduler service
-available with the name `myscheduler`):
+The following sample manifest shows both environment properties configured (assuming you have a PCF-Scheduler service available with the name `myscheduler`):
====
[source,yml]
@@ -746,10 +788,10 @@ applications:
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_DOMAIN: local.pcfdev.io
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_USERNAME: admin
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_PASSWORD: admin
- SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES: rabbit
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES: mysql,myscheduler
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATION: true
SPRING_CLOUD_DATAFLOW_FEATURES_SCHEDULES_ENABLED: true
+ SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI: https://<skipper-host-name>/api
SPRING_CLOUD_SCHEDULER_CLOUDFOUNDRY_SCHEDULER_URL: https://scheduler.local.pcfdev.io
SPRING_APPLICATION_JSON: '{"maven": { "remote-repositories": { "repo1": { "url": "https://repo.spring.io/libs-release"} } } }'
services:
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
index ed1e409..8092668 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/getting-started.adoc
@@ -4,23 +4,19 @@
[[getting-started-requirements]]
== System Requirements
-The Spring Cloud Data Flow server deploys streams (long-lived applications) and tasks (short-lived applications) to Cloud
-Foundry. The server is a lightweight Spring Boot application. It can run on Cloud Foundry or your laptop, but it is more
-common to run the server in Cloud Foundry.
+The Spring Cloud Data Flow server deploys task tasks (short-lived applications) and via Skipper deploys streams (long-lived applications) to Cloud Foundry.
+The server is a lightweight Spring Boot application. It can run on Cloud Foundry or your laptop, but it is more common to run the server in Cloud Foundry.
-Spring Cloud Data Flow requires a few data services to perform streaming, task/batch processing, and analytics. You have
-two options when you provision Spring Cloud Data Flow and related services on Cloud Foundry:
+Spring Cloud Data Flow requires a few data services to perform streaming, task/batch processing, and analytics.
+You have two options when you provision Spring Cloud Data Flow and related services on Cloud Foundry:
-* The simplest (and automated) method is to use the link:https://network.pivotal.io/products/p-dataflow[Spring Cloud Data Flow for PCF]
-tile. This is an opinionated tile for Pivotal Cloud Foundry. It automatically provisions the server and the required
-data services, thus simplifying the overall getting-started experience. You can read more about the installation
-link:http://docs.pivotal.io/scdf/[here].
-* Alternatively, you can provision all the components manually. The following section goes into the specifics of how to
-do so.
+* The simplest (and automated) method is to use the link:https://network.pivotal.io/products/p-dataflow[Spring Cloud Data Flow for PCF] tile.
+This is an opinionated tile for Pivotal Cloud Foundry.
+It automatically provisions the server and the required data services, thus simplifying the overall getting-started experience. You can read more about the installation link:http://docs.pivotal.io/scdf/[here].
+* Alternatively, you can provision all the components manually. The following section goes into the specifics of how to do so.
=== Provision a Redis Service Instance on Cloud Foundry
-A Redis instance is required for analytics apps and is typically bound to such apps when you create an analytics
-stream by using the <<getting-started.adoc#getting-started-service-binding-at-application-level,per-app-binding>> feature.
+A Redis instance is required for analytics apps and is typically bound to such apps when you create an analytics stream by using the <<getting-started.adoc#getting-started-service-binding-at-application-level,per-app-binding>> feature.
You can use `cf marketplace` to discover which plans are available to you, depending on the details of your Cloud Foundry setup.
For example, you can use link:https://run.pivotal.io/[Pivotal Web Services], as the following example shows:
@@ -33,10 +29,9 @@ cf create-service rediscloud 30mb redis
====
=== Provision a Rabbit Service Instance on Cloud Foundry
-RabbitMQ is used as a messaging middleware between streaming apps and is bound to each deployed streaming
-app. Apache Kafka is the other option. We can use the `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES` setting in Data
-Flow configuration or use the `SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_SERVICES` setting in
-Skipper, which automatically binds RabbitMQ to the deployed streaming applications.
+RabbitMQ is used as a messaging middleware between streaming apps and is bound to each deployed streaming app.
+Apache Kafka is the other option.
+We can use the `SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_SERVICES` setting in `Skipper Server` configuration which automatically binds RabbitMQ to the deployed streaming applications.
You can use `cf marketplace` to discover which plans are available to you, depending on the details of your Cloud Foundry setup.
For example, you can use link:https://run.pivotal.io/[Pivotal Web Services]:
@@ -63,9 +58,7 @@ cf create-service cleardb spark my_mysql
[[getting-started-cloudfoundry]]
== Cloud Foundry Installation
-Starting with 1.3.x, the Data Flow Server can run in either `skipper` or `classic` (non-skipper) mode. You can specify the mode
-when you start the Data Flow server by setting the `spring.cloud.dataflow.features.skipper-enabled` property.
-By default, the `classic` mode is enabled.
+Starting with 2.0.x, the Data Flow Server requires a `Skipper` server for managing the Streams lifecycle.
. Download the Data Flow server and shell applications, as the following example shows:
+
@@ -77,7 +70,8 @@ wget http://repo.spring.io/{version-type-lowercase}/org/springframework/cloud/sp
wget http://repo.spring.io/{dataflow-version-type-lowercase}/org/springframework/cloud/spring-cloud-dataflow-shell/{dataflow-project-version}/spring-cloud-dataflow-shell-{dataflow-project-version}.jar
----
====
-. Optionally, download http://cloud.spring.io/spring-cloud-skipper/[Skipper] if you want the added features of upgrading and rolling back Streams since Data Flow delegates to Skipper for those features. The following example shows how to do so:
+. Download http://cloud.spring.io/spring-cloud-skipper/[Skipper] to which Data Flow delegate Streams lifecycle operations such as deployment, upgrading and rolling back.
+The following example shows how to do so:
+
====
[source,yaml,options=nowrap,subs=attributes]
@@ -86,8 +80,7 @@ wget http://repo.spring.io/{skipper-version-type-lowercase}/org/springframework/
----
====
+
-Push Skipper to Cloud Foundry only if you want to run Spring Cloud Data Flow server in `skipper` mode. The following example shows a
-manifest for Skipper.
+Push Skipper to Cloud Foundry. The following example shows a manifest for Skipper.
+
====
[source,yaml,options=nowrap]
@@ -100,24 +93,29 @@ applications:
disk_quota: 1G
instances: 1
timeout: 180
+ buildpack: java_buildpack
path: <PATH TO THE DOWNLOADED SKIPPER SERVER UBER-JAR>
-env:
+ env:
SPRING_APPLICATION_NAME: skipper-server
SPRING_CLOUD_SKIPPER_SERVER_ENABLE_LOCAL_PLATFORM: false
- SPRING_CLOUD_SKIPPER_SERVER_STRATEGIES_HEALTHCHECK.TIMEOUTINMILLIS: 300000
+ SPRING_CLOUD_SKIPPER_SERVER_STRATEGIES_HEALTHCHECK_TIMEOUTINMILLIS: 300000
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_URL: https://api.run.pivotal.io
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_ORG: {org}
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_SPACE: {space}
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_DOMAIN: cfapps.io
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_USERNAME: {email}
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_PASSWORD: {password}
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_CONNECTION_SKIP_SSL_VALIDATION: false
- SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_DOMAIN: cfapps.io
+ SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_DELETE_ROUTES: false
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_SERVICES: {middlewareServiceName}
SPRING_CLOUD_SKIPPER_SERVER_PLATFORM_CLOUDFOUNDRY_ACCOUNTS[pws]_DEPLOYMENT_STREAM_ENABLE_RANDOM_APP_NAME_PREFIX: false
+services:
+- {services}
----
====
+
-You need to fill in `\{org}`, `\{space}`, `\{email}`, `\{password}` and `{middlewareServiceName}` before running these commands. Once you have the desired config values in `manifest.yml`, you can run the `cf push` command to provision the skipper-server.
+You need to fill in `\{org}`, `\{space}`, `\{email}`, `\{password}`, `{middlewareServiceName}` (e.g. rabbit or kafka) and {services} (such as mysql) before running these commands.
+Once you have the desired config values in `manifest.yml`, you can run the `cf push` command to provision the skipper-server.
+
WARNING: Only set 'Skip SSL Validation' to `true` if you run on a Cloud Foundry instance by using self-signed
certificates (for example, in development). Do not use self-signed certificates for production.
@@ -125,8 +123,7 @@ certificates (for example, in development). Do not use self-signed certificates
. Configure and run the Data Flow Server
+
One of the most important configuration details is providing credentials to the Cloud Foundry instance so that the server can itself spawn applications.
-You can use any Spring Boot-compatible configuration mechanism (passing program arguments, editing configuration files before building the application, using
-link:https://github.com/spring-cloud/spring-cloud-config[Spring Cloud Config], using environment variables, and others), although some may prove more practicable than others, depending on how you typically deploy applications to Cloud Foundry.
+You can use any Spring Boot-compatible configuration mechanism (passing program arguments, editing configuration files before building the application, using link:https://github.com/spring-cloud/spring-cloud-config[Spring Cloud Config], using environment variables, and others), although some may prove more practicable than others, depending on how you typically deploy applications to Cloud Foundry.
In later sections, we show how to deploy Data Flow by using <<getting-started-cloudfoundry-deploying-using-env-vars,environment variables>> or a <<getting-started-cloudfoundry-deploying-using-manifest,Cloud Foundry manifest>>.
However, there are some general configuration details you should be aware of in either approach.
@@ -134,27 +131,25 @@ However, there are some general configuration details you should be aware of in
[[getting-started-cloudfoundry-general-configuration]]
=== General Configuration
-NOTE: You must use a unique name for your app. An application with the same name in the same organization causes your
-deployment to fail.
+NOTE: You must use a unique name for your app. An application with the same name in the same organization causes your deployment to fail.
-NOTE: The recommended minimum memory setting for the server is 2G. Also, to push apps to PCF and obtain
-application property metadata, the server downloads applications to a Maven repository hosted on the local disk. While
-you can specify up to 2G as a typical maximum value for disk space on a PCF installation, you can increase this to
-10G. Read the xref:getting-started-maximum-disk-quota-configuration[maximum disk quota] section for information on
-how to configure this PCF property. Also, the Data Flow server itself implements a Last-Recently-Used algorithm to
-free disk space when it falls below a low-water-mark value.
+NOTE: The recommended minimum memory setting for the server is 2G. Also, to push apps to PCF and obtain application property metadata, the server downloads applications to a Maven repository hosted on the local disk.
+While you can specify up to 2G as a typical maximum value for disk space on a PCF installation, you can increase this to 10G.
+Read the xref:getting-started-maximum-disk-quota-configuration[maximum disk quota] section for information on how to configure this PCF property.
+Also, the Data Flow server itself implements a Last-Recently-Used algorithm to free disk space when it falls below a low-water-mark value.
-NOTE: If you are pushing to a space with multiple users (for example, on PWS), the route you chose for your application name may already be taken. You can use the `--random-route` option to avoid this when you push the server application.
+NOTE: If you are pushing to a space with multiple users (for example, on PWS), the route you chose for your application name may already be taken.
+You can use the `--random-route` option to avoid this when you push the server application.
-NOTE: By default, the https://github.com/spring-cloud/spring-cloud-dataflow/tree/master/spring-cloud-dataflow-registry[application registry] in Spring Cloud Data Flow's Cloud Foundry server is empty. It is intentionally designed to let you have the flexibility of http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#spring-cloud-dataflow-register-stream-apps[choosing and registering] applications as you find appropriate for the given use-case requirement. Depending on the message-binder you choose, you can register between http://repo.spring.io/libs-snapshot/org/springframework/cloud/stream/app/[RabbitMQ- or Apache Kafka-based] Maven artifacts.
+NOTE: By default, the https://github.com/spring-cloud/spring-cloud-dataflow/tree/master/spring-cloud-dataflow-registry[application registry] in Spring Cloud Data Flow's Cloud Foundry server is empty.
+It is intentionally designed to let you have the flexibility of http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#spring-cloud-dataflow-register-stream-apps[choosing and registering] applications as you find appropriate for the given use-case requirement. Depending on the message-binder you choose, you can register between http://repo.spring.io/libs-snapshot/org/springframework/cloud/stream/app/[RabbitMQ- or Apache Kafka-based] Maven artifacts.
NOTE: If you need to configure multiple Maven repositories, a proxy, or authorization for a private repository, see link:http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#getting-started-maven-configuration[Maven Configuration].
[[getting-started-cloudfoundry-deploying-using-env-vars]]
=== Deploying by Using Environment Variables
-The following configuration is for Pivotal Web Services. You need to fill in `\{org}`, `\{space}`,
-`\{email}` and `\{password}` before running these commands.
+The following configuration is for Pivotal Web Services. You need to fill in `\{org}`, `\{space}`, `\{email}` and `\{password}` before running these commands.
====
[source]
@@ -163,25 +158,17 @@ cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_URL https://api.ru
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_ORG {org}
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SPACE {space}
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_DOMAIN cfapps.io
-cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES rabbit
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES my_mysql
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_USERNAME {email}
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_PASSWORD {password}
cf set-env dataflow-server SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATION false
+cf set-env dataflow-server SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI https://<skipper-host-name>/api
----
====
[NOTE]
=====
-If you are going to use Skipper to deploy Streams, deploy Skipper first and then configure the URI location where the Skipper server runs and set the server to be in `skipper` mode. The following example shows how to do so:
-
-====
-[source]
-----
-cf set-env dataflow-server SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI https://<skipper-host-name>/api
-cf set-env dataflow-server SPRING_CLOUD_DATAFLOW_FEATURES_SKIPPER_ENABLED true
-----
-====
+Deploy Skipper first and then configure the URI location where the Skipper server runs.
=====
The Spring Cloud Data Flow server does not have any default remote maven repository configured.
@@ -196,11 +183,10 @@ cf set-env dataflow-server SPRING_APPLICATION_JSON '{"maven": { "remote-reposito
where `repo1` is the alias name for the remote repository
====
-WARNING: Only set 'Skip SSL Validation' to true if you run on a Cloud Foundry instance using self-signed
-certificates (for example, in development). Do not use self-signed certificates for production.
+WARNING: Only set 'Skip SSL Validation' to true if you run on a Cloud Foundry instance using self-signed certificates (for example, in development).
+Do not use self-signed certificates for production.
-NOTE: If you are deploying in an environment that requires you to sign on using the Pivotal Single Sign-On Service,
-see <<getting-started-security-cloud-foundry>> for information on how to configure the server.
+NOTE: If you are deploying in an environment that requires you to sign on using the Pivotal Single Sign-On Service, see <<getting-started-security-cloud-foundry>> for information on how to configure the server.
You can now issue a `cf push` command and reference the Data Flow server .jar file, as the following example shows:
@@ -216,8 +202,7 @@ cf bind-service dataflow-server my_mysql
[[getting-started-cloudfoundry-deploying-using-manifest]]
=== Deploying by Using a Manifest
-As an alternative to setting environment variables with the `cf set-env` command, you can curate all the relevant env-var's
-in a `manifest.yml` file and use the `cf push` command to provision the server.
+As an alternative to setting environment variables with the `cf set-env` command, you can curate all the relevant env-var's in a `manifest.yml` file and use the `cf push` command to provision the server.
The following example template provisions the server on PCFDev:
@@ -240,9 +225,9 @@ applications:
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_DOMAIN: local.pcfdev.io
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_USERNAME: admin
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_PASSWORD: admin
- SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES: rabbit
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES: mysql
SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATION: true
+ SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI: https://<skipper-host-name>/api
SPRING_APPLICATION_JSON: '{"maven": { "remote-repositories": { "repo1": { "url": "https://repo.spring.io/libs-release"} } } }'
services:
- mysql
@@ -251,21 +236,10 @@ services:
[NOTE]
=====
-If you are going to use `Skipper` to deploy Streams, deploy Skipper first and then configure the URI location where the Skipper server runs and set the feature toggle to use skipper, as the following example shows:
-
-====
-[source,yml]
-----
-applications:
- env:
- SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI: https://<skipper-host-name>/api
- SPRING_CLOUD_DATAFLOW_FEATURES_SKIPPER_ENABLED: true
-----
-====
+Deploy Skipper first and then configure the URI location where the Skipper server runs.
=====
-Once you are ready with the relevant properties in this file, you can issue a `cf push` command from the directory where
-this file is stored.
+Once you are ready with the relevant properties in this file, you can issue a `cf push` command from the directory where this file is stored.
[[getting-started-cloudfoundry-on-local]]
== Local Installation
@@ -283,34 +257,24 @@ export SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_USERNAME={email}
export SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_PASSWORD={password}
export SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_SKIP_SSL_VALIDATION=false
-export SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES=rabbit
# The following is for letting task apps write to their db.
# Note however that when the *server* is running locally, it can't access that db
# task related commands that show executions won't work then
export SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_TASK_SERVICES=my_mysql
+export SKIPPER_CLIENT_HOST https://<skipper-host-name>/api
----
====
You need to fill in `\{org}`, `\{space}`, `\{email}` and `\{password}` before running these commands.
-WARNING: Only set 'Skip SSL Validation' to true if you run on a Cloud Foundry instance using self-signed
-certificates (for example, in development). Do not use self-signed certificates for production.
+WARNING: Only set 'Skip SSL Validation' to true if you run on a Cloud Foundry instance using self-signed certificates (for example, in development).
+Do not use self-signed certificates for production.
[NOTE]
=====
-If you are going to use `Skipper` to deploy Streams, deploy Skipper first and then configure the URI location of where the Skipper server is running and enable the Skipper feature toggle.
-
-====
-[source]
-----
-export SKIPPER_CLIENT_HOST https://<skipper-host-name>/api
-export SPRING_CLOUD_DATAFLOW_FEATURES_SKIPPER_ENABLED true
-----
-====
+Deploy Skipper first and then configure the URI location of where the Skipper server is running.
=====
-NOTE: Since Skipper is a Spring Boot application, you can also pass the configuration properties as command line options instead of environment variables. For example, `SPRING_CLOUD_DEPLOYER_CLOUDFOUNDRY_STREAM_SERVICES` becomes `--spring.cloud.deployer.cloudfoundry.stream.services`.
-
Now we are ready to start the server application, as follows:
====
@@ -320,14 +284,12 @@ java -jar spring-cloud-dataflow-server-cloudfoundry-{project-version}.jar
----
====
-TIP: All other parameterization options that were available when running the server on Cloud Foundry are
-still available. This is particularly true for xref:configuring-defaults[configuring defaults] for applications. To use them,
-substitute `cf set-env` syntax with `export`.
+TIP: All other parameterization options that were available when running the server on Cloud Foundry are still available.
+This is particularly true for xref:configuring-defaults[configuring defaults] for applications. To use them, substitute `cf set-env` syntax with `export`.
[[getting-started-data-flow-shell]]
== Data Flow Shell
-Launching the Data Flow shell requires that you specify the appropriate data flow server mode.
-The following example shows how to start the Data Flow Shell for the Data Flow server running in `classic` mode:
+The following example shows how to start the Data Flow Shell:
====
[source,bash,subs=attributes]
@@ -339,8 +301,8 @@ $ java -jar spring-cloud-dataflow-shell-{dataflow-project-version}.jar
[[getting-started-deploying-streams]]
== Deploying Streams
-By default, the application registry is empty. If you would like to register all out-of-the-box stream applications
-built with the RabbitMQ binder in bulk, run the following command:
+By default, the application registry is empty.
+If you would like to register all out-of-the-box stream applications built with the RabbitMQ binder in bulk, run the following command:
====
[source]
@@ -349,25 +311,25 @@ dataflow:>app import --uri http://bit.ly/Darwin-SR1-stream-applications-rabbit-m
----
====
-For more details, review how to
-xref:spring-cloud-dataflow-register-apps[register applications].
+For more details, review how to xref:spring-cloud-dataflow-register-apps[register applications].
-You have two options for deploying Streams: the "`traditional`" way that Data Flow has always used and a new way that delegates to the Skipper server. Deploying by using Skipper lets you update and rollback the streams, while the traditional way does not.
+Data Flow delegates the Streams deployment to Skipper which provide support for features such as Streams update and rollback.
-=== Creating Streams without Skipper
+=== Creating Streams
-The following example shows how to create a simple stream with an HTTP source and a log sink:
+NOTE: Make sure the Skipper server is deployed and have configured the Data Flow server's `SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI` property to reference the Skipper server.
+
+The following example shows how to create and deploy a stream:
====
[source]
----
-dataflow:> stream create --name httptest --definition "http | log" --deploy
+dataflow:> stream create --name httptest --definition "http | log"
+dataflow:> stream deploy --name httptest --platformName pws
----
====
-NOTE: You need to wait a little while until the applications are actually deployed
-before posting data. Tail the log file for each application to verify that
-the application has started.
+NOTE: You need to wait a little while until the applications are actually deployed before posting data. Tail the log file for each application to verify that the application has started.
Now you can post some data. The URL is unique to your deployment. The following example shows how to post data:
@@ -380,35 +342,19 @@ dataflow:> http post --target http://dataflow-AxwwAhK-httptest-http.cfapps.io --
Now you can see whether `hello world` is in the log files for the `log` application.
-=== Creating Streams with Skipper
-
-This section assumes you have deployed Skipper and have configured the Data Flow server's `SPRING_CLOUD_SKIPPER_CLIENT_SERVER_URI` property to reference the Skipper server.
-
-The following example shows how to create and deploy a stream with Skipper:
-
-====
-[source]
-----
-dataflow:> stream create --name httptest --definition "http | log"
-dataflow:> stream deploy --name httptest --platformName pws
-----
-====
-
-Now you can see whether `hello world` is in the log files for the `log` application.
-
NOTE: Skipper includes the concept of link:https://docs.spring.io/spring-cloud-skipper/docs/current/reference/htmlsingle/#platforms[platforms],
-so it is important to define the "`accounts`" based on the project preferences. In the preceding YAML file, the accounts map
-to `pws` as the platform. You can modify this, and you can have any number of platform definitions.
+so it is important to define the "`accounts`" based on the project preferences.
+In the preceding YAML file, the accounts map to `pws` as the platform. You can modify this, and you can have any number of platform definitions.
The https://docs.spring.io/spring-cloud-skipper/docs/current/reference/htmlsingle/[Spring Cloud Skipper reference guide] has more details.
-You can read more about the general features of using Skipper to deploy streams in the <<spring-cloud-dataflow-stream-lifecycle-skipper>> section and how to upgrade a streams in the <<spring-cloud-dataflow-stream-lifecycle-skipper-update>> section.
+You can read more about the general features of using Skipper to deploy streams in the <<spring-cloud-dataflow-stream-lifecycle>> section and how to upgrade a streams in the <<spring-cloud-dataflow-stream-lifecycle-update>> section.
[[streams-using-skipper]]
-== Deploying Streams by Using Skipper
+== Deploying Streams
-This section proceeds with the assumption that Spring Cloud Data Flow, Spring Cloud Skipper, RDBMS, and your desired messaging
-middleware are all running in PWS. The following listing shows the apps running in a sample org and space:
+This section proceeds with the assumption that Spring Cloud Data Flow, Spring Cloud Skipper, RDBMS, and your desired messaging middleware are all running in PWS.
+The following listing shows the apps running in a sample org and space:
====
[source,console,options=nowrap]
@@ -423,12 +369,12 @@ dataflow-server started 1/1 1G 1G dataf
----
====
-The following example shows how to start the Data Flow Shell for the Data Flow server running in `skipper` mode:
+The following example shows how to start the Data Flow shell for the Data Flow server:
====
[source,bash,subs=attributes]
----
-$ java -jar spring-cloud-dataflow-shell-{dataflow-project-version}.jar --dataflow.mode=skipper
+$ java -jar spring-cloud-dataflow-shell-{dataflow-project-version}.jar
----
====
@@ -459,8 +405,8 @@ dataflow:>stream platform-list
----
====
-We start by deploying a stream with the `time-source` pointing to `1.2.0.RELEASE` and `log-sink` pointing
-to `1.1.0.RELEASE`. The goal is to perform a rolling upgrade of the `log-sink` application to `1.2.0.RELEASE`.
+We start by deploying a stream with the `time-source` pointing to `1.2.0.RELEASE` and `log-sink` pointing to `1.1.0.RELEASE`.
+The goal is to perform a rolling upgrade of the `log-sink` application to `1.2.0.RELEASE`.
====
[source,console,options=nowrap]
@@ -652,9 +598,8 @@ dataflow-server started 1/1 1G 1G dataf
----
====
-NOTE: There are two versions of the `log-sink` applications. The `ticker-314-log-v1` application instance is going down
-(route already removed) and the newly spawned `ticker-314-log-v2` application is bootstrapping. The version number is incremented and
-the version-number (`v2`) is included in the new application name.
+NOTE: There are two versions of the `log-sink` applications. The `ticker-314-log-v1` application instance is going down (route already removed) and the newly spawned `ticker-314-log-v2` application is bootstrapping.
+The version number is incremented and the version-number (`v2`) is included in the new application name.
. Once the new application is up and running, you can verify the logs, as the following example shows:
@@ -670,7 +615,9 @@ $ cf logs ticker-314-log-v2
----
====
-Now you can look at the updated package manifest persisted in Skipper. You should now be seeing `log-sink` at 1.2.0.RELEASE. The following example shows the command to use and its output:
+Now you can look at the updated package manifest persisted in Skipper.
+You should now be seeing `log-sink` at 1.2.0.RELEASE.
+The following example shows the command to use and its output:
====
[source,yml,options=nowrap]
@@ -739,7 +686,8 @@ dataflow:>stream history --name ticker-314
----
====
-Rolling-back to the previous version is just a command away. The following example shows how to do so and the resulting output:
+Rolling-back to the previous version is just a command away.
+The following example shows how to do so and the resulting output:
====
[source,console,options=nowrap]
@@ -792,10 +740,7 @@ dataflow:>task launch mytask
----
====
-You will see the year (`2018` at the time of this writing) printed in the logs. The execution status of the task is stored
-in the database, and you can retrieve information about the task execution by using the
-`task execution list` and `task execution status --id <ID_OF_TASK>` shell commands or though the Data Flow UI.
+You will see the year (`2018` at the time of this writing) printed in the logs. The execution status of the task is stored in the database, and you can retrieve information about the task execution by using the `task execution list` and `task execution status --id <ID_OF_TASK>` shell commands or though the Data Flow UI.
-NOTE: The current underlying PCF task capabilities are considered experimental for PCF version
-versions less than 1.9. See http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#enable-disable-specific-features[Feature Togglers]
-for how to disable task support in Data Flow.
+NOTE: The current underlying PCF task capabilities are considered experimental for PCF version versions less than 1.9.
+See http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#enable-disable-specific-features[Feature Togglers] for how to disable task support in Data Flow.
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc
index 3a076ff..90666ae 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/index.adoc
@@ -1,5 +1,5 @@
= Spring Cloud Data Flow Server for Cloud Foundry
-Sabby Anandan; Eric Bottard; Mark Fisher; Ilayaperumal Gopinathan; Gunnar Hillert; Mark Pollack; Thomas Risberg; Marius Bogoevici; Josh Long; Michael Minella; David Turanski; Vinicius Carvalho; Jay Bryant; Glenn Renfro
+Sabby Anandan; Eric Bottard; Mark Fisher; Ilayaperumal Gopinathan; Gunnar Hillert; Mark Pollack; Thomas Risberg; Marius Bogoevici; Josh Long; Michael Minella; David Turanski; Vinicius Carvalho; Jay Bryant; Glenn Renfro; Christian Tzolov
:doctype: book
:toc: left
:toclevels: 4
From 9cb70b153c41e6af356d503c1eb311684234ac97 Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Tue, 4 Dec 2018 17:44:04 +0530
Subject: [PATCH 150/158] Add boot test starter dependency
---
spring-cloud-dataflow-server-cloudfoundry/pom.xml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/spring-cloud-dataflow-server-cloudfoundry/pom.xml b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
index 7520ebd..bb804af 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/pom.xml
+++ b/spring-cloud-dataflow-server-cloudfoundry/pom.xml
@@ -34,6 +34,11 @@
<artifactId>spring-cloud-spring-service-connector</artifactId>
<version>${spring-cloud-cloudfoundry-connector.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-test</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
<resources>
From ca3809571123a25dbaf10b1126c3d68a244ad9e8 Mon Sep 17 00:00:00 2001
From: Mark Pollack <mpollack@pivotal.io>
Date: Mon, 10 Dec 2018 18:35:06 -0500
Subject: [PATCH 151/158] Update CloudFoundryOAuthSecurityConfiguration to
accomodate snapshot sec changes
---
.../security/CloudFoundryOAuthSecurityConfiguration.java | 3 ---
1 file changed, 3 deletions(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/security/CloudFoundryOAuthSecurityConfiguration.java b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/security/CloudFoundryOAuthSecurityConfiguration.java
index adf81d9..cd471fd 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/security/CloudFoundryOAuthSecurityConfiguration.java
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/security/CloudFoundryOAuthSecurityConfiguration.java
@@ -29,12 +29,10 @@
import org.springframework.boot.cloud.CloudPlatform;
import org.springframework.cloud.common.security.OAuthSecurityConfiguration;
import org.springframework.cloud.common.security.support.DefaultAuthoritiesExtractor;
-import org.springframework.cloud.common.security.support.OnSecurityEnabledAndOAuth2Enabled;
import org.springframework.cloud.dataflow.server.cloudfoundry.config.security.support.CloudFoundryDataflowAuthoritiesExtractor;
import org.springframework.cloud.dataflow.server.cloudfoundry.config.security.support.CloudFoundryPrincipalExtractor;
import org.springframework.cloud.dataflow.server.cloudfoundry.config.security.support.CloudFoundrySecurityService;
import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.security.oauth2.client.OAuth2RestTemplate;
@@ -60,7 +58,6 @@
* @author Ilayaperumal Gopinathan
*/
@Configuration
-@Conditional(OnSecurityEnabledAndOAuth2Enabled.class)
@ConditionalOnCloudPlatform(CloudPlatform.CLOUD_FOUNDRY)
@Import(CloudFoundryOAuthSecurityConfiguration.CloudFoundryUAAConfiguration.class)
public class CloudFoundryOAuthSecurityConfiguration {
From 2d8a54367a05981efeed7e3fe78c7e62c74aa2d8 Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Wed, 12 Dec 2018 16:42:05 +0530
Subject: [PATCH 152/158] Update CF deployer/deployer SPI to
2.0.0.BUILD-SNAPSHOT
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 36651db..6a234c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,8 +14,8 @@
<properties>
<spring-cloud-dataflow.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-dataflow.version>
- <spring-cloud-deployer-cloudfoundry.version>1.4.4.RELEASE</spring-cloud-deployer-cloudfoundry.version>
- <spring-cloud-deployer-spi.version>1.3.4.RELEASE</spring-cloud-deployer-spi.version>
+ <spring-cloud-deployer-cloudfoundry.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-deployer-cloudfoundry.version>
+ <spring-cloud-deployer-spi.version>2.0.0.BUILD-SNAPSHOT</spring-cloud-deployer-spi.version>
<spring-cloud-common-security-config.version>1.1.0.BUILD-SNAPSHOT</spring-cloud-common-security-config.version>
<spring-cloud-cloudfoundry-connector.version>2.0.3.RELEASE</spring-cloud-cloudfoundry-connector.version>
<spring-cloud-services-starters.version>2.0.3.RELEASE</spring-cloud-services-starters.version>
From 69ebc7890633d60f16e56f2f7f438bfe2bc0bc31 Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Fri, 14 Dec 2018 16:46:03 +0530
Subject: [PATCH 153/158] Fix boot 2.1 upgrade issues
- Add autoconfiguration order to run the SCDF server config before deployer auto config
- Add the delegate resource loader customizer to configure docker resource loader
Resolves #460
---
...oudFoundryDataFlowServerConfiguration.java | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryDataFlowServerConfiguration.java b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryDataFlowServerConfiguration.java
index c5cb9df..48979ec 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryDataFlowServerConfiguration.java
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryDataFlowServerConfiguration.java
@@ -16,27 +16,22 @@
package org.springframework.cloud.dataflow.server.cloudfoundry.config;
-import java.util.HashMap;
-import java.util.Map;
-
import javax.annotation.PostConstruct;
import reactor.core.publisher.Hooks;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.dataflow.server.cloudfoundry.config.security.CloudFoundryOAuthSecurityConfiguration;
+import org.springframework.cloud.deployer.autoconfigure.DelegatingResourceLoaderBuilderCustomizer;
import org.springframework.cloud.deployer.resource.docker.DockerResource;
import org.springframework.cloud.deployer.resource.docker.DockerResourceLoader;
-import org.springframework.cloud.deployer.resource.maven.MavenProperties;
-import org.springframework.cloud.deployer.resource.maven.MavenResource;
-import org.springframework.cloud.deployer.resource.maven.MavenResourceLoader;
-import org.springframework.cloud.deployer.resource.support.DelegatingResourceLoader;
import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryConnectionProperties;
+import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryDeployerAutoConfiguration;
import org.springframework.cloud.deployer.spi.cloudfoundry.CloudFoundryDeploymentProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
-import org.springframework.core.io.ResourceLoader;
/**
* Configuration class for customizing Cloud Foundry deployer.
@@ -45,6 +40,7 @@
*/
@Configuration
@Import(CloudFoundryOAuthSecurityConfiguration.class)
+@AutoConfigureBefore(CloudFoundryDeployerAutoConfiguration.class)
public class CloudFoundryDataFlowServerConfiguration {
@Bean
@@ -66,11 +62,8 @@ public CloudFoundryServerConfigurationProperties cloudFoundryServerConfiguration
}
@Bean
- public DelegatingResourceLoader delegatingResourceLoader(MavenProperties mavenProperties) {
- Map<String, ResourceLoader> loaders = new HashMap<>();
- loaders.put(DockerResource.URI_SCHEME, new DockerResourceLoader());
- loaders.put(MavenResource.URI_SCHEME, new MavenResourceLoader(mavenProperties));
- return new DelegatingResourceLoader(loaders);
+ public DelegatingResourceLoaderBuilderCustomizer dockerDelegatingResourceLoaderBuilderCustomizer() {
+ return customizer -> customizer.loader(DockerResource.URI_SCHEME, new DockerResourceLoader());
}
@PostConstruct
From 742fab39d0c8451b5fa561c480710a78144f6d0c Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Fri, 14 Dec 2018 23:47:12 +0530
Subject: [PATCH 154/158] Handle OAuth configuration conditionally
- Remove the default OAuth properties from server configuration
- Import the CloudFoundryOAuthSecurityConfiguration only when OAuth client properties are set
- Remove basic security configuration properties
Resolves #461
---
.../CloudFoundryOAuthSecurityConfiguration.java | 3 +++
.../src/main/resources/dataflow-server.yml | 11 -----------
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/security/CloudFoundryOAuthSecurityConfiguration.java b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/security/CloudFoundryOAuthSecurityConfiguration.java
index cd471fd..07b63b2 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/security/CloudFoundryOAuthSecurityConfiguration.java
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/security/CloudFoundryOAuthSecurityConfiguration.java
@@ -29,10 +29,12 @@
import org.springframework.boot.cloud.CloudPlatform;
import org.springframework.cloud.common.security.OAuthSecurityConfiguration;
import org.springframework.cloud.common.security.support.DefaultAuthoritiesExtractor;
+import org.springframework.cloud.common.security.support.OnOAuth2SecurityEnabled;
import org.springframework.cloud.dataflow.server.cloudfoundry.config.security.support.CloudFoundryDataflowAuthoritiesExtractor;
import org.springframework.cloud.dataflow.server.cloudfoundry.config.security.support.CloudFoundryPrincipalExtractor;
import org.springframework.cloud.dataflow.server.cloudfoundry.config.security.support.CloudFoundrySecurityService;
import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Conditional;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
import org.springframework.security.oauth2.client.OAuth2RestTemplate;
@@ -59,6 +61,7 @@
*/
@Configuration
@ConditionalOnCloudPlatform(CloudPlatform.CLOUD_FOUNDRY)
+@Conditional(OnOAuth2SecurityEnabled.class)
@Import(CloudFoundryOAuthSecurityConfiguration.CloudFoundryUAAConfiguration.class)
public class CloudFoundryOAuthSecurityConfiguration {
diff --git a/spring-cloud-dataflow-server-cloudfoundry/src/main/resources/dataflow-server.yml b/spring-cloud-dataflow-server-cloudfoundry/src/main/resources/dataflow-server.yml
index b618d0f..19953ad 100644
--- a/spring-cloud-dataflow-server-cloudfoundry/src/main/resources/dataflow-server.yml
+++ b/spring-cloud-dataflow-server-cloudfoundry/src/main/resources/dataflow-server.yml
@@ -9,17 +9,6 @@ info:
name: "@project.artifactId@"
description: "@project.name@"
version: "@project.version@"
-security:
- basic:
- enabled: false
- oauth2:
- client:
- client-id: ${security.oauth2.client.clientId:false} # myclientid
- client-secret: ${security.oauth2.client.clientSecret:} # mysecret
- access-token-uri: ${security.oauth2.client.accessTokenUri:} # http://127.0.0.1:9999/oauth/token
- user-authorization-uri: ${security.oauth2.client.userAuthorizationUri:} # http://127.0.0.1:9999/oauth/authorize
- resource:
- user-info-uri: ${security.oauth2.resource.userInfoUri:} # http://127.0.0.1:9999/me
spring:
application:
name: dataflow
From 483177c1dd10adc3d1dfc944fc435e38707b7fee Mon Sep 17 00:00:00 2001
From: Ilayaperumal Gopinathan <igopinathan@pivotal.io>
Date: Mon, 17 Dec 2018 20:58:08 +0530
Subject: [PATCH 155/158] Remove freeDiskSpacePercentage property
- Since this property is no longer used (as LRU cleaning resource loader no longer exists), we can safely remove this from CF DataFlowServer configuration
Resolves #459
---
...dFoundryServerConfigurationProperties.java | 19 -------------------
1 file changed, 19 deletions(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryServerConfigurationProperties.java b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryServerConfigurationProperties.java
index 4a2abd9..6efdefd 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryServerConfigurationProperties.java
+++ b/spring-cloud-dataflow-server-cloudfoundry-autoconfig/src/main/java/org/springframework/cloud/dataflow/server/cloudfoundry/config/CloudFoundryServerConfigurationProperties.java
@@ -16,9 +16,6 @@
package org.springframework.cloud.dataflow.server.cloudfoundry.config;
-import javax.validation.constraints.Max;
-import javax.validation.constraints.Min;
-
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.validation.annotation.Validated;
@@ -37,27 +34,11 @@ public class CloudFoundryServerConfigurationProperties {
* Whether to turn on reactor style stacktraces.
*/
public boolean debugReactor = false;
- /**
- * The target percentag of free disk space to always aim for when cleaning downloaded
- * resources (typically via the local maven repository). Specify as an integer greater
- * than zero and less than 100. Default is 25.
- */
- private int freeDiskSpacePercentage = 25;
private int maxPoolSize = 10;
int maxWaitTime = 30000;
- @Min(0)
- @Max(100)
- public int getFreeDiskSpacePercentage() {
- return freeDiskSpacePercentage;
- }
-
- public void setFreeDiskSpacePercentage(int freeDiskSpacePercentage) {
- this.freeDiskSpacePercentage = freeDiskSpacePercentage;
- }
-
public boolean isDebugReactor() {
return debugReactor;
}
From 06a5125739ae82aa089652894cfc76e934c0137d Mon Sep 17 00:00:00 2001
From: Gunnar Hillert <ghillert@pivotal.io>
Date: Mon, 17 Dec 2018 23:17:26 -1000
Subject: [PATCH 156/158] Docs: Clarify security configurations
related to https://github.com/spring-cloud/spring-cloud-dataflow-server-cloudfoundry/issues/461
---
.../src/main/asciidoc/configuration.adoc | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
index e67ea45..84859b0 100644
--- a/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
+++ b/spring-cloud-dataflow-server-cloudfoundry-docs/src/main/asciidoc/configuration.adoc
@@ -364,7 +364,19 @@ https://github.com/pivotal-cf/spring-cloud-sso-connector[Spring Cloud Single Sig
which provides Cloud Foundry-specific auto-configuration support for OAuth 2.0.
To do so, bind the Pivotal Single Sign-On Service to your Data Flow Server application and
-Single Sign-On (SSO) over OAuth2 will be enabled by default.
+provide the following properties:
+
+[source,yaml]
+----
+SPRING_CLOUD_DATAFLOW_SECURITY_CFUSEUAA: false # <1>
+SECURITY_OAUTH2_CLIENT_CLIENTID: "${security.oauth2.client.clientId}"
+SECURITY_OAUTH2_CLIENT_CLIENTSECRET: "${security.oauth2.client.clientSecret}"
+SECURITY_OAUTH2_CLIENT_ACCESSTOKENURI: "${security.oauth2.client.accessTokenUri}"
+SECURITY_OAUTH2_CLIENT_USERAUTHORIZATIONURI: "${security.oauth2.client.userAuthorizationUri}"
+SECURITY_OAUTH2_RESOURCE_USERINFOURI: "${security.oauth2.resource.userInfoUri}"
+----
+
+<1> It is important that the property `spring.cloud.dataflow.security.cf-use-uaa` is set to `false`
Authorization is similarly supported for non-Cloud Foundry security scenarios.
See the security section from the core Data Flow http://docs.spring.io/spring-cloud-dataflow/docs/{scdf-core-version}/reference/htmlsingle/#configuration-security[reference guide].
@@ -416,7 +428,7 @@ public BeanPostProcessor myUserInfoTokenServicesPostProcessor() {
==== Cloud Foundry UAA
The availability of Cloud Foundry User Account and Authentication (UAA) depends on the Cloud Foundry environment.
-In order to provide UAA integration, you have to manually provide the necessary
+In order to provide UAA integration, you have to provide the necessary
OAuth2 configuration properties (for example, by setting the `SPRING_APPLICATION_JSON`
property).
From a3204d349bfe82928b30afbad50b0cd4d0616a9a Mon Sep 17 00:00:00 2001
From: Sabby Anandan <sabby.anandan@gmail.com>
Date: Mon, 28 Jan 2019 13:15:09 -0800
Subject: [PATCH 157/158] Add 2.0 behavior change notice
---
README.adoc | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/README.adoc b/README.adoc
index dd41b05..fa31a6c 100644
--- a/README.adoc
+++ b/README.adoc
@@ -4,6 +4,17 @@ This project provides support for deploying https://github.com/spring-cloud/spri
Please refer to the http://docs.spring.io/spring-cloud-dataflow-server-cloudfoundry/docs/current-SNAPSHOT/reference/htmlsingle/#index[reference documentation] on how to get started.
+=== NOTE: Spring Cloud Data Flow v2.0
+
+Beginning with Spring Cloud Data Flow v2.0.0, we have consolidated the Local, Cloud Foundry, and Kubernetes servers into a single server. Instead of building, maintaining, and shipping individual server-implementations, we have consolidated them into a single server, and all the supported https://github.com/spring-cloud/spring-cloud-dataflow#components[platform-specific deployer implementation] libraries are bundled in it.
+
+That would mean, as a user, you don't need to pick different JARs or Docker-images depending on what platform you want to run.
+
+The other notable benefit to this approach is the ability to configure the single-server with multiple platform backends. The same server can be configured against Local, "n" number of Cloud Foundry `org/space` combinations, and as well against "n" number of Kubernetes clusters and the associated `namespace`. At the time of stream-deployment or task-launches, you would be able to pick-and-choose the platform where you want to orchestrate the deployment. It would further simplify and promote CI/CD practices for data pipelines.
+
+The http://docs.spring.io/spring-cloud-dataflow/docs/2.0.0.BUILD-SNAPSHOT/reference/htmlsingle/#getting-started[getting-started] steps for each platform remains mostly the same. One significant change is how Tasks are configured, as we are opening up the capability for Tasks to be launched across different platforms as well.
+
+In summary, please DO NOT use the `master` branch of this repository; switch over to https://github.com/spring-cloud/spring-cloud-dataflow[Spring Cloud Data Flow] v2.0 instead. We intend to continue to support the Spring Cloud Data Flow's v1.x branch of CloudFoundry-server for a period of at least a year from the general availability of v2.0 GA release.
=== Contributing
From ee6a79bbadf696e5a98ce6c2b3c8f85914e27df4 Mon Sep 17 00:00:00 2001
From: Trevor Marshall <tmarshall@vmware.com>
Date: Fri, 8 Jul 2022 14:54:12 -0700
Subject: [PATCH 158/158] Add archive text to README.adoc
---
README.adoc | 2 ++
1 file changed, 2 insertions(+)
diff --git a/README.adoc b/README.adoc
index fa31a6c..b0a3f7c 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,3 +1,5 @@
+# spring-cloud-dataflow-server-cloudfoundry is no longer actively maintained by VMware, Inc.
+
= Spring Cloud Data Flow Server for Cloud Foundry image:https://build.spring.io/plugins/servlet/wittified/build-status/SCD-CFBMASTER[Build Status, link=https://build.spring.io/browse/SCD-CFBMASTER] image:https://badge.waffle.io/spring-cloud/spring-cloud-dataflow-server-cloudfoundry.svg?label=ready&title=Ready[Stories in Ready, link=http://waffle.io/spring-cloud/spring-cloud-dataflow-server-cloudfoundry] image:https://badge.waffle.io/spring-cloud/spring-cloud-dataflow-server-cloudfoundry.svg?label=In%20Progress&title=In%20Progress[Stories in Progress, link=http://waffle.io/spring-cloud/spring-cloud-dataflow-server-cloudfoundry]
This project provides support for deploying https://github.com/spring-cloud/spring-cloud-dataflow[Spring Cloud Data Flow]'s streaming and batch data pipelines to Cloud Foundry. It includes an implementation of Spring Cloud Data Flow's https://github.com/spring-cloud/spring-cloud-deployer[Deployer SPI] for Cloud Foundry.