git://wamblee.org
/
utils
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
better definition of spring dependencies
[utils]
/
pom.xml
diff --git
a/pom.xml
b/pom.xml
index c5caa5337d5b23c341707bdac69b746d8ef7400e..0dba6ad04f3e1b7eb51ae4a8c4d1b76ef289a314 100644
(file)
--- a/
pom.xml
+++ b/
pom.xml
@@
-30,6
+30,12
@@
<artifactId>jmock-cglib</artifactId>
<version>1.1.0</version>
<scope>test</scope>
<artifactId>jmock-cglib</artifactId>
<version>1.1.0</version>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-full</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</dependency>
</dependencies>
@@
-79,14
+85,14
@@
<version>1.7.0</version>
</dependency>
<dependency>
<version>1.7.0</version>
</dependency>
<dependency>
- <groupId>springframework</groupId>
+ <groupId>
org.
springframework</groupId>
<artifactId>spring-beans</artifactId>
<artifactId>spring-beans</artifactId>
- <version>1.2.
6
</version>
+ <version>1.2.
8
</version>
</dependency>
<dependency>
</dependency>
<dependency>
- <groupId>springframework</groupId>
- <artifactId>spring-
hibernate
</artifactId>
- <version>1.2.
6
</version>
+ <groupId>
org.
springframework</groupId>
+ <artifactId>spring-
orm
</artifactId>
+ <version>1.2.
8
</version>
</dependency>
<!-- should be possible to remove the dependence on log4j -->
<dependency>
</dependency>
<!-- should be possible to remove the dependence on log4j -->
<dependency>
@@
-98,6
+104,12
@@
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.6</version>
<groupId>dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>1.6</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>ehcache</groupId>
</dependency>
<dependency>
<groupId>ehcache</groupId>
@@
-123,6
+135,16
@@
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.1-beta-9</version>
<groupId>jaxen</groupId>
<artifactId>jaxen</artifactId>
<version>1.1-beta-9</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xom</groupId>
+ <artifactId>xom</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xmlParserAPIs</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
</dependency>
</dependencies>