Skip to content

Commit 2b5586c

Browse files
committed
Use special "bill of materials" (BOM) dependency to ensure the same version of all Spring's artifacts.
@see http://docs.spring.io/spring/docs/4.0.x/spring-framework-reference/html/overview.html#overview-maven-bom No functional changes.
1 parent 5d55129 commit 2b5586c

File tree

1 file changed

+13
-19
lines changed

1 file changed

+13
-19
lines changed

pom.xml

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,19 @@
7878
<skipTests>false</skipTests>
7979
</properties>
8080

81+
<dependencyManagement>
82+
<dependencies>
83+
<!-- http://docs.spring.io/spring/docs/4.0.x/spring-framework-reference/html/overview.html#overview-maven-bom -->
84+
<dependency>
85+
<groupId>org.springframework</groupId>
86+
<artifactId>spring-framework-bom</artifactId>
87+
<version>${spring.version}</version>
88+
<type>pom</type>
89+
<scope>import</scope>
90+
</dependency>
91+
</dependencies>
92+
</dependencyManagement>
93+
8194
<dependencies>
8295

8396
<dependency>
@@ -116,7 +129,6 @@
116129
<dependency>
117130
<groupId>org.springframework</groupId>
118131
<artifactId>spring-webmvc</artifactId>
119-
<version>${spring.version}</version>
120132
<exclusions>
121133
<exclusion>
122134
<!-- Because we use jcl-over-slf4j instead -->
@@ -129,20 +141,17 @@
129141
<dependency>
130142
<groupId>org.springframework</groupId>
131143
<artifactId>spring-orm</artifactId>
132-
<version>${spring.version}</version>
133144
</dependency>
134145

135146
<dependency>
136147
<groupId>org.springframework</groupId>
137148
<artifactId>spring-tx</artifactId>
138-
<version>${spring.version}</version>
139149
</dependency>
140150

141151
<!-- For mail classes -->
142152
<dependency>
143153
<groupId>org.springframework</groupId>
144154
<artifactId>spring-context-support</artifactId>
145-
<version>${spring.version}</version>
146155
</dependency>
147156

148157
<dependency>
@@ -157,19 +166,6 @@
157166
<version>${spring.security.version}</version>
158167
</dependency>
159168

160-
<!--
161-
spring-security-web 3.1.0 depends from spring-aop 3.0.6,
162-
so to force application use spring-aop 3.1.1 we add this
163-
dependency explicitly. May be removed when new Spring
164-
Security will not depends from old version of Spring.
165-
-->
166-
<dependency>
167-
<groupId>org.springframework</groupId>
168-
<artifactId>spring-aop</artifactId>
169-
<version>${spring.version}</version>
170-
<scope>runtime</scope>
171-
</dependency>
172-
173169
<dependency>
174170
<groupId>org.springframework.security</groupId>
175171
<artifactId>spring-security-config</artifactId>
@@ -366,7 +362,6 @@
366362
<dependency>
367363
<groupId>org.springframework</groupId>
368364
<artifactId>spring-test</artifactId>
369-
<version>${spring.version}</version>
370365
<scope>test</scope>
371366
</dependency>
372367

@@ -472,7 +467,6 @@
472467
<dependency>
473468
<groupId>org.springframework</groupId>
474469
<artifactId>spring-jdbc</artifactId>
475-
<version>${spring.version}</version>
476470
</dependency>
477471
<dependency>
478472
<groupId>com.h2database</groupId>

0 commit comments

Comments
 (0)