Skip to content

Commit 3081396

Browse files
markpollackmarkpollack
committed
pom maintenance - changes needed to run inside eclipse via m2eclipse
1 parent a7a9731 commit 3081396

File tree

4 files changed

+140
-111
lines changed

4 files changed

+140
-111
lines changed

‎org.springframework.jdbc/pom.xml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
<relativePath>../org.springframework.spring-parent</relativePath>
1212
<version>3.0.0.BUILD-SNAPSHOT</version>
1313
</parent>
14-
1514
<dependencies>
1615
<dependency>
1716
<groupId>c3p0</groupId>
@@ -68,13 +67,16 @@
6867
<version>1.0.71</version>
6968
<scope>compile</scope>
7069
<optional>true</optional>
71-
</dependency>
70+
</dependency>
7271
<dependency>
7372
<groupId>org.apache.derby</groupId>
74-
<artifactId>derby</artifactId>
75-
<version>10.4.2.0</version>
76-
<scope>compile</scope>
77-
<optional>true</optional>
73+
<artifactId>com.springsource.org.apache.derby</artifactId>
74+
<version>10.5.1000001.764942</version>
75+
</dependency>
76+
<dependency>
77+
<groupId>org.apache.derby</groupId>
78+
<artifactId>com.springsource.org.apache.derby.client</artifactId>
79+
<version>10.5.1000001.764942</version>
7880
</dependency>
7981
<dependency>
8082
<groupId>junit</groupId>
@@ -99,7 +101,7 @@
99101
<build>
100102
<testResources>
101103
<testResource>
102-
<directory>${pom.build.sourceDirectory}</directory>
104+
<directory>src/test/resources</directory>
103105
<includes>
104106
<include>**/*.sql</include>
105107
<include>**/*.xml</include>

‎org.springframework.orm/pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,18 @@
231231
<include>**/*.xsd</include>
232232
</includes>
233233
</testResource>
234+
<testResource>
235+
<directory>src/test/resources</directory>
236+
<includes>
237+
<include>**/*.xml</include>
238+
</includes>
239+
</testResource>
240+
<testResource>
241+
<directory>src/test/resources</directory>
242+
<includes>
243+
<include>*.jar</include>
244+
</includes>
245+
</testResource>
234246
</testResources>
235247
</build>
236248
</project>

‎org.springframework.oxm/pom.xml

Lines changed: 106 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -1,107 +1,109 @@
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-oxm</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-oxm</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>com.thoughtworks.xstream</groupId>
18-
<artifactId>xstream</artifactId>
19-
<version>1.3</version>
20-
<optional>true</optional>
21-
</dependency>
22-
<dependency>
23-
<groupId>com.sun.xml.bind</groupId>
24-
<artifactId>jaxb-impl</artifactId>
25-
<version>2.1.7</version>
26-
<optional>true</optional>
27-
</dependency>
28-
<dependency>
29-
<groupId>org.jibx</groupId>
30-
<artifactId>jibx-run</artifactId>
31-
<version>1.1.5</version>
32-
<optional>true</optional>
33-
</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>
40-
<dependency>
41-
<groupId>xerces</groupId>
42-
<artifactId>xercesImpl</artifactId>
43-
<version>2.8.1</version>
44-
<optional>true</optional>
45-
</dependency>
46-
<dependency>
47-
<groupId>org.apache.xmlbeans</groupId>
48-
<artifactId>xmlbeans</artifactId>
49-
<version>2.4.0</version>
50-
<optional>true</optional>
51-
</dependency>
52-
<dependency>
53-
<groupId>org.codehaus.castor</groupId>
54-
<artifactId>castor</artifactId>
55-
<version>1.2</version>
56-
<optional>true</optional>
57-
</dependency>
58-
<dependency>
59-
<groupId>org.springframework</groupId>
60-
<artifactId>spring-beans</artifactId>
61-
<version>${project.version}</version>
62-
<scope>compile</scope>
63-
</dependency>
64-
<dependency>
65-
<groupId>org.springframework</groupId>
66-
<artifactId>spring-context</artifactId>
67-
<version>${project.version}</version>
68-
<scope>compile</scope>
69-
</dependency>
70-
<dependency>
71-
<groupId>org.springframework</groupId>
72-
<artifactId>spring-core</artifactId>
73-
<version>${project.version}</version>
74-
<scope>compile</scope>
75-
</dependency>
76-
<dependency>
77-
<groupId>junit</groupId>
78-
<artifactId>junit</artifactId>
79-
<version>4.6</version>
80-
<scope>test</scope>
81-
</dependency>
82-
<dependency>
83-
<groupId>org.easymock</groupId>
84-
<artifactId>easymock</artifactId>
85-
<version>2.3</version>
86-
<scope>test</scope>
87-
</dependency>
88-
<dependency>
89-
<groupId>org.codehaus.jettison</groupId>
90-
<artifactId>jettison</artifactId>
91-
<version>1.0.1</version>
92-
<scope>test</scope>
93-
</dependency>
94-
<dependency>
95-
<groupId>xmlunit</groupId>
96-
<artifactId>xmlunit</artifactId>
97-
<version>1.2</version>
98-
<scope>test</scope>
99-
</dependency>
100-
<dependency>
101-
<groupId>xmlpull</groupId>
102-
<artifactId>xmlpull</artifactId>
103-
<version>1.1.3.4a</version>
104-
<scope>test</scope>
105-
</dependency>
106-
</dependencies>
17+
<dependencies>
18+
<dependency>
19+
<groupId>com.thoughtworks.xstream</groupId>
20+
<artifactId>xstream</artifactId>
21+
<version>1.3</version>
22+
<optional>true</optional>
23+
</dependency>
24+
<dependency>
25+
<groupId>com.sun.xml.bind</groupId>
26+
<artifactId>jaxb-impl</artifactId>
27+
<version>2.1.7</version>
28+
<optional>true</optional>
29+
</dependency>
30+
<dependency>
31+
<groupId>org.jibx</groupId>
32+
<artifactId>jibx-run</artifactId>
33+
<version>1.1.5</version>
34+
<optional>true</optional>
35+
</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>
42+
<dependency>
43+
<groupId>xerces</groupId>
44+
<artifactId>xercesImpl</artifactId>
45+
<version>2.8.1</version>
46+
<optional>true</optional>
47+
</dependency>
48+
<dependency>
49+
<groupId>org.apache.xmlbeans</groupId>
50+
<artifactId>xmlbeans</artifactId>
51+
<version>2.4.0</version>
52+
<optional>true</optional>
53+
</dependency>
54+
<dependency>
55+
<groupId>org.codehaus.castor</groupId>
56+
<artifactId>castor</artifactId>
57+
<version>1.2</version>
58+
<optional>true</optional>
59+
</dependency>
60+
<dependency>
61+
<groupId>org.springframework</groupId>
62+
<artifactId>spring-beans</artifactId>
63+
<version>${project.version}</version>
64+
<scope>compile</scope>
65+
</dependency>
66+
<dependency>
67+
<groupId>org.springframework</groupId>
68+
<artifactId>spring-context</artifactId>
69+
<version>${project.version}</version>
70+
<scope>compile</scope>
71+
</dependency>
72+
<dependency>
73+
<groupId>org.springframework</groupId>
74+
<artifactId>spring-core</artifactId>
75+
<version>${project.version}</version>
76+
<scope>compile</scope>
77+
</dependency>
78+
<dependency>
79+
<groupId>junit</groupId>
80+
<artifactId>junit</artifactId>
81+
<version>4.6</version>
82+
<scope>test</scope>
83+
</dependency>
84+
<dependency>
85+
<groupId>org.easymock</groupId>
86+
<artifactId>easymock</artifactId>
87+
<version>2.3</version>
88+
<scope>test</scope>
89+
</dependency>
90+
<dependency>
91+
<groupId>org.codehaus.jettison</groupId>
92+
<artifactId>jettison</artifactId>
93+
<version>1.0.1</version>
94+
<scope>test</scope>
95+
</dependency>
96+
<dependency>
97+
<groupId>xmlunit</groupId>
98+
<artifactId>xmlunit</artifactId>
99+
<version>1.2</version>
100+
<scope>test</scope>
101+
</dependency>
102+
<dependency>
103+
<groupId>xmlpull</groupId>
104+
<artifactId>xmlpull</artifactId>
105+
<version>1.1.3.4a</version>
106+
<scope>test</scope>
107+
</dependency>
108+
</dependencies>
107109
</project>

‎org.springframework.test/pom.xml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,19 @@
151151
<version>1.8.0.7</version>
152152
<scope>test</scope>
153153
</dependency>
154+
<dependency>
155+
<groupId>org.hibernate</groupId>
156+
<artifactId>hibernate-core</artifactId>
157+
<version>3.3.1.GA</version>
158+
<optional>true</optional>
159+
<scope>test</scope>
160+
</dependency>
161+
<dependency>
162+
<groupId>org.hibernate</groupId>
163+
<artifactId>hibernate-cglib-repack</artifactId>
164+
<version>2.1_3</version>
165+
<scope>test</scope>
166+
</dependency>
154167
<dependency>
155168
<groupId>cglib</groupId>
156169
<artifactId>cglib-nodep</artifactId>

0 commit comments

Comments
 (0)