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

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

@@ -6,7 +6,7 @@
<groupId>io.spring.sample</groupId>
<artifactId>function-sample</artifactId>
<version>2.0.0.RELEASE</version>
<version>4.0.0.RELEASE</version>
<packaging>jar</packaging>
<name>function-sample</name>
<description>Spring Cloud Function Web Support</description>
@@ -14,13 +14,21 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<<<<<<< HEAD
<version>2.6.1</version>
=======
<version>3.0.0-SNAPSHOT</version>
>>>>>>> 4.x
<relativePath/>
</parent>
<properties>
<<<<<<< HEAD
<java.version>1.8</java.version>
<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
<wrapper.version>1.0.27.RELEASE</wrapper.version>
</properties>