From b51d64a25ac8c8babd72ad14b981da0c35146fa4 Mon Sep 17 00:00:00 2001
From: jenkins <jenkins-int@bgbm.org>
Date: Thu, 15 Feb 2018 15:04:20 +0100
Subject: [PATCH] updating develop poms to master versions to avoid merge
 conflicts

---
 cdmlib-cache/pom.xml         | 4 ++--
 cdmlib-commons/pom.xml       | 2 +-
 cdmlib-db/pom.xml            | 2 +-
 cdmlib-ext/pom.xml           | 2 +-
 cdmlib-io/pom.xml            | 2 +-
 cdmlib-model/pom.xml         | 2 +-
 cdmlib-persistence/pom.xml   | 2 +-
 cdmlib-print/pom.xml         | 2 +-
 cdmlib-remote-webapp/pom.xml | 2 +-
 cdmlib-remote/pom.xml        | 2 +-
 cdmlib-services/pom.xml      | 2 +-
 cdmlib-test/pom.xml          | 2 +-
 pom.xml                      | 2 +-
 13 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/cdmlib-cache/pom.xml b/cdmlib-cache/pom.xml
index d5df467d34..af9e723bba 100644
--- a/cdmlib-cache/pom.xml
+++ b/cdmlib-cache/pom.xml
@@ -4,14 +4,14 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>4.15.0-SNAPSHOT</version>
+    <version>4.14.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdmlib-cache</artifactId>
-  <version>4.15.0-SNAPSHOT</version>
+  <version>4.14.0</version>
   <name>CDM Entity Cache</name>
   <description>CDM Entity Cache</description>
   <scm>
diff --git a/cdmlib-commons/pom.xml b/cdmlib-commons/pom.xml
index 939f617bce..f65f76ce64 100644
--- a/cdmlib-commons/pom.xml
+++ b/cdmlib-commons/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>4.15.0-SNAPSHOT</version>
+    <version>4.14.0</version>
 	<relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/cdmlib-db/pom.xml b/cdmlib-db/pom.xml
index aa7a264ee8..557bd4ff4a 100644
--- a/cdmlib-db/pom.xml
+++ b/cdmlib-db/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>4.15.0-SNAPSHOT</version>
+    <version>4.14.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/cdmlib-ext/pom.xml b/cdmlib-ext/pom.xml
index a29494b3ab..148b3a9b5d 100644
--- a/cdmlib-ext/pom.xml
+++ b/cdmlib-ext/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 	    <groupId>eu.etaxonomy</groupId>
 	    <artifactId>cdmlib-parent</artifactId>
-	    <version>4.15.0-SNAPSHOT</version>
+	    <version>4.14.0</version>
 	    <relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/cdmlib-io/pom.xml b/cdmlib-io/pom.xml
index 3f184a138f..ac34fc6fe9 100644
--- a/cdmlib-io/pom.xml
+++ b/cdmlib-io/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>4.15.0-SNAPSHOT</version>
+    <version>4.14.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/cdmlib-model/pom.xml b/cdmlib-model/pom.xml
index dd54b382c9..730b6d4505 100644
--- a/cdmlib-model/pom.xml
+++ b/cdmlib-model/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>4.15.0-SNAPSHOT</version>
+    <version>4.14.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 25b81e3d6c..0a95d505c5 100644
--- a/cdmlib-persistence/pom.xml
+++ b/cdmlib-persistence/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>4.15.0-SNAPSHOT</version>
+    <version>4.14.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/cdmlib-print/pom.xml b/cdmlib-print/pom.xml
index 69296ee149..4948d4f81b 100644
--- a/cdmlib-print/pom.xml
+++ b/cdmlib-print/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>cdmlib-parent</artifactId>
     <groupId>eu.etaxonomy</groupId>
-    <version>4.15.0-SNAPSHOT</version>
+    <version>4.14.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 5e4e605b93..d9dcb6fe5d 100755
--- 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>4.15.0-SNAPSHOT</version>
+    <version>4.14.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/cdmlib-remote/pom.xml b/cdmlib-remote/pom.xml
index 7862f6b355..75616f3692 100644
--- a/cdmlib-remote/pom.xml
+++ b/cdmlib-remote/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>4.15.0-SNAPSHOT</version>
+    <version>4.14.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/cdmlib-services/pom.xml b/cdmlib-services/pom.xml
index d6e09d4e68..3a788b8b97 100644
--- a/cdmlib-services/pom.xml
+++ b/cdmlib-services/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>4.15.0-SNAPSHOT</version>
+    <version>4.14.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/cdmlib-test/pom.xml b/cdmlib-test/pom.xml
index 663713e275..cad8773d7f 100644
--- a/cdmlib-test/pom.xml
+++ b/cdmlib-test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>4.15.0-SNAPSHOT</version>
+    <version>4.14.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index 1c0b4e50fa..ba48ac4530 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdmlib-parent</artifactId>
-  <version>4.15.0-SNAPSHOT</version>
+  <version>4.14.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>
-- 
2.34.1