From 04f917c11338ebe2839da953a7cdd28355609b95 Mon Sep 17 00:00:00 2001 From: Dave Syer Date: Tue, 24 Apr 2018 14:10:37 +0100 Subject: [PATCH] Make it explicit that stream does not depend on a web server --- .../function-sample-pojo/pom.xml | 2 +- .../src/main/resources/META-INF/thin-stream.properties | 2 ++ .../src/main/resources/application.properties | 2 +- .../src/main/resources/META-INF/thin-rabbit.properties | 1 + .../src/main/resources/application.properties | 2 +- spring-cloud-function-stream/pom.xml | 10 ++++++++++ .../cloud/function/stream/web/SingletonTests.java | 3 +-- 7 files changed, 17 insertions(+), 5 deletions(-) diff --git a/spring-cloud-function-samples/function-sample-pojo/pom.xml b/spring-cloud-function-samples/function-sample-pojo/pom.xml index f4ba588db..0822bf879 100644 --- a/spring-cloud-function-samples/function-sample-pojo/pom.xml +++ b/spring-cloud-function-samples/function-sample-pojo/pom.xml @@ -20,7 +20,7 @@ 1.8 1.0.0.BUILD-SNAPSHOT - 1.0.10.RELEASE + 1.0.11.BUILD-SNAPSHOT 3.1.2.RELEASE 2.19.1 diff --git a/spring-cloud-function-samples/function-sample-pojo/src/main/resources/META-INF/thin-stream.properties b/spring-cloud-function-samples/function-sample-pojo/src/main/resources/META-INF/thin-stream.properties index 78f98ce95..958a4c512 100644 --- a/spring-cloud-function-samples/function-sample-pojo/src/main/resources/META-INF/thin-stream.properties +++ b/spring-cloud-function-samples/function-sample-pojo/src/main/resources/META-INF/thin-stream.properties @@ -1,3 +1,5 @@ boms.spring-cloud-dependencies: org.springframework.cloud:spring-cloud-dependencies:Finchley.M8 +exclusions.spring-cloud-function-web: org.springframework.cloud:spring-cloud-starter-function-web +exclusions.rabbit-http-client: com.rabbitmq:http-client dependencies.spring-cloud-function-stream: org.springframework.cloud:spring-cloud-function-stream dependencies.spring-cloud-stream-rabbit: org.springframework.cloud:spring-cloud-starter-stream-rabbit \ No newline at end of file diff --git a/spring-cloud-function-samples/function-sample-pojo/src/main/resources/application.properties b/spring-cloud-function-samples/function-sample-pojo/src/main/resources/application.properties index 1751e8a8a..4b88c4acf 100644 --- a/spring-cloud-function-samples/function-sample-pojo/src/main/resources/application.properties +++ b/spring-cloud-function-samples/function-sample-pojo/src/main/resources/application.properties @@ -1,4 +1,4 @@ spring.cloud.stream.bindings.input.destination: foos spring.cloud.stream.bindings.output.destination: bars -spring.cloud.function.stream.default-route: uppercase +spring.cloud.function.stream.processor.name: uppercase management.security.enabled: false \ No newline at end of file diff --git a/spring-cloud-function-samples/function-sample/src/main/resources/META-INF/thin-rabbit.properties b/spring-cloud-function-samples/function-sample/src/main/resources/META-INF/thin-rabbit.properties index a906ce5cc..3cfb4be15 100644 --- a/spring-cloud-function-samples/function-sample/src/main/resources/META-INF/thin-rabbit.properties +++ b/spring-cloud-function-samples/function-sample/src/main/resources/META-INF/thin-rabbit.properties @@ -1,3 +1,4 @@ boms.spring-cloud-dependencies: org.springframework.cloud:spring-cloud-dependencies:Edgware.RELEASE dependencies.spring-cloud-function-stream: org.springframework.cloud:spring-cloud-function-stream dependencies.spring-cloud-stream-rabbit: org.springframework.cloud:spring-cloud-starter-stream-rabbit +exclusions.spring-cloud-function-web: org.springframework.cloud:spring-cloud-starter-function-web diff --git a/spring-cloud-function-samples/function-sample/src/main/resources/application.properties b/spring-cloud-function-samples/function-sample/src/main/resources/application.properties index 9093ab614..e4b566fd5 100644 --- a/spring-cloud-function-samples/function-sample/src/main/resources/application.properties +++ b/spring-cloud-function-samples/function-sample/src/main/resources/application.properties @@ -1,2 +1,2 @@ -spring.cloud.function.stream.default-route: uppercase +spring.cloud.function.stream.processor.name: uppercase spring.cloud.function.scan.packages: com.example.functions \ No newline at end of file diff --git a/spring-cloud-function-stream/pom.xml b/spring-cloud-function-stream/pom.xml index 79240c467..f082aa206 100644 --- a/spring-cloud-function-stream/pom.xml +++ b/spring-cloud-function-stream/pom.xml @@ -26,6 +26,16 @@ org.springframework.cloud spring-cloud-stream + + + org.springframework.boot + spring-boot-starter-actuator + + + org.springframework.boot + spring-boot-starter-web + + org.springframework.cloud diff --git a/spring-cloud-function-stream/src/test/java/org/springframework/cloud/function/stream/web/SingletonTests.java b/spring-cloud-function-stream/src/test/java/org/springframework/cloud/function/stream/web/SingletonTests.java index 1eef4198e..40a2b37ae 100644 --- a/spring-cloud-function-stream/src/test/java/org/springframework/cloud/function/stream/web/SingletonTests.java +++ b/spring-cloud-function-stream/src/test/java/org/springframework/cloud/function/stream/web/SingletonTests.java @@ -50,8 +50,7 @@ import reactor.core.publisher.Flux; * */ @RunWith(SpringRunner.class) -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = { "debug=true", - "spring.autoconfigure.exclude=org.springframework.cloud.stream.test.binder.TestSupportBinderAutoConfiguration"}) +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, properties = "spring.autoconfigure.exclude=org.springframework.cloud.stream.test.binder.TestSupportBinderAutoConfiguration") @ContextConfiguration(classes = TestApplicationConfiguration.class) public class SingletonTests {