SpringCloud/spring-cloud-dataflow-samples
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump libs up to latest

Browse Source 
* Spring Boot 2.6.3
* Spring Cloud 2021.0.0
* SCS/F 3.2.1
* etc..

Partially resolves #156
This commit is contained in:
Chris Bono
2022-01-24 10:20:21 -06:00
committed by GitHub
parent a70383677b
commit 301ba872bb
45 changed files with 182 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dataflow-website/batch-developer-guides/batch/batchsamples/billrun/pom.xml
View File

@@ -15,7 +15,7 @@
<properties>
<java.version>1.8</java.version>
<spring-cloud.version>Greenwich.SR1</spring-cloud.version>
<spring-cloud.version>2021.0.0</spring-cloud.version>
<docker.org>springcloudtask</docker.org>
</properties>

2
dataflow-website/batch-developer-guides/batch/batchsamples/pom.xml
View File

@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.2</version>
<version>2.6.3</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>

6
dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.0.RELEASE</version>
<version>2.6.3</version>
<relativePath></relativePath>
</parent>
<groupId>io.spring.dataflow.sample</groupId>
@@ -37,14 +37,14 @@
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>http-app-dependencies</artifactId>
<version>2.1.0.RELEASE</version>
<version>2.1.5.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>app-starters-core-dependencies</artifactId>
<version>2.1.0.RELEASE</version>
<version>2.1.6.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>

4
dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/src/test/java/io/spring/dataflow/sample/HttpTransformerKafkaApplicationTests.java
View File

@@ -16,12 +16,10 @@
package io.spring.dataflow.sample;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
public class HttpTransformerKafkaApplicationTests {

4
dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.0.RELEASE</version>
<version>2.6.3</version>
<relativePath></relativePath>
</parent>
<groupId>io.spring.dataflow.sample</groupId>
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-kotlin</artifactId>
<version>2.0.0.RELEASE</version>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>

4
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
View File

@@ -16,12 +16,10 @@
package org.springframework.cloud.stream.app.http.source.kafka;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
public class HttpTransformerKotlinKafkaApplicationTests {

8
dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.0.RELEASE</version>
<version>2.6.3</version>
<relativePath></relativePath>
</parent>
<groupId>io.spring.dataflow.sample</groupId>
@@ -37,14 +37,14 @@
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>http-app-dependencies</artifactId>
<version>2.1.0.RELEASE</version>
<version>2.1.5.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>app-starters-core-dependencies</artifactId>
<version>2.1.0.RELEASE</version>
<version>2.1.6.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -59,7 +59,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-kotlin</artifactId>
<version>2.0.0.RELEASE</version>
<version>3.2.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>

4
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
View File

@@ -16,12 +16,10 @@
package org.springframework.cloud.stream.app.http.source.rabbit;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
public class HttpSourceRabbitApplicationTests {

6
dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.0.RELEASE</version>
<version>2.6.3</version>
<relativePath></relativePath>
</parent>
<groupId>io.spring.dataflow.sample</groupId>
@@ -37,14 +37,14 @@
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>http-app-dependencies</artifactId>
<version>2.1.0.RELEASE</version>
<version>2.1.5.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>app-starters-core-dependencies</artifactId>
<version>2.1.0.RELEASE</version>
<version>2.1.6.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>

4
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
View File

@@ -16,12 +16,10 @@
package org.springframework.cloud.stream.app.http.source.rabbit;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
public class HttpSourceRabbitApplicationTests {

4
dataflow-website/stream-developer-guides/streams/standalone-stream-sample/pom.xml
View File

@@ -9,7 +9,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.2</version>
<version>2.6.3</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -22,7 +22,7 @@
<docker.org>springcloudstream</docker.org>
<docker.version>${project.version}</docker.version>
<java.version>1.8</java.version>
<spring-cloud.version>2020.0.1</spring-cloud.version>
<spring-cloud.version>2021.0.0</spring-cloud.version>
</properties>
<dependencyManagement>

2
dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-detail-sender/src/test/java/io/spring/dataflow/sample/usagedetailsender/UsageDetailSenderApplicationTests.java
View File

@@ -28,7 +28,7 @@ public class UsageDetailSenderApplicationTests {
.run()) {
OutputDestination target = context.getBean(OutputDestination.class);
Message<byte[]> sourceMessage = target.receive(10000);
Message<byte[]> sourceMessage = target.receive(10000, "usage-detail");
final MessageConverter converter = context.getBean(CompositeMessageConverter.class);
UsageDetail usageDetail = (UsageDetail) converter

12
function-samples/http-click-ingest/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.6.3</version>
<relativePath/>
</parent>
@@ -21,21 +21,21 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-dependencies</artifactId>
<version>Horsham.SR6</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>3.0.8.RELEASE</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Hoxton.SR1</version>
<version>2021.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -54,12 +54,12 @@
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>http-supplier</artifactId>
<version>1.0.0-M2</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>payload-converter-function</artifactId>
<version>1.0.0-M2</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>

12
function-samples/http-region-ingest/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.6.3</version>
<relativePath/>
</parent>
@@ -21,21 +21,21 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-dependencies</artifactId>
<version>Horsham.SR6</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>3.0.8.RELEASE</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Hoxton.SR1</version>
<version>2021.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -54,12 +54,12 @@
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>http-supplier</artifactId>
<version>1.0.0-M2</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>payload-converter-function</artifactId>
<version>1.0.0-M2</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>

8
function-samples/kstreams-join-user-clicks-and-region/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.6.3</version>
<relativePath/>
</parent>
@@ -24,21 +24,21 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-dependencies</artifactId>
<version>Horsham.SR6</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>3.0.8.RELEASE</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Hoxton.SR1</version>
<version>2021.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>

4
function-samples/kstreams-join-user-clicks-and-region/src/main/java/org/springframework/cloud/dataflow/samples/processor/UserClicksAndUserRegionsProcessor.java
View File

@@ -23,7 +23,7 @@ import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.kstream.Joined;
import org.apache.kafka.streams.kstream.KStream;
import org.apache.kafka.streams.kstream.KTable;
import org.apache.kafka.streams.kstream.Serialized;
import org.apache.kafka.streams.kstream.Grouped;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -44,7 +44,7 @@ public class UserClicksAndUserRegionsProcessor {
(clicks, region) -> new RegionWithClicks(region == null ? "UNKNOWN" : region, clicks),
Joined.with(Serdes.String(), Serdes.Long(), null))
.map((user, regionWithClicks) -> new KeyValue<>(regionWithClicks.getRegion(), regionWithClicks.getClicks()))
.groupByKey(Serialized.with(Serdes.String(), Serdes.Long()))
.groupByKey(Grouped.with(Serdes.String(), Serdes.Long()))
.reduce((firstClicks, secondClicks) -> firstClicks + secondClicks)
.toStream();
}

8
function-samples/kstreams-log-user-clicks-per-region/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.6.3</version>
<relativePath/>
</parent>
@@ -20,21 +20,21 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-dependencies</artifactId>
<version>Horsham.SR6</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>3.0.8.RELEASE</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Hoxton.SR1</version>
<version>2021.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>

10
function-samples/transform-user-clicks-per-region/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.6.3</version>
<relativePath/>
</parent>
@@ -20,21 +20,21 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-dependencies</artifactId>
<version>Horsham.SR6</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>3.0.8.RELEASE</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Hoxton.SR1</version>
<version>2021.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>payload-converter-function</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.1.1</version>
</dependency>
<!-- This dependency adds Spring Cloud Stream Binder for Apache Kafka -->
<dependency>

18
function-samples/uppercase-processor/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.6.3</version>
<relativePath/>
</parent>
@@ -21,28 +21,28 @@
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>function-dependencies</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.1.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-dependencies</artifactId>
<version>Horsham.SR6</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>3.0.8.RELEASE</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Hoxton.SR6</version>
<version>2021.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -55,12 +55,12 @@
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-security-common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-micrometer-common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
@@ -77,7 +77,7 @@
<dependency>
<groupId>io.micrometer.prometheus</groupId>
<artifactId>prometheus-rsocket-spring</artifactId>
<version>0.9.0</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
@@ -86,7 +86,7 @@
<dependency>
<groupId>io.pivotal.cfenv</groupId>
<artifactId>java-cfenv-boot</artifactId>
<version>2.1.2.RELEASE</version>
<version>2.4.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>

6
kafka-samples/http-ingest/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.3.RELEASE</version>
<version>2.6.3</version>
<relativePath/>
</parent>
@@ -20,14 +20,14 @@
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>app-starters-core-dependencies</artifactId>
<version>2.1.0.RELEASE</version>
<version>2.1.6.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>http-app-dependencies</artifactId>
<version>2.1.0.RELEASE</version>
<version>2.1.5.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>

4
kafka-samples/kstreams-join-user-clicks-and-region/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.3.RELEASE</version>
<version>2.6.3</version>
<relativePath/>
</parent>
@@ -23,7 +23,7 @@
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>app-starters-core-dependencies</artifactId>
<version>2.1.0.RELEASE</version>
<version>2.1.6.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>

4
kafka-samples/kstreams-join-user-clicks-and-region/src/main/java/org/springframework/cloud/dataflow/samples/processor/UserClicksAndUserRegionsProcessor.java
View File

@@ -21,7 +21,7 @@ import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.kstream.Joined;
import org.apache.kafka.streams.kstream.KStream;
import org.apache.kafka.streams.kstream.KTable;
import org.apache.kafka.streams.kstream.Serialized;
import org.apache.kafka.streams.kstream.Grouped;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.stream.annotation.EnableBinding;
@@ -51,7 +51,7 @@ public class UserClicksAndUserRegionsProcessor {
(clicks, region) -> new RegionWithClicks(region == null ? "UNKNOWN" : region, clicks),
Joined.with(Serdes.String(), Serdes.Long(), null))
.map((user, regionWithClicks) -> new KeyValue<>(regionWithClicks.getRegion(), regionWithClicks.getClicks()))
.groupByKey(Serialized.with(Serdes.String(), Serdes.Long()))
.groupByKey(Grouped.with(Serdes.String(), Serdes.Long()))
.reduce((firstClicks, secondClicks) -> firstClicks + secondClicks)
.toStream();
}

4
kafka-samples/kstreams-log-user-clicks-per-region/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.3.RELEASE</version>
<version>2.6.3</version>
<relativePath/>
</parent>
@@ -19,7 +19,7 @@
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>app-starters-core-dependencies</artifactId>
<version>2.1.0.RELEASE</version>
<version>2.1.6.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>

2
kafka-samples/kstreams-log-user-clicks-per-region/src/main/java/org/springframework/cloud/dataflow/samples/sink/UserClicksPerRegionLogger.java
View File

@@ -36,7 +36,7 @@ public class UserClicksPerRegionLogger {
LoggingHandler loggingHandler = new LoggingHandler(LoggingHandler.Level.INFO) {
@Override
protected void handleMessageInternal(Message<?> message) throws Exception {
protected void handleMessageInternal(Message<?> message) {
Long userClicksPerRegion = (Long) message.getPayload();
String userRegion = (String) message.getHeaders().get("kafka_receivedMessageKey");
message = new MutableMessage<>(userRegion + " : " + userClicksPerRegion.toString());

4
kafka-samples/kstreams-word-count/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.1.3.RELEASE</version>
<version>2.6.3</version>
<relativePath/>
</parent>
@@ -23,7 +23,7 @@
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>app-starters-core-dependencies</artifactId>
<version>2.1.0.RELEASE</version>
<version>2.1.6.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>

7
kafka-samples/kstreams-word-count/src/main/java/org/springframework/cloud/dataflow/samples/processor/KafkaStreamsWordCountApplication.java
View File

@@ -16,6 +16,7 @@
package org.springframework.cloud.dataflow.samples.processor;
import java.time.Duration;
import java.util.Arrays;
import java.util.Date;
@@ -23,7 +24,7 @@ import org.apache.kafka.common.serialization.Serdes;
import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.kstream.KStream;
import org.apache.kafka.streams.kstream.Materialized;
import org.apache.kafka.streams.kstream.Serialized;
import org.apache.kafka.streams.kstream.Grouped;
import org.apache.kafka.streams.kstream.TimeWindows;
import org.springframework.boot.SpringApplication;
@@ -50,8 +51,8 @@ public class KafkaStreamsWordCountApplication {
return input
.flatMapValues(value -> Arrays.asList(value.toLowerCase().split("\\W+")))
.map((key, value) -> new KeyValue<>(value, value))
.groupByKey(Serialized.with(Serdes.String(), Serdes.String()))
.windowedBy(TimeWindows.of(30000))
.groupByKey(Grouped.with(Serdes.String(), Serdes.String()))
.windowedBy(TimeWindows.of(Duration.ofSeconds(30L)))
.count(Materialized.as("WordCounts-1"))
.toStream()
.map((key, value) -> new KeyValue<>(null, new WordCount(key.key(), value, new Date(key.window().start()), new Date(key.window().end()))));

4
monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml
View File

@@ -16,7 +16,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.3</version>
<version>2.6.3</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>io.spring.task</groupId>
@@ -28,7 +28,7 @@
<properties>
<java.version>1.8</java.version>
<prometheus-rsocket-spring.version>1.3.0</prometheus-rsocket-spring.version>
<spring-cloud-task-dependencies.version>2.3.0</spring-cloud-task-dependencies.version>
<spring-cloud-task-dependencies.version>2.4.0</spring-cloud-task-dependencies.version>
</properties>
<dependencies>

18
multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-click-ingest/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.11.RELEASE</version>
<version>2.6.3</version>
<relativePath/>
</parent>
@@ -25,28 +25,28 @@
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>function-dependencies</artifactId>
<version>1.0.3</version>
<version>1.1.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-dependencies</artifactId>
<version>Horsham.SR12</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>3.0.14.RELEASE</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Hoxton.SR11</version>
<version>2021.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -68,22 +68,22 @@
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-composite-function-support</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-security-common</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-micrometer-common</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-postprocessor-common</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>

24
multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-clicks-and-region-ingest/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.11.RELEASE</version>
<version>2.6.3</version>
<relativePath/>
</parent>
@@ -16,7 +16,7 @@
<description>Http clicks and region ingest application</description>
<properties>
<java-cfenv.version>2.1.2.RELEASE</java-cfenv.version>
<java-cfenv.version>2.4.0</java-cfenv.version>
</properties>
<dependencyManagement>
@@ -25,28 +25,28 @@
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>function-dependencies</artifactId>
<version>1.0.3</version>
<version>1.1.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-dependencies</artifactId>
<version>Horsham.SR12</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>3.0.14.RELEASE</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Hoxton.SR11</version>
<version>2021.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -60,32 +60,32 @@
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>http-supplier</artifactId>
<version>1.0.3</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-composite-function-support</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-composite-function-support</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-security-common</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-micrometer-common</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-postprocessor-common</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>

24
multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-region-ingest/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.11.RELEASE</version>
<version>2.6.3</version>
<relativePath/>
</parent>
@@ -25,21 +25,21 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-dependencies</artifactId>
<version>Horsham.SR12</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>3.0.14.RELEASE</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Hoxton.SR11</version>
<version>2021.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -58,42 +58,42 @@
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>http-supplier</artifactId>
<version>1.0.3</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>payload-converter-function</artifactId>
<version>1.0.3</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>spel-function</artifactId>
<version>1.0.3</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-composite-function-support</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-composite-function-support</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-security-common</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-micrometer-common</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-postprocessor-common</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>

20
multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/log-user-clicks-per-region/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.11.RELEASE</version>
<version>2.6.3</version>
<relativePath/>
</parent>
@@ -24,21 +24,21 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-dependencies</artifactId>
<version>Horsham.SR12</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>3.0.14.RELEASE</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Hoxton.SR11</version>
<version>2021.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -55,32 +55,32 @@
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>spel-function</artifactId>
<version>1.0.3</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>payload-converter-function</artifactId>
<version>1.0.3</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-composite-function-support</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-composite-function-support</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-security-common</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-postprocessor-common</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>

20
multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/user-clicks-per-region-processor/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.11.RELEASE</version>
<version>2.6.3</version>
<relativePath/>
</parent>
@@ -28,21 +28,21 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-dependencies</artifactId>
<version>Horsham.SR12</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>3.0.14.RELEASE</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Hoxton.SR11</version>
<version>2021.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -61,32 +61,32 @@
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>spel-function</artifactId>
<version>1.0.3</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-composite-function-support</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-composite-function-support</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-security-common</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-micrometer-common</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-postprocessor-common</artifactId>
<version>3.0.5</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>

3
multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/user-clicks-per-region-processor/src/main/java/org/springframework/cloud/dataflow/samples/processor/UserClicksAndUserRegionsProcessor.java
View File

@@ -20,11 +20,10 @@ import java.util.function.BiFunction;
import org.apache.kafka.common.serialization.Serdes;
import org.apache.kafka.streams.KeyValue;
import org.apache.kafka.streams.kstream.Grouped;
import org.apache.kafka.streams.kstream.Joined;
import org.apache.kafka.streams.kstream.KStream;
import org.apache.kafka.streams.kstream.KTable;
import org.apache.kafka.streams.kstream.Serialized;
import org.apache.kafka.streams.kstream.Grouped;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;

18
multi-io-samples/purchase-orders/http-purchase-orders/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.1.RELEASE</version>
<version>2.6.3</version>
</parent>
<groupId>org.springframework.cloud.dataflow.samples</groupId>
@@ -20,28 +20,28 @@
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>function-dependencies</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.1.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-dependencies</artifactId>
<version>Horsham.SR6</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>3.0.8.RELEASE</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Hoxton.SR6</version>
<version>2021.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -55,22 +55,22 @@
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>http-supplier</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-composite-function-support</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-security-common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-micrometer-common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.1</version>
</dependency>
<!--<dependency>-->
<!--<groupId>io.micrometer</groupId>-->

18
multi-io-samples/ticktock/multi-input-log-kafka/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.0.RELEASE</version>
<version>2.6.3</version>
<relativePath></relativePath>
</parent>
<groupId>org.springframework.cloud.stream.app</groupId>
@@ -40,21 +40,21 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-dependencies</artifactId>
<version>Horsham.SR6</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>3.0.8.RELEASE</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Hoxton.SR6</version>
<version>2021.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -67,17 +67,17 @@
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>log-consumer</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-security-common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-micrometer-common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
@@ -94,7 +94,7 @@
<dependency>
<groupId>io.micrometer.prometheus</groupId>
<artifactId>prometheus-rsocket-spring</artifactId>
<version>0.9.0</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
@@ -103,7 +103,7 @@
<dependency>
<groupId>io.pivotal.cfenv</groupId>
<artifactId>java-cfenv-boot</artifactId>
<version>2.1.2.RELEASE</version>
<version>2.4.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>

4
multi-io-samples/ticktock/multi-input-log-kafka/src/test/java/org/springframework/cloud/stream/app/log/sink/rabbit/LogSinkRabbitApplicationTests.java
View File

@@ -16,12 +16,10 @@
package org.springframework.cloud.stream.app.log.sink.rabbit;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
public class LogSinkRabbitApplicationTests {

18
multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.0.RELEASE</version>
<version>2.6.3</version>
<relativePath></relativePath>
</parent>
<groupId>org.springframework.cloud.stream.app</groupId>
@@ -40,21 +40,21 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-dependencies</artifactId>
<version>Horsham.SR6</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>3.0.8.RELEASE</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Hoxton.SR6</version>
<version>2021.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -67,17 +67,17 @@
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>log-consumer</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-security-common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-micrometer-common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
@@ -94,7 +94,7 @@
<dependency>
<groupId>io.micrometer.prometheus</groupId>
<artifactId>prometheus-rsocket-spring</artifactId>
<version>0.9.0</version>
<version>1.3.0</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
@@ -103,7 +103,7 @@
<dependency>
<groupId>io.pivotal.cfenv</groupId>
<artifactId>java-cfenv-boot</artifactId>
<version>2.1.2.RELEASE</version>
<version>2.4.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>

4
multi-io-samples/ticktock/multi-input-log-rabbit/src/test/java/org/springframework/cloud/stream/app/log/sink/rabbit/LogSinkRabbitApplicationTests.java
View File

@@ -16,12 +16,10 @@
package org.springframework.cloud.stream.app.log.sink.rabbit;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
public class LogSinkRabbitApplicationTests {

18
multi-io-samples/ticktock/multi-output-time-kafka/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.0.RELEASE</version>
<version>2.6.3</version>
<relativePath></relativePath>
</parent>
<groupId>org.springframework.cloud.stream.app</groupId>
@@ -40,21 +40,21 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-dependencies</artifactId>
<version>Horsham.SR6</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>3.0.8.RELEASE</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Hoxton.SR6</version>
<version>2021.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -67,22 +67,22 @@
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>time-supplier</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-composite-function-support</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-security-common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-micrometer-common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
@@ -108,7 +108,7 @@
<dependency>
<groupId>io.pivotal.cfenv</groupId>
<artifactId>java-cfenv-boot</artifactId>
<version>2.1.2.RELEASE</version>
<version>2.4.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>

4
multi-io-samples/ticktock/multi-output-time-kafka/src/test/java/org/springframework/cloud/stream/app/time/source/rabbit/TimeSourceRabbitApplicationTests.java
View File

@@ -16,12 +16,10 @@
package org.springframework.cloud.stream.app.time.source.rabbit;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
public class TimeSourceRabbitApplicationTests {

18
multi-io-samples/ticktock/multi-output-time-rabbit/pom.xml
View File

@@ -6,7 +6,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.3.0.RELEASE</version>
<version>2.6.3</version>
<relativePath></relativePath>
</parent>
<groupId>org.springframework.cloud.stream.app</groupId>
@@ -40,21 +40,21 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-dependencies</artifactId>
<version>Horsham.SR6</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-dependencies</artifactId>
<version>3.0.8.RELEASE</version>
<version>3.2.1</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-dependencies</artifactId>
<version>Hoxton.SR6</version>
<version>2021.0.0</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -67,22 +67,22 @@
<dependency>
<groupId>org.springframework.cloud.fn</groupId>
<artifactId>time-supplier</artifactId>
<version>1.0.0-SNAPSHOT</version>
<version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-composite-function-support</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-security-common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>org.springframework.cloud.stream.app</groupId>
<artifactId>stream-applications-micrometer-common</artifactId>
<version>3.0.0-SNAPSHOT</version>
<version>3.1.1</version>
</dependency>
<dependency>
<groupId>io.micrometer</groupId>
@@ -108,7 +108,7 @@
<dependency>
<groupId>io.pivotal.cfenv</groupId>
<artifactId>java-cfenv-boot</artifactId>
<version>2.1.2.RELEASE</version>
<version>2.4.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>

4
multi-io-samples/ticktock/multi-output-time-rabbit/src/test/java/org/springframework/cloud/stream/app/time/source/rabbit/TimeSourceRabbitApplicationTests.java
View File

@@ -16,12 +16,10 @@
package org.springframework.cloud.stream.app.time.source.rabbit;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
@RunWith(SpringRunner.class)
@SpringBootTest
public class TimeSourceRabbitApplicationTests {

4
scenario-task/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.4.0</version>
<version>2.6.3</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>io.spring</groupId>
@@ -16,7 +16,7 @@
<properties>
<java.version>8</java.version>
<spring-cloud.version>Hoxton.SR9</spring-cloud.version>
<spring-cloud.version>2021.0.0</spring-cloud.version>
<test-container-version>1.15.3</test-container-version>
</properties>

2
timestamp-batch/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.1</version>
<version>2.6.3</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>io.spring</groupId>

2
timestamp-task/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>2.6.1</version>
<version>2.6.3</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>io.spring</groupId>