From 31f1c2176ec172ba63a4c70bdf28bd632058d61e Mon Sep 17 00:00:00 2001
From: jenkins <jenkins-int@bgbm.org>
Date: Wed, 6 Jul 2016 16:10:49 +0200
Subject: [PATCH] updating develop poms to master versions to avoid merge
 conflicts

---
 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 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cdmlib-commons/pom.xml b/cdmlib-commons/pom.xml
index 5a350e78fd..484ffd84be 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.3.0-SNAPSHOT</version>
+    <version>4.2.0</version>
 	<relativePath>../pom.xml</relativePath>
   </parent>
   
diff --git a/cdmlib-db/pom.xml b/cdmlib-db/pom.xml
index c7225e1903..dc9f53e314 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.3.0-SNAPSHOT</version>
+		<version>4.2.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/cdmlib-ext/pom.xml b/cdmlib-ext/pom.xml
index 12862d5662..090ad5c99d 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.3.0-SNAPSHOT</version>
+	    <version>4.2.0</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/cdmlib-io/pom.xml b/cdmlib-io/pom.xml
index 1ff718092f..4bd6c420f5 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.3.0-SNAPSHOT</version>
+		<version>4.2.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/cdmlib-model/pom.xml b/cdmlib-model/pom.xml
index 6d03f44813..fedd031857 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.3.0-SNAPSHOT</version>
+    <version>4.2.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 ae2c643cf8..bf453b28ba 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.3.0-SNAPSHOT</version>
+		<version>4.2.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/cdmlib-print/pom.xml b/cdmlib-print/pom.xml
index 30ca7a26e0..f422248d8f 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.3.0-SNAPSHOT</version>
+    <version>4.2.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 1a51965ad1..97d53c6706 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.3.0-SNAPSHOT</version>
+    <version>4.2.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/cdmlib-remote/pom.xml b/cdmlib-remote/pom.xml
index 49fe5a0f09..7547433c28 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.3.0-SNAPSHOT</version>
+    <version>4.2.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/cdmlib-services/pom.xml b/cdmlib-services/pom.xml
index d96e326bc8..eafb803f55 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.3.0-SNAPSHOT</version>
+    <version>4.2.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/cdmlib-test/pom.xml b/cdmlib-test/pom.xml
index a785fa32f1..dd5528e169 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.3.0-SNAPSHOT</version>
+		<version>4.2.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/pom.xml b/pom.xml
index 0149c609d6..f8b7c991e8 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.3.0-SNAPSHOT</version>
+  <version>4.2.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