diff --git a/dataflow-website/batch-developer-guides/batch/batchsamples/billrun/pom.xml b/dataflow-website/batch-developer-guides/batch/batchsamples/billrun/pom.xml index 6259614..cfedb03 100644 --- a/dataflow-website/batch-developer-guides/batch/batchsamples/billrun/pom.xml +++ b/dataflow-website/batch-developer-guides/batch/batchsamples/billrun/pom.xml @@ -15,7 +15,7 @@ 1.8 - Greenwich.SR1 + 2021.0.0 springcloudtask diff --git a/dataflow-website/batch-developer-guides/batch/batchsamples/pom.xml b/dataflow-website/batch-developer-guides/batch/batchsamples/pom.xml index 89e1202..3f5fa0b 100644 --- a/dataflow-website/batch-developer-guides/batch/batchsamples/pom.xml +++ b/dataflow-website/batch-developer-guides/batch/batchsamples/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.2 + 2.6.3 diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/pom.xml b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/pom.xml index e2e5e6c..03d6ab1 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/pom.xml +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RELEASE + 2.6.3 io.spring.dataflow.sample @@ -37,14 +37,14 @@ org.springframework.cloud.stream.app http-app-dependencies - 2.1.0.RELEASE + 2.1.5.RELEASE pom import org.springframework.cloud.stream.app app-starters-core-dependencies - 2.1.0.RELEASE + 2.1.6.RELEASE pom import diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/src/test/java/io/spring/dataflow/sample/HttpTransformerKafkaApplicationTests.java b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/src/test/java/io/spring/dataflow/sample/HttpTransformerKafkaApplicationTests.java index 776fedf..bb8aa56 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/src/test/java/io/spring/dataflow/sample/HttpTransformerKafkaApplicationTests.java +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kafka/src/test/java/io/spring/dataflow/sample/HttpTransformerKafkaApplicationTests.java @@ -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 { diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/pom.xml b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/pom.xml index b425c7a..0198c0c 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/pom.xml +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-kafka/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RELEASE + 2.6.3 io.spring.dataflow.sample @@ -59,7 +59,7 @@ org.springframework.cloud spring-cloud-function-kotlin - 2.0.0.RELEASE + 3.2.1 org.springframework.cloud diff --git a/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 b/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 index 0f292dc..bbc8c96 100644 --- a/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 +++ b/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 @@ -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 { diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/pom.xml b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/pom.xml index c59f640..e26f184 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/pom.xml +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-kotlin-rabbitmq/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RELEASE + 2.6.3 io.spring.dataflow.sample @@ -37,14 +37,14 @@ org.springframework.cloud.stream.app http-app-dependencies - 2.1.0.RELEASE + 2.1.5.RELEASE pom import org.springframework.cloud.stream.app app-starters-core-dependencies - 2.1.0.RELEASE + 2.1.6.RELEASE pom import @@ -59,7 +59,7 @@ org.springframework.cloud spring-cloud-function-kotlin - 2.0.0.RELEASE + 3.2.1 org.springframework.cloud diff --git a/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 b/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 index 923b83b..6e1d8da 100644 --- a/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 +++ b/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 @@ -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 { diff --git a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/pom.xml b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/pom.xml index 5086207..937df34 100644 --- a/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/pom.xml +++ b/dataflow-website/stream-developer-guides/feature-guides/streams/function-composition/composed-http-transformer-rabbitmq/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.0.RELEASE + 2.6.3 io.spring.dataflow.sample @@ -37,14 +37,14 @@ org.springframework.cloud.stream.app http-app-dependencies - 2.1.0.RELEASE + 2.1.5.RELEASE pom import org.springframework.cloud.stream.app app-starters-core-dependencies - 2.1.0.RELEASE + 2.1.6.RELEASE pom import diff --git a/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 b/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 index 923b83b..6e1d8da 100644 --- a/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 +++ b/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 @@ -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 { diff --git a/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/pom.xml b/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/pom.xml index bf293a5..9a6f467 100644 --- a/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/pom.xml +++ b/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/pom.xml @@ -9,7 +9,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.2 + 2.6.3 @@ -22,7 +22,7 @@ springcloudstream ${project.version} 1.8 - 2020.0.1 + 2021.0.0 diff --git a/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-detail-sender/src/test/java/io/spring/dataflow/sample/usagedetailsender/UsageDetailSenderApplicationTests.java b/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-detail-sender/src/test/java/io/spring/dataflow/sample/usagedetailsender/UsageDetailSenderApplicationTests.java index a833d16..2b06f9e 100644 --- a/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-detail-sender/src/test/java/io/spring/dataflow/sample/usagedetailsender/UsageDetailSenderApplicationTests.java +++ b/dataflow-website/stream-developer-guides/streams/standalone-stream-sample/usage-detail-sender/src/test/java/io/spring/dataflow/sample/usagedetailsender/UsageDetailSenderApplicationTests.java @@ -28,7 +28,7 @@ public class UsageDetailSenderApplicationTests { .run()) { OutputDestination target = context.getBean(OutputDestination.class); - Message sourceMessage = target.receive(10000); + Message sourceMessage = target.receive(10000, "usage-detail"); final MessageConverter converter = context.getBean(CompositeMessageConverter.class); UsageDetail usageDetail = (UsageDetail) converter diff --git a/function-samples/http-click-ingest/pom.xml b/function-samples/http-click-ingest/pom.xml index 6a1b5e3..b3c6699 100644 --- a/function-samples/http-click-ingest/pom.xml +++ b/function-samples/http-click-ingest/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.6.3 @@ -21,21 +21,21 @@ org.springframework.cloud spring-cloud-stream-dependencies - Horsham.SR6 + 3.2.1 pom import org.springframework.cloud spring-cloud-function-dependencies - 3.0.8.RELEASE + 3.2.1 pom import org.springframework.cloud spring-cloud-dependencies - Hoxton.SR1 + 2021.0.0 pom import @@ -54,12 +54,12 @@ org.springframework.cloud.fn http-supplier - 1.0.0-M2 + 1.1.1 org.springframework.cloud.fn payload-converter-function - 1.0.0-M2 + 1.1.1 org.springframework.boot diff --git a/function-samples/http-region-ingest/pom.xml b/function-samples/http-region-ingest/pom.xml index 067be86..d9dba04 100644 --- a/function-samples/http-region-ingest/pom.xml +++ b/function-samples/http-region-ingest/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.6.3 @@ -21,21 +21,21 @@ org.springframework.cloud spring-cloud-stream-dependencies - Horsham.SR6 + 3.2.1 pom import org.springframework.cloud spring-cloud-function-dependencies - 3.0.8.RELEASE + 3.2.1 pom import org.springframework.cloud spring-cloud-dependencies - Hoxton.SR1 + 2021.0.0 pom import @@ -54,12 +54,12 @@ org.springframework.cloud.fn http-supplier - 1.0.0-M2 + 1.1.1 org.springframework.cloud.fn payload-converter-function - 1.0.0-M2 + 1.1.1 org.springframework.boot diff --git a/function-samples/kstreams-join-user-clicks-and-region/pom.xml b/function-samples/kstreams-join-user-clicks-and-region/pom.xml index 388655f..5702980 100644 --- a/function-samples/kstreams-join-user-clicks-and-region/pom.xml +++ b/function-samples/kstreams-join-user-clicks-and-region/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.6.3 @@ -24,21 +24,21 @@ org.springframework.cloud spring-cloud-stream-dependencies - Horsham.SR6 + 3.2.1 pom import org.springframework.cloud spring-cloud-function-dependencies - 3.0.8.RELEASE + 3.2.1 pom import org.springframework.cloud spring-cloud-dependencies - Hoxton.SR1 + 2021.0.0 pom import diff --git a/function-samples/kstreams-join-user-clicks-and-region/src/main/java/org/springframework/cloud/dataflow/samples/processor/UserClicksAndUserRegionsProcessor.java b/function-samples/kstreams-join-user-clicks-and-region/src/main/java/org/springframework/cloud/dataflow/samples/processor/UserClicksAndUserRegionsProcessor.java index 90e68a3..f5fd364 100644 --- a/function-samples/kstreams-join-user-clicks-and-region/src/main/java/org/springframework/cloud/dataflow/samples/processor/UserClicksAndUserRegionsProcessor.java +++ b/function-samples/kstreams-join-user-clicks-and-region/src/main/java/org/springframework/cloud/dataflow/samples/processor/UserClicksAndUserRegionsProcessor.java @@ -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(); } diff --git a/function-samples/kstreams-log-user-clicks-per-region/pom.xml b/function-samples/kstreams-log-user-clicks-per-region/pom.xml index 2268cb1..ab61f16 100644 --- a/function-samples/kstreams-log-user-clicks-per-region/pom.xml +++ b/function-samples/kstreams-log-user-clicks-per-region/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.6.3 @@ -20,21 +20,21 @@ org.springframework.cloud spring-cloud-stream-dependencies - Horsham.SR6 + 3.2.1 pom import org.springframework.cloud spring-cloud-function-dependencies - 3.0.8.RELEASE + 3.2.1 pom import org.springframework.cloud spring-cloud-dependencies - Hoxton.SR1 + 2021.0.0 pom import diff --git a/function-samples/transform-user-clicks-per-region/pom.xml b/function-samples/transform-user-clicks-per-region/pom.xml index 23bd992..b6685da 100644 --- a/function-samples/transform-user-clicks-per-region/pom.xml +++ b/function-samples/transform-user-clicks-per-region/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.6.3 @@ -20,21 +20,21 @@ org.springframework.cloud spring-cloud-stream-dependencies - Horsham.SR6 + 3.2.1 pom import org.springframework.cloud spring-cloud-function-dependencies - 3.0.8.RELEASE + 3.2.1 pom import org.springframework.cloud spring-cloud-dependencies - Hoxton.SR1 + 2021.0.0 pom import @@ -46,7 +46,7 @@ org.springframework.cloud.fn payload-converter-function - 1.0.0-SNAPSHOT + 1.1.1 diff --git a/function-samples/uppercase-processor/pom.xml b/function-samples/uppercase-processor/pom.xml index 5863dbc..a970d82 100644 --- a/function-samples/uppercase-processor/pom.xml +++ b/function-samples/uppercase-processor/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.6.3 @@ -21,28 +21,28 @@ org.springframework.cloud.fn function-dependencies - 1.0.0-SNAPSHOT + 1.1.1 pom import org.springframework.cloud spring-cloud-stream-dependencies - Horsham.SR6 + 3.2.1 pom import org.springframework.cloud spring-cloud-function-dependencies - 3.0.8.RELEASE + 3.2.1 pom import org.springframework.cloud spring-cloud-dependencies - Hoxton.SR6 + 2021.0.0 pom import @@ -55,12 +55,12 @@ org.springframework.cloud.stream.app stream-applications-security-common - 3.0.0-SNAPSHOT + 3.1.1 org.springframework.cloud.stream.app stream-applications-micrometer-common - 3.0.0-SNAPSHOT + 3.1.1 io.micrometer @@ -77,7 +77,7 @@ io.micrometer.prometheus prometheus-rsocket-spring - 0.9.0 + 1.3.0 io.micrometer @@ -86,7 +86,7 @@ io.pivotal.cfenv java-cfenv-boot - 2.1.2.RELEASE + 2.4.0 org.springframework.boot diff --git a/kafka-samples/http-ingest/pom.xml b/kafka-samples/http-ingest/pom.xml index cca2e36..82361ea 100644 --- a/kafka-samples/http-ingest/pom.xml +++ b/kafka-samples/http-ingest/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.6.3 @@ -20,14 +20,14 @@ org.springframework.cloud.stream.app app-starters-core-dependencies - 2.1.0.RELEASE + 2.1.6.RELEASE pom import org.springframework.cloud.stream.app http-app-dependencies - 2.1.0.RELEASE + 2.1.5.RELEASE pom import diff --git a/kafka-samples/kstreams-join-user-clicks-and-region/pom.xml b/kafka-samples/kstreams-join-user-clicks-and-region/pom.xml index 237e947..180859c 100644 --- a/kafka-samples/kstreams-join-user-clicks-and-region/pom.xml +++ b/kafka-samples/kstreams-join-user-clicks-and-region/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.6.3 @@ -23,7 +23,7 @@ org.springframework.cloud.stream.app app-starters-core-dependencies - 2.1.0.RELEASE + 2.1.6.RELEASE pom import diff --git a/kafka-samples/kstreams-join-user-clicks-and-region/src/main/java/org/springframework/cloud/dataflow/samples/processor/UserClicksAndUserRegionsProcessor.java b/kafka-samples/kstreams-join-user-clicks-and-region/src/main/java/org/springframework/cloud/dataflow/samples/processor/UserClicksAndUserRegionsProcessor.java index c8df2f1..71ded65 100644 --- a/kafka-samples/kstreams-join-user-clicks-and-region/src/main/java/org/springframework/cloud/dataflow/samples/processor/UserClicksAndUserRegionsProcessor.java +++ b/kafka-samples/kstreams-join-user-clicks-and-region/src/main/java/org/springframework/cloud/dataflow/samples/processor/UserClicksAndUserRegionsProcessor.java @@ -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(); } diff --git a/kafka-samples/kstreams-log-user-clicks-per-region/pom.xml b/kafka-samples/kstreams-log-user-clicks-per-region/pom.xml index fe4f91b..41599ff 100644 --- a/kafka-samples/kstreams-log-user-clicks-per-region/pom.xml +++ b/kafka-samples/kstreams-log-user-clicks-per-region/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.6.3 @@ -19,7 +19,7 @@ org.springframework.cloud.stream.app app-starters-core-dependencies - 2.1.0.RELEASE + 2.1.6.RELEASE pom import diff --git a/kafka-samples/kstreams-log-user-clicks-per-region/src/main/java/org/springframework/cloud/dataflow/samples/sink/UserClicksPerRegionLogger.java b/kafka-samples/kstreams-log-user-clicks-per-region/src/main/java/org/springframework/cloud/dataflow/samples/sink/UserClicksPerRegionLogger.java index fae704e..77fb228 100644 --- a/kafka-samples/kstreams-log-user-clicks-per-region/src/main/java/org/springframework/cloud/dataflow/samples/sink/UserClicksPerRegionLogger.java +++ b/kafka-samples/kstreams-log-user-clicks-per-region/src/main/java/org/springframework/cloud/dataflow/samples/sink/UserClicksPerRegionLogger.java @@ -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()); diff --git a/kafka-samples/kstreams-word-count/pom.xml b/kafka-samples/kstreams-word-count/pom.xml index 129cdbe..7c7e3ef 100644 --- a/kafka-samples/kstreams-word-count/pom.xml +++ b/kafka-samples/kstreams-word-count/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.1.3.RELEASE + 2.6.3 @@ -23,7 +23,7 @@ org.springframework.cloud.stream.app app-starters-core-dependencies - 2.1.0.RELEASE + 2.1.6.RELEASE pom import diff --git a/kafka-samples/kstreams-word-count/src/main/java/org/springframework/cloud/dataflow/samples/processor/KafkaStreamsWordCountApplication.java b/kafka-samples/kstreams-word-count/src/main/java/org/springframework/cloud/dataflow/samples/processor/KafkaStreamsWordCountApplication.java index cdca8df..bca5a48 100644 --- a/kafka-samples/kstreams-word-count/src/main/java/org/springframework/cloud/dataflow/samples/processor/KafkaStreamsWordCountApplication.java +++ b/kafka-samples/kstreams-word-count/src/main/java/org/springframework/cloud/dataflow/samples/processor/KafkaStreamsWordCountApplication.java @@ -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())))); diff --git a/monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml b/monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml index 715ac8a..0e1dd31 100644 --- a/monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml +++ b/monitoring-samples/task-apps/task-demo-metrics-prometheus/pom.xml @@ -16,7 +16,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.3 + 2.6.3 io.spring.task @@ -28,7 +28,7 @@ 1.8 1.3.0 - 2.3.0 + 2.4.0 diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-click-ingest/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-click-ingest/pom.xml index 26fa39e..67eee1c 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-click-ingest/pom.xml +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-click-ingest/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.11.RELEASE + 2.6.3 @@ -25,28 +25,28 @@ org.springframework.cloud.fn function-dependencies - 1.0.3 + 1.1.1 pom import org.springframework.cloud spring-cloud-stream-dependencies - Horsham.SR12 + 3.2.1 pom import org.springframework.cloud spring-cloud-function-dependencies - 3.0.14.RELEASE + 3.2.1 pom import org.springframework.cloud spring-cloud-dependencies - Hoxton.SR11 + 2021.0.0 pom import @@ -68,22 +68,22 @@ org.springframework.cloud.stream.app stream-applications-composite-function-support - 3.0.5 + 3.1.1 org.springframework.cloud.stream.app stream-applications-security-common - 3.0.5 + 3.1.1 org.springframework.cloud.stream.app stream-applications-micrometer-common - 3.0.5 + 3.1.1 org.springframework.cloud.stream.app stream-applications-postprocessor-common - 3.0.5 + 3.1.1 org.springframework.cloud diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-clicks-and-region-ingest/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-clicks-and-region-ingest/pom.xml index 123daed..5ac4392 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-clicks-and-region-ingest/pom.xml +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-clicks-and-region-ingest/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.11.RELEASE + 2.6.3 @@ -16,7 +16,7 @@ Http clicks and region ingest application - 2.1.2.RELEASE + 2.4.0 @@ -25,28 +25,28 @@ org.springframework.cloud.fn function-dependencies - 1.0.3 + 1.1.1 pom import org.springframework.cloud spring-cloud-stream-dependencies - Horsham.SR12 + 3.2.1 pom import org.springframework.cloud spring-cloud-function-dependencies - 3.0.14.RELEASE + 3.2.1 pom import org.springframework.cloud spring-cloud-dependencies - Hoxton.SR11 + 2021.0.0 pom import @@ -60,32 +60,32 @@ org.springframework.cloud.fn http-supplier - 1.0.3 + 1.1.1 org.springframework.cloud.stream.app stream-applications-composite-function-support - 3.0.5 + 3.1.1 org.springframework.cloud.stream.app stream-applications-composite-function-support - 3.0.5 + 3.1.1 org.springframework.cloud.stream.app stream-applications-security-common - 3.0.5 + 3.1.1 org.springframework.cloud.stream.app stream-applications-micrometer-common - 3.0.5 + 3.1.1 org.springframework.cloud.stream.app stream-applications-postprocessor-common - 3.0.5 + 3.1.1 org.springframework.cloud diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-region-ingest/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-region-ingest/pom.xml index 619d573..65e7b8e 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-region-ingest/pom.xml +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/http-region-ingest/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.11.RELEASE + 2.6.3 @@ -25,21 +25,21 @@ org.springframework.cloud spring-cloud-stream-dependencies - Horsham.SR12 + 3.2.1 pom import org.springframework.cloud spring-cloud-function-dependencies - 3.0.14.RELEASE + 3.2.1 pom import org.springframework.cloud spring-cloud-dependencies - Hoxton.SR11 + 2021.0.0 pom import @@ -58,42 +58,42 @@ org.springframework.cloud.fn http-supplier - 1.0.3 + 1.1.1 org.springframework.cloud.fn payload-converter-function - 1.0.3 + 1.1.1 org.springframework.cloud.fn spel-function - 1.0.3 + 1.1.1 org.springframework.cloud.stream.app stream-applications-composite-function-support - 3.0.5 + 3.1.1 org.springframework.cloud.stream.app stream-applications-composite-function-support - 3.0.5 + 3.1.1 org.springframework.cloud.stream.app stream-applications-security-common - 3.0.5 + 3.1.1 org.springframework.cloud.stream.app stream-applications-micrometer-common - 3.0.5 + 3.1.1 org.springframework.cloud.stream.app stream-applications-postprocessor-common - 3.0.5 + 3.1.1 org.springframework.cloud diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/log-user-clicks-per-region/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/log-user-clicks-per-region/pom.xml index c935de0..f4de9e9 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/log-user-clicks-per-region/pom.xml +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/log-user-clicks-per-region/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.11.RELEASE + 2.6.3 @@ -24,21 +24,21 @@ org.springframework.cloud spring-cloud-stream-dependencies - Horsham.SR12 + 3.2.1 pom import org.springframework.cloud spring-cloud-function-dependencies - 3.0.14.RELEASE + 3.2.1 pom import org.springframework.cloud spring-cloud-dependencies - Hoxton.SR11 + 2021.0.0 pom import @@ -55,32 +55,32 @@ org.springframework.cloud.fn spel-function - 1.0.3 + 1.1.1 org.springframework.cloud.fn payload-converter-function - 1.0.3 + 1.1.1 org.springframework.cloud.stream.app stream-applications-composite-function-support - 3.0.5 + 3.1.1 org.springframework.cloud.stream.app stream-applications-composite-function-support - 3.0.5 + 3.1.1 org.springframework.cloud.stream.app stream-applications-security-common - 3.0.5 + 3.1.1 org.springframework.cloud.stream.app stream-applications-postprocessor-common - 3.0.5 + 3.1.1 org.springframework.cloud diff --git a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/user-clicks-per-region-processor/pom.xml b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/user-clicks-per-region-processor/pom.xml index 4fb83bb..2559e65 100644 --- a/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/user-clicks-per-region-processor/pom.xml +++ b/multi-io-samples/kafka-streams/user-clicks-per-region-1.2.x/user-clicks-per-region-processor/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.11.RELEASE + 2.6.3 @@ -28,21 +28,21 @@ org.springframework.cloud spring-cloud-stream-dependencies - Horsham.SR12 + 3.2.1 pom import org.springframework.cloud spring-cloud-function-dependencies - 3.0.14.RELEASE + 3.2.1 pom import org.springframework.cloud spring-cloud-dependencies - Hoxton.SR11 + 2021.0.0 pom import @@ -61,32 +61,32 @@ org.springframework.cloud.fn spel-function - 1.0.3 + 1.1.1 org.springframework.cloud.stream.app stream-applications-composite-function-support - 3.0.5 + 3.1.1 org.springframework.cloud.stream.app stream-applications-composite-function-support - 3.0.5 + 3.1.1 org.springframework.cloud.stream.app stream-applications-security-common - 3.0.5 + 3.1.1 org.springframework.cloud.stream.app stream-applications-micrometer-common - 3.0.5 + 3.1.1 org.springframework.cloud.stream.app stream-applications-postprocessor-common - 3.0.5 + 3.1.1 org.springframework.cloud diff --git a/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 b/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 index e09bfa8..f5fd364 100644 --- a/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 +++ b/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 @@ -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; diff --git a/multi-io-samples/purchase-orders/http-purchase-orders/pom.xml b/multi-io-samples/purchase-orders/http-purchase-orders/pom.xml index 04664f8..43f3f93 100644 --- a/multi-io-samples/purchase-orders/http-purchase-orders/pom.xml +++ b/multi-io-samples/purchase-orders/http-purchase-orders/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.1.RELEASE + 2.6.3 org.springframework.cloud.dataflow.samples @@ -20,28 +20,28 @@ org.springframework.cloud.fn function-dependencies - 1.0.0-SNAPSHOT + 1.1.1 pom import org.springframework.cloud spring-cloud-stream-dependencies - Horsham.SR6 + 3.2.1 pom import org.springframework.cloud spring-cloud-function-dependencies - 3.0.8.RELEASE + 3.2.1 pom import org.springframework.cloud spring-cloud-dependencies - Hoxton.SR6 + 2021.0.0 pom import @@ -55,22 +55,22 @@ org.springframework.cloud.fn http-supplier - 1.0.0-SNAPSHOT + 1.1.1 org.springframework.cloud.stream.app stream-applications-composite-function-support - 3.0.0-SNAPSHOT + 3.1.1 org.springframework.cloud.stream.app stream-applications-security-common - 3.0.0-SNAPSHOT + 3.1.1 org.springframework.cloud.stream.app stream-applications-micrometer-common - 3.0.0-SNAPSHOT + 3.1.1 diff --git a/multi-io-samples/ticktock/multi-input-log-kafka/pom.xml b/multi-io-samples/ticktock/multi-input-log-kafka/pom.xml index 3a3b3a5..730f75a 100644 --- a/multi-io-samples/ticktock/multi-input-log-kafka/pom.xml +++ b/multi-io-samples/ticktock/multi-input-log-kafka/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.RELEASE + 2.6.3 org.springframework.cloud.stream.app @@ -40,21 +40,21 @@ org.springframework.cloud spring-cloud-stream-dependencies - Horsham.SR6 + 3.2.1 pom import org.springframework.cloud spring-cloud-function-dependencies - 3.0.8.RELEASE + 3.2.1 pom import org.springframework.cloud spring-cloud-dependencies - Hoxton.SR6 + 2021.0.0 pom import @@ -67,17 +67,17 @@ org.springframework.cloud.fn log-consumer - 1.0.0-SNAPSHOT + 1.1.1 org.springframework.cloud.stream.app stream-applications-security-common - 3.0.0-SNAPSHOT + 3.1.1 org.springframework.cloud.stream.app stream-applications-micrometer-common - 3.0.0-SNAPSHOT + 3.1.1 io.micrometer @@ -94,7 +94,7 @@ io.micrometer.prometheus prometheus-rsocket-spring - 0.9.0 + 1.3.0 io.micrometer @@ -103,7 +103,7 @@ io.pivotal.cfenv java-cfenv-boot - 2.1.2.RELEASE + 2.4.0 org.springframework.boot diff --git a/multi-io-samples/ticktock/multi-input-log-kafka/src/test/java/org/springframework/cloud/stream/app/log/sink/rabbit/LogSinkRabbitApplicationTests.java b/multi-io-samples/ticktock/multi-input-log-kafka/src/test/java/org/springframework/cloud/stream/app/log/sink/rabbit/LogSinkRabbitApplicationTests.java index 79a5ef4..05a0f12 100644 --- a/multi-io-samples/ticktock/multi-input-log-kafka/src/test/java/org/springframework/cloud/stream/app/log/sink/rabbit/LogSinkRabbitApplicationTests.java +++ b/multi-io-samples/ticktock/multi-input-log-kafka/src/test/java/org/springframework/cloud/stream/app/log/sink/rabbit/LogSinkRabbitApplicationTests.java @@ -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 { diff --git a/multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml b/multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml index 73279b7..e2d62ea 100644 --- a/multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml +++ b/multi-io-samples/ticktock/multi-input-log-rabbit/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.RELEASE + 2.6.3 org.springframework.cloud.stream.app @@ -40,21 +40,21 @@ org.springframework.cloud spring-cloud-stream-dependencies - Horsham.SR6 + 3.2.1 pom import org.springframework.cloud spring-cloud-function-dependencies - 3.0.8.RELEASE + 3.2.1 pom import org.springframework.cloud spring-cloud-dependencies - Hoxton.SR6 + 2021.0.0 pom import @@ -67,17 +67,17 @@ org.springframework.cloud.fn log-consumer - 1.0.0-SNAPSHOT + 1.1.1 org.springframework.cloud.stream.app stream-applications-security-common - 3.0.0-SNAPSHOT + 3.1.1 org.springframework.cloud.stream.app stream-applications-micrometer-common - 3.0.0-SNAPSHOT + 3.1.1 io.micrometer @@ -94,7 +94,7 @@ io.micrometer.prometheus prometheus-rsocket-spring - 0.9.0 + 1.3.0 io.micrometer @@ -103,7 +103,7 @@ io.pivotal.cfenv java-cfenv-boot - 2.1.2.RELEASE + 2.4.0 org.springframework.boot diff --git a/multi-io-samples/ticktock/multi-input-log-rabbit/src/test/java/org/springframework/cloud/stream/app/log/sink/rabbit/LogSinkRabbitApplicationTests.java b/multi-io-samples/ticktock/multi-input-log-rabbit/src/test/java/org/springframework/cloud/stream/app/log/sink/rabbit/LogSinkRabbitApplicationTests.java index 79a5ef4..05a0f12 100644 --- a/multi-io-samples/ticktock/multi-input-log-rabbit/src/test/java/org/springframework/cloud/stream/app/log/sink/rabbit/LogSinkRabbitApplicationTests.java +++ b/multi-io-samples/ticktock/multi-input-log-rabbit/src/test/java/org/springframework/cloud/stream/app/log/sink/rabbit/LogSinkRabbitApplicationTests.java @@ -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 { diff --git a/multi-io-samples/ticktock/multi-output-time-kafka/pom.xml b/multi-io-samples/ticktock/multi-output-time-kafka/pom.xml index 2dbe171..4a4fc61 100644 --- a/multi-io-samples/ticktock/multi-output-time-kafka/pom.xml +++ b/multi-io-samples/ticktock/multi-output-time-kafka/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.RELEASE + 2.6.3 org.springframework.cloud.stream.app @@ -40,21 +40,21 @@ org.springframework.cloud spring-cloud-stream-dependencies - Horsham.SR6 + 3.2.1 pom import org.springframework.cloud spring-cloud-function-dependencies - 3.0.8.RELEASE + 3.2.1 pom import org.springframework.cloud spring-cloud-dependencies - Hoxton.SR6 + 2021.0.0 pom import @@ -67,22 +67,22 @@ org.springframework.cloud.fn time-supplier - 1.0.0-SNAPSHOT + 1.1.1 org.springframework.cloud.stream.app stream-applications-composite-function-support - 3.0.0-SNAPSHOT + 3.1.1 org.springframework.cloud.stream.app stream-applications-security-common - 3.0.0-SNAPSHOT + 3.1.1 org.springframework.cloud.stream.app stream-applications-micrometer-common - 3.0.0-SNAPSHOT + 3.1.1 io.micrometer @@ -108,7 +108,7 @@ io.pivotal.cfenv java-cfenv-boot - 2.1.2.RELEASE + 2.4.0 org.springframework.boot diff --git a/multi-io-samples/ticktock/multi-output-time-kafka/src/test/java/org/springframework/cloud/stream/app/time/source/rabbit/TimeSourceRabbitApplicationTests.java b/multi-io-samples/ticktock/multi-output-time-kafka/src/test/java/org/springframework/cloud/stream/app/time/source/rabbit/TimeSourceRabbitApplicationTests.java index a931aae..da1bd71 100644 --- a/multi-io-samples/ticktock/multi-output-time-kafka/src/test/java/org/springframework/cloud/stream/app/time/source/rabbit/TimeSourceRabbitApplicationTests.java +++ b/multi-io-samples/ticktock/multi-output-time-kafka/src/test/java/org/springframework/cloud/stream/app/time/source/rabbit/TimeSourceRabbitApplicationTests.java @@ -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 { diff --git a/multi-io-samples/ticktock/multi-output-time-rabbit/pom.xml b/multi-io-samples/ticktock/multi-output-time-rabbit/pom.xml index 57f62b8..7018326 100644 --- a/multi-io-samples/ticktock/multi-output-time-rabbit/pom.xml +++ b/multi-io-samples/ticktock/multi-output-time-rabbit/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.0.RELEASE + 2.6.3 org.springframework.cloud.stream.app @@ -40,21 +40,21 @@ org.springframework.cloud spring-cloud-stream-dependencies - Horsham.SR6 + 3.2.1 pom import org.springframework.cloud spring-cloud-function-dependencies - 3.0.8.RELEASE + 3.2.1 pom import org.springframework.cloud spring-cloud-dependencies - Hoxton.SR6 + 2021.0.0 pom import @@ -67,22 +67,22 @@ org.springframework.cloud.fn time-supplier - 1.0.0-SNAPSHOT + 1.1.1 org.springframework.cloud.stream.app stream-applications-composite-function-support - 3.0.0-SNAPSHOT + 3.1.1 org.springframework.cloud.stream.app stream-applications-security-common - 3.0.0-SNAPSHOT + 3.1.1 org.springframework.cloud.stream.app stream-applications-micrometer-common - 3.0.0-SNAPSHOT + 3.1.1 io.micrometer @@ -108,7 +108,7 @@ io.pivotal.cfenv java-cfenv-boot - 2.1.2.RELEASE + 2.4.0 org.springframework.boot diff --git a/multi-io-samples/ticktock/multi-output-time-rabbit/src/test/java/org/springframework/cloud/stream/app/time/source/rabbit/TimeSourceRabbitApplicationTests.java b/multi-io-samples/ticktock/multi-output-time-rabbit/src/test/java/org/springframework/cloud/stream/app/time/source/rabbit/TimeSourceRabbitApplicationTests.java index a931aae..da1bd71 100644 --- a/multi-io-samples/ticktock/multi-output-time-rabbit/src/test/java/org/springframework/cloud/stream/app/time/source/rabbit/TimeSourceRabbitApplicationTests.java +++ b/multi-io-samples/ticktock/multi-output-time-rabbit/src/test/java/org/springframework/cloud/stream/app/time/source/rabbit/TimeSourceRabbitApplicationTests.java @@ -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 { diff --git a/scenario-task/pom.xml b/scenario-task/pom.xml index 7d3cf9d..766bb51 100644 --- a/scenario-task/pom.xml +++ b/scenario-task/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.4.0 + 2.6.3 io.spring @@ -16,7 +16,7 @@ 8 - Hoxton.SR9 + 2021.0.0 1.15.3 diff --git a/timestamp-batch/pom.xml b/timestamp-batch/pom.xml index e851959..b87e711 100644 --- a/timestamp-batch/pom.xml +++ b/timestamp-batch/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 io.spring diff --git a/timestamp-task/pom.xml b/timestamp-task/pom.xml index 35e451f..b1bfc3e 100644 --- a/timestamp-task/pom.xml +++ b/timestamp-task/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 2.6.1 + 2.6.3 io.spring