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

GH-1034 Finish merging work to support web workloads in serverless environments

Browse Source 
Resolves #1034
This commit is contained in:
Oleg Zhurakousky
2023-05-09 12:10:47 +02:00
parent e7e808916b
commit 74aaadea98
31 changed files with 187 additions and 742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spring-cloud-function-adapters/spring-cloud-function-adapter-aws/pom.xml
View File

@@ -85,36 +85,18 @@
<scope>provided</scope>
</dependency>
<!-- <dependency>-->
<!-- <groupId>org.springframework</groupId>-->
<!-- <artifactId>spring-web</artifactId>-->
<!-- </dependency>-->
<dependency>
<<<<<<< HEAD
=======
<!-- Spring Boot autoconfiguration needs this to be able to create a Jackson
ObjectMapper -->
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
<!-- <optional>true</optional>-->
<!-- <scope>test</scope> -->
</dependency>
<dependency>
>>>>>>> 24687a3ab (working on AWS)
<groupId>org.springframework</groupId>
<artifactId>spring-webmvc</artifactId>
<!-- <optional>true</optional>-->
</dependency>
<dependency>
<<<<<<< HEAD
=======
<groupId>javax.servlet</groupId>
<artifactId>javax.servlet-api</artifactId>
<!-- <version>3.1.0</version>-->
<!-- <scope>provided</scope>-->
</dependency>
<dependency>
>>>>>>> 24687a3ab (working on AWS)
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-web</artifactId>
<optional>true</optional>
<!-- <scope>test</scope> -->
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>