updating develop poms to master versions to avoid merge conflicts

[cdmlib.git] / cdmlib-services / pom.xml

diff --git a/cdmlib-services/pom.xml b/cdmlib-services/pom.xml
index c780fbeb08bbe8f230e12576ef9143456d51aa04..d2d1dd6d99224ffaf1b20550a412673a6823e634 100644 (file)
--- a/cdmlib-services/pom.xml
+++ b/cdmlib-services/pom.xml
@@ -6,12 +6,13 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>3.4.0-SNAPSHOT</version>
+    <version>3.7.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cdmlib-services</artifactId>
+  <version>3.7</version>  
   <name>CDM Services</name>
   <description>EDIT CDM library services. The local API and basis for webservices too.</description>
   <packaging>bundle</packaging>
@@ -123,8 +124,7 @@
     </dependency>
     <dependency>
          <groupId>net.sf.ehcache</groupId>
-         <artifactId>ehcache-core</artifactId>
-         <version>2.6.9</version>
+         <artifactId>ehcache-core</artifactId>   
        </dependency>
   </dependencies>
 </project>