Merge branch '2.0.x' into 2.1.x

This commit is contained in:
Andy Wilkinson
2019-03-19 17:04:41 +00:00
224 changed files with 236 additions and 252 deletions

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
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>
<parent>
<groupId>org.springframework.boot</groupId>
@@ -30,7 +30,7 @@
<dependency-management-plugin.version>1.0.6.RELEASE</dependency-management-plugin.version>
</properties>
<scm>
<url>http://github.com/spring-projects/spring-boot</url>
<url>https://github.com/spring-projects/spring-boot</url>
<connection>scm:git:git://github.com/spring-projects/spring-boot.git</connection>
<developerConnection>scm:git:ssh://git@github.com/spring-projects/spring-boot.git</developerConnection>
</scm>