Skip to content

Commit 639f0e1

Browse files
author
Phillip Webb
committed
Merge branch 'gh-1047'
2 parents 9b982da + 933c6b3 commit 639f0e1

File tree

56 files changed

+2428
-602
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+2428
-602
lines changed

‎spring-boot-dependencies/pom.xml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,12 @@
162162
<groupId>org.springframework.boot</groupId>
163163
<artifactId>spring-boot-starter</artifactId>
164164
<version>1.1.0.BUILD-SNAPSHOT</version>
165+
<exclusions>
166+
<exclusion>
167+
<groupId>commons-logging</groupId>
168+
<artifactId>commons-logging</artifactId>
169+
</exclusion>
170+
</exclusions>
165171
</dependency>
166172
<dependency>
167173
<groupId>org.springframework.boot</groupId>
@@ -292,6 +298,12 @@
292298
<groupId>org.springframework.boot</groupId>
293299
<artifactId>spring-boot-starter-test</artifactId>
294300
<version>1.1.0.BUILD-SNAPSHOT</version>
301+
<exclusions>
302+
<exclusion>
303+
<groupId>commons-logging</groupId>
304+
<artifactId>commons-logging</artifactId>
305+
</exclusion>
306+
</exclusions>
295307
</dependency>
296308
<dependency>
297309
<groupId>org.springframework.boot</groupId>
@@ -491,6 +503,12 @@
491503
<groupId>org.apache.httpcomponents</groupId>
492504
<artifactId>httpclient</artifactId>
493505
<version>${httpclient.version}</version>
506+
<exclusions>
507+
<exclusion>
508+
<groupId>commons-logging</groupId>
509+
<artifactId>commons-logging</artifactId>
510+
</exclusion>
511+
</exclusions>
494512
</dependency>
495513
<dependency>
496514
<groupId>org.apache.httpcomponents</groupId>
@@ -501,6 +519,12 @@
501519
<groupId>org.apache.httpcomponents</groupId>
502520
<artifactId>httpasyncclient</artifactId>
503521
<version>${httpasyncclient.version}</version>
522+
<exclusions>
523+
<exclusion>
524+
<groupId>commons-logging</groupId>
525+
<artifactId>commons-logging</artifactId>
526+
</exclusion>
527+
</exclusions>
504528
</dependency>
505529
<dependency>
506530
<groupId>org.apache.tomcat.embed</groupId>
@@ -546,6 +570,12 @@
546570
<groupId>org.apache.velocity</groupId>
547571
<artifactId>velocity-tools</artifactId>
548572
<version>${velocity-tools.version}</version>
573+
<exclusions>
574+
<exclusion>
575+
<groupId>commons-logging</groupId>
576+
<artifactId>commons-logging</artifactId>
577+
</exclusion>
578+
</exclusions>
549579
</dependency>
550580
<dependency>
551581
<groupId>org.aspectj</groupId>
@@ -666,6 +696,12 @@
666696
<groupId>org.crashub</groupId>
667697
<artifactId>crash.connectors.ssh</artifactId>
668698
<version>${crashub.version}</version>
699+
<exclusions>
700+
<exclusion>
701+
<groupId>commons-logging</groupId>
702+
<artifactId>commons-logging</artifactId>
703+
</exclusion>
704+
</exclusions>
669705
</dependency>
670706
<dependency>
671707
<groupId>org.crashub</groupId>
@@ -964,6 +1000,16 @@
9641000
<groupId>org.springframework.integration</groupId>
9651001
<artifactId>spring-integration-http</artifactId>
9661002
<version>${spring-integration.version}</version>
1003+
<exclusions>
1004+
<exclusion>
1005+
<groupId>commons-logging</groupId>
1006+
<artifactId>commons-logging</artifactId>
1007+
</exclusion>
1008+
<exclusion>
1009+
<groupId>commons-logging</groupId>
1010+
<artifactId>commons-logging-api</artifactId>
1011+
</exclusion>
1012+
</exclusions>
9671013
</dependency>
9681014
<dependency>
9691015
<groupId>org.springframework.mobile</groupId>

‎spring-boot-integration-tests/src/test/resources/build.gradle

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
import org.gradle.api.artifacts.result.UnresolvedDependencyResult;
22

3+
buildscript {
4+
repositories {
5+
mavenLocal()
6+
}
7+
dependencies {
8+
classpath("org.springframework.boot:spring-boot-gradle-plugin:${project.bootVersion}")
9+
}
10+
}
11+
312
repositories {
413
mavenLocal()
514
mavenCentral()
@@ -13,6 +22,8 @@ dependencies {
1322
springBootStarter "org.springframework.boot:${project.starter}:${project.bootVersion}"
1423
}
1524

25+
apply plugin: 'spring-boot'
26+
1627
task checkCommonsLogging {
1728
doFirst {
1829
def commonsLogging = resolvedDependencies
@@ -46,4 +57,4 @@ def getResolvedDependencies() {
4657
throw new GradleException("Resolution of ${project.starter} failed: ${unresolved}")
4758
}
4859
resolved
49-
}
60+
}

‎spring-boot-starters/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
<main.basedir>${basedir}/..</main.basedir>
2121
</properties>
2222
<modules>
23+
<!-- If you add a starter remember to also add a dependency in spring-boot-versions -->
2324
<module>spring-boot-starter</module>
2425
<module>spring-boot-starter-amqp</module>
2526
<module>spring-boot-starter-aop</module>

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,15 @@
2020
<dependencies>
2121
<dependency>
2222
<groupId>org.springframework.boot</groupId>
23-
<artifactId>spring-boot-actuator</artifactId>
24-
<exclusions>
25-
<exclusion>
26-
<groupId>commons-logging</groupId>
27-
<artifactId>commons-logging</artifactId>
28-
</exclusion>
29-
</exclusions>
23+
<artifactId>spring-boot-starter</artifactId>
3024
</dependency>
3125
<dependency>
3226
<groupId>org.springframework.boot</groupId>
33-
<artifactId>spring-boot-starter</artifactId>
27+
<artifactId>spring-boot-actuator</artifactId>
28+
</dependency>
29+
<dependency>
30+
<groupId>org.springframework</groupId>
31+
<artifactId>spring-core</artifactId>
3432
<exclusions>
3533
<exclusion>
3634
<groupId>commons-logging</groupId>

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

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,13 @@
1818
<main.basedir>${basedir}/../..</main.basedir>
1919
</properties>
2020
<dependencies>
21+
<dependency>
22+
<groupId>org.springframework.boot</groupId>
23+
<artifactId>spring-boot-starter</artifactId>
24+
</dependency>
2125
<dependency>
2226
<groupId>org.springframework</groupId>
23-
<artifactId>spring-tx</artifactId>
27+
<artifactId>spring-core</artifactId>
2428
<exclusions>
2529
<exclusion>
2630
<groupId>commons-logging</groupId>
@@ -29,24 +33,12 @@
2933
</exclusions>
3034
</dependency>
3135
<dependency>
32-
<groupId>org.springframework.amqp</groupId>
33-
<artifactId>spring-rabbit</artifactId>
34-
<exclusions>
35-
<exclusion>
36-
<groupId>commons-logging</groupId>
37-
<artifactId>commons-logging</artifactId>
38-
</exclusion>
39-
</exclusions>
36+
<groupId>org.springframework</groupId>
37+
<artifactId>spring-tx</artifactId>
4038
</dependency>
4139
<dependency>
42-
<groupId>org.springframework.boot</groupId>
43-
<artifactId>spring-boot-starter</artifactId>
44-
<exclusions>
45-
<exclusion>
46-
<groupId>commons-logging</groupId>
47-
<artifactId>commons-logging</artifactId>
48-
</exclusion>
49-
</exclusions>
40+
<groupId>org.springframework.amqp</groupId>
41+
<artifactId>spring-rabbit</artifactId>
5042
</dependency>
5143
</dependencies>
5244
</project>

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

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,16 @@
1919
</properties>
2020
<dependencies>
2121
<dependency>
22-
<groupId>org.aspectj</groupId>
23-
<artifactId>aspectjrt</artifactId>
22+
<groupId>org.springframework.boot</groupId>
23+
<artifactId>spring-boot-starter</artifactId>
2424
</dependency>
2525
<dependency>
26-
<groupId>org.aspectj</groupId>
27-
<artifactId>aspectjweaver</artifactId>
26+
<groupId>org.springframework</groupId>
27+
<artifactId>spring-aop</artifactId>
2828
</dependency>
2929
<dependency>
3030
<groupId>org.springframework</groupId>
31-
<artifactId>spring-aop</artifactId>
31+
<artifactId>spring-core</artifactId>
3232
<exclusions>
3333
<exclusion>
3434
<groupId>commons-logging</groupId>
@@ -37,14 +37,12 @@
3737
</exclusions>
3838
</dependency>
3939
<dependency>
40-
<groupId>org.springframework.boot</groupId>
41-
<artifactId>spring-boot-starter</artifactId>
42-
<exclusions>
43-
<exclusion>
44-
<groupId>commons-logging</groupId>
45-
<artifactId>commons-logging</artifactId>
46-
</exclusion>
47-
</exclusions>
40+
<groupId>org.aspectj</groupId>
41+
<artifactId>aspectjrt</artifactId>
42+
</dependency>
43+
<dependency>
44+
<groupId>org.aspectj</groupId>
45+
<artifactId>aspectjweaver</artifactId>
4846
</dependency>
4947
</dependencies>
5048
</project>

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

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,17 @@
1818
<main.basedir>${basedir}/../..</main.basedir>
1919
</properties>
2020
<dependencies>
21+
<dependency>
22+
<groupId>org.springframework.boot</groupId>
23+
<artifactId>spring-boot-starter</artifactId>
24+
</dependency>
2125
<dependency>
2226
<groupId>org.hsqldb</groupId>
2327
<artifactId>hsqldb</artifactId>
2428
</dependency>
2529
<dependency>
2630
<groupId>org.springframework</groupId>
27-
<artifactId>spring-jdbc</artifactId>
31+
<artifactId>spring-core</artifactId>
2832
<exclusions>
2933
<exclusion>
3034
<groupId>commons-logging</groupId>
@@ -33,24 +37,12 @@
3337
</exclusions>
3438
</dependency>
3539
<dependency>
36-
<groupId>org.springframework.batch</groupId>
37-
<artifactId>spring-batch-core</artifactId>
38-
<exclusions>
39-
<exclusion>
40-
<groupId>commons-logging</groupId>
41-
<artifactId>commons-logging</artifactId>
42-
</exclusion>
43-
</exclusions>
40+
<groupId>org.springframework</groupId>
41+
<artifactId>spring-jdbc</artifactId>
4442
</dependency>
4543
<dependency>
46-
<groupId>org.springframework.boot</groupId>
47-
<artifactId>spring-boot-starter</artifactId>
48-
<exclusions>
49-
<exclusion>
50-
<groupId>commons-logging</groupId>
51-
<artifactId>commons-logging</artifactId>
52-
</exclusion>
53-
</exclusions>
44+
<groupId>org.springframework.batch</groupId>
45+
<artifactId>spring-batch-core</artifactId>
5446
</dependency>
5547
</dependencies>
5648
</project>

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

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@
1919
<main.basedir>${basedir}/../..</main.basedir>
2020
</properties>
2121
<dependencies>
22+
<dependency>
23+
<groupId>org.springframework.boot</groupId>
24+
<artifactId>spring-boot-starter</artifactId>
25+
</dependency>
2226
<dependency>
2327
<groupId>org.springframework</groupId>
24-
<artifactId>spring-tx</artifactId>
28+
<artifactId>spring-core</artifactId>
2529
<exclusions>
2630
<exclusion>
2731
<groupId>commons-logging</groupId>
@@ -30,24 +34,12 @@
3034
</exclusions>
3135
</dependency>
3236
<dependency>
33-
<groupId>org.springframework.boot</groupId>
34-
<artifactId>spring-boot-starter</artifactId>
35-
<exclusions>
36-
<exclusion>
37-
<groupId>commons-logging</groupId>
38-
<artifactId>commons-logging</artifactId>
39-
</exclusion>
40-
</exclusions>
37+
<groupId>org.springframework</groupId>
38+
<artifactId>spring-tx</artifactId>
4139
</dependency>
4240
<dependency>
4341
<groupId>org.springframework.data</groupId>
4442
<artifactId>spring-data-elasticsearch</artifactId>
45-
<exclusions>
46-
<exclusion>
47-
<groupId>commons-logging</groupId>
48-
<artifactId>commons-logging</artifactId>
49-
</exclusion>
50-
</exclusions>
5143
</dependency>
5244
</dependencies>
5345
</project>

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

Lines changed: 12 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,17 @@
1919
<main.basedir>${basedir}/../..</main.basedir>
2020
</properties>
2121
<dependencies>
22+
<dependency>
23+
<groupId>org.springframework.boot</groupId>
24+
<artifactId>spring-boot-starter</artifactId>
25+
</dependency>
2226
<dependency>
2327
<groupId>com.gemstone.gemfire</groupId>
2428
<artifactId>gemfire</artifactId>
2529
</dependency>
2630
<dependency>
2731
<groupId>org.springframework</groupId>
28-
<artifactId>spring-context-support</artifactId>
32+
<artifactId>spring-core</artifactId>
2933
<exclusions>
3034
<exclusion>
3135
<groupId>commons-logging</groupId>
@@ -35,33 +39,19 @@
3539
</dependency>
3640
<dependency>
3741
<groupId>org.springframework</groupId>
38-
<artifactId>spring-tx</artifactId>
39-
<exclusions>
40-
<exclusion>
41-
<groupId>commons-logging</groupId>
42-
<artifactId>commons-logging</artifactId>
43-
</exclusion>
44-
</exclusions>
42+
<artifactId>spring-context</artifactId>
4543
</dependency>
4644
<dependency>
47-
<groupId>org.springframework.boot</groupId>
48-
<artifactId>spring-boot-starter</artifactId>
49-
<exclusions>
50-
<exclusion>
51-
<groupId>commons-logging</groupId>
52-
<artifactId>commons-logging</artifactId>
53-
</exclusion>
54-
</exclusions>
45+
<groupId>org.springframework</groupId>
46+
<artifactId>spring-context-support</artifactId>
47+
</dependency>
48+
<dependency>
49+
<groupId>org.springframework</groupId>
50+
<artifactId>spring-tx</artifactId>
5551
</dependency>
5652
<dependency>
5753
<groupId>org.springframework.data</groupId>
5854
<artifactId>spring-data-gemfire</artifactId>
59-
<exclusions>
60-
<exclusion>
61-
<groupId>commons-logging</groupId>
62-
<artifactId>commons-logging</artifactId>
63-
</exclusion>
64-
</exclusions>
6555
</dependency>
6656
</dependencies>
6757
<repositories>

0 commit comments

Comments
 (0)