Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add spring-framework.version alias for spring.version

Browse Source 
Closes gh-12544
This commit is contained in:
Stephane Nicoll
2018-09-06 15:31:28 +02:00
parent a170bfcc76
commit f3ece97d9d
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-dependencies/pom.xml
View File

@@ -156,11 +156,13 @@
<slf4j.version>1.7.25</slf4j.version>
<snakeyaml.version>1.23</snakeyaml.version>
<solr.version>7.4.0</solr.version>
<!-- deprecated in favour of "spring-framework.version" -->
<spring.version>5.1.0.BUILD-SNAPSHOT</spring.version>
<spring-amqp.version>2.1.0.BUILD-SNAPSHOT</spring-amqp.version>
<spring-batch.version>4.1.0.M3</spring-batch.version>
<spring-cloud-connectors.version>2.0.2.RELEASE</spring-cloud-connectors.version>
<spring-data-releasetrain.version>Lovelace-RC2</spring-data-releasetrain.version>
<spring-framework.version>${spring.version}</spring-framework.version>
<spring-hateoas.version>0.25.0.RELEASE</spring-hateoas.version>
<spring-integration.version>5.1.0.M2</spring-integration.version>
<spring-kafka.version>2.2.0.BUILD-SNAPSHOT</spring-kafka.version>
@@ -2538,12 +2540,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
<version>${spring-framework.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>${spring.version}</version>
<version>${spring-framework.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>

8
spring-boot-project/spring-boot-docs/pom.xml
View File

@@ -939,7 +939,7 @@
<links>
<link>https://docs.oracle.com/javase/8/docs/api</link>
<link>https://docs.oracle.com/javaee/7/api</link>
<link>https://docs.spring.io/spring-framework/docs/${spring.version}/javadoc-api</link>
<link>https://docs.spring.io/spring-framework/docs/${spring-framework.version}/javadoc-api</link>
<link>https://docs.spring.io/spring-security/site/docs/${spring-security.version}/api</link>
<link>https://tomcat.apache.org/tomcat-8.5-doc/api</link>
<link>https://www.eclipse.org/jetty/javadoc/${jetty.version}</link>
@@ -1149,11 +1149,11 @@
<attributes>
<docinfo>true</docinfo>
<jooq-version>${jooq.version}</jooq-version>
<spring-version>${spring.version}</spring-version>
<spring-framework-version>${spring-framework.version}</spring-framework-version>
<spring-boot-version>${revision}</spring-boot-version>
<spring-boot-docs-version>${revision}</spring-boot-docs-version>
<spring-boot-repo>${spring-boot-repo}</spring-boot-repo>
<spring-docs-version>${spring.version}</spring-docs-version>
<spring-docs-version>${spring-framework.version}</spring-docs-version>
<spring-security-docs-version>${spring-security.version}</spring-security-docs-version>
<spring-webservices-docs-version>${spring-ws.version}</spring-webservices-docs-version>
<github-tag>${github-tag}</github-tag>
@@ -1435,7 +1435,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
<version>${spring.version}</version>
<version>${spring-framework.version}</version>
</dependency>
</dependencies>
</plugin>

2
spring-boot-project/spring-boot-docs/src/main/asciidoc/getting-started.adoc
View File

@@ -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: