updating develop poms to master versions to avoid merge conflicts

diff --git a/cdmlib-cache/pom.xml b/cdmlib-cache/pom.xml
index bdec0b9a8f5cebce1f56c9b3f889587e387fc082..da8ec7180106db5e6d1bac6739ea7b8df50ba046 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.14.0-SNAPSHOT</version>
+    <version>5.13.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-commons/pom.xml b/cdmlib-commons/pom.xml
index d52e99f45adb20b82a3184910a3b812fa801230b..cecda72b8c2d2efe5cabded29cfda1f360ec8580 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.14.0-SNAPSHOT</version>
+    <version>5.13.0</version>
        <relativePath>../pom.xml</relativePath>
   </parent>
   

diff --git a/cdmlib-db/pom.xml b/cdmlib-db/pom.xml
index f9cc4d2f6daf837bac2ea2afc3438c9cca7c32d1..c0d1def335f53103eb4fab55c7d14249230f834e 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.14.0-SNAPSHOT</version>
+    <version>5.13.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-ext/pom.xml b/cdmlib-ext/pom.xml
index f7c024d8c3924b39d4c52ca22faee7270e95a2c0..725d6f325a4c667af07ebe7ff17c576870d64a39 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.14.0-SNAPSHOT</version>
+           <version>5.13.0</version>
            <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/cdmlib-io/pom.xml b/cdmlib-io/pom.xml
index c19a2c55313987d95081169275a8d783934124fc..26b18413d050eaf5d9f2462bc9e85f49c3dd9bd9 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.14.0-SNAPSHOT</version>
+    <version>5.13.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-model/pom.xml b/cdmlib-model/pom.xml
index f96a6b9de673f22faf85010f7e0e1db6a2090bef..afe081508f2be04cca1802e52300f5f29a08bc07 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.14.0-SNAPSHOT</version>
+    <version>5.13.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 d7e67843f1ab9b54019e6ea7b0f0a802a911834d..9964bc0aed183a0925f632d8c53925876959f98e 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.14.0-SNAPSHOT</version>
+    <version>5.13.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-print/pom.xml b/cdmlib-print/pom.xml
index b98381422eaa663b31aa90996549f295c80328ef..ad4ef446e08c2d9871ea26b8d999b9dcdd02f073 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.14.0-SNAPSHOT</version>
+    <version>5.13.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 15cb093d93c84f0f45d0d7bafa76c17fef676518..f7c4fae3e0f966e0a11bef00ba0c12c558cf96a0 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.14.0-SNAPSHOT</version>
+    <version>5.13.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-remote/pom.xml b/cdmlib-remote/pom.xml
index b69072327638d3c1b70fee622d613540a5de4ba2..c50d77355910ab61976bef65de5166dddfc5523e 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.14.0-SNAPSHOT</version>
+    <version>5.13.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-services/pom.xml b/cdmlib-services/pom.xml
index 85076208a56547f000cad49457ae36e2da7520e1..92d5e02220bb1703d783601283bac6226c8b5741 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.14.0-SNAPSHOT</version>
+    <version>5.13.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-test/pom.xml b/cdmlib-test/pom.xml
index 4cb118b845981597bef9c04c42ffdf9accf9ff92..4c932b80e517a6d9e4a29f896489a3a160be1b30 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.14.0-SNAPSHOT</version>
+    <version>5.13.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index 4a82be61637e53cb7882bd13980b2e8c7b899fe1..b839c862f44785813eb842b94a35172037e3fdbd 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.14.0-SNAPSHOT</version>
+  <version>5.13.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>