updating develop poms to master versions to avoid merge conflicts

diff --git a/cdmlib-commons/pom.xml b/cdmlib-commons/pom.xml
index 985802c7596bc175e5153766659a5eea50926ad9..c5a250ae2a368c7e14f71fc3f27d0f38014d8b06 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.6.0-SNAPSHOT</version>
+    <version>4.5.0</version>
        <relativePath>../pom.xml</relativePath>
   </parent>
   

diff --git a/cdmlib-db/pom.xml b/cdmlib-db/pom.xml
index a8455ed269a16f8211cdbcca68b279f9ec847c9e..68886abcfddc28ee0ff8de8753aa59bc79669606 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.6.0-SNAPSHOT</version>
+    <version>4.5.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-ext/pom.xml b/cdmlib-ext/pom.xml
index abb60e91671eea1ec32ad2642faf5cfa72a98b0c..dd493f7a2f424a7179d0cf6c20b2c73c98721e58 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.6.0-SNAPSHOT</version>
+           <version>4.5.0</version>
            <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/cdmlib-io/pom.xml b/cdmlib-io/pom.xml
index ed8d05453a036e368ac804cc8b574369490f2427..d26f6c5e28218107e543fbea6b8442f6eb2a701a 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.6.0-SNAPSHOT</version>
+    <version>4.5.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-model/pom.xml b/cdmlib-model/pom.xml
index bc6f98cac702c1c04b2c1bc1dd4a7ac1ccfb57d9..ba401274c3e55fdf4292e190a99aeb9c7001f861 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.6.0-SNAPSHOT</version>
+    <version>4.5.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 d79323c7f5f02cfd324d2a8f229159ed9b32bf63..90a380974d0687e7c1e179f4ad132fefac7a0288 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.6.0-SNAPSHOT</version>
+    <version>4.5.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-print/pom.xml b/cdmlib-print/pom.xml
index cfe09c0e1992333eb427168cda492762564823c0..c34ee5d612b0f08f1fda52ee5dc983f97ed182f7 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.6.0-SNAPSHOT</version>
+    <version>4.5.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 90d38e10ad1c1901ac0dd4944a60a7b58d3474ed..3afafee27ce74994134f13586a2187298ccab18d 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.6.0-SNAPSHOT</version>
+    <version>4.5.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-remote/pom.xml b/cdmlib-remote/pom.xml
index 8468b4c44977ce2328857a88c8eb8448f360ceff..b68e8b79bfc60a35e3f3542c85b013014f8ecf99 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.6.0-SNAPSHOT</version>
+    <version>4.5.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-services/pom.xml b/cdmlib-services/pom.xml
index 2dd0cac82b4d09c9343149ff2270a3a3fdbccbd4..2a583d53c085fb3af39a2eb33e54f98715668ce7 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.6.0-SNAPSHOT</version>
+    <version>4.5.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-test/pom.xml b/cdmlib-test/pom.xml
index 9102e815eba27a411a492b0ff8833921c109f11a..6f5f94da9028fe5527236d97da04a0c2882a0324 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.6.0-SNAPSHOT</version>
+    <version>4.5.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index 9641dae3de7a1c3b5fdba9cc087e4b6cef62c2f7..26605aff1f40dead41514520dd27f18899473ed7 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.6.0-SNAPSHOT</version>
+  <version>4.5.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>