updating develop poms to master versions to avoid merge conflicts

diff --git a/cdmlib-commons/pom.xml b/cdmlib-commons/pom.xml
index a6a59085d15fa02ef39888c12a847a6a037e9610..f322bc1eb8a80a58cf7b61d16590adc0add4e53d 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.8.0-SNAPSHOT</version>
+    <version>4.7.0</version>
        <relativePath>../pom.xml</relativePath>
   </parent>
   

diff --git a/cdmlib-db/pom.xml b/cdmlib-db/pom.xml
index 93ea738d7155f2743d0d441752856b3234db3963..ee55359a225af137b6585b2797c49f379c7d3aa1 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.8.0-SNAPSHOT</version>
+    <version>4.7.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-ext/pom.xml b/cdmlib-ext/pom.xml
index 121ccdb9b90804f79f8deac3e2649d22b5d0cdf9..dad755ea8830cbf32c06912a330179b8e9caa993 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.8.0-SNAPSHOT</version>
+           <version>4.7.0</version>
            <relativePath>../pom.xml</relativePath>
        </parent>
 

diff --git a/cdmlib-io/pom.xml b/cdmlib-io/pom.xml
index 73a9f215e7c71c897f8fef496b8e4f656da814ed..ca4f3f9a478a87004db424b7ea46aedcf9481d3e 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.8.0-SNAPSHOT</version>
+    <version>4.7.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-model/pom.xml b/cdmlib-model/pom.xml
index 551bbe94d61931938778489762b043a82f7ee089..f236b2725b04dc9eb27e16a1f04c21861f9ded89 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.8.0-SNAPSHOT</version>
+    <version>4.7.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 07e130873c3bf19afdcb35bdbcca17ed8190bd68..572856e76782690a962b8496f9091c6a1784b03a 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.8.0-SNAPSHOT</version>
+    <version>4.7.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-print/pom.xml b/cdmlib-print/pom.xml
index a9f2da1754650d4e3e8919fd3adfc8fff130fed5..8b68722a19006de651af0644c91b9a0aaa8702d3 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.8.0-SNAPSHOT</version>
+    <version>4.7.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 331f8984bd71b32cbb82c732298db0c60a261ce1..b7d39604739a5a8cf1cc818264ab1ea63dc567a2 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.8.0-SNAPSHOT</version>
+    <version>4.7.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-remote/pom.xml b/cdmlib-remote/pom.xml
index a7bf05d9ffe5240d396e16d9a5cfd336dc2bd569..cc9fcacb2fbc94961188bfa9f652c8b347584d57 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.8.0-SNAPSHOT</version>
+    <version>4.7.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-services/pom.xml b/cdmlib-services/pom.xml
index 760c2db2399c493c9e5f9bf95d16b080b64d3ca9..891f975324034b8430ac63fbffcbd9c2b743bf8b 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.8.0-SNAPSHOT</version>
+    <version>4.7.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/cdmlib-test/pom.xml b/cdmlib-test/pom.xml
index e6d9d043b95ed9b01defe458c02e64fa7fed6b76..2eb83c4fa7382c2beae6515e1f4f39babc911f61 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.8.0-SNAPSHOT</version>
+    <version>4.7.0</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

diff --git a/pom.xml b/pom.xml
index cc1804601b90e5178cfb87055779916b636ac060..8cbec56d37e3668c6339c29dbb33a9da1bcdf47c 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.8.0-SNAPSHOT</version>
+  <version>4.7.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>