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

Merge branch '4.x' into main

Browse Source
This commit is contained in:
Oleg Zhurakousky
2022-01-17 15:13:34 +01:00
parent ff9cb57741 5074b7eee4
commit a1a3c236d0
116 changed files with 521 additions and 5557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-function-parent</artifactId>
<version>3.2.2-SNAPSHOT</version>
<version>4.0.0-SNAPSHOT</version>
</parent>
<properties>
@@ -46,6 +46,19 @@
<groupId>com.fasterxml.jackson.module</groupId>
<artifactId>jackson-module-kotlin</artifactId>
<optional>true</optional>
<<<<<<< HEAD
=======
</dependency>
<dependency>
<groupId>javax.annotation</groupId>
<artifactId>javax.annotation-api</artifactId>
<version>1.3.2</version>
</dependency>
<dependency>
<groupId>javax.activation</groupId>
<artifactId>javax.activation-api</artifactId>
<version>1.2.0</version>
>>>>>>> 4.x
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>