updating develop poms to master versions to avoid merge conflicts

diff --git a/cdmlib-cache/pom.xml b/cdmlib-cache/pom.xml
index 60712c8b5086e499514abc828ae93da6cb10fd90..fd05346a7857b62089e7619b225753d2259bb627 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.16.0-SNAPSHOT</version>
+    <version>5.15.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-commons/pom.xml b/cdmlib-commons/pom.xml
index f1e02393f306ae4d301c6e3863e8395c33cbf93c..7f87742997057ce5394db4e9c47302ae43c141be 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.16.0-SNAPSHOT</version>
+    <version>5.15.0</version>
        <relativePath>../pom.xml</relativePath>
   </parent>
   

diff --git a/cdmlib-db/pom.xml b/cdmlib-db/pom.xml
index d900a2b8147d1eedf191bb08f287f8dc89b65450..d89df34ccef189df07f473b2a034ad3c7a334516 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.16.0-SNAPSHOT</version>
+    <version>5.15.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-ext/pom.xml b/cdmlib-ext/pom.xml
index 38ef76af44e6aae0a9b193bd7bbb313feb839727..e865f232fb85809280acf0ca50ed3b9b71de27b7 100644 (file)
--- 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.16.0-SNAPSHOT</version>
+    <version>5.15.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-io/pom.xml b/cdmlib-io/pom.xml
index 799598054ad6b7f3705e9107965115aaded68bbf..3967db38be922fe2f0d252839754cd2cf38f51b1 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.16.0-SNAPSHOT</version>
+    <version>5.15.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-model/pom.xml b/cdmlib-model/pom.xml
index 9bf126f156ea16cf6a7669b8e21ed803cff96252..9f3c21eec584f7c202129f74c8f8e17aac4fa357 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.16.0-SNAPSHOT</version>
+    <version>5.15.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 3a51b6f1110ae041cf504e3ffdd340a1f9af0079..4f9c25caf5434c4e258065b2816ce599b2807028 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.16.0-SNAPSHOT</version>
+    <version>5.15.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-print/pom.xml b/cdmlib-print/pom.xml
index 6c984d635a33b62373e03e290a9dffd2f113ceb7..15e9dd1a58a782414cd2ec92d45301284ad28c14 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.16.0-SNAPSHOT</version>
+    <version>5.15.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 b7af7740dc350fb2967b72c67d285f3a21048b7b..ca2bfb9d3a8ea2dadbdc2ce06464bcdaaef2e65f 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.16.0-SNAPSHOT</version>
+    <version>5.15.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 8f0beacb155d69031b7fdae60ddce67cf0399504..8a3739f73e0640e9e5de704a3e0bad11ebb9ffe0 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.16.0-SNAPSHOT</version>
+    <version>5.15.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-services/pom.xml b/cdmlib-services/pom.xml
index 41d471e1a2b86bef482cd9056096dea54d2413c1..65022d015a938ca576fae3ce1dea899539a743a1 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.16.0-SNAPSHOT</version>
+    <version>5.15.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-test/pom.xml b/cdmlib-test/pom.xml
index e60de197e57768ebc026f79c4e8586f3f92b68d1..c30e28b682ce26c83712cd79f0ee5a3b5ce53b1d 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.16.0-SNAPSHOT</version>
+    <version>5.15.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index 3b4a7e9d00dfe81607269e6c211b28fa1ab07727..8158eb11e147025ec128a836b4ba0f462f9788ce 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.16.0-SNAPSHOT</version>
+  <version>5.15.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>