diff --git a/applications/source/cdc-debezium-source/src/test/java/org/springframework/cloud/stream/app/source/cdc/CdcFlatteningIntegrationTest.java b/applications/source/cdc-debezium-source/src/test/java/org/springframework/cloud/stream/app/source/cdc/CdcFlatteningIntegrationTest.java index 7281bdc4..5f471caa 100644 --- a/applications/source/cdc-debezium-source/src/test/java/org/springframework/cloud/stream/app/source/cdc/CdcFlatteningIntegrationTest.java +++ b/applications/source/cdc-debezium-source/src/test/java/org/springframework/cloud/stream/app/source/cdc/CdcFlatteningIntegrationTest.java @@ -51,7 +51,7 @@ public class CdcFlatteningIntegrationTest extends CdcMySqlTestSupport { .withUserConfiguration( TestChannelBinderConfiguration.getCompleteConfiguration(TestCdcSourceApplication.class)) .withPropertyValues( - "spring.cloud.stream.function.definition=cdcSupplier", + "spring.cloud.function.definition=cdcSupplier", "cdc.name=my-sql-connector", "cdc.schema=false", "cdc.stream.header.offset=false", diff --git a/applications/source/cdc-debezium-source/src/test/java/org/springframework/cloud/stream/app/source/cdc/CdcSourceDatabasesIntegrationTest.java b/applications/source/cdc-debezium-source/src/test/java/org/springframework/cloud/stream/app/source/cdc/CdcSourceDatabasesIntegrationTest.java index 471c67b5..d9b17ccd 100644 --- a/applications/source/cdc-debezium-source/src/test/java/org/springframework/cloud/stream/app/source/cdc/CdcSourceDatabasesIntegrationTest.java +++ b/applications/source/cdc-debezium-source/src/test/java/org/springframework/cloud/stream/app/source/cdc/CdcSourceDatabasesIntegrationTest.java @@ -62,7 +62,7 @@ public class CdcSourceDatabasesIntegrationTest { private final SpringApplicationBuilder applicationBuilder = new SpringApplicationBuilder( TestChannelBinderConfiguration.getCompleteConfiguration(TestCdcSourceApplication.class)) .web(WebApplicationType.NONE) - .properties("spring.cloud.stream.function.definition=cdcSupplier", + .properties("spring.cloud.function.definition=cdcSupplier", "cdc.name=my-connector", "cdc.flattening.dropTombstones=false", "cdc.schema=false", diff --git a/applications/source/cdc-debezium-source/src/test/java/org/springframework/cloud/stream/app/source/cdc/CdcTestUtils.java b/applications/source/cdc-debezium-source/src/test/java/org/springframework/cloud/stream/app/source/cdc/CdcTestUtils.java index 65b9bdf9..0dd22cb9 100644 --- a/applications/source/cdc-debezium-source/src/test/java/org/springframework/cloud/stream/app/source/cdc/CdcTestUtils.java +++ b/applications/source/cdc-debezium-source/src/test/java/org/springframework/cloud/stream/app/source/cdc/CdcTestUtils.java @@ -35,7 +35,7 @@ import org.springframework.util.StreamUtils; public final class CdcTestUtils { /** - * derived from the spring.cloud.stream.function.definition value + * derived from the spring.cloud.function.definition value */ public static final String CDC_SUPPLIER_OUT_0 = "cdcSupplier-out-0"; diff --git a/applications/stream-applications-core/stream-applications-composite-function-support/src/main/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingEnvironmentPostProcessor.java b/applications/stream-applications-core/stream-applications-composite-function-support/src/main/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingEnvironmentPostProcessor.java index a37fcf5b..31d9b571 100644 --- a/applications/stream-applications-core/stream-applications-composite-function-support/src/main/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingEnvironmentPostProcessor.java +++ b/applications/stream-applications-core/stream-applications-composite-function-support/src/main/java/org/springframework/cloud/stream/app/composite/function/common/FunctionBindingEnvironmentPostProcessor.java @@ -105,7 +105,7 @@ public class FunctionBindingEnvironmentPostProcessor implements EnvironmentPostP environment.getProperty(SPRING_CLOUD_FUNCTION_DEFINITION)); } if (environment.containsProperty(SPRING_CLOUD_STREAM_FUNCTION_DEFINITION)) { - log.warn("The property '" + SPRING_CLOUD_STREAM_FUNCTION_DEFINITION + "' is deprecated. Please use '" + log.error("The property '" + SPRING_CLOUD_STREAM_FUNCTION_DEFINITION + "' is deprecated. Please use '" + SPRING_CLOUD_FUNCTION_DEFINITION + "'"); functionDefinition = sanitizeActualFunctionDefinition( environment.getProperty(SPRING_CLOUD_STREAM_FUNCTION_DEFINITION)); diff --git a/docs/FunctionComposition.adoc b/docs/FunctionComposition.adoc index 978696af..2d832a5b 100644 --- a/docs/FunctionComposition.adoc +++ b/docs/FunctionComposition.adoc @@ -26,7 +26,7 @@ finally publish a task launch request every second to the rabbit exchange with t ---- java -jar target/time-source-rabbit-3.0.0-SNAPSHOT.jar \ --spring.cloud.stream.bindings.output.destination=time-test \ - --spring.cloud.stream.function.definition="timeSupplier|spelFunction|headerEnricherFunction|taskLaunchRequestFunction" \ + --spring.cloud.function.definition="timeSupplier|spelFunction|headerEnricherFunction|taskLaunchRequestFunction" \ --spel.function.expression="payload.length()" \ --header.enricher.headers=task-id=payload*2 \ --task.launch.request.task-name-expression="'task-'+headers['task-id']" diff --git a/stream-applications-build/pom.xml b/stream-applications-build/pom.xml index 74a00a86..d51b4207 100644 --- a/stream-applications-build/pom.xml +++ b/stream-applications-build/pom.xml @@ -42,10 +42,9 @@ 6.0.4 2022.0.2 - 4.0.1 - 4.0.1 - 4.0.1 - 4.0.1 + 4.0.2 + 4.0.2 + 4.0.2 1.17.6 5.13.2 diff --git a/version/RELEASE_VERSION b/version/RELEASE_VERSION index e0eb5f4f..94ae9ee1 100644 --- a/version/RELEASE_VERSION +++ b/version/RELEASE_VERSION @@ -1 +1 @@ -4.0.0-M1 +4.0.0-SNAPSHOT