Skip to content

Commit ac77f60

Browse files
onobconobc
committed
Bump libs up to latest.
* Spring Boot 2.6.3 * Spring Cloud 2021.0.0 * SCS/F 3.2.1 * etc.. Partially resolves spring-cloud#156
1 parent b9f2591 commit ac77f60

File tree

46 files changed

+183
-199
lines changed

Some content is hidden

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

46 files changed

+183
-199
lines changed

Diff for: ‎dataflow-website/batch-developer-guides/batch/batchsamples/billrun/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616
<properties>
1717
<java.version>1.8</java.version>
18-
<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
18+
<spring-cloud.version>2021.0.0</spring-cloud.version>
1919
<docker.org>springcloudtask</docker.org>
2020
</properties>
2121

Diff for: ‎dataflow-website/batch-developer-guides/batch/batchsamples/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<parent>
1515
<groupId>org.springframework.boot</groupId>
1616
<artifactId>spring-boot-starter-parent</artifactId>
17-
<version>2.6.2</version>
17+
<version>2.6.3</version>
1818
<relativePath/> <!-- lookup parent from repository -->
1919
</parent>
2020

Diff for: ‎dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.1.0.RELEASE</version>
8+
<version>2.6.3</version>
99
<relativePath></relativePath>
1010
</parent>
1111
<groupId>io.spring.dataflow.sample</groupId>
@@ -37,14 +37,14 @@
3737
<dependency>
3838
<groupId>org.springframework.cloud.stream.app</groupId>
3939
<artifactId>http-app-dependencies</artifactId>
40-
<version>2.1.0.RELEASE</version>
40+
<version>2.1.5.RELEASE</version>
4141
<type>pom</type>
4242
<scope>import</scope>
4343
</dependency>
4444
<dependency>
4545
<groupId>org.springframework.cloud.stream.app</groupId>
4646
<artifactId>app-starters-core-dependencies</artifactId>
47-
<version>2.1.0.RELEASE</version>
47+
<version>2.1.6.RELEASE</version>
4848
<type>pom</type>
4949
<scope>import</scope>
5050
</dependency>

Diff for: ‎dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/src/test/java/io/spring/dataflow/sample/HttpTransformerKafkaApplicationTests.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@
1616

1717
package io.spring.dataflow.sample;
1818

19-
import org.junit.Test;
20-
import org.junit.runner.RunWith;
19+
import org.junit.jupiter.api.Test;
2120
import org.springframework.boot.test.context.SpringBootTest;
2221
import org.springframework.test.context.junit4.SpringRunner;
2322

24-
@RunWith(SpringRunner.class)
2523
@SpringBootTest
2624
public class HttpTransformerKafkaApplicationTests {
2725

Diff for: ‎dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.1.0.RELEASE</version>
8+
<version>2.6.3</version>
99
<relativePath></relativePath>
1010
</parent>
1111
<groupId>io.spring.dataflow.sample</groupId>
@@ -59,7 +59,7 @@
5959
<dependency>
6060
<groupId>org.springframework.cloud</groupId>
6161
<artifactId>spring-cloud-function-kotlin</artifactId>
62-
<version>2.0.0.RELEASE</version>
62+
<version>3.2.1</version>
6363
</dependency>
6464
<dependency>
6565
<groupId>org.springframework.cloud</groupId>

Diff for: ‎dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/src/test/java/org/springframework/cloud/stream/app/http/source/kafka/HttpTransformerKotlinKafkaApplicationTests.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@
1616

1717
package org.springframework.cloud.stream.app.http.source.kafka;
1818

19-
import org.junit.Test;
20-
import org.junit.runner.RunWith;
19+
import org.junit.jupiter.api.Test;
2120
import org.springframework.boot.test.context.SpringBootTest;
2221
import org.springframework.test.context.junit4.SpringRunner;
2322

24-
@RunWith(SpringRunner.class)
2523
@SpringBootTest
2624
public class HttpTransformerKotlinKafkaApplicationTests {
2725

Diff for: ‎dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.1.0.RELEASE</version>
8+
<version>2.6.3</version>
99
<relativePath></relativePath>
1010
</parent>
1111
<groupId>io.spring.dataflow.sample</groupId>
@@ -37,14 +37,14 @@
3737
<dependency>
3838
<groupId>org.springframework.cloud.stream.app</groupId>
3939
<artifactId>http-app-dependencies</artifactId>
40-
<version>2.1.0.RELEASE</version>
40+
<version>2.1.5.RELEASE</version>
4141
<type>pom</type>
4242
<scope>import</scope>
4343
</dependency>
4444
<dependency>
4545
<groupId>org.springframework.cloud.stream.app</groupId>
4646
<artifactId>app-starters-core-dependencies</artifactId>
47-
<version>2.1.0.RELEASE</version>
47+
<version>2.1.6.RELEASE</version>
4848
<type>pom</type>
4949
<scope>import</scope>
5050
</dependency>
@@ -59,7 +59,7 @@
5959
<dependency>
6060
<groupId>org.springframework.cloud</groupId>
6161
<artifactId>spring-cloud-function-kotlin</artifactId>
62-
<version>2.0.0.RELEASE</version>
62+
<version>3.2.1</version>
6363
</dependency>
6464
<dependency>
6565
<groupId>org.springframework.cloud</groupId>

Diff for: ‎dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/src/test/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplicationTests.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@
1616

1717
package org.springframework.cloud.stream.app.http.source.rabbit;
1818

19-
import org.junit.Test;
20-
import org.junit.runner.RunWith;
19+
import org.junit.jupiter.api.Test;
2120
import org.springframework.boot.test.context.SpringBootTest;
2221
import org.springframework.test.context.junit4.SpringRunner;
2322

24-
@RunWith(SpringRunner.class)
2523
@SpringBootTest
2624
public class HttpSourceRabbitApplicationTests {
2725

Diff for: ‎dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.1.0.RELEASE</version>
8+
<version>2.6.3</version>
99
<relativePath></relativePath>
1010
</parent>
1111
<groupId>io.spring.dataflow.sample</groupId>
@@ -37,14 +37,14 @@
3737
<dependency>
3838
<groupId>org.springframework.cloud.stream.app</groupId>
3939
<artifactId>http-app-dependencies</artifactId>
40-
<version>2.1.0.RELEASE</version>
40+
<version>2.1.5.RELEASE</version>
4141
<type>pom</type>
4242
<scope>import</scope>
4343
</dependency>
4444
<dependency>
4545
<groupId>org.springframework.cloud.stream.app</groupId>
4646
<artifactId>app-starters-core-dependencies</artifactId>
47-
<version>2.1.0.RELEASE</version>
47+
<version>2.1.6.RELEASE</version>
4848
<type>pom</type>
4949
<scope>import</scope>
5050
</dependency>

Diff for: ‎dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/src/test/java/org/springframework/cloud/stream/app/http/source/rabbit/HttpSourceRabbitApplicationTests.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,10 @@
1616

1717
package org.springframework.cloud.stream.app.http.source.rabbit;
1818

19-
import org.junit.Test;
20-
import org.junit.runner.RunWith;
19+
import org.junit.jupiter.api.Test;
2120
import org.springframework.boot.test.context.SpringBootTest;
2221
import org.springframework.test.context.junit4.SpringRunner;
2322

24-
@RunWith(SpringRunner.class)
2523
@SpringBootTest
2624
public class HttpSourceRabbitApplicationTests {
2725

Diff for: ‎dataflow-website/stream-developer-guides/streams/standalone-stream-sample/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>org.springframework.boot</groupId>
1111
<artifactId>spring-boot-starter-parent</artifactId>
12-
<version>2.4.2</version>
12+
<version>2.6.3</version>
1313
<relativePath/> <!-- lookup parent from repository -->
1414
</parent>
1515

@@ -22,7 +22,7 @@
2222
<docker.org>springcloudstream</docker.org>
2323
<docker.version>${project.version}</docker.version>
2424
<java.version>1.8</java.version>
25-
<spring-cloud.version>2020.0.1</spring-cloud.version>
25+
<spring-cloud.version>2021.0.0</spring-cloud.version>
2626
</properties>
2727

2828
<dependencyManagement>

Diff for: ‎dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-detail-sender/src/test/java/io/spring/dataflow/sample/usagedetailsender/UsageDetailSenderApplicationTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public void testUsageDetailSender() {
2828
.run()) {
2929

3030
OutputDestination target = context.getBean(OutputDestination.class);
31-
Message<byte[]> sourceMessage = target.receive(10000);
31+
Message<byte[]> sourceMessage = target.receive(10000, "usage-detail");
3232

3333
final MessageConverter converter = context.getBean(CompositeMessageConverter.class);
3434
UsageDetail usageDetail = (UsageDetail) converter

Diff for: ‎function-samples/http-click-ingest/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.3.1.RELEASE</version>
8+
<version>2.6.3</version>
99
</parent>
1010

1111
<groupId>org.springframework.cloud.dataflow.samples</groupId>
@@ -20,21 +20,21 @@
2020
<dependency>
2121
<groupId>org.springframework.cloud</groupId>
2222
<artifactId>spring-cloud-stream-dependencies</artifactId>
23-
<version>Horsham.SR6</version>
23+
<version>3.2.1</version>
2424
<type>pom</type>
2525
<scope>import</scope>
2626
</dependency>
2727
<dependency>
2828
<groupId>org.springframework.cloud</groupId>
2929
<artifactId>spring-cloud-function-dependencies</artifactId>
30-
<version>3.0.8.RELEASE</version>
30+
<version>3.2.1</version>
3131
<type>pom</type>
3232
<scope>import</scope>
3333
</dependency>
3434
<dependency>
3535
<groupId>org.springframework.cloud</groupId>
3636
<artifactId>spring-cloud-dependencies</artifactId>
37-
<version>Hoxton.SR1</version>
37+
<version>2021.0.0</version>
3838
<type>pom</type>
3939
<scope>import</scope>
4040
</dependency>
@@ -53,12 +53,12 @@
5353
<dependency>
5454
<groupId>org.springframework.cloud.fn</groupId>
5555
<artifactId>http-supplier</artifactId>
56-
<version>1.0.0-M2</version>
56+
<version>1.1.1</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.springframework.cloud.fn</groupId>
6060
<artifactId>payload-converter-function</artifactId>
61-
<version>1.0.0-M2</version>
61+
<version>1.1.1</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>org.springframework.boot</groupId>

Diff for: ‎function-samples/http-region-ingest/pom.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.3.1.RELEASE</version>
8+
<version>2.6.3</version>
99
</parent>
1010

1111
<groupId>org.springframework.cloud.dataflow.samples</groupId>
@@ -20,21 +20,21 @@
2020
<dependency>
2121
<groupId>org.springframework.cloud</groupId>
2222
<artifactId>spring-cloud-stream-dependencies</artifactId>
23-
<version>Horsham.SR6</version>
23+
<version>3.2.1</version>
2424
<type>pom</type>
2525
<scope>import</scope>
2626
</dependency>
2727
<dependency>
2828
<groupId>org.springframework.cloud</groupId>
2929
<artifactId>spring-cloud-function-dependencies</artifactId>
30-
<version>3.0.8.RELEASE</version>
30+
<version>3.2.1</version>
3131
<type>pom</type>
3232
<scope>import</scope>
3333
</dependency>
3434
<dependency>
3535
<groupId>org.springframework.cloud</groupId>
3636
<artifactId>spring-cloud-dependencies</artifactId>
37-
<version>Hoxton.SR1</version>
37+
<version>2021.0.0</version>
3838
<type>pom</type>
3939
<scope>import</scope>
4040
</dependency>
@@ -53,12 +53,12 @@
5353
<dependency>
5454
<groupId>org.springframework.cloud.fn</groupId>
5555
<artifactId>http-supplier</artifactId>
56-
<version>1.0.0-M2</version>
56+
<version>1.1.1</version>
5757
</dependency>
5858
<dependency>
5959
<groupId>org.springframework.cloud.fn</groupId>
6060
<artifactId>payload-converter-function</artifactId>
61-
<version>1.0.0-M2</version>
61+
<version>1.1.1</version>
6262
</dependency>
6363
<dependency>
6464
<groupId>org.springframework.boot</groupId>

Diff for: ‎function-samples/kstreams-join-user-clicks-and-region/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>org.springframework.boot</groupId>
88
<artifactId>spring-boot-starter-parent</artifactId>
9-
<version>2.3.1.RELEASE</version>
9+
<version>2.6.3</version>
1010
</parent>
1111

1212
<groupId>org.springframework.cloud.dataflow.samples</groupId>
@@ -23,21 +23,21 @@
2323
<dependency>
2424
<groupId>org.springframework.cloud</groupId>
2525
<artifactId>spring-cloud-stream-dependencies</artifactId>
26-
<version>Horsham.SR6</version>
26+
<version>3.2.1</version>
2727
<type>pom</type>
2828
<scope>import</scope>
2929
</dependency>
3030
<dependency>
3131
<groupId>org.springframework.cloud</groupId>
3232
<artifactId>spring-cloud-function-dependencies</artifactId>
33-
<version>3.0.8.RELEASE</version>
33+
<version>3.2.1</version>
3434
<type>pom</type>
3535
<scope>import</scope>
3636
</dependency>
3737
<dependency>
3838
<groupId>org.springframework.cloud</groupId>
3939
<artifactId>spring-cloud-dependencies</artifactId>
40-
<version>Hoxton.SR1</version>
40+
<version>2021.0.0</version>
4141
<type>pom</type>
4242
<scope>import</scope>
4343
</dependency>

Diff for: ‎function-samples/kstreams-join-user-clicks-and-region/src/main/java/org/springframework/cloud/dataflow/samples/processor/UserClicksAndUserRegionsProcessor.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import org.apache.kafka.streams.kstream.Joined;
2424
import org.apache.kafka.streams.kstream.KStream;
2525
import org.apache.kafka.streams.kstream.KTable;
26-
import org.apache.kafka.streams.kstream.Serialized;
26+
import org.apache.kafka.streams.kstream.Grouped;
2727

2828
import org.springframework.boot.SpringApplication;
2929
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -44,7 +44,7 @@ public BiFunction<KStream<String, Long>, KTable<String, String>, KStream<String,
4444
(clicks, region) -> new RegionWithClicks(region == null ? "UNKNOWN" : region, clicks),
4545
Joined.with(Serdes.String(), Serdes.Long(), null))
4646
.map((user, regionWithClicks) -> new KeyValue<>(regionWithClicks.getRegion(), regionWithClicks.getClicks()))
47-
.groupByKey(Serialized.with(Serdes.String(), Serdes.Long()))
47+
.groupByKey(Grouped.with(Serdes.String(), Serdes.Long()))
4848
.reduce((firstClicks, secondClicks) -> firstClicks + secondClicks)
4949
.toStream();
5050
}

Diff for: ‎function-samples/kstreams-log-user-clicks-per-region/pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.3.1.RELEASE</version>
8+
<version>2.6.3</version>
99
</parent>
1010

1111
<groupId>org.springframework.cloud.dataflow.samples</groupId>
@@ -19,21 +19,21 @@
1919
<dependency>
2020
<groupId>org.springframework.cloud</groupId>
2121
<artifactId>spring-cloud-stream-dependencies</artifactId>
22-
<version>Horsham.SR6</version>
22+
<version>3.2.1</version>
2323
<type>pom</type>
2424
<scope>import</scope>
2525
</dependency>
2626
<dependency>
2727
<groupId>org.springframework.cloud</groupId>
2828
<artifactId>spring-cloud-function-dependencies</artifactId>
29-
<version>3.0.8.RELEASE</version>
29+
<version>3.2.1</version>
3030
<type>pom</type>
3131
<scope>import</scope>
3232
</dependency>
3333
<dependency>
3434
<groupId>org.springframework.cloud</groupId>
3535
<artifactId>spring-cloud-dependencies</artifactId>
36-
<version>Hoxton.SR1</version>
36+
<version>2021.0.0</version>
3737
<type>pom</type>
3838
<scope>import</scope>
3939
</dependency>

0 commit comments

Comments
 (0)