From 8c4580af090010d0ac7eecf155a2fc4e4d311a60 Mon Sep 17 00:00:00 2001
From: jenkins <jenkins-int@bgbm.org>
Date: Thu, 3 Dec 2020 19:33:24 +0100
Subject: [PATCH] updating develop poms to master versions to avoid merge
 conflicts

---
 cdmlib-cache/pom.xml         | 2 +-
 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, 13 insertions(+), 13 deletions(-)

diff --git a/cdmlib-cache/pom.xml b/cdmlib-cache/pom.xml
index 31e46a8b1b..ced046f745 100644
--- 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.19.0-SNAPSHOT</version>
+    <version>5.18.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/cdmlib-commons/pom.xml b/cdmlib-commons/pom.xml
index 19d38ac3cd..d4d799bcef 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>5.19.0-SNAPSHOT</version>
+    <version>5.18.0</version>
 	<relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/cdmlib-db/pom.xml b/cdmlib-db/pom.xml
index c79884b0c1..9394c3e75e 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>5.19.0-SNAPSHOT</version>
+    <version>5.18.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/cdmlib-ext/pom.xml b/cdmlib-ext/pom.xml
index 02fbd89fb1..cd09a4af69 100644
--- a/cdmlib-ext/pom.xml
+++ b/cdmlib-ext/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.19.0-SNAPSHOT</version>
+    <version>5.18.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/cdmlib-io/pom.xml b/cdmlib-io/pom.xml
index ebdc97fe61..c208b683c8 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>5.19.0-SNAPSHOT</version>
+    <version>5.18.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/cdmlib-model/pom.xml b/cdmlib-model/pom.xml
index 2a354451bb..ea5fa92355 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>5.19.0-SNAPSHOT</version>
+    <version>5.18.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 f9089f68c4..050d710622 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>5.19.0-SNAPSHOT</version>
+    <version>5.18.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/cdmlib-print/pom.xml b/cdmlib-print/pom.xml
index 2324049fa1..8ef9ae1986 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>5.19.0-SNAPSHOT</version>
+    <version>5.18.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 00e3b08838..4a6c934682 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>5.19.0-SNAPSHOT</version>
+    <version>5.18.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>cdmlib-remote-webapp</artifactId>
diff --git a/cdmlib-remote/pom.xml b/cdmlib-remote/pom.xml
index 1272a9fcf2..39349afcde 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>5.19.0-SNAPSHOT</version>
+    <version>5.18.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/cdmlib-services/pom.xml b/cdmlib-services/pom.xml
index cb15c42cad..91ff07b38d 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>5.19.0-SNAPSHOT</version>
+    <version>5.18.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/cdmlib-test/pom.xml b/cdmlib-test/pom.xml
index 72b4de71ee..d59e6a4e0f 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>5.19.0-SNAPSHOT</version>
+    <version>5.18.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index c4137f97f4..c7df3a1c15 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>5.19.0-SNAPSHOT</version>
+  <version>5.18.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