updating develop poms to master versions to avoid merge conflicts

diff --git a/cdmlib-commons/pom.xml b/cdmlib-commons/pom.xml
index d6bb7000667e0456c9329bb51ff4c72c1592cb5a..7bf6532b5fbd822ef6a20926f2990b8e9e9e35f4 100644 (file)
--- a/cdmlib-commons/pom.xml
+++ b/cdmlib-commons/pom.xml
@@ -6,13 +6,13 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>3.8.0-SNAPSHOT</version>
+    <version>3.7.0</version>
        <relativePath>../pom.xml</relativePath>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cdmlib-commons</artifactId>
-  <version>3.8-SNAPSHOT</version>
+  <version>3.7</version>
   <name>CDM Commons</name>
   <description>EDIT CDM library - Commons</description>
   <scm>

diff --git a/cdmlib-ext/pom.xml b/cdmlib-ext/pom.xml
index 173970a2ed33ed2acc50e31de152aac706f6baf7..6f5e7752014e4e0b92f2a183871d0c2d7b9260db 100644 (file)
--- a/cdmlib-ext/pom.xml
+++ b/cdmlib-ext/pom.xml
@@ -6,13 +6,13 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>cdmlib-parent</artifactId>
-           <version>3.8.0-SNAPSHOT</version>
+           <version>3.7.0</version>
                <relativePath>../pom.xml</relativePath>
        </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cdmlib-ext</artifactId>
-  <version>3.8-SNAPSHOT</version>
+  <version>3.7</version>
   <name>CDM External</name>
   <description>EDIT CDM library external services. Module for handling requests to non CDM library services like the EDIT geoservice.</description>
   <scm>

diff --git a/cdmlib-io/pom.xml b/cdmlib-io/pom.xml
index 5f09c18944cbbe9a485b8fe10c43b657535b06b2..cd88999d9c6ce30d6b879f065dc810c248bafa49 100644 (file)
--- a/cdmlib-io/pom.xml
+++ b/cdmlib-io/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-               <version>3.8.0-SNAPSHOT</version>
+               <version>3.7.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cdmlib-io</artifactId>
-  <version>3.8-SNAPSHOT</version>
+  <version>3.7</version>
   <name>CDM Import/Export</name>
   <description>The import-export package for EDIT's cdmLibrary</description>
   <scm>

diff --git a/cdmlib-model/pom.xml b/cdmlib-model/pom.xml
index d736a2e5b5377a25026fb14c09043594cad23fc4..b212dfa026ec14315f21f44192e69f867be01ea2 100644 (file)
--- a/cdmlib-model/pom.xml
+++ b/cdmlib-model/pom.xml
@@ -2,12 +2,12 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>3.8.0-SNAPSHOT</version>
+    <version>3.7.0</version>
   <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cdmlib-model</artifactId>
-  <version>3.8-SNAPSHOT</version>
+  <version>3.7</version>
   <name>CDM Domain Model</name>
   <description>The domain model java implementation of EDIT's Common Data Model</description>
   <scm>

diff --git a/cdmlib-persistence/pom.xml b/cdmlib-persistence/pom.xml
index 8ef60c2e436693fed377fb6806c03417235a07f4..aa44761f3ab092f65d92f54c5473d1a7fb1b7e44 100644 (file)
--- a/cdmlib-persistence/pom.xml
+++ b/cdmlib-persistence/pom.xml
@@ -3,13 +3,13 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-               <version>3.8.0-SNAPSHOT</version>
+               <version>3.7.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cdmlib-persistence</artifactId>
-  <version>3.8-SNAPSHOT</version>
+  <version>3.7</version>
   <name>CDM Persistence</name>
   <description>EDIT CDM library persistence layer. Mainly DAOs</description>
   <scm>

diff --git a/cdmlib-print/pom.xml b/cdmlib-print/pom.xml
index 34ec9e449eee972d5444e12b90692dcb5233d2d2..c17cb74e73c2b88c16d2a53fb2fc63fb7508e2b0 100644 (file)
--- a/cdmlib-print/pom.xml
+++ b/cdmlib-print/pom.xml
@@ -3,13 +3,13 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>3.8.0-SNAPSHOT</version>
+    <version>3.7.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdmlib-print</artifactId>
-  <version>3.8-SNAPSHOT</version>
+  <version>3.7</version>
   <packaging>jar</packaging>
   <name>CDM Print Publisher</name>
   <description>EDIT CDM Print Publishing Framework</description>

diff --git a/cdmlib-remote-webapp/pom.xml b/cdmlib-remote-webapp/pom.xml
index 44de0986c0fe87226424f45a87e911bbe43e8c4e..1c1bd2115b20a0fc98b68149ee10baf717e45a93 100644 (file)
--- a/cdmlib-remote-webapp/pom.xml
+++ b/cdmlib-remote-webapp/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>3.8.0-SNAPSHOT</version>
+    <version>3.7.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdmlib-remote-webapp</artifactId>
-  <version>3.8-SNAPSHOT</version>
+  <version>3.7</version>
   <name>CDM Remote Webapp</name>
   <packaging>war</packaging>
 

diff --git a/cdmlib-remote/pom.xml b/cdmlib-remote/pom.xml
index 97737264de128423610423c0cf27efa4eaec43a3..9a32622cb830311cd3ad1dafb9e511b3fbfde1e5 100644 (file)
--- a/cdmlib-remote/pom.xml
+++ b/cdmlib-remote/pom.xml
@@ -4,13 +4,13 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>3.8.0-SNAPSHOT</version>
+    <version>3.7.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cdmlib-remote</artifactId>
-  <version>3.8-SNAPSHOT</version>
+  <version>3.7</version>
   <properties>
     <!-- custom property to hold the patch version number shouldn't this
       be set in the parent pom? -->

diff --git a/cdmlib-services/pom.xml b/cdmlib-services/pom.xml
index 9681454bc3eaf463581a1aaa0d7a88552c8c8c8b..d2d1dd6d99224ffaf1b20550a412673a6823e634 100644 (file)
--- a/cdmlib-services/pom.xml
+++ b/cdmlib-services/pom.xml
@@ -6,13 +6,13 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>3.8.0-SNAPSHOT</version>
+    <version>3.7.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <artifactId>cdmlib-services</artifactId>
-  <version>3.8-SNAPSHOT</version>  
+  <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>

diff --git a/pom.xml b/pom.xml
index 183286a11942e4ecf25e77e552dbd8d11676db1b..f894906b50e8ef5c1b64faa74f7121a5c5a961b4 100755 (executable)
--- 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.8.0-SNAPSHOT</version>
+  <version>3.7.0</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>
@@ -635,37 +635,37 @@
       <dependency>
         <groupId>eu.etaxonomy</groupId>
         <artifactId>cdmlib-commons</artifactId>
-        <version>3.8-SNAPSHOT</version>
+        <version>3.7</version>
       </dependency>
       <dependency>
         <groupId>eu.etaxonomy</groupId>
         <artifactId>cdmlib-model</artifactId>
-        <version>3.8-SNAPSHOT</version>
+        <version>3.7</version>
       </dependency>
       <dependency>
         <groupId>eu.etaxonomy</groupId>
         <artifactId>cdmlib-persistence</artifactId>
-        <version>3.8-SNAPSHOT</version>
+        <version>3.7</version>
       </dependency>
       <dependency>
         <groupId>eu.etaxonomy</groupId>
         <artifactId>cdmlib-services</artifactId>
-        <version>3.8-SNAPSHOT</version>
+        <version>3.7</version>
       </dependency>
       <dependency>
         <groupId>eu.etaxonomy</groupId>
         <artifactId>cdmlib-io</artifactId>
-        <version>3.8-SNAPSHOT</version>
+        <version>3.7</version>
       </dependency>
       <dependency>
         <groupId>eu.etaxonomy</groupId>
         <artifactId>cdmlib-remote</artifactId>
-        <version>3.8-SNAPSHOT</version>
+        <version>3.7</version>
       </dependency>
       <dependency>
         <groupId>eu.etaxonomy</groupId>
         <artifactId>cdmlib-remote-webapp</artifactId>
-        <version>3.8-SNAPSHOT</version>
+        <version>3.7</version>
       </dependency>
       <dependency>
         <groupId>eu.etaxonomy</groupId>
@@ -675,12 +675,12 @@
       <dependency>
         <groupId>eu.etaxonomy</groupId>
         <artifactId>cdmlib-ext</artifactId>
-        <version>3.8-SNAPSHOT</version>
+        <version>3.7</version>
       </dependency>
       <dependency>
         <groupId>eu.etaxonomy</groupId>
         <artifactId>cdmlib-print</artifactId>
-        <version>3.8-SNAPSHOT</version>
+        <version>3.7</version>
       </dependency>
       <!--*********** JAXB********* -->
       <dependency>