updating develop poms to master versions to avoid merge conflicts

diff --git a/cdmlib-cache/pom.xml b/cdmlib-cache/pom.xml
index 618345debacffa35cac11643be678113a01af0f3..a9f31025782292a301722fd9243e9bb9ad070668 100644 (file)
--- a/cdmlib-cache/pom.xml
+++ b/cdmlib-cache/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.10.0-SNAPSHOT</version>
+    <version>5.9.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-commons/pom.xml b/cdmlib-commons/pom.xml
index dea8ceb97e241911d08665d3c362ff808bc46111..35e653d145dd76e70d751bfdc20ad1c7a4de81a0 100644 (file)
--- a/cdmlib-commons/pom.xml
+++ b/cdmlib-commons/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.10.0-SNAPSHOT</version>
+    <version>5.9.0</version>
        <relativePath>../pom.xml</relativePath>
   </parent>
   

diff --git a/cdmlib-db/pom.xml b/cdmlib-db/pom.xml
index a7ff83ffdfcb679a4423d39d2d434936ab65bf13..7afb335a965bd8c41b95d3a78afc2d9f7b1c2794 100644 (file)
--- a/cdmlib-db/pom.xml
+++ b/cdmlib-db/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.10.0-SNAPSHOT</version>
+    <version>5.9.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-ext/pom.xml b/cdmlib-ext/pom.xml
index 9e2248ac57770747e725dfa06926fbbb1205b9fb..528174a10a8b7e65d761f40f4e17e8bd1ff9f4c4 100644 (file)
--- a/cdmlib-ext/pom.xml
+++ b/cdmlib-ext/pom.xml
@@ -6,7 +6,7 @@
        <parent>
            <groupId>eu.etaxonomy</groupId>
            <artifactId>cdmlib-parent</artifactId>
-           <version>5.10.0-SNAPSHOT</version>
+           <version>5.9.0</version>
            <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/cdmlib-io/pom.xml b/cdmlib-io/pom.xml
index 06773fac1f02032a90fd8d7825b8e7c3b33cd111..257f4a97be92541b53df052c90b8789bf57581cc 100644 (file)
--- a/cdmlib-io/pom.xml
+++ b/cdmlib-io/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.10.0-SNAPSHOT</version>
+    <version>5.9.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-model/pom.xml b/cdmlib-model/pom.xml
index fa2b2c22b044626cb452264754fd86f603125fec..7b181e3e3b957283a37a6ea115097f2e97ca4b9f 100644 (file)
--- a/cdmlib-model/pom.xml
+++ b/cdmlib-model/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>5.10.0-SNAPSHOT</version>
+    <version>5.9.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/cdmlib-persistence/pom.xml b/cdmlib-persistence/pom.xml
index 07c3588c97286dc9e83ce599c446e9aaa2303faa..342e6fccdd619acd8f0c0d0923a2887c88468f68 100644 (file)
--- a/cdmlib-persistence/pom.xml
+++ b/cdmlib-persistence/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.10.0-SNAPSHOT</version>
+    <version>5.9.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-print/pom.xml b/cdmlib-print/pom.xml
index 8c859e441badc9d6c91bb02cfbcd2d9ec54fed3c..a000d4b172b9f28f1d6a136fb70a6b7a06fa83c8 100644 (file)
--- a/cdmlib-print/pom.xml
+++ b/cdmlib-print/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>5.10.0-SNAPSHOT</version>
+    <version>5.9.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <modelVersion>4.0.0</modelVersion>

diff --git a/cdmlib-remote-webapp/pom.xml b/cdmlib-remote-webapp/pom.xml
index e2a9a9f14537ef8f71c544ff1e119c83260ccd4a..d2467c7444bdf3ebbd7ac30e81190e27f46798fa 100755 (executable)
--- a/cdmlib-remote-webapp/pom.xml
+++ b/cdmlib-remote-webapp/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>5.10.0-SNAPSHOT</version>
+    <version>5.9.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-remote/pom.xml b/cdmlib-remote/pom.xml
index 57a7cf46aed0351af1346f8c50a527830b9a1f0a..8620b7cfbe4ef542a875411a7321d51a652edce2 100644 (file)
--- a/cdmlib-remote/pom.xml
+++ b/cdmlib-remote/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.10.0-SNAPSHOT</version>
+    <version>5.9.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-services/pom.xml b/cdmlib-services/pom.xml
index c3c3d9bac48da53f0e5c7f9f9872e01b2f3b645a..e9085033075f618e53f24fe1e4911b680a19fa2a 100644 (file)
--- a/cdmlib-services/pom.xml
+++ b/cdmlib-services/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.10.0-SNAPSHOT</version>
+    <version>5.9.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-test/pom.xml b/cdmlib-test/pom.xml
index aef3be4bc9144a9ffe9f0b0ed33ac4a4e633297d..4daddcff20d46529f40374257e26f2701547d92f 100644 (file)
--- a/cdmlib-test/pom.xml
+++ b/cdmlib-test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.10.0-SNAPSHOT</version>
+    <version>5.9.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index 5e8167d5e03aa2cd125930f2546cbbe6c4f81a35..171a9dd404a589f2b9683fafb8435b314930db70 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>5.10.0-SNAPSHOT</version>
+  <version>5.9.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>