Some cleanup for HGTaxonComparator #3338

[cdmlib.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 26fe66550be16b7aab7cd68b3c0eba08edeeb834..3d3afa5818ea0a4dfa59a66495fb5e6bf0e6f589 100644 (file)
--- 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.13.0-SNAPSHOT</version>
+  <version>4.0.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>
@@ -29,7 +29,7 @@
        <hibernate.version>5.0.7.Final</hibernate.version>
        <hibernate-validator.version>5.2.2.Final</hibernate-validator.version>
     <hibernate-search.version>5.5.2.Final</hibernate-search.version>
-    <lucene.version>5.4.0</lucene.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>  -->
@@ -38,7 +38,7 @@
     <httpcomponents.version>4.5.1</httpcomponents.version>
     <doxia.version>1.6</doxia.version>
     <poi.version>3.13</poi.version>
-    <jackson.version>2.7.0</jackson.version>
+    <jackson.version>2.6.5</jackson.version>
        <commons-logging.version>1.2</commons-logging.version>
        <slf4j.version>1.7.13</slf4j.version>
        <jaxb.version>2.2.11</jaxb.version>
@@ -781,6 +781,10 @@
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate</artifactId>
           </exclusion>
+          <exclusion>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-nop</artifactId>
+          </exclusion>
         </exclusions>
       </dependency>
       <dependency>
@@ -1169,7 +1173,7 @@
       <dependency>
         <groupId>com.thoughtworks.xstream</groupId>
         <artifactId>xstream</artifactId>
-        <version>1.4.4</version>
+        <version>1.4.7</version>
       </dependency>
       <dependency>
         <groupId>xpp3</groupId>
@@ -1246,6 +1250,13 @@
       <dependency>
         <groupId>com.mchange</groupId>
         <artifactId>c3p0</artifactId>
+        <!-- 
+          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!
+        -->
         <version>0.9.5.2</version>
       </dependency>
       <dependency>
@@ -1368,6 +1379,11 @@
         <version>3.1.0</version>
       </dependency>
       <!-- ******* DATABASES DRIVER ******* -->
+      <!-- 
+            IMPORTANT:
+            Any driver dependency listed here must be excluded from the 
+            cdmlib-remote depedency in cdmlib-remote-webapp
+       -->
       <dependency>
         <!-- SQL Server and Sybase -->
         <groupId>net.sourceforge.jtds</groupId>
@@ -1395,7 +1411,6 @@
         <artifactId>jdbc4</artifactId>
         <version>2.0</version>
       </dependency>
-
       <dependency>
         <groupId>oracle</groupId>
         <artifactId>ojdbc14</artifactId>
@@ -1416,8 +1431,7 @@
       <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 -->
@@ -1452,11 +1466,6 @@
                <version>${hibernate-validator.version}</version>
          </dependency>
          
-      <dependency>
-        <groupId>p6spy</groupId>
-        <artifactId>p6spy</artifactId>
-        <version>2.1.4</version>
-      </dependency>
       <!-- for ikey-plus -->
       <dependency>
         <groupId>identificationKeyAPI</groupId>