X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdmlib.git/blobdiff_plain/3dd6c00ee97df6d2976e0bb597c8d0e986002f91..92e522086eb4288296dfb9054561985a27e7f33c:/pom.xml

diff --git a/pom.xml b/pom.xml
index 23865e27b6..fcef442522 100644
--- 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.12.0-SNAPSHOT</version>
+  <version>4.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://cybertaxonomy.eu/cdmlib/</url>
@@ -12,7 +12,8 @@
   <modules>
     <module>cdmlib-commons</module>
     <module>cdmlib-model</module>
-	<module>cdmlib-test</module>
+	<module>cdmlib-db</module>
+    <module>cdmlib-test</module>
     <module>cdmlib-persistence</module>
     <module>cdmlib-services</module>
     <module>cdmlib-ext</module>
@@ -23,26 +24,26 @@
   </modules>
   <properties>    
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <java.codelevel>1.6</java.codelevel>
-    <spring.version>4.2.2.RELEASE</spring.version>
+    <java.codelevel>1.7</java.codelevel>
+    <spring.version>4.2.4.RELEASE</spring.version>
     <spring-security.version>4.0.3.RELEASE</spring-security.version>
+	<hibernate.version>5.0.7.Final</hibernate.version>
 	<hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-	<hibernate.version>5.0.3.Final</hibernate.version>
-	<hibernate-search.version>5.5.0.Final</hibernate-search.version>
-    <lucene.version>5.3.1</lucene.version>
+    <hibernate-search.version>5.5.2.Final</hibernate-search.version>
+    <lucene.version>5.4.1</lucene.version>
 	<unitils.version>3.4.2</unitils.version>
     <hsqldb.version>2.3.3</hsqldb.version>
 	<!-- <hsqldb.version>1.8.0.10</hsqldb.version>  -->
 	<!-- 1.8.0.10, 1.9.0-rc6 (manually build only for debugging) -->
-	<mysql.version>5.1.37</mysql.version>
     <httpcomponents.version>4.5.1</httpcomponents.version>
     <doxia.version>1.6</doxia.version>
     <poi.version>3.13</poi.version>
-    <jackson.version>2.6.3</jackson.version>
+    <jackson.version>2.6.5</jackson.version>
 	<commons-logging.version>1.2</commons-logging.version>
-	<slf4j.version>1.7.12</slf4j.version>
+	<slf4j.version>1.7.13</slf4j.version>
 	<jaxb.version>2.2.11</jaxb.version>
+	<cglib.version>3.2.0</cglib.version>
+	<aspectj.version>1.8.8</aspectj.version>
   </properties>
   
   <scm>
@@ -55,30 +56,26 @@
     <maven>3.0.5</maven>
   </prerequisites>
   
-  <mailingLists>
-    <mailingList>
-      <name>dev-edit</name>
-      <subscribe>
-                https://listes.mnhn.fr/wwsympa.fcgi/suboptions/dev-edit
+    <mailingLists>
+        <mailingList>
+            <name>EDIT Platform Developers</name>
+            <subscribe>
+                https://lists.fu-berlin.de/listinfo/editplatformdevelopers#subscribe
             </subscribe>
-      <unsubscribe>
-                https://listes.mnhn.fr/wwsympa.fcgi/signoff/dev-edit
+            <unsubscribe>
+                https://lists.fu-berlin.de/listinfo/editplatformdevelopers#options
             </unsubscribe>
-      <post>dev-edit@mnhn.fr</post>
-      <archive>https://listes.mnhn.fr/wwsympa.fcgi/arc/dev-edit</archive>
-    </mailingList>
-    <mailingList>
-      <name>cdm-edit</name>
-      <post>cdm-edit@mnhn.fr</post>
-      <subscribe>
-                https://listes.mnhn.fr/wwsympa.fcgi/suboptions/cdm-edit
+        </mailingList>
+        <mailingList>
+            <name>EDIT User</name>
+            <subscribe>
+                https://lists.fu-berlin.de/listinfo/edituser#subscribe
             </subscribe>
-      <unsubscribe>
-                https://listes.mnhn.fr/wwsympa.fcgi/signoff/cdm-edit
+            <unsubscribe>
+                https://lists.fu-berlin.de/listinfo/edituser#options
             </unsubscribe>
-      <archive>https://listes.mnhn.fr/wwsympa.fcgi/arc/cdm-edit</archive>
-    </mailingList>
-  </mailingLists>
+        </mailingList>
+    </mailingLists>
   <licenses>
     <license>
       <name>Mozilla Public License Version 1.1</name>
@@ -722,21 +719,6 @@
 		<artifactId>jaxb-jxc</artifactId>
 		<version>${jaxb.version}</version>
 	  </dependency>
- <!--     <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-impl</artifactId>
-        <version>${jaxb.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb1-impl</artifactId>
-        <version>${jaxb.version}</version>
-      </dependency>  
-      <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-xjc</artifactId>
-        <version>${jaxb.version}</version>
-      </dependency>  -->
       <!-- ******* hibernate uses slf4j ******* -->
       <dependency>
         <groupId>org.slf4j</groupId>
@@ -795,6 +777,10 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-nop</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -837,7 +823,7 @@
         <groupId>org.unitils</groupId>
         <artifactId>unitils-spring</artifactId>
         <version>${unitils.version}</version>
-        <scope>test</scope>
+     <!--    <scope>test</scope>  -->
       </dependency>
       <dependency>
         <groupId>xmlunit</groupId>
@@ -845,12 +831,12 @@
         <version>1.6</version>
      <!--    <scope>test</scope>  -->
       </dependency>
-      <dependency>
+  <!--    <dependency>
         <groupId>org.dbunit</groupId>
         <artifactId>dbunit</artifactId>
-        <version>2.4.9</version>
+        <version>2.4.9</version>  -->
      <!--    <scope>test</scope>  -->
-      </dependency>
+  <!--    </dependency>   -->
       <!-- dependency of unitils-database, but with lower number there , 
         higher number needed for compatibility with current hibernate and Java 1.6 
         PreparedStatement -->
@@ -863,7 +849,7 @@
 	  <dependency>
 		<groupId>eu.etaxonomy</groupId>
 		<artifactId>cdmlib-test</artifactId>
-		<scope>test</scope>
+     <!--    <scope>test</scope>  -->
 		<version>${project.version}</version>
 	  </dependency>
 
@@ -871,12 +857,12 @@
       <dependency>
         <groupId>org.aspectj</groupId>
         <artifactId>aspectjrt</artifactId>
-        <version>1.7.4</version>
+        <version>${aspectj.version}</version>
       </dependency>
       <dependency>
         <groupId>org.aspectj</groupId>
         <artifactId>aspectjweaver</artifactId>
-        <version>1.7.4</version>
+        <version>${aspectj.version}</version>
       </dependency>
       <!-- ******* VARIOUS ******* -->
       <dependency>
@@ -902,12 +888,12 @@
       <dependency>
         <groupId>cglib</groupId>
         <artifactId>cglib</artifactId>
-        <version>2.2.2</version>
+        <version>${cglib.version}</version>
       </dependency>
       <dependency>
         <groupId>cglib</groupId>
         <artifactId>cglib-nodep</artifactId>
-        <version>2.2.2</version>
+        <version>${cglib.version}</version>
       </dependency>
       <dependency>
         <groupId>commons-lang</groupId>
@@ -917,7 +903,7 @@
       <dependency>
         <groupId>commons-collections</groupId>
         <artifactId>commons-collections</artifactId>
-        <version>3.2.1</version>
+        <version>3.2.2</version>
       </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
@@ -927,7 +913,7 @@
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>
         <artifactId>httpcore</artifactId>
-        <version>4.4.3</version>
+        <version>4.4.4</version>
       </dependency>
       <dependency>
         <groupId>commons-io</groupId>
@@ -961,6 +947,13 @@
       <!-- 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. -->
+	  <!-- since hibernate 5.0.4 Dialect throws exception if jta is missing  -->
+	  <dependency>
+        <groupId>javax.transaction</groupId>
+        <artifactId>jta</artifactId>
+        <version>1.1</version>
+      </dependency>  
+		
       <!-- TODO xerces xmlParserAPIs duplicates many classes from jre and 
         xml-apis. It is a dependency that comes with xom:xom -->
       <dependency>
@@ -1015,7 +1008,7 @@
       <dependency>
         <groupId>joda-time</groupId>
         <artifactId>joda-time</artifactId>
-        <version>2.9</version>
+        <version>2.9.1</version>
       </dependency>
 	  <!-- maybe replaced by usertype.core -->
       <dependency>
@@ -1023,30 +1016,25 @@
         <artifactId>usertype.jodatime</artifactId>
         <version>2.0.1</version>
       </dependency>
-	  
       <dependency>
         <groupId>org.apache.lucene</groupId>
         <artifactId>lucene-core</artifactId>
         <version>${lucene.version}</version>
       </dependency>
-<<<<<<< HEAD
-	  <!--  OLD concept, not under development anymore,
-     to be removed as soon as CdmMassIndexer is updated -->
-      <dependency>
-        <groupId>org.apache.lucene</groupId>
-        <artifactId>lucene-spellchecker</artifactId>
-        <version>3.6.2</version>
-=======
 	  <dependency>
 		<groupId>org.apache.lucene</groupId>
 		<artifactId>lucene-suggest</artifactId>
 		<version>${lucene.version}</version>
 	  </dependency>
+	  <dependency>
+		<groupId>org.apache.lucene</groupId>
+		<artifactId>lucene-analyzers-common</artifactId>
+		<version>${lucene.version}</version>
+	  </dependency>
 	  <dependency>
         <groupId>org.apache.lucene</groupId>
         <artifactId>lucene-queryparser</artifactId>
         <version>${lucene.version}</version>
->>>>>>> Upgrade to hibernate 5 with persistence tests running  #4716
       </dependency>
       <dependency>
         <groupId>org.apache.lucene</groupId>
@@ -1063,7 +1051,22 @@
         <artifactId>lucene-join</artifactId>
         <version>${lucene.version}</version>
       </dependency>
-
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-backward-codecs</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-misc</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.lucene</groupId>
+        <artifactId>lucene-facet</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+            
       <dependency>
         <groupId>com.ibm.lsid</groupId>
         <artifactId>lsid-client</artifactId>
@@ -1093,7 +1096,12 @@
       <dependency>
         <groupId>xml-apis</groupId>
         <artifactId>xml-apis</artifactId>
-        <version>2.0.2</version>
+        <!-- 
+            WARNING: do not upgrade to later versions 2.0.x of xml-apis
+            since these are effectivly reloated to the early beta version
+            1.0.b2
+        -->
+        <version>1.4.01</version>
       </dependency>
       <dependency>
         <groupId>xerces</groupId>
@@ -1144,7 +1152,7 @@
           <!-- used in eu.etaxonomy.cdm.io.markup and for swagger -->
           <groupId>com.google.guava</groupId>
           <artifactId>guava</artifactId>
-          <version>18.0</version>
+          <version>19.0</version>
       </dependency>
       <dependency>
         <groupId>jaxen</groupId>
@@ -1166,7 +1174,7 @@
       <dependency>
         <groupId>com.thoughtworks.xstream</groupId>
         <artifactId>xstream</artifactId>
-        <version>1.4.8</version>
+        <version>1.4.7</version>
       </dependency>
       <dependency>
         <groupId>xpp3</groupId>
@@ -1195,7 +1203,7 @@
       <dependency>
         <groupId>net.sf.saxon</groupId>
         <artifactId>Saxon-HE</artifactId>
-        <version>9.6.0-7</version>
+        <version>9.7.0-2</version>
       </dependency>
       <!-- ******* http components (ViBRANT)******* -->
       <dependency>
@@ -1212,8 +1220,8 @@
       <!-- ******* HIBERNATE / EJB3 ******* -->
       <dependency>
         <groupId>org.hibernate.javax.persistence</groupId>
-        <artifactId>hibernate-jpa-2.0-api</artifactId>
-        <version>1.0.1.Final</version>
+        <artifactId>hibernate-jpa-2.1-api</artifactId>
+        <version>1.0.0.Final</version>
       </dependency>
       <dependency>
         <groupId>org.hibernate</groupId>
@@ -1243,22 +1251,31 @@
       <dependency>
         <groupId>com.mchange</groupId>
         <artifactId>c3p0</artifactId>
-        <version>0.9.5.1</version>
+        <!-- 
+          IMPORTANT!!!
+          when changing the version of this artifact, the 
+          version in cdm-server pom.xml must be changed 
+          the same otherwise db connections through jndi 
+          will not work!
+		  NOTE: not so critical anymore as we use cdmlib-db
+		  now for both projects
+        -->
+        <version>0.9.5.2</version>
       </dependency>
       <dependency>
         <groupId>org.hibernate.common</groupId>
         <artifactId>hibernate-commons-annotations</artifactId>
-        <version>5.0.0.Final</version>
+        <version>5.0.1.Final</version>
       </dependency>
       <dependency>
         <groupId>org.hibernate</groupId>
-        <artifactId>hibernate-search</artifactId>
-        <version>4.2.0.Final</version>
+        <artifactId>hibernate-search-orm</artifactId>
+        <version>${hibernate-search.version}</version>
       </dependency>
       <dependency>
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-search-engine</artifactId>
-        <version>4.2.0.Final</version>
+        <version>${hibernate-search.version}</version>
       </dependency>
       <dependency>
         <groupId>org.javassist</groupId>
@@ -1364,57 +1381,12 @@
         <artifactId>javax.servlet-api</artifactId>
         <version>3.1.0</version>
       </dependency>
-      <!-- ******* DATABASES DRIVER ******* -->
-      <dependency>
-        <!-- SQL Server and Sybase -->
-        <groupId>net.sourceforge.jtds</groupId>
-        <artifactId>jtds</artifactId>
-        <version>1.3.1</version>
-      </dependency>
-      <dependency>
-        <groupId>mysql</groupId>
-        <artifactId>mysql-connector-java</artifactId>
-        <version>${mysql.version}</version>
-      </dependency>
-	  <dependency>
-	     <groupId>org.postgresql</groupId>
-	     <artifactId>postgresql</artifactId>
-	     <version>9.4-1204-jdbc42</version>
-      </dependency>
-      <dependency>
-        <groupId>org.hsqldb</groupId>
-        <artifactId>hsqldb</artifactId>
-        <version>${hsqldb.version}</version>
-      </dependency>
-      <!--for sqlserver2008 and sqlserver2005 -->
-      <dependency>
-        <groupId>com.microsoft.sqlserver</groupId>
-        <artifactId>jdbc4</artifactId>
-        <version>2.0</version>
-      </dependency>
 
-      <dependency>
-        <groupId>oracle</groupId>
-        <artifactId>ojdbc14</artifactId>
-        <version>10.2.0.4.0</version>
-      </dependency>
-	  <!-- 	  <dependency>
-		<groupId>ojdbc</groupId>
-		<artifactId>ojdbc</artifactId>
-		<version>14</version>
-	</dependency>   -->
-      <dependency>
-        <groupId>com.h2database</groupId>
-        <artifactId>h2</artifactId>
-        <!-- <version>1.1.115</version> -->
-        <version>1.4.190</version>
-      </dependency>
       <!-- yourkit profiler api controller (used in ..) -->
       <dependency>
         <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 -->
+        <version>2015-build-15086</version>
         <scope>test</scope>
       </dependency>
       <!-- For Validation -->
@@ -1427,16 +1399,21 @@
         <groupId>org.hibernate</groupId>
         <artifactId>hibernate-validator</artifactId>
         <version>${hibernate-validator.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>com.fasterxml</groupId>
+        <artifactId>classmate</artifactId>
+        <version>1.3.1</version>
       </dependency>
 	  <dependency>
        <groupId>javax.el</groupId>
        <artifactId>javax.el-api</artifactId>
-       <version>2.2.4</version>
+       <version>2.2.5</version>
 	  </dependency>
 	  <dependency>
 		<groupId>org.glassfish.web</groupId>
 		<artifactId>javax.el</artifactId>
-		<version>2.2.4</version>
+		<version>2.2.6</version>
 	  </dependency>
 	  <dependency>
 	    <groupId>org.hibernate</groupId>
@@ -1444,21 +1421,16 @@
 		<version>${hibernate-validator.version}</version>
 	  </dependency>
 	  
-      <dependency>
-        <groupId>p6spy</groupId>
-        <artifactId>p6spy</artifactId>
-        <version>1.3</version>
-      </dependency>
       <!-- for ikey-plus -->
       <dependency>
         <groupId>identificationKeyAPI</groupId>
         <artifactId>identificationKeyAPI</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0</version>   <!-- was <version>1.0-SNAPSHOT</version> -->
       </dependency>
       <dependency>
         <groupId>com.itextpdf</groupId>
         <artifactId>itextpdf</artifactId>
-        <version>5.5.7</version>
+        <version>5.5.8</version>
         <scope>compile</scope>
       </dependency>
       <!-- AptView -->
@@ -1474,32 +1446,14 @@
       </dependency>
       <!-- swagger (rest service doc) -->
       <dependency>
-        <groupId>com.wordnik</groupId>
+        <groupId>io.swagger</groupId>
         <artifactId>swagger-annotations</artifactId>
-        <!-- should match the swagger-spring depends on -->
-        <version>1.3.5</version>
-      </dependency>
-      <dependency>
-        <groupId>com.mangofactory</groupId>
-        <artifactId>swagger-springmvc</artifactId>
-        <version>0.8.5</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-test</artifactId>
-          </exclusion>
-          <exclusion>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-web</artifactId>
-          </exclusion>
-<!--           <exclusion>  -currently not referenced by any other project
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-webmvc</artifactId>
-          </exclusion> -->
-        </exclusions>
+        <!-- should match the springfox-swagger2 depends on -->
+        <version>1.5.6</version>
       </dependency>
+
       <!-- dependencies for swagger-springmvc, added explicitely -->
-      <dependency>
+        <dependency>
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-databind</artifactId>
         <version>${jackson.version}</version>
@@ -1513,8 +1467,57 @@
         <groupId>com.fasterxml.jackson.core</groupId>
         <artifactId>jackson-annotations</artifactId>
         <version>${jackson.version}</version>
-      </dependency>
+      </dependency> 
       <!-- END of dependencies for swagger-springmvc, added explicitely -->
+      <dependency>
+        <groupId>io.springfox</groupId>
+        <artifactId>springfox-swagger2</artifactId>
+        <version>2.4.0</version>
+      </dependency>
+      
+      <!-- ******* DATABASES DRIVER ******* -->
+      <dependency>
+        <groupId>mysql</groupId>
+        <artifactId>mysql-connector-java</artifactId>
+        <version>5.1.38</version>
+      </dependency>
+      <dependency>
+         <groupId>org.postgresql</groupId>
+         <artifactId>postgresql</artifactId>
+         <version>9.4-1206-jdbc4</version>
+      </dependency>
+	  <dependency>
+        <groupId>com.h2database</groupId>
+        <artifactId>h2</artifactId>
+        <version>1.4.190</version>
+      </dependency>
+      <!--for sqlserver2008 and sqlserver2005 -->
+      <dependency>
+        <groupId>com.microsoft.sqlserver</groupId>
+        <artifactId>jdbc4</artifactId>
+        <version>2.0</version>
+      </dependency>
+	  <dependency>
+        <groupId>org.hsqldb</groupId>
+        <artifactId>hsqldb</artifactId>
+        <version>${hsqldb.version}</version>
+      </dependency>
+      <dependency>
+        <!-- SQL Server and Sybase -->
+        <groupId>net.sourceforge.jtds</groupId>
+        <artifactId>jtds</artifactId>
+        <version>1.3.1</version>
+      </dependency>
+      <dependency>
+        <groupId>oracle</groupId>
+        <artifactId>ojdbc14</artifactId>
+        <version>10.2.0.4.0</version>
+      </dependency>
+      <!--    <dependency>
+        <groupId>ojdbc</groupId>
+        <artifactId>ojdbc</artifactId>
+        <version>14</version>
+    </dependency>   -->      
     </dependencies>
   </dependencyManagement>
 </project>