Skip to content

Commit 1a06b6a

Browse files
author
David Syer
committed
SPR-5327: tidy up Maven dependencies (keeping commons-logging)
1 parent 81d7f5b commit 1a06b6a

File tree

6 files changed

+873
-852
lines changed

6 files changed

+873
-852
lines changed

‎org.springframework.context/pom.xml

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<groupId>javax.inject</groupId>
3838
<artifactId>javax.inject</artifactId>
3939
<version>1</version>
40-
<scope>provided</scope>
40+
<optional>true</optional>
4141
</dependency>
4242
<dependency>
4343
<groupId>org.atinject</groupId>
@@ -61,7 +61,7 @@
6161
<groupId>javax.validation</groupId>
6262
<artifactId>validation-api</artifactId>
6363
<version>1.0.0.GA</version>
64-
<scope>provided</scope>
64+
<optional>true</optional>
6565
</dependency>
6666
<dependency>
6767
<groupId>javax.xml.ws</groupId>
@@ -117,17 +117,11 @@
117117
<version>1.6</version>
118118
<optional>true</optional>
119119
</dependency>
120-
<dependency>
121-
<groupId>org.springframework</groupId>
122-
<artifactId>spring-asm</artifactId>
123-
<version>${project.version}</version>
124-
<scope>compile</scope>
125-
</dependency>
126120
<dependency>
127121
<groupId>org.springframework</groupId>
128122
<artifactId>spring-aop</artifactId>
129123
<version>${project.version}</version>
130-
<scope>compile</scope>
124+
<optional>true</optional>
131125
</dependency>
132126
<dependency>
133127
<groupId>org.springframework</groupId>
@@ -163,7 +157,7 @@
163157
<groupId>org.apache.geronimo.specs</groupId>
164158
<artifactId>geronimo-jta_1.1_spec</artifactId>
165159
<version>1.1</version>
166-
<scope>test</scope>
160+
<optional>true</optional>
167161
</dependency>
168162
<dependency>
169163
<groupId>javax.xml</groupId>
@@ -206,8 +200,7 @@
206200
</dependency>
207201
<dependency>
208202
<groupId>org.slf4j</groupId>
209-
<artifactId>slf4j-jcl</artifactId>
210-
<version>1.5.3</version>
203+
<artifactId>slf4j-log4j12</artifactId>
211204
<scope>test</scope>
212205
</dependency>
213206
</dependencies>

‎org.springframework.core/pom.xml

Lines changed: 80 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,83 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3-
<modelVersion>4.0.0</modelVersion>
4-
<groupId>org.springframework</groupId>
5-
<artifactId>spring-core</artifactId>
6-
<packaging>jar</packaging>
7-
<version>3.0.0.BUILD-SNAPSHOT</version>
8-
<parent>
9-
<groupId>org.springframework</groupId>
10-
<artifactId>spring-parent</artifactId>
11-
<relativePath>../org.springframework.spring-parent</relativePath>
12-
<version>3.0.0.BUILD-SNAPSHOT</version>
13-
</parent>
2+
<project xmlns="http://maven.apache.org/POM/4.0.0"
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
4+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
5+
<modelVersion>4.0.0</modelVersion>
6+
<groupId>org.springframework</groupId>
7+
<artifactId>spring-core</artifactId>
8+
<packaging>jar</packaging>
9+
<version>3.0.0.BUILD-SNAPSHOT</version>
10+
<parent>
11+
<groupId>org.springframework</groupId>
12+
<artifactId>spring-parent</artifactId>
13+
<relativePath>../org.springframework.spring-parent</relativePath>
14+
<version>3.0.0.BUILD-SNAPSHOT</version>
15+
</parent>
1416

15-
<dependencies>
16-
<dependency>
17-
<groupId>commons-collections</groupId>
18-
<artifactId>commons-collections</artifactId>
19-
<version>3.2</version>
20-
<optional>true</optional>
21-
</dependency>
22-
<dependency>
23-
<groupId>org.springframework</groupId>
24-
<artifactId>spring-asm</artifactId>
25-
<version>${project.version}</version>
26-
<scope>compile</scope>
27-
</dependency>
28-
<dependency>
29-
<groupId>commons-logging</groupId>
30-
<artifactId>commons-logging</artifactId>
31-
<version>1.1.1</version>
32-
<scope>compile</scope>
33-
</dependency>
34-
<dependency>
35-
<groupId>log4j</groupId>
36-
<artifactId>log4j</artifactId>
37-
<optional>true</optional>
38-
</dependency>
39-
<dependency>
40-
<groupId>org.aspectj</groupId>
41-
<artifactId>aspectjweaver</artifactId>
42-
<optional>true</optional>
43-
</dependency>
44-
<dependency>
45-
<groupId>org.jboss.vfs</groupId>
46-
<artifactId>com.springsource.org.jboss.virtual</artifactId>
47-
<version>2.1.0.GA</version>
48-
<optional>true</optional>
49-
</dependency>
50-
<dependency>
51-
<groupId>javax.servlet</groupId>
52-
<artifactId>servlet-api</artifactId>
53-
<version>2.5</version>
54-
<scope>test</scope>
55-
</dependency>
56-
<dependency>
57-
<groupId>junit</groupId>
58-
<artifactId>junit</artifactId>
59-
<scope>test</scope>
60-
</dependency>
61-
<dependency>
62-
<groupId>org.easymock</groupId>
63-
<artifactId>easymock</artifactId>
64-
<scope>test</scope>
65-
</dependency>
66-
<dependency>
67-
<groupId>xmlunit</groupId>
68-
<artifactId>xmlunit</artifactId>
69-
<version>1.2</version>
70-
<scope>test</scope>
71-
</dependency>
72-
<dependency>
73-
<groupId>org.codehaus.woodstox</groupId>
74-
<artifactId>wstx-asl</artifactId>
75-
<version>3.2.7</version>
76-
<scope>test</scope>
77-
</dependency>
78-
</dependencies>
17+
<dependencies>
18+
<dependency>
19+
<groupId>commons-collections</groupId>
20+
<artifactId>commons-collections</artifactId>
21+
<version>3.2</version>
22+
<optional>true</optional>
23+
</dependency>
24+
<dependency>
25+
<groupId>org.springframework</groupId>
26+
<artifactId>spring-asm</artifactId>
27+
<version>${project.version}</version>
28+
<scope>compile</scope>
29+
</dependency>
30+
<dependency>
31+
<groupId>commons-logging</groupId>
32+
<artifactId>commons-logging</artifactId>
33+
<version>1.1.1</version>
34+
<scope>compile</scope>
35+
</dependency>
36+
<dependency>
37+
<groupId>log4j</groupId>
38+
<artifactId>log4j</artifactId>
39+
<scope>compile</scope>
40+
<optional>true</optional>
41+
</dependency>
42+
<dependency>
43+
<groupId>org.aspectj</groupId>
44+
<artifactId>aspectjweaver</artifactId>
45+
<optional>true</optional>
46+
</dependency>
47+
<dependency>
48+
<groupId>org.jboss.vfs</groupId>
49+
<artifactId>com.springsource.org.jboss.virtual</artifactId>
50+
<version>2.1.0.GA</version>
51+
<scope>compile</scope>
52+
<optional>true</optional>
53+
</dependency>
54+
<dependency>
55+
<groupId>javax.servlet</groupId>
56+
<artifactId>servlet-api</artifactId>
57+
<version>2.5</version>
58+
<scope>test</scope>
59+
</dependency>
60+
<dependency>
61+
<groupId>junit</groupId>
62+
<artifactId>junit</artifactId>
63+
<scope>test</scope>
64+
</dependency>
65+
<dependency>
66+
<groupId>org.easymock</groupId>
67+
<artifactId>easymock</artifactId>
68+
<scope>test</scope>
69+
</dependency>
70+
<dependency>
71+
<groupId>xmlunit</groupId>
72+
<artifactId>xmlunit</artifactId>
73+
<version>1.2</version>
74+
<scope>test</scope>
75+
</dependency>
76+
<dependency>
77+
<groupId>org.codehaus.woodstox</groupId>
78+
<artifactId>wstx-asl</artifactId>
79+
<version>3.2.7</version>
80+
<scope>test</scope>
81+
</dependency>
82+
</dependencies>
7983
</project>

0 commit comments

Comments
 (0)