X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/180e68a89073913b43e52691d33b099cd2f21790..38f213078ed0de120886f0935c5b3c95ad0b9928:/pom.xml

diff --git a/pom.xml b/pom.xml
index 5c0777f6d5..94749e1cc1 100755
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-	<version>3.2.0-SNAPSHOT</version>
+	<version>3.2.4-SNAPSHOT</version>
     <name>CDM Library</name>
     <description>The Java implementation of the Common Data Model (CDM), the data model for EDIT's internet platform for cybertaxonomy.</description>
     <url>http://wp5.e-taxonomy.eu/cdmlib/</url>
@@ -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>
@@ -939,6 +960,11 @@
 		       <artifactId>lucene-grouping</artifactId>
 		       <version>${lucene.version}</version>
 		    </dependency>
+            <dependency>
+               <groupId>org.apache.lucene</groupId>
+               <artifactId>lucene-join</artifactId>
+               <version>${lucene.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>com.ibm.lsid</groupId>
@@ -960,6 +986,7 @@
                 <artifactId>dozer</artifactId>
                 <version>5.3.0</version>
             </dependency>
+
             <!-- ******* XML ******* -->
             <dependency>
                 <groupId>xml-apis</groupId>
@@ -1039,6 +1066,12 @@
                 <artifactId>xom</artifactId>
                 <version>1.0</version>
             </dependency>
+	<!-- ******* SAXON ******* -->
+	<dependency>
+		<groupId>net.sf.saxon</groupId>
+		<artifactId>Saxon-HE</artifactId>
+		<version>9.5.1-2</version>
+	</dependency>
             <!-- ******* HIBERNATE / EJB3 ******* -->
        <dependency>
                 <groupId>org.hibernate.javax.persistence</groupId>