changed some template names

[cdmlib.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 5c0777f6d55ee09ded0c6c851a26a275ecba5298..c404fdb735834e0103cbd044d472a26f655a172e 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -744,6 +744,10 @@
                 <exclusion>
                     <groupId>org.springframework</groupId>
                     <artifactId>spring-orm</artifactId>
+                </exclusion>
+                               <exclusion>
+                    <groupId>javax.persistence</groupId>
+                    <artifactId>persistence-api</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
@@ -876,6 +880,23 @@
                                <artifactId>commons-codec</artifactId>
                                <version>20041127.091804</version>  <!-- probably same as commons-codec version 1.8 --> 
                        </dependency>
+                       <!-- only for version management, httpcore:4.2.4, commons-beanutils:1.8.3, commons-collections:3.2.1 currently require 1.1.1 , httpclient:4.2.3, spring-modules-cache require 1.1 and batik-ext requires 1.0.4, so we update here to the latest version 1.1.2 -->
+                       <dependency>
+                               <groupId>commons-logging</groupId>
+                               <artifactId>commons-logging</artifactId>
+                               <version>1.1.2</version>
+                       </dependency>
+            <!-- only for version management, hibernate-commons-annotations:4.0.1.Final requires 3.1.0.CR2 , hibernate-ehcache:4.1.10  requires 3.1.0.GA , so we update here to the latest version 3.1.3.GA -->
+                       <dependency>
+                               <groupId>org.jboss.logging</groupId>
+                               <artifactId>jboss-logging</artifactId>
+                               <version>3.1.3.GA</version>
+                       </dependency>
+                       <!-- TODO com.springsource.org.aopalliance  and com.springsource.org.apache.commons.logging seem to be duplicates of e.g. apache commons-logging. Needs to be further checked.   
+                       -->
+                       <!-- TODO xerces xmlParserAPIs duplicates many classes from jre and xml-apis. It is a dependency that comes with xom:xom  -->
+                       
+                       
                        <dependency>
                 <groupId>net.sf.ezmorph</groupId>
                 <artifactId>ezmorph</artifactId>