updating develop poms to master versions to avoid merge conflicts

diff --git a/cdmlib-cache/pom.xml b/cdmlib-cache/pom.xml
index 1c45659d3eb40beac17ef13b2f1135fa18b1ef77..c86eb5ea17eef379d32e41868e60ce5c3c79bc51 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.27.0-SNAPSHOT</version>
+    <version>5.26.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-commons/pom.xml b/cdmlib-commons/pom.xml
index ba9ceb3f85d91d375d96be92d5b0d3874503a3ed..260cb1322694ee8d99f39e655fa604fc9957f64d 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.27.0-SNAPSHOT</version>
+    <version>5.26.0</version>
        <relativePath>../pom.xml</relativePath>
   </parent>
   

diff --git a/cdmlib-db/pom.xml b/cdmlib-db/pom.xml
index 86193d291b6a8357743a25fb62533f8c54a8eb71..976475b3789db8e7f88f1423e18c37c9bd7d7cac 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.27.0-SNAPSHOT</version>
+    <version>5.26.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-ext/pom.xml b/cdmlib-ext/pom.xml
index 6cde2d2a77a1b4c557fb116d485ad18b0e1545d1..a2827a42b3238afd9af36090cf94971dd3028fc4 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.27.0-SNAPSHOT</version>
+    <version>5.26.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-io/pom.xml b/cdmlib-io/pom.xml
index a95282bbde9f85029265b2ed687415f0921b1135..1021d816151031e8ddfb86f2d0019a264de8e6da 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.27.0-SNAPSHOT</version>
+    <version>5.26.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-model/pom.xml b/cdmlib-model/pom.xml
index 5dbe53b5b9b84a0866d823ced154bd05402ed7ac..2aa00bb0a0f42471d4527ad2705b680ffbab22ca 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.27.0-SNAPSHOT</version>
+    <version>5.26.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 16626a03228eaeb61ee6f4c0f570c8ca95b67fa0..03d79863ed0d39ec58ef7f375ef2b4c7a8628ae0 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.27.0-SNAPSHOT</version>
+    <version>5.26.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-print/pom.xml b/cdmlib-print/pom.xml
index b76dbcbcee3e19f5fbd6c5aeb3e529740807bc9d..09d80caebdbe3f9d5398a3f975b95a30c9404553 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.27.0-SNAPSHOT</version>
+    <version>5.26.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 47bfce12b144c319cd794f3356fbadf533dcebca..e42bac8b672c269f422d56b370628554d8670330 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.27.0-SNAPSHOT</version>
+    <version>5.26.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 4501c0b243f71775f29ab487d57a171e827c2602..8bee2dba6ec559fd18579b47dd715bcb2b7f492d 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.27.0-SNAPSHOT</version>
+    <version>5.26.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-services/pom.xml b/cdmlib-services/pom.xml
index d0c1e0d19a03d713e0bcb9a0027fafb9e4ae4ccc..9235a46c9dd687045051c3e2aaad77f6a3252631 100644 (file)
--- a/cdmlib-services/pom.xml
+++ b/cdmlib-services/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>cdmlib-parent</artifactId>
-    <version>5.27.0-SNAPSHOT</version>
+    <version>5.26.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-test/pom.xml b/cdmlib-test/pom.xml
index 1f8c9533462016db9b5b0baa246fee335c4f3e58..4be5aaf364a143d20b70c090fb397cd4f1ad8e11 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.27.0-SNAPSHOT</version>
+    <version>5.26.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index 4afbd8acba3ae04a276fc9c329eec87d5a57116f..0dd328b8c84eb87ff43d43c97bece6ee4d95861d 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.27.0-SNAPSHOT</version>
+  <version>5.26.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>