|
|
@@ -211,6 +211,12 @@
|
|
211
|
211
|
<groupId>commons-logging</groupId>
|
|
212
|
212
|
<artifactId>commons-logging</artifactId>
|
|
213
|
213
|
<version>1.1</version>
|
|
|
214
|
+ <exclusions>
|
|
|
215
|
+ <exclusion>
|
|
|
216
|
+ <groupId>avalon-framework</groupId>
|
|
|
217
|
+ <artifactId>avalon-framework</artifactId>
|
|
|
218
|
+ </exclusion>
|
|
|
219
|
+ </exclusions>
|
|
214
|
220
|
</dependency>
|
|
215
|
221
|
<dependency>
|
|
216
|
222
|
<groupId>commons-dbcp</groupId>
|
|
|
@@ -250,6 +256,10 @@
|
|
250
|
256
|
<version>2.3</version>
|
|
251
|
257
|
<scope>test</scope>
|
|
252
|
258
|
</dependency>
|
|
|
259
|
+
|
|
|
260
|
+ <!-- JAX-WS integration with Spring. Lots of broken pom files unfortunately,
|
|
|
261
|
+ so we need a few excluded-and-overridden dependencies.
|
|
|
262
|
+ This problem will mostly go away when we move to Java 6. -->
|
|
253
|
263
|
<dependency>
|
|
254
|
264
|
<groupId>org.jvnet.jax-ws-commons.spring</groupId>
|
|
255
|
265
|
<artifactId>jaxws-spring</artifactId>
|
|
|
@@ -259,12 +269,33 @@
|
|
259
|
269
|
<groupId>org.springframework</groupId>
|
|
260
|
270
|
<artifactId>spring</artifactId>
|
|
261
|
271
|
</exclusion>
|
|
|
272
|
+ <exclusion>
|
|
|
273
|
+ <groupId>com.sun.xml.stream.buffer</groupId>
|
|
|
274
|
+ <artifactId>streambuffer</artifactId>
|
|
|
275
|
+ </exclusion>
|
|
|
276
|
+ <exclusion>
|
|
|
277
|
+ <groupId>org.jvnet.staxex</groupId>
|
|
|
278
|
+ <artifactId>stax-ex</artifactId>
|
|
|
279
|
+ </exclusion>
|
|
262
|
280
|
</exclusions>
|
|
263
|
281
|
</dependency>
|
|
264
|
282
|
<dependency>
|
|
|
283
|
+ <groupId>org.jvnet.staxex</groupId>
|
|
|
284
|
+ <artifactId>stax-ex</artifactId>
|
|
|
285
|
+ <version>1.2</version>
|
|
|
286
|
+ <scope>runtime</scope>
|
|
|
287
|
+ </dependency>
|
|
|
288
|
+ <dependency>
|
|
|
289
|
+ <groupId>com.sun.xml.stream.buffer</groupId>
|
|
|
290
|
+ <artifactId>streambuffer</artifactId>
|
|
|
291
|
+ <version>0.7</version>
|
|
|
292
|
+ <scope>runtime</scope>
|
|
|
293
|
+ </dependency>
|
|
|
294
|
+ <dependency>
|
|
265
|
295
|
<groupId>com.sun.xml.ws</groupId>
|
|
266
|
296
|
<artifactId>jaxws-rt</artifactId>
|
|
267
|
297
|
<version>2.1.3</version>
|
|
|
298
|
+ <scope>runtime</scope>
|
|
268
|
299
|
</dependency>
|
|
269
|
300
|
<dependency>
|
|
270
|
301
|
<groupId>com.sun.istack</groupId>
|