Skip to content

Commit fdbec3a

Browse files
author
gaurav bhatnagar
committed
Dropping deprecated spring.version and using spring.freamwork.version as ref
1 parent a6fdfac commit fdbec3a

File tree

35 files changed

+36
-38
lines changed

35 files changed

+36
-38
lines changed

‎spring-boot-project/spring-boot-dependencies/pom.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,11 @@
178178
<slf4j.version>1.7.26</slf4j.version>
179179
<snakeyaml.version>1.24</snakeyaml.version>
180180
<solr.version>8.0.0</solr.version>
181-
<!-- deprecated in favor of "spring-framework.version" -->
182-
<spring.version>5.2.0.BUILD-SNAPSHOT</spring.version>
183181
<spring-amqp.version>2.2.0.M2</spring-amqp.version>
184182
<spring-batch.version>4.2.0.M2</spring-batch.version>
185183
<spring-cloud-connectors.version>2.0.5.RELEASE</spring-cloud-connectors.version>
186184
<spring-data-releasetrain.version>Moore-BUILD-SNAPSHOT</spring-data-releasetrain.version>
187-
<spring-framework.version>${spring.version}</spring-framework.version>
185+
<spring-framework.version>5.2.0.BUILD-SNAPSHOT</spring-framework.version>
188186
<spring-hateoas.version>1.0.0.BUILD-SNAPSHOT</spring-hateoas.version>
189187
<spring-integration.version>5.2.0.M2</spring-integration.version>
190188
<spring-kafka.version>2.3.0.M2</spring-kafka.version>

‎spring-boot-project/spring-boot-docs/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1444,8 +1444,8 @@
14441444
<spring-security-docs-version>${spring-security.version}</spring-security-docs-version>
14451445
<spring-webservices-docs-version>${spring-ws.version}</spring-webservices-docs-version>
14461446
<github-tag>${github-tag}</github-tag>
1447-
<spring-version>${spring.version}</spring-version>
1448-
<spring-docs-version>${spring.version}</spring-docs-version>
1447+
<spring-version>${spring-framework.version}</spring-version>
1448+
<spring-docs-version>${spring-framework.version}</spring-docs-version>
14491449
<spring-boot-version>${revision}</spring-boot-version>
14501450
<sources-root>${project.basedir}/src/</sources-root>
14511451
<generated-resources-root>${project.basedir}/target/generated-resources</generated-resources-root>

‎spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-dir/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<dependency>
9292
<groupId>org.springframework</groupId>
9393
<artifactId>spring-webmvc</artifactId>
94-
<version>@spring.version@</version>
94+
<version>@spring-framework.version@</version>
9595
</dependency>
9696
</dependencies>
9797
</project>

‎spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-jar/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
<dependency>
106106
<groupId>org.springframework</groupId>
107107
<artifactId>spring-webmvc</artifactId>
108-
<version>@spring.version@</version>
108+
<version>@spring-framework.version@</version>
109109
</dependency>
110110
</dependencies>
111111
</project>

‎spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-props-lib/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
<dependency>
109109
<groupId>org.springframework</groupId>
110110
<artifactId>spring-context</artifactId>
111-
<version>@spring.version@</version>
111+
<version>@spring-framework.version@</version>
112112
</dependency>
113113
</dependencies>
114114
</project>

‎spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-props/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
<dependency>
9696
<groupId>org.springframework</groupId>
9797
<artifactId>spring-context</artifactId>
98-
<version>@spring.version@</version>
98+
<version>@spring-framework.version@</version>
9999
</dependency>
100100
</dependencies>
101101
</project>

‎spring-boot-project/spring-boot-tools/spring-boot-loader/src/it/executable-war/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
<dependency>
8585
<groupId>org.springframework</groupId>
8686
<artifactId>spring-webmvc</artifactId>
87-
<version>@spring.version@</version>
87+
<version>@spring-framework.version@</version>
8888
</dependency>
8989
</dependencies>
9090
</project>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/build-info-additional-properties/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<dependency>
3939
<groupId>org.springframework</groupId>
4040
<artifactId>spring-context</artifactId>
41-
<version>@spring.version@</version>
41+
<version>@spring-framework.version@</version>
4242
</dependency>
4343
<dependency>
4444
<groupId>jakarta.servlet</groupId>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/build-info-custom-file/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<dependency>
3535
<groupId>org.springframework</groupId>
3636
<artifactId>spring-context</artifactId>
37-
<version>@spring.version@</version>
37+
<version>@spring-framework.version@</version>
3838
</dependency>
3939
<dependency>
4040
<groupId>jakarta.servlet</groupId>

‎spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/it/build-info/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
<dependency>
3232
<groupId>org.springframework</groupId>
3333
<artifactId>spring-context</artifactId>
34-
<version>@spring.version@</version>
34+
<version>@spring-framework.version@</version>
3535
</dependency>
3636
<dependency>
3737
<groupId>jakarta.servlet</groupId>

0 commit comments

Comments
 (0)