Merge branch 'release/5.0.0' into develop

[taxeditor.git] / eu.etaxonomy.taxeditor.cdmlib / pom.xml

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index e225d23d79ac403d4f432f26260a1b1584b7c43e..f11e414d5ba1a5d1fa761792476ebece798e8d67 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -4,7 +4,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>4.7.0-SNAPSHOT</version>\r
+    <version>5.1.0</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
@@ -39,7 +39,7 @@
                 cdmlib-remote-webapp\r
               </excludeArtifactIds>\r
               <includeArtifactIds>\r
-                cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote,cdmlib-test\r
+                cdmlib-services,cdmlib-commons,cdmlib-cache,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote,cdmlib-test\r
               </includeArtifactIds>\r
               <outputDirectory>${basedir}/lib</outputDirectory>\r
               <overWriteReleases>true</overWriteReleases>\r
@@ -236,7 +236,11 @@
       <artifactId>cdmlib-test</artifactId>\r
       <version>${cdmlib.version}</version>\r
     </dependency>\r
-\r
+    <dependency>\r
+      <groupId>eu.etaxonomy</groupId>\r
+      <artifactId>cdmlib-cache</artifactId>\r
+      <version>${cdmlib.version}</version>\r
+    </dependency>\r
     <dependency>\r
       <groupId>net.sf.ehcache</groupId>\r
       <artifactId>ehcache-core</artifactId>\r
@@ -259,8 +263,8 @@
     </dependency>\r
     <dependency>\r
       <groupId>org.hibernate.javax.persistence</groupId>\r
-      <artifactId>hibernate-jpa-2.0-api</artifactId>\r
-      <version>1.0.1.Final</version>\r
+      <artifactId>hibernate-jpa-2.1-api</artifactId>\r
+      <version>1.0.0.Final</version>\r
     </dependency>\r
     <dependency>\r
       <groupId>org.hibernate</groupId>\r
@@ -478,6 +482,7 @@
       <version>1.1.0.Final</version>\r
     </dependency>\r
     <!-- For Hibernate Mapping End -->\r
+\r
     \r
   </dependencies>\r
 </project>\r