updating develop poms to master versions to avoid merge conflicts

diff --git a/cdmlib-commons/pom.xml b/cdmlib-commons/pom.xml
index 5a350e78fda2070b04186d29a840be35337a87ac..484ffd84be27f3f9d4ac5399804630d4bde48b13 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>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 c7225e1903bdd876a1b56394ef870e53ae831f41..dc9f53e3143ac3b2ae49fff07334d6eeaf28c847 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>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 12862d56623c670bca23e8a023964ab8fa81d6cc..090ad5c99d6c16bf2a8bbac4acabf6feafead92f 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>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 1ff718092fdd2615711684846e2ef0e712a2ec4d..4bd6c420f59c655baa29c8c5c0b34279c4ce6621 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>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 6d03f448135c125b77c59ce7d542fa221b314db4..fedd0318573b4af4c1744b3d16fda3c7f19140a8 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>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 ae2c643cf8b036da6f9b69d128c2c56b6e330b72..bf453b28baea94ff08ea9cbf01f066b86beb45bb 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>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 30ca7a26e08c09b3732eb759e504f229da2d6541..f422248d8f5b0fd8666fb1b67d05697e8078dfb2 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>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 1a51965ad1d3f40506a84634eb334d331e508f33..97d53c67065088580320f09b93366fa2d99fd7f2 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>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 49fe5a0f092053caebaf41511eefb6856c25d780..7547433c2865033c2240320879d543776e3e5db3 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>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 d96e326bc83dffd33878b39a68ed75bacedb44b2..eafb803f55714e3ca97c18702c67035c7e3093d8 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>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 a785fa32f14ae9a8949654d671d3c963a259eb54..dd5528e1691bb19a21a6f88691a9461e6245c126 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>4.3.0-SNAPSHOT</version>
+               <version>4.2.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index 0149c609d60760902b25fb22d1c464189720a3a6..f8b7c991e85bdaae04f7667cccdf82f028557aec 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>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>