spring-cloud · corneil · Dec 30, 2024
diff --git a/.github/workflows/download-jar/gradle.properties b/.github/workflows/download-jar/gradle.properties
@@ -1,4 +1,4 @@
 artifactGroup=org.springframework.cloud
 artifactId=spring-cloud-dataflow-server
-artifactVersion=2.11.3-SNAPSHOT
+artifactVersion=3.0.0-SNAPSHOT
 artifactPath=./dl
diff --git a/spring-cloud-dataflow-docs/src/main/asciidoc/appendix-create-containers.adoc b/spring-cloud-dataflow-docs/src/main/asciidoc/appendix-create-containers.adoc
@@ -43,7 +43,7 @@ Downloads all applications needed by `create-containers.sh` from Maven repositor
 
 Usage: `download-apps.sh [version]`
 
-* `version` is the dataflow-server version like `2.11.3`. Default is `2.11.3-SNAPSHOT`
+* `version` is the dataflow-server version like `2.11.3`. Default is `3.0.0-SNAPSHOT`
 
 ===== `src/local/create-containers.sh`
 Creates all containers and pushes to local docker registry.
@@ -52,8 +52,8 @@ This script requires link:https://github.com/GoogleContainerTools/jib/tree/maste
 
 Usage: `create-containers.sh [version] [jre-version]`
 
-* `version` is the dataflow-server version like `2.11.3`. Default is `2.11.3-SNAPSHOT`
-* `jre-version` should be one of 11, 17. Default is 11
+* `version` is the dataflow-server version like `3.0.0`. Default is `3.0.0-SNAPSHOT`
+* `jre-version` should be one of 17, 21. Default is 17
 
 ==== Scripts in `spring-cloud-skipper`
 
@@ -64,16 +64,16 @@ Downloads all applications needed by `create-containers.sh` from Maven repositor
 
 Usage: `download-app.sh [version]`
 
-* `version` is the skipper version like `2.11.3` or default is `2.11.3-SNAPSHOT`
+* `version` is the skipper version like `3.0.0` or default is `3.0.0-SNAPSHOT`
 
 ===== `local/create-container.sh`
 Creates all containers and pushes to local docker registry.
 This script requires link:https://github.com/GoogleContainerTools/jib/tree/master/jib-cli[jib-cli]
 
 Usage: `create-containers.sh [version] [jre-version]`
 
-* `version` is the skipper version like `2.11.3` or default is `2.11.3-SNAPSHOT`
-* `jre-version` should be one of 11, 17
+* `version` is the skipper version like `3.0.0` or default is `3.0.0-SNAPSHOT`
+* `jre-version` should be one of 17, 21
 
 ==== Scripts in `stream-applications`
 
@@ -85,36 +85,7 @@ Downloads all applications needed by `create-containers.sh` from Maven repositor
 
 Usage: `download-apps.sh [version] [broker] [filter]`
 
-* `version` is the stream applications version like `4.0.0` or default is `4.0.1-SNAPSHOT`
+* `version` is the stream applications version like `5.0.0` or default is `5.0.1-SNAPSHOT`
 * `broker` is one of rabbitmq, rabbit or kafka
 * `filter` is a name of an application or a partial name that will be matched.
 
-===== `local/create-containers.sh`
-Creates all containers and pushes to local docker registry.
-
-This script requires link:https://github.com/GoogleContainerTools/jib/tree/master/jib-cli[jib-cli]
-
-Usage: `create-containers.sh [version] [broker] [jre-version] [filter]`
-
-* `version` is the stream-applications version like `4.0.0` or default is `4.0.1-SNAPSHOT`
-* `broker` is one of rabbitmq, rabbit or kafka
-* `jre-version` must be 17
-* `filter` is a name of an application or a partial name that will be matched.
-
-If the file is not present required to create the container the script will skip the one.
-
-===== `local/pack-containers.sh`
-Creates all containers and pushes to local docker registry.
-
-This script requires link:https://buildpacks.io/docs/tools/pack[packeto pack]
-
-Usage: `pack-containers.sh [version] [broker] [jre-version] [filter]`
-
-* `version` is the stream-applications version like `4.0.0` or default is `4.0.1-SNAPSHOT`
-* `broker` is one of rabbitmq, rabbit or kafka
-* `jre-version` must be 17
-* `filter` is a name of an application or a partial name that will be matched.
-
-If the required file is not present to create the container the script will skip that one.
-
-NOTE: If any parameter is provided all those to the left of it should be considered required.
diff --git a/spring-cloud-dataflow-docs/src/main/asciidoc/appendix-local-k8s-development.adoc b/spring-cloud-dataflow-docs/src/main/asciidoc/appendix-local-k8s-development.adoc
@@ -139,8 +139,8 @@ This example shows the versions of the current development snapshot.
 
 [source,shell]
 ....
-export DATAFLOW_VERSION=2.11.5-SNAPSHOT
-export SKIPPER_VERSION=2.11.5-SNAPSHOT
+export DATAFLOW_VERSION=3.0.0-SNAPSHOT
+export SKIPPER_VERSION=3.0.0-SNAPSHOT
 ....
 
 Before you can install SCDF you will need to pull the following images to ensure they are present for uploading to the k8s cluster.

diff --git a/spring-cloud-dataflow-docs/src/main/asciidoc/configuration-kubernetes.adoc b/spring-cloud-dataflow-docs/src/main/asciidoc/configuration-kubernetes.adoc
@@ -580,7 +580,7 @@ The following YAML snippet from a Deployment is an example of mounting a ConfigM
 ...
       containers:
       - name: scdf-server
-        image: springcloud/spring-cloud-dataflow-server:2.11.3-SNAPSHOT
+        image: springcloud/spring-cloud-dataflow-server:3.0.0-SNAPSHOT
         imagePullPolicy: IfNotPresent
         volumeMounts:
           - name: config

diff --git a/.../test/java/org/springframework/cloud/dataflow/server/controller/AboutControllerTests.java b/.../test/java/org/springframework/cloud/dataflow/server/controller/AboutControllerTests.java
@@ -147,7 +147,7 @@ void checksumDisabled() throws Exception {
 	@SpringBootTest(classes = TestDependencies.class)
 	@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
 	@TestPropertySource(properties = {
-			"spring.cloud.dataflow.version-info.dependencies.spring-cloud-dataflow-shell.version=2.11.3-SNAPSHOT",
+			"spring.cloud.dataflow.version-info.dependencies.spring-cloud-dataflow-shell.version=3.0.0-SNAPSHOT",
 			"spring.cloud.dataflow.version-info.dependency-fetch.enabled=false",
 			"spring.cloud.dataflow.version-info.dependencies.spring-cloud-dataflow-shell.checksum-sha1=ABCDEFG"
 	})
@@ -170,8 +170,8 @@ void snapshotVersionInfo() throws Exception {
 			ResultActions result = mockMvc.perform(get("/about").accept(MediaType.APPLICATION_JSON)).andDo(print()).andExpect(status().isOk());
 			result.andExpect(jsonPath("$.featureInfo.analyticsEnabled", is(true)))
 					.andExpect(jsonPath("$.versionInfo.shell.name", is("Spring Cloud Data Flow Shell")))
-					.andExpect(jsonPath("$.versionInfo.shell.url", is("https://repo.spring.io/snapshot/org/springframework/cloud/spring-cloud-dataflow-shell/2.11.3-SNAPSHOT/spring-cloud-dataflow-shell-2.11.3-SNAPSHOT.jar")))
-					.andExpect(jsonPath("$.versionInfo.shell.version", is("2.11.3-SNAPSHOT")))
+					.andExpect(jsonPath("$.versionInfo.shell.url", is("https://repo.spring.io/snapshot/org/springframework/cloud/spring-cloud-dataflow-shell/3.0.0-SNAPSHOT/spring-cloud-dataflow-shell-3.0.0-SNAPSHOT.jar")))
+					.andExpect(jsonPath("$.versionInfo.shell.version", is("3.0.0-SNAPSHOT")))
 					.andExpect(jsonPath("$.versionInfo.shell.checksumSha1").doesNotExist())
 					.andExpect(jsonPath("$.versionInfo.shell.checksumSha256").doesNotExist());
 		}

diff --git a/spring-cloud-dataflow-server-core/src/test/resources/META-INF/build-info.properties b/spring-cloud-dataflow-server-core/src/test/resources/META-INF/build-info.properties
@@ -2,4 +2,4 @@ build.artifact=spring-cloud-dataflow-server
 build.group=org.springframework.cloud
 build.name=Spring Cloud Data Flow Server
 build.time=2023-11-08T17\:15\:26.885Z
-build.version=2.11.3-SNAPSHOT
+build.version=3.0.0-SNAPSHOT
diff --git a/src/carvel/docs/examples/kapp-controller-default/README.adoc b/src/carvel/docs/examples/kapp-controller-default/README.adoc
@@ -27,14 +27,14 @@ scdf-snapshot.tanzu.vmware    2m35s   Reconcile succeeded
 
 kubectl get packages
 NAME                                   PACKAGEMETADATA NAME    VERSION          AGE
-scdf.tanzu.vmware.com.2.11.3-SNAPSHOT  scdf.tanzu.vmware.com   2.11.3-SNAPSHOT   2m23s
+scdf.tanzu.vmware.com.3.0.0-SNAPSHOT  scdf.tanzu.vmware.com   3.0.0-SNAPSHOT   2m23s
 ----
 
 NOTE: Above package and package repos are defined within public repos on a
 VMWare space so you don't get trouble with rate limiting(which would be
 a case with dockerhub).
 
-Install `2.11.3-SNAPSHOT` with `postgres` and `rabbit`:
+Install `3.0.0-SNAPSHOT` with `postgres` and `rabbit`:
 
 [source, bash]
 ----
@@ -45,9 +45,9 @@ kapp deploy \
 
 kubectl get packageinstalls
 NAME        PACKAGE NAME            PACKAGE VERSION   DESCRIPTION   AGE
-scdf-demo   scdf.tanzu.vmware.com   2.11.3-SNAPSHOT   Reconciling   12s
+scdf-demo   scdf.tanzu.vmware.com   3.0.0-SNAPSHOT   Reconciling   12s
 
 kubectl get packageinstalls
 NAME        PACKAGE NAME            PACKAGE VERSION   DESCRIPTION           AGE
-scdf-demo   scdf.tanzu.vmware.com   2.11.3-SNAPSHOT   Reconcile succeeded   88s
+scdf-demo   scdf.tanzu.vmware.com   3.0.0-SNAPSHOT   Reconcile succeeded   88s
 ----
diff --git a/src/carvel/docs/examples/kapp-controller-default/scdf-repo-ghcr.yml b/src/carvel/docs/examples/kapp-controller-default/scdf-repo-ghcr.yml
@@ -5,4 +5,4 @@ metadata:
 spec:
   fetch:
     imgpkgBundle:
-      image: springcloud/scdf-oss-repo:2.11.3-SNAPSHOT
+      image: springcloud/scdf-oss-repo:3.0.0-SNAPSHOT
diff --git a/src/carvel/docs/examples/kapp-controller-default/scdf-values.yml b/src/carvel/docs/examples/kapp-controller-default/scdf-values.yml
@@ -8,7 +8,7 @@ spec:
   packageRef:
     refName: scdf.tanzu.vmware.com
     versionSelection:
-      constraints: 2.11.3-SNAPSHOT
+      constraints: 3.0.0-SNAPSHOT
       prereleases: {}
   values:
   - secretRef:

diff --git a/src/carvel/docs/examples/kapp-default/scdf-values.yml b/src/carvel/docs/examples/kapp-default/scdf-values.yml
@@ -3,10 +3,10 @@
 scdf:
   server:
     image:
-      tag: 2.11.3-SNAPSHOT
+      tag: 3.0.0-SNAPSHOT
   skipper:
     image:
-      tag: 2.11.3-SNAPSHOT
+      tag: 3.0.0-SNAPSHOT
   ctr:
     image:
-      tag: 2.11.3-SNAPSHOT
+      tag: 3.0.0-SNAPSHOT
diff --git a/src/carvel/docs/examples/kubectl-default/scdf-minikube-values.yml b/src/carvel/docs/examples/kubectl-default/scdf-minikube-values.yml
@@ -3,13 +3,13 @@
 scdf:
   server:
     image:
-      tag: 2.11.3-SNAPSHOT
+      tag: 3.0.0-SNAPSHOT
     service:
       type:
         NodePort
   skipper:
     image:
-      tag: 2.11.3-SNAPSHOT
+      tag: 3.0.0-SNAPSHOT
   ctr:
     image:
-      tag: 2.11.3-SNAPSHOT
+      tag: 3.0.0-SNAPSHOT
diff --git a/src/carvel/docs/examples/kubectl-default/scdf-values.yml b/src/carvel/docs/examples/kubectl-default/scdf-values.yml
@@ -3,10 +3,10 @@
 scdf:
   server:
     image:
-      tag: 2.11.3-SNAPSHOT
+      tag: 3.0.0-SNAPSHOT
   skipper:
     image:
-      tag: 2.11.3-SNAPSHOT
+      tag: 3.0.0-SNAPSHOT
   ctr:
     image:
-      tag: 2.11.3-SNAPSHOT
+      tag: 3.0.0-SNAPSHOT
diff --git a/src/carvel/docs/examples/tanzu-airgap/README.adoc b/src/carvel/docs/examples/tanzu-airgap/README.adoc
@@ -25,7 +25,7 @@ Install _Dataflow_ with configured _GitHub Container Registry_ secrets:
 ----
 tanzu package install scdf-demo \
   --package-name scdf.tanzu.vmware.com \
-  --version 2.11.3-SNAPSHOT \
+  --version 3.0.0-SNAPSHOT \
   --values-file scdf-values.yml
 ----
 
@@ -39,7 +39,7 @@ Copy source, sink and task:
 [source, bash]
 ----
 imgpkg copy \
-  -b springcloud/scdf-oss-repo:2.11.3-SNAPSHOT \
+  -b springcloud/scdf-oss-repo:3.0.0-SNAPSHOT \
   --to-repo ghcr.io/jvalkeal/private/scdf-oss-repo
 
 imgpkg copy \

diff --git a/src/carvel/docs/examples/tanzu-cloud-default/README.adoc b/src/carvel/docs/examples/tanzu-cloud-default/README.adoc
@@ -18,13 +18,13 @@ repository. If you look `scdf-values.yml` it simply uses defaults and defines
 _Dataflow_ server service type as `LoadBalancer` which is probably something
 you need if wanting to access server publicly.
 
-Setup repo `2.11.3-SNAPSHOT` repo:
+Setup repo `3.0.0-SNAPSHOT` repo:
 
 [source, bash]
 ----
 tanzu package install scdf-demo \
   --package-name scdf.tanzu.vmware.com \
-  --version 2.11.3-SNAPSHOT \
+  --version 3.0.0-SNAPSHOT \
   --values-file scdf-values.yml
 ----
 

diff --git a/src/carvel/docs/examples/tanzu-default/README.adoc b/src/carvel/docs/examples/tanzu-default/README.adoc
@@ -20,26 +20,26 @@ _ghcr_ where everything is relocated unter a space of a that repository.
 Follow instructions in {example-kapp-controller-install} to setup kapp-controller.
 Follow instructions in {example-secretgen-controller-install} to setup secretgen-controller.
 
-Setup `2.11.3-SNAPSHOT` repo:
+Setup `3.0.0-SNAPSHOT` repo:
 
 [source, bash]
 ----
 tanzu package repository add scdf-oss-repo \
-  --url springcloud/scdf-oss-repo:2.11.3-SNAPSHOT
+  --url springcloud/scdf-oss-repo:3.0.0-SNAPSHOT
 
 tanzu package repository list
   NAME                REPOSITORY                                     STATUS               DETAILS
-  scdf-oss-repo           springcloud/scdf-oss-repo:2.11.3-SNAPSHOT           Reconcile succeeded
+  scdf-oss-repo           springcloud/scdf-oss-repo:3.0.0-SNAPSHOT           Reconcile succeeded
 
 tanzu package available list
   NAME                   DISPLAY-NAME  SHORT-DESCRIPTION
   scdf.tanzu.vmware.com  scdf          Spring Cloud Data Flow
 
 tanzu package available list scdf.tanzu.vmware.com
   NAME                   VERSION         RELEASED-AT
-  scdf.tanzu.vmware.com  2.11.3-SNAPSHOT
+  scdf.tanzu.vmware.com  3.0.0-SNAPSHOT
 
-tanzu package available get scdf.tanzu.vmware.com/2.11.3-SNAPSHOT --values-schema
+tanzu package available get scdf.tanzu.vmware.com/3.0.0-SNAPSHOT --values-schema
   KEY                              DEFAULT     TYPE     DESCRIPTION
   scdf.binder.kafka.broker.host    <nil>       string   External kafka broker host
   scdf.binder.kafka.broker.port    <nil>       string   External kafka broker port
@@ -52,7 +52,7 @@ Install:
 ----
 tanzu package install scdf-demo \
   --package-name scdf.tanzu.vmware.com \
-  --version 2.11.3-SNAPSHOT
+  --version 3.0.0-SNAPSHOT
 ----
 
 Cleanup:

diff --git a/src/carvel/docs/examples/tanzu-external-kafka/README.adoc b/src/carvel/docs/examples/tanzu-external-kafka/README.adoc
@@ -25,21 +25,21 @@ Setup _Dataflow_ package repo:
 
 [source, bash]
 ----
-tanzu package repository add scdf-oss-repo --url springcloud/scdf-oss-repo:2.11.3-SNAPSHOT
+tanzu package repository add scdf-oss-repo --url springcloud/scdf-oss-repo:3.0.0-SNAPSHOT
 
 tanzu package repository list
   NAME        REPOSITORY                            STATUS               DETAILS
-  scdf-oss-repo   springcloud/scdf-oss-repo:2.11.3-SNAPSHOT Reconcile succeeded
+  scdf-oss-repo   springcloud/scdf-oss-repo:3.0.0-SNAPSHOT Reconcile succeeded
 
 tanzu package available list
   NAME                   DISPLAY-NAME  SHORT-DESCRIPTION
   scdf.tanzu.vmware.com  scdf          Spring Cloud Data Flow
 
 tanzu package available list scdf.tanzu.vmware.com
   NAME                   VERSION         RELEASED-AT
-  scdf.tanzu.vmware.com  2.11.3-SNAPSHOT
+  scdf.tanzu.vmware.com  3.0.0-SNAPSHOT
 
-tanzu package available get scdf.tanzu.vmware.com/2.11.3-SNAPSHOT --values-schema
+tanzu package available get scdf.tanzu.vmware.com/3.0.0-SNAPSHOT --values-schema
   KEY                              DEFAULT     TYPE     DESCRIPTION
   scdf.binder.kafka.broker.host    <nil>       string   External kafka broker host
   scdf.binder.kafka.broker.port    <nil>       string   External kafka broker port
@@ -54,7 +54,7 @@ Install:
 ----
 tanzu package install scdf-demo \
   --package-name scdf.tanzu.vmware.com \
-  --version 2.11.3-SNAPSHOT \
+  --version 3.0.0-SNAPSHOT \
   --values-file examples/tanzu-external-kafka/minikube-values.yml
 ----
 

diff --git a/src/carvel/docs/examples/tanzu-external-postgres/README.adoc b/src/carvel/docs/examples/tanzu-external-postgres/README.adoc
@@ -25,19 +25,19 @@ Setup _Dataflow_ package repo:
 
 [source, bash]
 ----
-tanzu package repository add scdf-oss-repo --url springcloud/scdf-oss-repo:2.11.3-SNAPSHOT
+tanzu package repository add scdf-oss-repo --url springcloud/scdf-oss-repo:3.0.0-SNAPSHOT
 
 tanzu package repository list
   NAME        REPOSITORY                            STATUS               DETAILS
-  scdf-oss-repo   springcloud/scdf-oss-repo:2.11.3-SNAPSHOT Reconcile succeeded
+  scdf-oss-repo   springcloud/scdf-oss-repo:3.0.0-SNAPSHOT Reconcile succeeded
 
 tanzu package available list
   NAME                   DISPLAY-NAME  SHORT-DESCRIPTION
   scdf.tanzu.vmware.com  scdf          Spring Cloud Data Flow
 
 tanzu package available list scdf.tanzu.vmware.com
   NAME                   VERSION         RELEASED-AT
-  scdf.tanzu.vmware.com  2.11.3-SNAPSHOT
+  scdf.tanzu.vmware.com  3.0.0-SNAPSHOT
 ----
 
 Get password for database and update values yml and install:
@@ -46,6 +46,6 @@ Get password for database and update values yml and install:
 ----
 tanzu package install scdf-demo \
   --package-name scdf.tanzu.vmware.com \
-  --version 2.11.3-SNAPSHOT \
+  --version 3.0.0-SNAPSHOT \
   --values-file examples/tanzu-external-postgres/minikube-values.yml
 ----
diff --git a/src/carvel/docs/random-notes.adoc b/src/carvel/docs/random-notes.adoc
@@ -6,8 +6,8 @@ What's inside package and package repository bundles.
 
 [source, bash]
 ----
-imgpkg pull -b springcloud/scdf-oss-repo:2.11.3-SNAPSHOT -o scdf-oss-repo-snapshot
-imgpkg pull -b springcloud/scdf-oss-package:2.11.3-SNAPSHOT -o scdf-package-snapshot
+imgpkg pull -b springcloud/scdf-oss-repo:3.0.0-SNAPSHOT -o scdf-oss-repo-snapshot
+imgpkg pull -b springcloud/scdf-oss-package:3.0.0-SNAPSHOT -o scdf-package-snapshot
 ----
 
 == Some debug notes

diff --git a/src/deploy/README.html b/src/deploy/README.html
@@ -1280,8 +1280,8 @@ <h6 id="_configure_database">Configure Database</h6>
 </div>
 <div class="listingblock">
 <div class="content">
-<pre class="CodeRay highlight"><code data-lang="shell">export DATAFLOW_VERSION=2.11.5-SNAPSHOT
-export SKIPPER_VERSION=2.11.5-SNAPSHOT</code></pre>
+<pre class="CodeRay highlight"><code data-lang="shell">export DATAFLOW_VERSION=3.0.0-SNAPSHOT
+export SKIPPER_VERSION=3.0.0-SNAPSHOT</code></pre>
 </div>
 </div>
 <div class="paragraph">

diff --git a/src/deploy/images/pull-composed-task-runner.sh b/src/deploy/images/pull-composed-task-runner.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 if [ "$DATAFLOW_VERSION" = "" ]; then
-  DATAFLOW_VERSION=2.11.5-SNAPSHOT
+  DATAFLOW_VERSION=3.0.0-SNAPSHOT
 fi
 docker pull "springcloud/spring-cloud-dataflow-composed-task-runner:$DATAFLOW_VERSION"
diff --git a/src/deploy/images/pull-dataflow.sh b/src/deploy/images/pull-dataflow.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 if [ "$DATAFLOW_VERSION" = "" ]; then
-  DATAFLOW_VERSION=2.11.5-SNAPSHOT
+  DATAFLOW_VERSION=3.0.0-SNAPSHOT
 fi
 docker pull "springcloud/spring-cloud-dataflow-server:$DATAFLOW_VERSION"