Merge branch '2.0.x' into 2.1.x
This commit is contained in:
@@ -46,7 +46,7 @@ javadoc {
|
||||
author()
|
||||
stylesheetFile = file('src/main/javadoc/spring-javadoc.css')
|
||||
links = [
|
||||
'http://docs.oracle.com/javase/8/docs/api/',
|
||||
'https://docs.oracle.com/javase/8/docs/api/',
|
||||
'https://docs.gradle.org/current/javadoc/'
|
||||
]
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
<?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>
|
||||
|
||||
Reference in New Issue
Block a user