diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml index 2730355dd29..e1b2777174a 100644 --- a/spring-boot-project/spring-boot-dependencies/pom.xml +++ b/spring-boot-project/spring-boot-dependencies/pom.xml @@ -156,11 +156,13 @@ 1.7.25 1.23 7.4.0 + 5.1.0.BUILD-SNAPSHOT 2.1.0.BUILD-SNAPSHOT 4.1.0.M3 2.0.2.RELEASE Lovelace-RC2 + ${spring.version} 0.25.0.RELEASE 5.1.0.M2 2.2.0.BUILD-SNAPSHOT @@ -2538,12 +2540,12 @@ org.springframework spring-core - ${spring.version} + ${spring-framework.version} org.springframework spring-framework-bom - ${spring.version} + ${spring-framework.version} import pom diff --git a/spring-boot-project/spring-boot-docs/pom.xml b/spring-boot-project/spring-boot-docs/pom.xml index 99bb77f782e..87f37123be4 100644 --- a/spring-boot-project/spring-boot-docs/pom.xml +++ b/spring-boot-project/spring-boot-docs/pom.xml @@ -939,7 +939,7 @@ https://docs.oracle.com/javase/8/docs/api https://docs.oracle.com/javaee/7/api - https://docs.spring.io/spring-framework/docs/${spring.version}/javadoc-api + https://docs.spring.io/spring-framework/docs/${spring-framework.version}/javadoc-api https://docs.spring.io/spring-security/site/docs/${spring-security.version}/api https://tomcat.apache.org/tomcat-8.5-doc/api https://www.eclipse.org/jetty/javadoc/${jetty.version} @@ -1149,11 +1149,11 @@ true ${jooq.version} - ${spring.version} + ${spring-framework.version} ${revision} ${revision} ${spring-boot-repo} - ${spring.version} + ${spring-framework.version} ${spring-security.version} ${spring-ws.version} ${github-tag} @@ -1435,7 +1435,7 @@ org.springframework spring-core - ${spring.version} + ${spring-framework.version} diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc index 90ce98f1469..ff6b50b31b4 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc @@ -39,7 +39,7 @@ configuration). [[getting-started-system-requirements]] == System Requirements Spring Boot {spring-boot-version} requires https://www.java.com[Java 8 or 9] and -{spring-reference}[Spring Framework {spring-version}] or above. +{spring-reference}[Spring Framework {spring-framework-version}] or above. Explicit build support is provided for the following build tools: