@@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
xmlns="http://maven.apache.org/POM/4.0.0"
|
||||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>io.spring.sample</groupId>
|
||||
@@ -14,29 +14,20 @@
|
||||
<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/>
|
||||
<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>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
||||
</dependency>
|
||||
<groupId>org.springframework.boot</groupId>
|
||||
<artifactId>spring-boot-starter-actuator</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.springframework.cloud</groupId>
|
||||
<artifactId>spring-cloud-starter-function-webflux</artifactId>
|
||||
|
||||
Reference in New Issue
Block a user