updating develop poms to master versions to avoid merge conflicts
authorjenkins <jenkins-int@bgbm.org>
Thu, 16 Jul 2015 09:35:13 +0000 (11:35 +0200)
committerjenkins <jenkins-int@bgbm.org>
Thu, 16 Jul 2015 09:35:13 +0000 (11:35 +0200)
12 files changed:
eu.etaxonomy.taxeditor.application/pom.xml
eu.etaxonomy.taxeditor.bulkeditor/pom.xml
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.feature.platform/pom.xml
eu.etaxonomy.taxeditor.feature/pom.xml
eu.etaxonomy.taxeditor.help/pom.xml
eu.etaxonomy.taxeditor.navigation/pom.xml
eu.etaxonomy.taxeditor.printpublisher/pom.xml
eu.etaxonomy.taxeditor.store/pom.xml
eu.etaxonomy.taxeditor/pom.xml
pom.xml

index 2f4db0a..bd81b5f 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.8.0-SNAPSHOT</version>
+    <version>3.7.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 7730f3f..6a4d7e4 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.8.0-SNAPSHOT</version>
+               <version>3.7.0</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 3369711..9526cf8 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.8.0-SNAPSHOT</version>
+    <version>3.7.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>
index eaeafdf..d2014d3 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>3.8.0-SNAPSHOT</version>
+    <version>3.7.0</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
index 89384ec..1f83292 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.8.0-SNAPSHOT</version>
+               <version>3.7.0</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
index e75d41e..dd303a7 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.8.0-SNAPSHOT</version>
+    <version>3.7.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
index 6a4b523..f78ca02 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.8.0-SNAPSHOT</version>
+               <version>3.7.0</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 992838c..aacca8d 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.8.0-SNAPSHOT</version>
+               <version>3.7.0</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 4c2859e..c77414a 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>3.8.0-SNAPSHOT</version>
+               <version>3.7.0</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 30f3016..b53451f 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>3.8.0-SNAPSHOT</version>
+       <version>3.7.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 09c338c..a6d28b7 100644 (file)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.8.0-SNAPSHOT</version>
+    <version>3.7.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 7ad765e..bfb7c31 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>3.8.0-SNAPSHOT</version>
+  <version>3.7.0</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy