X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/62a3f84384eb97c7df57109061dd81e4bed221aa..f1fa33354dc3b37adcb769ff950bfa5895606bb4:/pom.xml

diff --git a/pom.xml b/pom.xml
index 96e56e1906..49360efc7f 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.1.4-SNAPSHOT</version>
+	<version>3.3.0-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>
@@ -22,17 +22,15 @@
     </modules>
     <properties>
 		<java.codelevel>1.6</java.codelevel>
-        <spring.version>3.2.1.RELEASE</spring.version>
-        <spring-security.version>3.0.8.RELEASE</spring-security.version>
+        <spring.version>3.2.2.RELEASE</spring.version>
+        <spring-security.version>3.1.3.RELEASE</spring-security.version>
 		<hibernate.version>4.1.10.Final</hibernate.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <unitils.version>3.3</unitils.version>
         <lucene.version>3.6.2</lucene.version>
-        <!-- OLD: <lucene.version>2.9.4</lucene.version> --><!-- lucene.version in hibernate-search 3.4.0-SNAPSHOT is 2.4.0-->
-        
-        
         <hsqldb.version>1.8.0.10</hsqldb.version><!-- 1.8.0.10, 1.9.0-rc6 (manualy build only for debugging) -->
 		<httpcomponents.version>4.2.3</httpcomponents.version>
+		<doxia.version>1.3</doxia.version>
     </properties>
     <scm>
         <connection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdmlib/</connection>
@@ -746,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>
@@ -816,11 +818,11 @@
 	            <version>1.7.1</version>
 	        </dependency>
       <!-- ******* VARIOUS ******* -->
-      <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <version>1.2.15</version>
-      </dependency>
+		  <dependency>
+			<groupId>log4j</groupId>
+			<artifactId>log4j</artifactId>
+			<version>1.2.17</version>
+		  </dependency>
             <dependency>
                 <groupId>javax.annotation</groupId>
                 <artifactId>jsr250-api</artifactId>
@@ -872,7 +874,30 @@
                 <artifactId>commons-io</artifactId>
                 <version>2.4</version>
             </dependency>
-            <dependency>
+			<!-- only for version management, poi currently requires 1.6, commons-logging 1.1.1 requires 1.6, so we update here to the latest version -->
+			<dependency>
+			    <groupId>commons-codec</groupId>
+				<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>
                 <version>1.0.6</version>
@@ -882,11 +907,6 @@
                 <artifactId>commons-beanutils</artifactId>
                 <version>1.8.3</version>
             </dependency>
-<!-- 			<dependency> -->
-<!-- 				<groupId>net.sf.sojo</groupId> -->
-<!-- 				<artifactId>sojo</artifactId> -->
-<!-- 				<version>1.0.5</version> -->
-<!-- 			</dependency> -->
             <dependency>
                 <groupId>net.sf.json-lib</groupId>
                 <artifactId>json-lib</artifactId>
@@ -920,31 +940,6 @@
 				<version>2.0.1</version>
 			</dependency>
             
-            <!-- <dependency>
-                <groupId>joda-time</groupId>
-                <artifactId>joda-time-hibernate</artifactId>
-                <version>1.0</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>ehcache</artifactId>
-                        <groupId>ehcache</groupId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>cglib</groupId>
-                        <artifactId>cglib-full</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.hibernate</groupId>
-                        <artifactId>hibernate</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>hibernate</groupId>
-                        <artifactId>hibernate</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency> -->
-            
-            
             <dependency>
                 <groupId>org.apache.lucene</groupId>
                 <artifactId>lucene-core</artifactId>
@@ -965,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>
@@ -986,6 +986,7 @@
                 <artifactId>dozer</artifactId>
                 <version>5.3.0</version>
             </dependency>
+
             <!-- ******* XML ******* -->
             <dependency>
                 <groupId>xml-apis</groupId>
@@ -995,8 +996,46 @@
             <dependency>
                 <groupId>xerces</groupId>
                 <artifactId>xercesImpl</artifactId>
-                <version>2.7.1</version>
-            </dependency>
+                <version>2.11.0</version>
+            </dependency>
+              <!-- >batik-ext required by Xerces 2.11.0 for class ElementTraversal, as this is not included anymore in xml-apis 2.x-->
+			  <dependency>
+				<groupId>org.apache.xmlgraphics</groupId>
+				<artifactId>batik-ext</artifactId>
+				<version>1.7</version>
+			  </dependency>
+          	<dependency> <!-- required by cdmlib-print -->
+				<groupId>org.apache.xmlgraphics</groupId>
+				<artifactId>fop</artifactId>
+				<!-- version 1.1 does NOT work, because it depends on avalon-framework-api 4.2.0 which is not available in central maven repository under the given groupID  -->
+				<version>1.1</version>
+				<exclusions>
+					<!-- 1.1 depends on an old version of avalon-framework which does not exist in mvn repository under this groupId (has old groupId) -->
+					<exclusion>
+						<groupId>org.apache.avalon.framework</groupId>
+						<artifactId>avalon-framework-api</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>org.apache.avalon.framework</groupId>
+						<artifactId>avalon-framework-impl</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
+            <!-- not directly required, but fix mentioned to force 
+              correct version number 4.3.1. Required by org.apache.xmlgraphics/fop 1.1 
+              Remove when dependency in fop in corrected.
+              --> 
+            <dependency>
+				<groupId>org.apache.avalon.framework</groupId>
+				<artifactId>avalon-framework-api</artifactId>
+				<version>4.3.1</version>
+			</dependency>
+			<dependency>
+			<groupId>org.odftoolkit</groupId>
+				<artifactId>odfdom-java</artifactId>
+				<version>0.8.7</version>
+			</dependency>
+            
             <dependency>
                 <groupId>jaxen</groupId>
                 <artifactId>jaxen</artifactId>
@@ -1188,8 +1227,6 @@
                 <artifactId>spring-context-support</artifactId>
                 <version>${spring.version}</version>
             </dependency> 
-            
-            
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>org.springframework.oxm</artifactId>
@@ -1202,94 +1239,57 @@
                 <exclusions>
                   <exclusion>
                     <groupId>org.springframework</groupId>
-                    <artifactId>spring-expression</artifactId>
+                  	<artifactId>spring-aop</artifactId>
                   </exclusion>
                   <exclusion>
-                    <groupId>org.springframework</groupId>
+                  	<groupId>org.springframework</groupId>
                     <artifactId>spring-beans</artifactId>
                   </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-context</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-orm</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-aop</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-support</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-tx</artifactId>
-                    </exclusion>
+                  <exclusion>
+                  	<groupId>org.springframework</groupId>
+                    <artifactId>spring-context</artifactId>
+                  </exclusion>
+                  <exclusion>
+	              	<groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                  </exclusion>
+                  <exclusion>
+                    <groupId>org.springframework</groupId>
+                    <artifactId>spring-expression</artifactId>
+                  </exclusion>
+                  <exclusion>
+                  	<groupId>org.springframework</groupId>
+                    <artifactId>spring-tx</artifactId>
+                  </exclusion>
                 </exclusions>
             </dependency>
-            <dependency>
-                <groupId>org.springframework.security</groupId>
-                <artifactId>spring-security-context</artifactId>  <!-- could not find this on http://mvnrepository.com/ -->
-                <version>${spring-security.version}</version>
-            </dependency>
-            <dependency>  <!-- needed for the FSDirectoryFactoryBean -->
-                <groupId>org.springmodules</groupId>
-                <artifactId>spring-modules-lucene</artifactId>
-                <version>0.8</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.lucene</groupId>
-                        <artifactId>lucene-core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache</groupId>
-                        <artifactId>poi</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.apache</groupId>
-                        <artifactId>poi-scratchpad</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-dao</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-jca</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-support</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-beans</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-aop</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-context</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-core</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-jdbc</artifactId>
-                    </exclusion>
+		    <dependency>
+		    	<groupId>org.springframework.security</groupId>
+		   		<artifactId>spring-security-config</artifactId>
+		        <version>${spring-security.version}</version>
+		        <exclusions>
+                  <exclusion>
+                    <groupId>org.springframework</groupId>
+                  	<artifactId>spring-aop</artifactId>
+                  </exclusion>
+                  <exclusion>
+                  	<groupId>org.springframework</groupId>
+                    <artifactId>spring-beans</artifactId>
+                  </exclusion>
+                  <exclusion>
+                  	<groupId>org.springframework</groupId>
+                    <artifactId>spring-context</artifactId>
+                  </exclusion>
+                  <exclusion>
+	              	<groupId>org.springframework</groupId>
+                    <artifactId>spring-core</artifactId>
+                  </exclusion>
+                  <exclusion>
+                  	<groupId>org.springframework</groupId>
+                    <artifactId>spring-web</artifactId>
+                  </exclusion>
                 </exclusions>
-            </dependency>
+            </dependency>            
             
             <!-- ******* SERVLET/JSP/JSF ******* -->
             <dependency>
@@ -1305,9 +1305,9 @@
                 <version>1.3.0</version>
             </dependency>
             <dependency>
-                <groupId>mysql</groupId>
-                <artifactId>mysql-connector-java</artifactId>
-                <version>5.1.23</version>
+				<groupId>mysql</groupId>
+				<artifactId>mysql-connector-java</artifactId>
+				<version>5.1.24</version>
             </dependency>
             <dependency>
                 <groupId>postgresql</groupId>
@@ -1326,38 +1326,12 @@
                 <artifactId>jdbc4</artifactId>
                 <version>2.0</version>
             </dependency>
-            <!-- use SQL Server 2005 driver instead (com.microsoft.sqlserver/jdbc)
-        <dependency>
-            <groupId>com.microsoft.jdbcdriver</groupId>
-            <artifactId>mssqlserver</artifactId>
-            <version>2000.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.jdbcdriver</groupId>
-            <artifactId>msutil</artifactId>
-            <version>2000.3</version>
-        </dependency>
-        <dependency>
-            <groupId>com.microsoft.jdbcdriver</groupId>
-            <artifactId>msbase</artifactId>
-            <version>2000.3</version>
-        </dependency>
--->
+
             <dependency>
                 <groupId>oracle</groupId>
                 <artifactId>ojdbc14</artifactId>
                 <version>10.2.0.4.0</version>
             </dependency>
-            <!--dependency>
-                <groupId>oracle</groupId>
-                <artifactId>ojdbc14</artifactId>
-                <version>9i</version>
-            </dependency>
-            <dependency>
-                <groupId>oracle</groupId>
-                <artifactId>ojdbc14</artifactId>
-                <version>9.2.0.5</version>
-            </dependency-->
             <dependency>
                 <groupId>com.h2database</groupId>
                 <artifactId>h2</artifactId>
@@ -1369,6 +1343,8 @@
                 <groupId>com.yourkit</groupId>
                 <artifactId>yjp-controller-api-redist</artifactId>
                 <version>9.0.8</version>
+				<!-- <version>10.0.6</version> TODO find repo or put into our own -->
+				<scope>test</scope>
             </dependency>
             <!-- For Validation -->
             <dependency>
@@ -1398,6 +1374,17 @@
             <version>5.4.0</version>
             <scope>compile</scope>
           </dependency>
+              <!-- AptView -->
+		    <dependency>
+		      	<groupId>org.apache.maven.doxia</groupId>
+		      	<artifactId>doxia-module-apt</artifactId>
+		    	<version>${doxia.version}</version>
+		    </dependency>
+		    <dependency>
+		    	<groupId>org.apache.maven.doxia</groupId>
+		      	<artifactId>doxia-module-xhtml</artifactId>
+		    	<version>${doxia.version}</version>
+		    </dependency>
         </dependencies>
     </dependencyManagement>
 </project>