Skip to content

Commit d9f39ea

Browse files
author
Corneil du Plessis
committed
Update with merge from main-3
2 parents 5c323dc + b1028e6 commit d9f39ea

File tree

45 files changed

+229
-222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+229
-222
lines changed

‎spring-cloud-dataflow-docs/src/main/asciidoc/appendix-create-containers.adoc

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Downloads all applications needed by `create-containers.sh` from Maven repositor
8585

8686
Usage: `download-apps.sh [version] [broker] [filter]`
8787

88-
* `version` is the stream applications version like `3.2.1` or default is `3.2.2-SNAPSHOT`
88+
* `version` is the stream applications version like `5.0.0` or default is `5.0.1-SNAPSHOT`
8989
* `broker` is one of rabbitmq, rabbit or kafka
9090
* `filter` is a name of an application or a partial name that will be matched.
9191

@@ -96,9 +96,9 @@ This script requires link:https://github.com/GoogleContainerTools/jib/tree/maste
9696

9797
Usage: `create-containers.sh [version] [broker] [jre-version] [filter]`
9898

99-
* `version` is the stream-applications version like `3.2.1` or default is `3.2.2-SNAPSHOT`
99+
* `version` is the stream-applications version like `5.0.0` or default is `5.0.1-SNAPSHOT`
100100
* `broker` is one of rabbitmq, rabbit or kafka
101-
* `jre-version` should be one of 11, 17
101+
* `jre-version` must be 17
102102
* `filter` is a name of an application or a partial name that will be matched.
103103

104104
If the file is not present required to create the container the script will skip the one.
@@ -110,9 +110,9 @@ This script requires link:https://buildpacks.io/docs/tools/pack[packeto pack]
110110

111111
Usage: `pack-containers.sh [version] [broker] [jre-version] [filter]`
112112

113-
* `version` is the stream-applications version like `3.2.1` or default is `3.2.2-SNAPSHOT`
113+
* `version` is the stream-applications version like `5.0.0` or default is `5.0.1-SNAPSHOT`
114114
* `broker` is one of rabbitmq, rabbit or kafka
115-
* `jre-version` should be one of 11, 17
115+
* `jre-version` must be 17
116116
* `filter` is a name of an application or a partial name that will be matched.
117117

118118
If the required file is not present to create the container the script will skip that one.

‎spring-cloud-dataflow-docs/src/main/asciidoc/configuration-carvel.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ The default _app-name_ is `scdf-${SCDF_TYPE}`.
8787
| register-apps.sh
8888
| <broker> [stream-application-version]
8989
| _broker_ must be one of rabbit or kafka.
90-
_stream-application-version_ is optional and will install the latest version. The latest version is 2021.1.2
90+
_stream-application-version_ is optional and will install the latest version. The latest version is 2024.0.0
9191
|===
9292

9393
NOTE: Take note that the registration of application in the _pro_ version can take a few minutes since it retrieves all version information and metadata upfront.

‎spring-cloud-dataflow-docs/src/main/asciidoc/dashboard.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ The following examples show typical application definitions:
6767
====
6868
[source,subs=properties]
6969
----
70-
task.timestamp=maven://org.springframework.cloud.task.app:timestamp-task:1.2.0.RELEASE
71-
processor.transform=maven://org.springframework.cloud.stream.app:transform-processor-rabbit:1.2.0.RELEASE
70+
task.timestamp=maven://org.springframework.cloud.task.app:timestamp-task:3.0.0
71+
processor.transform=maven://org.springframework.cloud.stream.app:transform-processor-rabbit:5.0.0
7272
----
7373
====
7474

‎spring-cloud-dataflow-docs/src/main/asciidoc/index.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@ Sabby Anandan; Marius Bogoevici; Eric Bottard; Mark Fisher; Ilayaperumal Gopinat
1818
:scs-stream-apps-docs: https://docs.spring.io/stream-applications/docs/current/reference/html
1919
:dataflow-asciidoc-images: https://raw.githubusercontent.com/spring-cloud/spring-cloud-dataflow/main/spring-cloud-dataflow-docs/src/main/asciidoc/images
2020

21-
:docker-http-source-rabbit-version: 3.2.1
22-
:docker-time-source-rabbit-version: 3.2.1
23-
:docker-log-sink-rabbit-version: 3.2.1
24-
:docker-log-sink-kafka-version: 3.2.1
25-
:docker-http-source-kafka-version: 3.2.1
26-
:docker-time-source-kafka-version: 3.2.1
27-
:docker-timestamp-task-version: 2.0.2
21+
:docker-http-source-rabbit-version: 5.0.0
22+
:docker-time-source-rabbit-version: 5.0.0
23+
:docker-log-sink-rabbit-version: 5.0.0
24+
:docker-log-sink-kafka-version: 5.0.0
25+
:docker-http-source-kafka-version: 5.0.0
26+
:docker-time-source-kafka-version: 5.0.0
27+
:docker-timestamp-task-version: 3.0.0
2828

2929
ifdef::backend-html5[]
3030

‎spring-cloud-dataflow-docs/src/main/asciidoc/streams.adoc

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,8 @@ applications built with the RabbitMQ binder, you could do the following:
206206
====
207207
[source,bash]
208208
----
209-
dataflow:>app register --name http --type source --uri maven://org.springframework.cloud.stream.app:http-source-rabbit:3.2.1
210-
dataflow:>app register --name log --type sink --uri maven://org.springframework.cloud.stream.app:log-sink-rabbit:3.2.1
209+
dataflow:>app register --name http --type source --uri maven://org.springframework.cloud.stream.app:http-source-rabbit:5.0.0
210+
dataflow:>app register --name log --type sink --uri maven://org.springframework.cloud.stream.app:log-sink-rabbit:5.0.0
211211
----
212212
====
213213

@@ -218,8 +218,8 @@ For example, to register the snapshot versions of the `http` and `log` applicati
218218
====
219219
[source,bash]
220220
----
221-
source.http=maven://org.springframework.cloud.stream.app:http-source-rabbit:3.2.1
222-
sink.log=maven://org.springframework.cloud.stream.app:log-sink-rabbit:3.2.1
221+
source.http=maven://org.springframework.cloud.stream.app:http-source-rabbit:5.0.0
222+
sink.log=maven://org.springframework.cloud.stream.app:log-sink-rabbit:5.0.0
223223
----
224224
====
225225

@@ -340,20 +340,20 @@ The following table includes the `dataflow.spring.io` links to the stream applic
340340
|Artifact Type |Stable Release |SNAPSHOT Release
341341

342342
|RabbitMQ + Maven
343-
|https://dataflow.spring.io/rabbitmq-maven-latest
344-
|https://dataflow.spring.io/rabbitmq-maven-latest-snapshot
343+
|https://dataflow.spring.io/rabbitmq-maven-5-0-x
344+
|https://dataflow.spring.io/rabbitmq-maven-5-0-x-snapshot
345345

346346
|RabbitMQ + Docker
347-
|https://dataflow.spring.io/rabbitmq-docker-latest
348-
|https://dataflow.spring.io/rabbitmq-docker-latest-snapshot
347+
|https://dataflow.spring.io/rabbitmq-docker-5-0-x
348+
|https://dataflow.spring.io/rabbitmq-docker-5-0-x-snapshot
349349

350350
|Apache Kafka + Maven
351-
|https://dataflow.spring.io/kafka-maven-latest
352-
|https://dataflow.spring.io/kafka-maven-latest-snapshot
351+
|https://dataflow.spring.io/kafka-maven-5-0-x
352+
|https://dataflow.spring.io/kafka-maven-5-0-x-snapshot
353353

354354
|Apache Kafka + Docker
355-
|https://dataflow.spring.io/kafka-docker-latest
356-
|https://dataflow.spring.io/kafka-docker-latest-snapshot
355+
|https://dataflow.spring.io/kafka-docker-5-0-x
356+
|https://dataflow.spring.io/kafka-docker-5-0-x-snapshot
357357
|======================
358358

359359
NOTE: By default, the out-of-the-box app's actuator endpoints are secured. You can disable security by deploying streams by setting the following property: `[small]#app.*.spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration#`
@@ -370,12 +370,12 @@ The following table includes the `dataflow.spring.io` links to the task applicat
370370
|Artifact Type |Stable Release |SNAPSHOT Release
371371

372372
|Maven
373-
|https://dataflow.spring.io/task-maven-latest
374-
|https://dataflow.spring.io/task-maven-latest-snapshot
373+
|https://dataflow.spring.io/task-maven-3-0-x
374+
|https://dataflow.spring.io/task-maven-3-0-x-snapshot
375375

376376
|Docker
377-
|https://dataflow.spring.io/task-docker-latest
378-
|https://dataflow.spring.io/task-docker-latest-snapshot
377+
|https://dataflow.spring.io/task-docker-3-0-x
378+
|https://dataflow.spring.io/task-docker-3-0-x-snapshot
379379
|======================
380380

381381
For more information about the available out-of-the-box stream applications see the https://cloud.spring.io/spring-cloud-task-app-starters/[Spring Cloud Stream Applications] project page.
@@ -387,7 +387,7 @@ As an example, if you would like to register all out-of-the-box stream applicati
387387
====
388388
[source,bash,subs=attributes]
389389
----
390-
$ dataflow:>app import --uri https://dataflow.spring.io/kafka-maven-latest
390+
$ dataflow:>app import --uri https://dataflow.spring.io/kafka-maven-5-0-x
391391
----
392392
====
393393

@@ -396,7 +396,7 @@ Alternatively, you can register all the stream applications with the Rabbit bind
396396
====
397397
[source,bash,subs=attributes]
398398
----
399-
$ dataflow:>app import --uri https://dataflow.spring.io/rabbitmq-maven-latest
399+
$ dataflow:>app import --uri https://dataflow.spring.io/rabbitmq-maven-5-0-x
400400
----
401401
====
402402

@@ -486,9 +486,9 @@ The following listing shows the exposed properties for the `time` application:
486486
----
487487
dataflow:> app info --name time --type source
488488
Information about source application 'time':
489-
Version: '3.2.1':
489+
Version: '5.0.0':
490490
Default application version: 'true':
491-
Resource URI: maven://org.springframework.cloud.stream.app:time-source-rabbit:3.2.1
491+
Resource URI: maven://org.springframework.cloud.stream.app:time-source-rabbit:5.0.0
492492
╔══════════════════════════════╤══════════════════════════════╤══════════════════════════════╤══════════════════════════════╗
493493
║ Option Name │ Description │ Default │ Type ║
494494
╠══════════════════════════════╪══════════════════════════════╪══════════════════════════════╪══════════════════════════════╣
@@ -521,9 +521,9 @@ The following listing shows the exposed properties for the `log` application:
521521
----
522522
dataflow:> app info --name log --type sink
523523
Information about sink application 'log':
524-
Version: '3.2.1':
524+
Version: '5.0.0':
525525
Default application version: 'true':
526-
Resource URI: maven://org.springframework.cloud.stream.app:log-sink-rabbit:3.2.1
526+
Resource URI: maven://org.springframework.cloud.stream.app:log-sink-rabbit:5.0.0
527527
╔══════════════════════════════╤══════════════════════════════╤══════════════════════════════╤══════════════════════════════╗
528528
║ Option Name │ Description │ Default │ Type ║
529529
╠══════════════════════════════╪══════════════════════════════╪══════════════════════════════╪══════════════════════════════╣
@@ -790,13 +790,13 @@ Stream Deployment properties: {
790790
----
791791
====
792792

793-
Then the following command updates the stream to use the `3.2.1` version of the log application.
793+
Then the following command updates the stream to use the `5.0.0` version of the log application.
794794
Before updating the stream with the specific version of the application, we need to make sure that the application is registered with that version:
795795

796796
====
797797
[source,bash]
798798
----
799-
dataflow:>app register --name log --type sink --uri maven://org.springframework.cloud.stream.app:log-sink-rabbit:3.2.1
799+
dataflow:>app register --name log --type sink --uri maven://org.springframework.cloud.stream.app:log-sink-rabbit:5.0.0
800800
Successfully registered application 'sink:log'
801801
----
802802
====
@@ -806,7 +806,7 @@ Then we can update the application:
806806
====
807807
[source,bash]
808808
----
809-
dataflow:>stream update --name httptest --properties version.log=3.2.1
809+
dataflow:>stream update --name httptest --properties version.log=5.0.0
810810
----
811811
====
812812

@@ -829,11 +829,11 @@ Stream Deployment properties: {
829829
"spring.cloud.deployer.indexed" : "true",
830830
"spring.cloud.deployer.count" : "1",
831831
"spring.cloud.deployer.group" : "httptest",
832-
"maven://org.springframework.cloud.stream.app:log-sink-rabbit" : "3.2.1"
832+
"maven://org.springframework.cloud.stream.app:log-sink-rabbit" : "5.0.0"
833833
},
834834
"http" : {
835835
"spring.cloud.deployer.group" : "httptest",
836-
"maven://org.springframework.cloud.stream.app:http-source-rabbit" : "3.2.1"
836+
"maven://org.springframework.cloud.stream.app:http-source-rabbit" : "5.0.0"
837837
}
838838
}
839839
----

‎spring-cloud-dataflow-docs/src/main/asciidoc/tasks.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ For example, if you would like to register all the task applications that ship w
128128
====
129129
[source,bash]
130130
----
131-
dataflow:>app import --uri https://dataflow.spring.io/task-maven-latest
131+
dataflow:>app import --uri https://dataflow.spring.io/task-maven-3-0-x
132132
----
133133
====
134134

‎spring-cloud-dataflow-parent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
<joda-time.version>2.12.7</joda-time.version>
4040
<aws-java-sdk-ecr.version>1.12.513</aws-java-sdk-ecr.version>
4141
<!-- only used for dataflow managed stream applications, e.g., tasklauncher -->
42-
<stream-applications.version>3.2.1</stream-applications.version>
42+
<stream-applications.version>5.0.0</stream-applications.version>
4343
<wavefront-spring-boot-bom.version>3.2.0</wavefront-spring-boot-bom.version>
4444
<spring-cloud-dataflow-apps-docs-plugin.version>1.0.14</spring-cloud-dataflow-apps-docs-plugin.version>
4545
<spring-cloud-dataflow-apps-metadata-plugin.version>1.0.14</spring-cloud-dataflow-apps-metadata-plugin.version>

‎spring-cloud-dataflow-registry/src/main/java/org/springframework/cloud/dataflow/registry/service/DefaultAppRegistryService.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,12 +394,23 @@ private AppRegistration createAppRegistrations(Map<String, AppRegistration> regi
394394
}
395395
String type = typeName[0].trim();
396396
String name = typeName[1].trim();
397-
String version = getResourceVersion(lineSplit[1]);
397+
String extra = typeName.length == 3 ? typeName[2] : null;
398+
String version = "bootVersion".equals(extra) ? null : getResourceVersion(lineSplit[1]);
398399
// This is now versioned key
399400
String key = type + name + version;
400401
if (!registrations.containsKey(key) && registrations.containsKey(type + name + "latest")) {
401402
key = type + name + "latest";
402403
}
404+
// Allow bootVersion in descriptor file (already in 5.0.x stream app descriptor)
405+
if("bootVersion".equals(extra)) {
406+
if (previous == null) {
407+
throw new IllegalArgumentException("Expected uri for bootVersion:" + lineSplit[0]);
408+
}
409+
ApplicationType appType = ApplicationType.valueOf(type);
410+
Assert.isTrue(appType == previous.getType() && name.equals(previous.getName()), "Expected previous to be same type and name for:" + lineSplit[0]);
411+
// Do nothing with bootVersion though
412+
return previous;
413+
}
403414
AppRegistration ar = registrations.getOrDefault(key, new AppRegistration());
404415
ar.setName(name);
405416
ar.setType(ApplicationType.valueOf(type));
@@ -413,14 +424,15 @@ private AppRegistration createAppRegistrations(Map<String, AppRegistration> regi
413424
throw new IllegalArgumentException(e);
414425
}
415426
} else if (typeName.length == 3) {
427+
if (extra.equals("metadata")) {
416428
// metadata app uri
417429
try {
418430
ar.setMetadataUri(new URI(lineSplit[1]));
419431
warnOnMalformedURI(lineSplit[0], ar.getMetadataUri());
420432
} catch (Exception e) {
421433
throw new IllegalArgumentException(e);
422434
}
423-
435+
}
424436
}
425437
registrations.put(key, ar);
426438
return ar;

‎spring-cloud-dataflow-registry/src/main/java/org/springframework/cloud/dataflow/registry/support/AppResourceCommon.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ private String getDockerImageTag(DockerResource dockerResource) {
101101
/**
102102
* Parse the version number from a {@link UrlResource}. It can match a simple
103103
* {@code <artifactId>-<version>.jar} formatted name. For example, a resource ending in
104-
* {@code file-sink-rabbit-1.2.0.RELEASE.jar} will return {@code 1.2.0.RELEASE}. Snapshot
105-
* builds of the form {@code file-sink-rabbit-1.2.0.BUILD-SNAPSHOT.jar} and
106-
* {@code file-sink-rabbit-1.2.0-SNAPSHOT.jar} and {@code file-sink-rabbit-1.2.0-SNAPSHOT-metadata.jar} are also supported
104+
* {@code file-sink-rabbit-5.0.0.jar} will return {@code 5.0.0}. Snapshot
105+
* builds of the form {@code file-sink-rabbit-5.0.1-SNAPSHOT.jar} and
106+
* {@code file-sink-rabbit-5.0.1-SNAPSHOT-metadata.jar} are also supported
107107
* @param urlResource
108108
* @return
109109
*/

0 commit comments

Comments
 (0)