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

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>