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

Fix reactor dependencies

Browse Source
This commit is contained in:
Dave Syer
2018-01-03 15:59:20 +00:00
parent 1c0b603986
commit 9c1a9bff4e
12 changed files with 20 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spring-cloud-function-samples/function-sample-aws/pom.xml
View File

@@ -24,7 +24,7 @@
<java.version>1.8</java.version>
<wrapper.version>1.0.9.RELEASE</wrapper.version>
<aws-lambda-events.version>1.2.1</aws-lambda-events.version>
<reactor.version>3.0.7.RELEASE</reactor.version>
<reactor.version>3.1.2.RELEASE</reactor.version>
<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
<spring-cloud-stream-servlet.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-stream-servlet.version>
<start-class>example.Config</start-class>
@@ -37,12 +37,7 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-stream</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-servlet</artifactId>
<artifactId>spring-cloud-function-web</artifactId>
<scope>provided</scope>
</dependency>
<dependency>

13
spring-cloud-function-samples/function-sample-compiler/pom.xml
View File

@@ -21,18 +21,14 @@
<java.version>1.8</java.version>
<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
<spring-cloud-stream.version>Ditmars.RELEASE</spring-cloud-stream.version>
<reactor.version>3.1.1.RELEASE</reactor.version>
<reactor.version>3.1.2.RELEASE</reactor.version>
<wrapper.version>1.0.9.RELEASE</wrapper.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-stream</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-servlet</artifactId>
<artifactId>spring-cloud-function-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
@@ -61,11 +57,6 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-servlet</artifactId>
<version>${spring-cloud-stream-servlet.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

2
spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledConsumerTests.java
View File

@@ -44,7 +44,7 @@ public class SampleCompiledConsumerTests {
@Test
public void print() {
assertThat(new TestRestTemplate().postForObject(
"http://localhost:" + port + "/stream/test", "it works", String.class))
"http://localhost:" + port + "/test", "it works", String.class))
.isEqualTo("it works");
assertEquals("it works", Reference.instance);
}

2
spring-cloud-function-samples/function-sample-compiler/src/test/java/com/example/SampleCompiledFunctionTests.java
View File

@@ -43,7 +43,7 @@ public class SampleCompiledFunctionTests {
@Test
public void lowercase() {
assertThat(new TestRestTemplate().postForObject(
"http://localhost:" + port + "/stream/test", "it works", String.class))
"http://localhost:" + port + "/test", "it works", String.class))
.isEqualTo("it works!!!");
}

9
spring-cloud-function-samples/function-sample-pof/pom.xml
View File

@@ -20,7 +20,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
<reactor.version>3.1.1.RELEASE</reactor.version>
<reactor.version>3.1.2.RELEASE</reactor.version>
<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
<spring-cloud-stream-servlet.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-stream-servlet.version>
</properties>
@@ -28,12 +28,7 @@
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-stream</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-servlet</artifactId>
<version>${spring-cloud-stream-servlet.version}</version>
<artifactId>spring-cloud-function-web</artifactId>
</dependency>
</dependencies>

8
spring-cloud-function-samples/function-sample-pojo/pom.xml
View File

@@ -21,17 +21,13 @@
<java.version>1.8</java.version>
<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
<wrapper.version>1.0.9.RELEASE</wrapper.version>
<reactor.version>3.1.1.RELEASE</reactor.version>
<reactor.version>3.1.2.RELEASE</reactor.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-stream</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-servlet</artifactId>
<artifactId>spring-cloud-function-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>

2
spring-cloud-function-samples/function-sample-pojo/src/main/resources/META-INF/thin-stream.properties
View File

@@ -1,3 +1,3 @@
boms.spring-cloud-dependencies: org.springframework.cloud:spring-cloud-dependencies:Dalston.SR3
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

6
spring-cloud-function-samples/function-sample-pojo/src/test/java/com/example/SampleApplicationTests.java
View File

@@ -40,7 +40,7 @@ public class SampleApplicationTests {
@Test
public void words() {
assertThat(new TestRestTemplate()
.getForObject("http://localhost:" + port + "/stream/words", String.class))
.getForObject("http://localhost:" + port + "/words", String.class))
.isEqualTo("[{\"value\":\"foo\"},{\"value\":\"bar\"}]");
}
@@ -48,14 +48,14 @@ public class SampleApplicationTests {
public void uppercase() {
// TODO: make this work with a JSON stream as well (like in WebFlux)
assertThat(new TestRestTemplate().postForObject(
"http://localhost:" + port + "/stream/uppercase", "[{\"value\":\"foo\"}]",
"http://localhost:" + port + "/uppercase", "[{\"value\":\"foo\"}]",
String.class)).isEqualTo("[{\"value\":\"FOO\"}]");
}
@Test
public void lowercase() {
assertThat(new TestRestTemplate().postForObject(
"http://localhost:" + port + "/stream/lowercase", "[{\"value\":\"Foo\"}]",
"http://localhost:" + port + "/lowercase", "[{\"value\":\"Foo\"}]",
String.class)).isEqualTo("[{\"value\":\"foo\"}]");
}

8
spring-cloud-function-samples/function-sample-task/pom.xml
View File

@@ -21,7 +21,7 @@
<java.version>1.8</java.version>
<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
<wrapper.version>1.0.9.RELEASE</wrapper.version>
<reactor.version>3.1.1.RELEASE</reactor.version>
<reactor.version>3.1.2.RELEASE</reactor.version>
</properties>
<dependencies>
@@ -31,11 +31,7 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-servlet</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-stream</artifactId>
<artifactId>spring-cloud-function-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>

8
spring-cloud-function-samples/function-sample/pom.xml
View File

@@ -20,18 +20,14 @@
<properties>
<java.version>1.8</java.version>
<spring-cloud-function.version>1.0.0.BUILD-SNAPSHOT</spring-cloud-function.version>
<reactor.version>3.1.1.RELEASE</reactor.version>
<reactor.version>3.1.2.RELEASE</reactor.version>
<wrapper.version>1.0.9.RELEASE</wrapper.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-stream</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-stream-binder-servlet</artifactId>
<artifactId>spring-cloud-function-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>

8
spring-cloud-function-samples/function-sample/src/main/resources/META-INF/thin-rabbit.properties
View File

@@ -1,9 +1,3 @@
<<<<<<< HEAD:spring-cloud-function-samples/function-sample/src/main/resources/META-INF/thin-stream.properties
boms.spring-cloud-dependencies: org.springframework.cloud:spring-cloud-dependencies:Edgware.RELEASE
dependencies.spring-cloud-function-stream: org.springframework.cloud:spring-cloud-function-stream:1.0.0.BUILD-SNAPSHOT
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
=======
boms.spring-cloud-dependencies: org.springframework.cloud:spring-cloud-dependencies:Dalston.RELEASE
exclusions.spring-cloud-function-stream-binder-servlet: org.springframework.cloud:spring-cloud-stream-binder-servlet
dependencies.spring-cloud-stream-rabbit: org.springframework.cloud:spring-cloud-stream-binder-rabbit
>>>>>>> Migrate to servlet binder for web features:spring-cloud-function-samples/function-sample/src/main/resources/META-INF/thin-rabbit.properties