updating develop poms to master versions to avoid merge conflicts

diff --git a/cdmlib-cache/pom.xml b/cdmlib-cache/pom.xml
index e41a5e32bbddd5c6d211a91dca76386561b16ca9..6879712afc747f5a93c375b1e6b95857a370fe3f 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.12.0-SNAPSHOT</version>
+    <version>5.11.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-commons/pom.xml b/cdmlib-commons/pom.xml
index f7caf5a825595db67216d84a8489cf7dc79902b6..0e78d370db6cb44a47323d1fc49e196568892fa5 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.12.0-SNAPSHOT</version>
+    <version>5.11.0</version>
        <relativePath>../pom.xml</relativePath>
   </parent>
   

diff --git a/cdmlib-db/pom.xml b/cdmlib-db/pom.xml
index 3b44f884a13587dc1806e71f537c0ef0608f3c2c..4a70f76886dbc7827b01832df224ed5d7333fd31 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.12.0-SNAPSHOT</version>
+    <version>5.11.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-ext/pom.xml b/cdmlib-ext/pom.xml
index 5bc758c9b8040c6dbede9438439a66d974aa0bbb..71db807549a275dd7133f6e2d93056e630171c4f 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.12.0-SNAPSHOT</version>
+           <version>5.11.0</version>
            <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/cdmlib-io/pom.xml b/cdmlib-io/pom.xml
index fc53481d8043e5b9fc1e0cefa79c154b81076ca7..83d835a0b4e33195d7149faf8d6c5da54bbd1a6e 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.12.0-SNAPSHOT</version>
+    <version>5.11.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-model/pom.xml b/cdmlib-model/pom.xml
index eeee5d9dbbc792186907547af499374f29396ec7..685e9bf1b2454c59b10304539be2d8e4b9ca9efe 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.12.0-SNAPSHOT</version>
+    <version>5.11.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 df77801bce0356fc6de1ff89f9a6e1571eb63f65..d4a0e5c73544bdd96cbd5444d284b6ce0bde4cac 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.12.0-SNAPSHOT</version>
+    <version>5.11.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-print/pom.xml b/cdmlib-print/pom.xml
index 8df37a3ee2b4e904bcf970cef1118844ff869566..b526130efd241f7c9d34f1d894d67c8ae67be90a 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.12.0-SNAPSHOT</version>
+    <version>5.11.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 ac846432c49659707d92bc1727c4b9051fd572a0..06844a0106595a49728dcc63ee5d8311bd34e2b4 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.12.0-SNAPSHOT</version>
+    <version>5.11.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-remote/pom.xml b/cdmlib-remote/pom.xml
index af6f3c022aba8da24e295a58e368e0128212ea02..24b2b1686a026b177ebbb758a4a575bf51d9c712 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.12.0-SNAPSHOT</version>
+    <version>5.11.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-services/pom.xml b/cdmlib-services/pom.xml
index 1bd8e2230a116caeab671fc38614b5d1408b21b6..25fb3310cb56b1c9febde530c777478c09cda634 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.12.0-SNAPSHOT</version>
+    <version>5.11.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-test/pom.xml b/cdmlib-test/pom.xml
index 27fd50640c11c03cd544dc1bd010eee73e2b2ad3..3d2e003bc9649637a4285c11cb4b6597268a264f 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.12.0-SNAPSHOT</version>
+    <version>5.11.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index cda90ae00823a27c516cceddbf1a4ccc91b5baad..c18c630a153eea4bb6779c92331bd89026fb8b69 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.12.0-SNAPSHOT</version>
+  <version>5.11.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>