Skip to content

Commit 33082fd

Browse files
snicollPhillip Webb
snicoll
authored and
Phillip Webb
committed
Harmonized maven dependency management
This commit harmonizes the dependency management of internal modules so that versions can be omitted everywhere. Update the maven coordinates to provide the full groupId for consistency
1 parent 789f506 commit 33082fd

File tree

30 files changed

+214
-229
lines changed

30 files changed

+214
-229
lines changed

‎spring-boot-actuator/pom.xml

+3-6
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@
2121
<dependencies>
2222
<!-- Compile -->
2323
<dependency>
24-
<groupId>${project.groupId}</groupId>
24+
<groupId>org.springframework.boot</groupId>
2525
<artifactId>spring-boot</artifactId>
26-
<version>${project.version}</version>
2726
</dependency>
2827
<dependency>
29-
<groupId>${project.groupId}</groupId>
28+
<groupId>org.springframework.boot</groupId>
3029
<artifactId>spring-boot-autoconfigure</artifactId>
31-
<version>${project.version}</version>
3230
</dependency>
3331
<dependency>
3432
<groupId>com.fasterxml.jackson.core</groupId>
@@ -125,9 +123,8 @@
125123
<scope>test</scope>
126124
</dependency>
127125
<dependency>
128-
<groupId>${project.groupId}</groupId>
126+
<groupId>org.springframework.boot</groupId>
129127
<artifactId>spring-boot</artifactId>
130-
<version>${project.version}</version>
131128
<type>test-jar</type>
132129
<scope>test</scope>
133130
</dependency>

‎spring-boot-autoconfigure/pom.xml

+2-4
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@
2222
<dependencies>
2323
<!-- Compile -->
2424
<dependency>
25-
<groupId>${project.groupId}</groupId>
25+
<groupId>org.springframework.boot</groupId>
2626
<artifactId>spring-boot</artifactId>
27-
<version>${project.version}</version>
2827
</dependency>
2928
<!-- Optional -->
3029
<dependency>
@@ -239,9 +238,8 @@
239238
</dependency>
240239
<!-- Test -->
241240
<dependency>
242-
<groupId>${project.groupId}</groupId>
241+
<groupId>org.springframework.boot</groupId>
243242
<artifactId>spring-boot</artifactId>
244-
<version>${project.version}</version>
245243
<type>test-jar</type>
246244
<scope>test</scope>
247245
</dependency>

‎spring-boot-cli/pom.xml

+3-5
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,12 @@
3434
<dependencies>
3535
<!-- Compile -->
3636
<dependency>
37-
<groupId>${project.groupId}</groupId>
37+
<groupId>org.springframework.boot</groupId>
3838
<artifactId>spring-boot-dependency-tools</artifactId>
39-
<version>${project.version}</version>
4039
</dependency>
4140
<dependency>
42-
<groupId>${project.groupId}</groupId>
41+
<groupId>org.springframework.boot</groupId>
4342
<artifactId>spring-boot-loader-tools</artifactId>
44-
<version>${project.version}</version>
4543
</dependency>
4644
<dependency>
4745
<groupId>jline</groupId>
@@ -162,7 +160,7 @@
162160
<configuration>
163161
<artifactItems>
164162
<artifactItem>
165-
<groupId>${project.groupId}</groupId>
163+
<groupId>org.springframework.boot</groupId>
166164
<artifactId>spring-boot-loader</artifactId>
167165
<version>${project.version}</version>
168166
<type>jar</type>

‎spring-boot-dependencies/pom.xml

+168
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,9 @@
4545
</developer>
4646
</developers>
4747
<properties>
48+
<!-- Spring Boot -->
49+
<spring-boot.version>1.1.0.BUILD-SNAPSHOT</spring-boot.version>
50+
<!-- Third Party -->
4851
<activemq.version>5.7.0</activemq.version>
4952
<aspectj.version>1.7.4</aspectj.version>
5053
<codahale-metrics.version>3.0.2</codahale-metrics.version>
@@ -107,6 +110,171 @@
107110
</prerequisites>
108111
<dependencyManagement>
109112
<dependencies>
113+
<!-- Spring Boot -->
114+
<dependency>
115+
<groupId>org.springframework.boot</groupId>
116+
<artifactId>spring-boot</artifactId>
117+
<version>${spring-boot.version}</version>
118+
</dependency>
119+
<dependency>
120+
<groupId>org.springframework.boot</groupId>
121+
<artifactId>spring-boot</artifactId>
122+
<type>test-jar</type>
123+
<version>${spring-boot.version}</version>
124+
</dependency>
125+
<dependency>
126+
<groupId>org.springframework.boot</groupId>
127+
<artifactId>spring-boot-actuator</artifactId>
128+
<version>${spring-boot.version}</version>
129+
</dependency>
130+
<dependency>
131+
<groupId>org.springframework.boot</groupId>
132+
<artifactId>spring-boot-autoconfigure</artifactId>
133+
<version>${spring-boot.version}</version>
134+
</dependency>
135+
<dependency>
136+
<groupId>org.springframework.boot</groupId>
137+
<artifactId>spring-boot-dependency-tools</artifactId>
138+
<version>${spring-boot.version}</version>
139+
</dependency>
140+
<dependency>
141+
<groupId>org.springframework.boot</groupId>
142+
<artifactId>spring-boot-loader</artifactId>
143+
<version>${spring-boot.version}</version>
144+
</dependency>
145+
<dependency>
146+
<groupId>org.springframework.boot</groupId>
147+
<artifactId>spring-boot-loader-tools</artifactId>
148+
<version>${spring-boot.version}</version>
149+
</dependency>
150+
151+
<dependency>
152+
<groupId>org.springframework.boot</groupId>
153+
<artifactId>spring-boot-starter</artifactId>
154+
<version>${spring-boot.version}</version>
155+
</dependency>
156+
<dependency>
157+
<groupId>org.springframework.boot</groupId>
158+
<artifactId>spring-boot-starter-actuator</artifactId>
159+
<version>${spring-boot.version}</version>
160+
</dependency>
161+
<dependency>
162+
<groupId>org.springframework.boot</groupId>
163+
<artifactId>spring-boot-starter-amqp</artifactId>
164+
<version>${spring-boot.version}</version>
165+
</dependency>
166+
<dependency>
167+
<groupId>org.springframework.boot</groupId>
168+
<artifactId>spring-boot-starter-aop</artifactId>
169+
<version>${spring-boot.version}</version>
170+
</dependency>
171+
<dependency>
172+
<groupId>org.springframework.boot</groupId>
173+
<artifactId>spring-boot-starter-batch</artifactId>
174+
<version>${spring-boot.version}</version>
175+
</dependency>
176+
<dependency>
177+
<groupId>org.springframework.boot</groupId>
178+
<artifactId>spring-boot-starter-data-gemfire</artifactId>
179+
<version>${spring-boot.version}</version>
180+
</dependency>
181+
<dependency>
182+
<groupId>org.springframework.boot</groupId>
183+
<artifactId>spring-boot-starter-data-jpa</artifactId>
184+
<version>${spring-boot.version}</version>
185+
</dependency>
186+
<dependency>
187+
<groupId>org.springframework.boot</groupId>
188+
<artifactId>spring-boot-starter-data-mongodb</artifactId>
189+
<version>${spring-boot.version}</version>
190+
</dependency>
191+
<dependency>
192+
<groupId>org.springframework.boot</groupId>
193+
<artifactId>spring-boot-starter-data-neo4j</artifactId>
194+
<version>${spring-boot.version}</version>
195+
</dependency>
196+
<dependency>
197+
<groupId>org.springframework.boot</groupId>
198+
<artifactId>spring-boot-starter-data-rest</artifactId>
199+
<version>${spring-boot.version}</version>
200+
</dependency>
201+
<dependency>
202+
<groupId>org.springframework.boot</groupId>
203+
<artifactId>spring-boot-starter-freemarker</artifactId>
204+
<version>${spring-boot.version}</version>
205+
</dependency>
206+
<dependency>
207+
<groupId>org.springframework.boot</groupId>
208+
<artifactId>spring-boot-starter-integration</artifactId>
209+
<version>${spring-boot.version}</version>
210+
</dependency>
211+
<dependency>
212+
<groupId>org.springframework.boot</groupId>
213+
<artifactId>spring-boot-starter-jdbc</artifactId>
214+
<version>${spring-boot.version}</version>
215+
</dependency>
216+
<dependency>
217+
<groupId>org.springframework.boot</groupId>
218+
<artifactId>spring-boot-starter-jetty</artifactId>
219+
<version>${spring-boot.version}</version>
220+
</dependency>
221+
<dependency>
222+
<groupId>org.springframework.boot</groupId>
223+
<artifactId>spring-boot-starter-log4j</artifactId>
224+
<version>${spring-boot.version}</version>
225+
</dependency>
226+
<dependency>
227+
<groupId>org.springframework.boot</groupId>
228+
<artifactId>spring-boot-starter-logging</artifactId>
229+
<version>${spring-boot.version}</version>
230+
</dependency>
231+
<dependency>
232+
<groupId>org.springframework.boot</groupId>
233+
<artifactId>spring-boot-starter-mobile</artifactId>
234+
<version>${spring-boot.version}</version>
235+
</dependency>
236+
<dependency>
237+
<groupId>org.springframework.boot</groupId>
238+
<artifactId>spring-boot-starter-redis</artifactId>
239+
<version>${spring-boot.version}</version>
240+
</dependency>
241+
<dependency>
242+
<groupId>org.springframework.boot</groupId>
243+
<artifactId>spring-boot-starter-remote-shell</artifactId>
244+
<version>${spring-boot.version}</version>
245+
</dependency>
246+
<dependency>
247+
<groupId>org.springframework.boot</groupId>
248+
<artifactId>spring-boot-starter-security</artifactId>
249+
<version>${spring-boot.version}</version>
250+
</dependency>
251+
<dependency>
252+
<groupId>org.springframework.boot</groupId>
253+
<artifactId>spring-boot-starter-test</artifactId>
254+
<version>${spring-boot.version}</version>
255+
</dependency>
256+
<dependency>
257+
<groupId>org.springframework.boot</groupId>
258+
<artifactId>spring-boot-starter-thymeleaf</artifactId>
259+
<version>${spring-boot.version}</version>
260+
</dependency>
261+
<dependency>
262+
<groupId>org.springframework.boot</groupId>
263+
<artifactId>spring-boot-starter-tomcat</artifactId>
264+
<version>${spring-boot.version}</version>
265+
</dependency>
266+
<dependency>
267+
<groupId>org.springframework.boot</groupId>
268+
<artifactId>spring-boot-starter-web</artifactId>
269+
<version>${spring-boot.version}</version>
270+
</dependency>
271+
<dependency>
272+
<groupId>org.springframework.boot</groupId>
273+
<artifactId>spring-boot-starter-websocket</artifactId>
274+
<version>${spring-boot.version}</version>
275+
</dependency>
276+
277+
<!-- Third Party -->
110278
<dependency>
111279
<groupId>ch.qos.logback</groupId>
112280
<artifactId>logback-classic</artifactId>

‎spring-boot-docs/pom.xml

+5-10
Original file line numberDiff line numberDiff line change
@@ -20,29 +20,24 @@
2020
</properties>
2121
<dependencies>
2222
<dependency>
23-
<groupId>${project.groupId}</groupId>
23+
<groupId>org.springframework.boot</groupId>
2424
<artifactId>spring-boot</artifactId>
25-
<version>${project.version}</version>
2625
</dependency>
2726
<dependency>
28-
<groupId>${project.groupId}</groupId>
27+
<groupId>org.springframework.boot</groupId>
2928
<artifactId>spring-boot-autoconfigure</artifactId>
30-
<version>${project.version}</version>
3129
</dependency>
3230
<dependency>
33-
<groupId>${project.groupId}</groupId>
31+
<groupId>org.springframework.boot</groupId>
3432
<artifactId>spring-boot-actuator</artifactId>
35-
<version>${project.version}</version>
3633
</dependency>
3734
<dependency>
38-
<groupId>${project.groupId}</groupId>
35+
<groupId>org.springframework.boot</groupId>
3936
<artifactId>spring-boot-loader</artifactId>
40-
<version>${project.version}</version>
4137
</dependency>
4238
<dependency>
43-
<groupId>${project.groupId}</groupId>
39+
<groupId>org.springframework.boot</groupId>
4440
<artifactId>spring-boot-loader-tools</artifactId>
45-
<version>${project.version}</version>
4641
</dependency>
4742
</dependencies>
4843
<profiles>

‎spring-boot-docs/src/main/asciidoc/using-spring-boot.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ defaults. The parent project provides the following features:
3535
* Java 1.6 as the default compiler level.
3636
* UTF-8 source encoding.
3737
* A Dependency Management section, allowing you to omit `<version>` tags for common
38-
dependencies.
38+
dependencies, inherited from the `spring-boot-dependencies` POM.
3939
* Sensible https://maven.apache.org/plugins/maven-resources-plugin/examples/filter.html[resource filtering].
4040
* Sensible plugin configuration (http://mojo.codehaus.org/exec-maven-plugin/[exec plugin],
4141
http://maven.apache.org/surefire/maven-surefire-plugin/[surefire],

‎spring-boot-starters/spring-boot-starter-actuator/pom.xml

+2-4
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,12 @@
1919
</properties>
2020
<dependencies>
2121
<dependency>
22-
<groupId>${project.groupId}</groupId>
22+
<groupId>org.springframework.boot</groupId>
2323
<artifactId>spring-boot-starter</artifactId>
24-
<version>${project.version}</version>
2524
</dependency>
2625
<dependency>
27-
<groupId>${project.groupId}</groupId>
26+
<groupId>org.springframework.boot</groupId>
2827
<artifactId>spring-boot-actuator</artifactId>
29-
<version>${project.version}</version>
3028
</dependency>
3129
</dependencies>
3230
</project>

‎spring-boot-starters/spring-boot-starter-amqp/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
</properties>
2020
<dependencies>
2121
<dependency>
22-
<groupId>${project.groupId}</groupId>
22+
<groupId>org.springframework.boot</groupId>
2323
<artifactId>spring-boot-starter</artifactId>
24-
<version>${project.version}</version>
2524
</dependency>
2625
<dependency>
2726
<groupId>org.springframework.amqp</groupId>

‎spring-boot-starters/spring-boot-starter-aop/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
</properties>
2020
<dependencies>
2121
<dependency>
22-
<groupId>${project.groupId}</groupId>
22+
<groupId>org.springframework.boot</groupId>
2323
<artifactId>spring-boot-starter</artifactId>
24-
<version>${project.version}</version>
2524
</dependency>
2625
<dependency>
2726
<groupId>org.springframework</groupId>

‎spring-boot-starters/spring-boot-starter-batch/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
</properties>
2020
<dependencies>
2121
<dependency>
22-
<groupId>${project.groupId}</groupId>
22+
<groupId>org.springframework.boot</groupId>
2323
<artifactId>spring-boot-starter</artifactId>
24-
<version>${project.version}</version>
2524
</dependency>
2625
<dependency>
2726
<groupId>org.hsqldb</groupId>

‎spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,8 @@
2020
</properties>
2121
<dependencies>
2222
<dependency>
23-
<groupId>${project.groupId}</groupId>
23+
<groupId>org.springframework.boot</groupId>
2424
<artifactId>spring-boot-starter</artifactId>
25-
<version>${project.version}</version>
2625
</dependency>
2726
<dependency>
2827
<groupId>com.gemstone.gemfire</groupId>

‎spring-boot-starters/spring-boot-starter-data-jpa/pom.xml

+2-4
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,12 @@
1919
</properties>
2020
<dependencies>
2121
<dependency>
22-
<groupId>${project.groupId}</groupId>
22+
<groupId>org.springframework.boot</groupId>
2323
<artifactId>spring-boot-starter-aop</artifactId>
24-
<version>${project.version}</version>
2524
</dependency>
2625
<dependency>
27-
<groupId>${project.groupId}</groupId>
26+
<groupId>org.springframework.boot</groupId>
2827
<artifactId>spring-boot-starter-jdbc</artifactId>
29-
<version>${project.version}</version>
3028
</dependency>
3129
<dependency>
3230
<groupId>org.hibernate</groupId>

‎spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml

+1-2
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,8 @@
1919
</properties>
2020
<dependencies>
2121
<dependency>
22-
<groupId>${project.groupId}</groupId>
22+
<groupId>org.springframework.boot</groupId>
2323
<artifactId>spring-boot-starter</artifactId>
24-
<version>${project.version}</version>
2524
</dependency>
2625
<dependency>
2726
<groupId>org.mongodb</groupId>

0 commit comments

Comments
 (0)