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

Polishing after merge 4.x

Browse Source
This commit is contained in:
Oleg Zhurakousky
2022-01-17 15:50:18 +01:00
parent a1a3c236d0
commit f054d4534c
4 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-cloud-function-context/pom.xml
View File

@@ -46,8 +46,6 @@
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-kotlin</artifactId>
<optional>true</optional>
<<<<<<< HEAD
=======
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
@@ -58,7 +56,6 @@
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<version>1.2.0</version>
>>>>>>> 4.x
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>

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

@@ -24,11 +24,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<wrapper.version>1.0.27.RELEASE</wrapper.version>
<aws-lambda-events.version>3.9.0</aws-lambda-events.version>
<<<<<<< HEAD
<spring-cloud-function.version>3.2.2-SNAPSHOT</spring-cloud-function.version>
=======
<spring-cloud-function.version>4.0.0-SNAPSHOT</spring-cloud-function.version>
>>>>>>> 4.x
</properties>
<dependencies>

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

@@ -32,19 +32,12 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<<<<<<< HEAD
=======
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<scope>provided</scope>
>>>>>>> 4.x
</dependency>
<!-- <dependency> -->
<!-- <groupId>org.springframework</groupId> -->
<!-- <artifactId>spring-web</artifactId> -->
<!-- </dependency> -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>

4
spring-cloud-function-web/src/test/java/org/springframework/cloud/function/web/function/FunctionEndpointInitializerTests.java
View File

@@ -32,6 +32,7 @@ import org.springframework.cloud.function.context.FunctionalSpringApplication;
import org.springframework.cloud.function.context.catalog.FunctionTypeUtils;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.core.ResolvableType;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.util.SocketUtils;
@@ -137,9 +138,10 @@ public class FunctionEndpointInitializerTests {
@Override
public void initialize(GenericApplicationContext applicationContext) {
applicationContext.registerBean("consume", FunctionRegistration.class,
() -> new FunctionRegistration<>(consume())
.type(FunctionType.consumer(String.class)));
.type(ResolvableType.forClassWithGenerics(Consumer.class, String.class).getType()));
}
}