Skip to content

Commit c6cd1a5

Browse files
markpollackmarkpollack
committed
SPR-6119 - Add slf4j dependency back to orm's pom.xml but in test scope as it is needed to run tests that use Hibernate
SPR-5956 - Remove commons-logging dependency definitions in pom.xml for all but spring-core so as to make exclusion rule easier for user who use slf4j
1 parent cd1df84 commit c6cd1a5

File tree

15 files changed

+27
-99
lines changed

15 files changed

+27
-99
lines changed

‎org.springframework.aop/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,7 @@
3131
<version>1.0</version>
3232
<scope>compile</scope>
3333
</dependency>
34-
<dependency>
35-
<groupId>commons-logging</groupId>
36-
<artifactId>commons-logging</artifactId>
37-
<version>1.1.1</version>
38-
<scope>compile</scope>
39-
</dependency>
34+
<!-- common logging dependency is in spring-core -->
4035
<dependency>
4136
<groupId>commons-pool</groupId>
4237
<artifactId>commons-pool</artifactId>

‎org.springframework.aspects/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,7 @@
1313
</parent>
1414

1515
<dependencies>
16-
<dependency>
17-
<groupId>commons-logging</groupId>
18-
<artifactId>commons-logging</artifactId>
19-
<version>1.1.1</version>
20-
<scope>compile</scope>
21-
</dependency>
16+
<!-- common logging dependency is in spring-core -->
2217
<dependency>
2318
<groupId>org.aspectj</groupId>
2419
<artifactId>aspectjweaver</artifactId>

‎org.springframework.beans/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,7 @@
3131
<version>2.2</version>
3232
<optional>true</optional>
3333
</dependency>
34-
<dependency>
35-
<groupId>commons-logging</groupId>
36-
<artifactId>commons-logging</artifactId>
37-
<version>1.1.1</version>
38-
<scope>compile</scope>
39-
</dependency>
34+
<!-- common logging dependency is in spring-core -->
4035
<dependency>
4136
<groupId>org.springframework</groupId>
4237
<artifactId>spring-core</artifactId>

‎org.springframework.context.support/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,12 +62,7 @@
6262
<version>3.2</version>
6363
<optional>true</optional>
6464
</dependency>
65-
<dependency>
66-
<groupId>commons-logging</groupId>
67-
<artifactId>commons-logging</artifactId>
68-
<version>1.1.1</version>
69-
<scope>compile</scope>
70-
</dependency>
65+
<!-- common logging dependency is in spring-core -->
7166
<dependency>
7267
<groupId>velocity</groupId>
7368
<artifactId>velocity</artifactId>

‎org.springframework.context/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,7 @@
8484
<version>1.0</version>
8585
<scope>compile</scope>
8686
</dependency>
87-
<dependency>
88-
<groupId>commons-logging</groupId>
89-
<artifactId>commons-logging</artifactId>
90-
<version>1.1.1</version>
91-
<scope>compile</scope>
92-
</dependency>
87+
<!-- common logging dependency is in spring-core -->
9388
<dependency>
9489
<groupId>org.aspectj</groupId>
9590
<artifactId>aspectjweaver</artifactId>

‎org.springframework.expression/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,7 @@
1313
</parent>
1414

1515
<dependencies>
16-
<dependency>
17-
<groupId>commons-logging</groupId>
18-
<artifactId>commons-logging</artifactId>
19-
<version>1.1.1</version>
20-
<scope>compile</scope>
21-
</dependency>
16+
<!-- common logging dependency is in spring-core -->
2217
<dependency>
2318
<groupId>org.springframework</groupId>
2419
<artifactId>spring-core</artifactId>

‎org.springframework.jdbc/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,7 @@
2424
<version>1.1</version>
2525
<scope>provided</scope>
2626
</dependency>
27-
<dependency>
28-
<groupId>commons-logging</groupId>
29-
<artifactId>commons-logging</artifactId>
30-
<version>1.1.1</version>
31-
<scope>compile</scope>
32-
</dependency>
27+
<!-- common logging dependency is in spring-core -->
3328
<dependency>
3429
<groupId>org.springframework</groupId>
3530
<artifactId>spring-beans</artifactId>

‎org.springframework.jms/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,7 @@
3737
<version>1.0</version>
3838
<scope>compile</scope>
3939
</dependency>
40-
<dependency>
41-
<groupId>commons-logging</groupId>
42-
<artifactId>commons-logging</artifactId>
43-
<version>1.1.1</version>
44-
<scope>compile</scope>
45-
</dependency>
40+
<!-- common logging dependency is in spring-core -->
4641
<dependency>
4742
<groupId>commons-pool</groupId>
4843
<artifactId>commons-pool</artifactId>

‎org.springframework.orm/pom.xml‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,7 @@
2424
<version>1.0</version>
2525
<optional>true</optional>
2626
</dependency>
27-
<dependency>
28-
<groupId>commons-logging</groupId>
29-
<artifactId>commons-logging</artifactId>
30-
<version>1.1.1</version>
31-
<scope>compile</scope>
32-
</dependency>
27+
<!-- common logging dependency is in spring-core -->
3328
<dependency>
3429
<groupId>org.apache.ibatis</groupId>
3530
<artifactId>ibatis-sqlmap</artifactId>
@@ -84,6 +79,12 @@
8479
<version>2.2</version>
8580
<scope>test</scope>
8681
</dependency>
82+
<dependency>
83+
<groupId>org.slf4j</groupId>
84+
<artifactId>slf4j-jdk14</artifactId>
85+
<version>1.5.2</version>
86+
<scope>test</scope>
87+
</dependency>
8788
<dependency>
8889
<groupId>org.hibernate</groupId>
8990
<artifactId>hibernate-annotations</artifactId>

‎org.springframework.oxm/pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,7 @@
3333
<version>1.1.5</version>
3434
<optional>true</optional>
3535
</dependency>
36-
<dependency>
37-
<groupId>commons-logging</groupId>
38-
<artifactId>commons-logging</artifactId>
39-
<version>1.1.1</version>
40-
<scope>compile</scope>
41-
</dependency>
36+
<!-- common logging dependency is in spring-core -->
4237
<dependency>
4338
<groupId>xerces</groupId>
4439
<artifactId>xercesImpl</artifactId>

0 commit comments

Comments
 (0)