Skip to content

Commit 009282b

Browse files
onobconobc
committed
Update stream apps version refs to 4.0.0
This commit is the 1st step in the effort to update the default version of stream apps from 3.2.1 to 4.0.0. See spring-attic#5897
1 parent a362397 commit 009282b

File tree

17 files changed

+101
-101
lines changed

17 files changed

+101
-101
lines changed

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ 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
21+
:docker-http-source-rabbit-version: 4.0.0
22+
:docker-time-source-rabbit-version: 4.0.0
23+
:docker-log-sink-rabbit-version: 4.0.0
24+
:docker-log-sink-kafka-version: 4.0.0
25+
:docker-http-source-kafka-version: 4.0.0
26+
:docker-time-source-kafka-version: 4.0.0
2727
:docker-timestamp-task-version: 2.0.2
2828

2929
ifdef::backend-html5[]

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

+13-13
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:4.0.0
210+
dataflow:>app register --name log --type sink --uri maven://org.springframework.cloud.stream.app:log-sink-rabbit:4.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:4.0.0
222+
sink.log=maven://org.springframework.cloud.stream.app:log-sink-rabbit:4.0.0
223223
----
224224
====
225225

@@ -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: '4.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:4.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: '4.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:4.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 `4.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:4.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=4.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" : "4.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" : "4.0.0"
837837
}
838838
}
839839
----

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

+1-1
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>4.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/test/java/org/springframework/cloud/dataflow/registry/support/AppResourceCommonTests.java

+26-26
Original file line numberDiff line numberDiff line change
@@ -47,15 +47,15 @@ public class AppResourceCommonTests {
4747

4848
@Test
4949
public void testBadNamedJars() throws Exception {
50-
UrlResource urlResource = new UrlResource("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file-sink-rabbit/3.2.1/file-sink-rabbit.jar");
50+
UrlResource urlResource = new UrlResource("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file-sink-rabbit/4.0.0/file-sink-rabbit.jar");
5151
assertThatIllegalArgumentException().isThrownBy( () -> appResourceCommon.getUrlResourceVersion(urlResource));
5252
}
5353

5454
@Test
5555
public void testInvalidUrlResourceWithoutVersion() throws Exception {
5656
assertThat(appResourceCommon.getUrlResourceWithoutVersion(
57-
new UrlResource("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file-sink-rabbit/3.2.1/file-sink-rabbit-3.2.1.jar")))
58-
.isEqualTo("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file-sink-rabbit/3.2.1/file-sink-rabbit");
57+
new UrlResource("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file-sink-rabbit/4.0.0/file-sink-rabbit-4.0.0.jar")))
58+
.isEqualTo("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file-sink-rabbit/4.0.0/file-sink-rabbit");
5959
}
6060

6161
@Test
@@ -83,31 +83,31 @@ public void testDefaultResource() {
8383

8484
@Test
8585
public void testDockerUriString() throws Exception {
86-
String dockerUri = "docker:springcloudstream/log-sink-rabbit:3.2.1";
86+
String dockerUri = "docker:springcloudstream/log-sink-rabbit:4.0.0";
8787
Resource resource = appResourceCommon.getResource(dockerUri);
8888
assertThat(resource instanceof DockerResource).isTrue();
8989
assertThat(resource.getURI().toString().equals(dockerUri));
9090
}
9191

9292
@Test
9393
public void testJarMetadataUriDockerApp() throws Exception {
94-
String appUri = "docker:springcloudstream/log-sink-rabbit:3.2.1";
95-
String metadataUri = "https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file-sink-rabbit/3.2.1/file-sink-rabbit-3.2.1.jar";
94+
String appUri = "docker:springcloudstream/log-sink-rabbit:4.0.0";
95+
String metadataUri = "https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file-sink-rabbit/4.0.0/file-sink-rabbit-4.0.0.jar";
9696
appResourceCommon.getMetadataResource(new URI(appUri), new URI(metadataUri));
9797
verify(resourceLoader).getResource(eq(metadataUri));
9898
}
9999

100100
@Test
101101
public void testMetadataUriHttpApp() throws Exception {
102-
String appUri = "https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file-sink-rabbit/3.2.1/file-sink-rabbit-3.2.1.jar";
102+
String appUri = "https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file-sink-rabbit/4.0.0/file-sink-rabbit-4.0.0.jar";
103103
Resource metadataResource = appResourceCommon.getMetadataResource(new URI(appUri), null);
104104
assertThat(metadataResource instanceof UrlResource).isTrue();
105105
assertThat(metadataResource.getURI().toString().equals(appUri));
106106
}
107107

108108
@Test
109109
public void testMetadataUriDockerApp() throws Exception {
110-
String appUri = "docker:springcloudstream/log-sink-rabbit:3.2.1";
110+
String appUri = "docker:springcloudstream/log-sink-rabbit:4.0.0";
111111
Resource metadataResource = appResourceCommon.getMetadataResource(new URI(appUri), null);
112112
assertThat(metadataResource).isNotNull();
113113
assertThat(metadataResource instanceof DockerResource).isTrue();
@@ -130,73 +130,73 @@ public void testInvalidUrlResourceURI() throws Exception {
130130
@Test
131131
public void testJars() throws MalformedURLException {
132132
//Dashes in artifact name
133-
UrlResource urlResource = new UrlResource("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file-sink-rabbit/file-sink-rabbit-3.2.1.jar");
133+
UrlResource urlResource = new UrlResource("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file-sink-rabbit/file-sink-rabbit-4.0.0.jar");
134134
String version = appResourceCommon.getUrlResourceVersion(urlResource);
135-
assertThat(version).isEqualTo("3.2.1");
135+
assertThat(version).isEqualTo("4.0.0");
136136

137137
String theRest = appResourceCommon.getResourceWithoutVersion(urlResource);
138138
assertThat(theRest).isEqualTo("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file-sink-rabbit/file-sink-rabbit");
139139

140140
//No dashes in artfiact name - BUILD-SNAPSHOT
141-
urlResource = new UrlResource("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file/file-3.2.1-SNAPSHOT.jar");
141+
urlResource = new UrlResource("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file/file-4.0.1-SNAPSHOT.jar");
142142
version = appResourceCommon.getUrlResourceVersion(urlResource);
143-
assertThat(version).isEqualTo("3.2.1-SNAPSHOT");
143+
assertThat(version).isEqualTo("4.0.1-SNAPSHOT");
144144
theRest = appResourceCommon.getResourceWithoutVersion(urlResource);
145145
assertThat(theRest).isEqualTo("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file/file");
146146

147147
//No dashes in artfiact name - RELEASE
148-
urlResource = new UrlResource("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file/file-3.2.1.jar");
148+
urlResource = new UrlResource("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file/file-4.0.0.jar");
149149
version = appResourceCommon.getUrlResourceVersion(urlResource);
150-
assertThat(version).isEqualTo("3.2.1");
150+
assertThat(version).isEqualTo("4.0.0");
151151
theRest = appResourceCommon.getResourceWithoutVersion(urlResource);
152152
assertThat(theRest).isEqualTo("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file/file");
153153

154154
//Spring style snapshots naming scheme
155-
urlResource = new UrlResource("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file-sink-rabbit/file-sink-rabbit-3.2.1-SNAPSHOT.jar");
155+
urlResource = new UrlResource("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file-sink-rabbit/file-sink-rabbit-4.0.1-SNAPSHOT.jar");
156156
version = appResourceCommon.getUrlResourceVersion(urlResource);
157-
assertThat(version).isEqualTo("3.2.1-SNAPSHOT");
157+
assertThat(version).isEqualTo("4.0.1-SNAPSHOT");
158158
theRest = appResourceCommon.getResourceWithoutVersion(urlResource);
159159
assertThat(theRest).isEqualTo("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file-sink-rabbit/file-sink-rabbit");
160160

161161
//Standard maven style naming scheme
162-
urlResource = new UrlResource("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file-sink-rabbit/file-sink-rabbit-3.2.1-SNAPSHOT.jar");
162+
urlResource = new UrlResource("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file-sink-rabbit/file-sink-rabbit-4.0.1-SNAPSHOT.jar");
163163
version = appResourceCommon.getUrlResourceVersion(urlResource);
164-
assertThat(version).isEqualTo("3.2.1-SNAPSHOT");
164+
assertThat(version).isEqualTo("4.0.1-SNAPSHOT");
165165
theRest = appResourceCommon.getResourceWithoutVersion(urlResource);
166166
assertThat(theRest).isEqualTo("https://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/file-sink-rabbit/file-sink-rabbit");
167167
}
168168

169169
@Test
170170
public void testGetResourceWithoutVersion() {
171171
assertThat(appResourceCommon.getResourceWithoutVersion(
172-
MavenResource.parse("org.springframework.cloud.stream.app:aggregate-counter-sink-rabbit:war:exec:3.2.1")))
172+
MavenResource.parse("org.springframework.cloud.stream.app:aggregate-counter-sink-rabbit:war:exec:4.0.0")))
173173
.isEqualTo("maven://org.springframework.cloud.stream.app:aggregate-counter-sink-rabbit:war:exec");
174174
assertThat(appResourceCommon.getResourceWithoutVersion(
175-
MavenResource.parse("org.springframework.cloud.stream.app:aggregate-counter-sink-rabbit::exec:3.2.1")))
175+
MavenResource.parse("org.springframework.cloud.stream.app:aggregate-counter-sink-rabbit::exec:4.0.0")))
176176
.isEqualTo("maven://org.springframework.cloud.stream.app:aggregate-counter-sink-rabbit:jar:exec");
177177
assertThat(appResourceCommon.getResourceWithoutVersion(
178-
MavenResource.parse("org.springframework.cloud.stream.app:aggregate-counter-sink-rabbit:3.2.1")))
178+
MavenResource.parse("org.springframework.cloud.stream.app:aggregate-counter-sink-rabbit:4.0.0")))
179179
.isEqualTo("maven://org.springframework.cloud.stream.app:aggregate-counter-sink-rabbit:jar");
180180
}
181181

182182
@Test
183183
public void testGetResource() {
184-
String mavenUri = "maven://org.springframework.cloud.stream.app:aggregate-counter-sink-rabbit:3.2.1";
184+
String mavenUri = "maven://org.springframework.cloud.stream.app:aggregate-counter-sink-rabbit:4.0.0";
185185
Resource resource = appResourceCommon.getResource(mavenUri);
186186
assertThat(resource).isInstanceOf(MavenResource.class);
187187
}
188188

189189
@Test
190190
public void testGetResourceVersion() {
191-
String mavenUri = "maven://org.springframework.cloud.stream.app:aggregate-counter-sink-rabbit:3.2.1";
191+
String mavenUri = "maven://org.springframework.cloud.stream.app:aggregate-counter-sink-rabbit:4.0.0";
192192
String version = appResourceCommon.getResourceVersion(appResourceCommon.getResource(mavenUri));
193-
assertThat(version).isEqualTo("3.2.1");
193+
assertThat(version).isEqualTo("4.0.0");
194194
}
195195

196196
@Test
197197
public void testGetMetadataResourceVersion() {
198-
String httpUri = "http://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/cassandra-sink-rabbit/3.2.1-SNAPSHOT/cassandra-sink-rabbit-3.2.1-SNAPSHOT-metadata.jar";
198+
String httpUri = "http://repo.maven.apache.org/maven2/org/springframework/cloud/stream/app/cassandra-sink-rabbit/4.0.1-SNAPSHOT/cassandra-sink-rabbit-4.0.1-SNAPSHOT-metadata.jar";
199199
String version = appResourceCommon.getResourceVersion(appResourceCommon.getResource(httpUri));
200-
assertThat(version).isEqualTo("3.2.1-SNAPSHOT");
200+
assertThat(version).isEqualTo("4.0.1-SNAPSHOT");
201201
}
202202
}

0 commit comments

Comments
 (0)