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 2f4db0a333cf6b161c68a17a536f75a8b78d590c..bd81b5f07dccb5a81004cd74bacb75fce7b29486 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
   <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>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 7730f3fadd05822f612735572142cc88171b6bac..6a4d7e4397134813756f8dcd6a038cf18dd8d9de 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <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>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 3369711696df66cf3a600b5f6f14640429d4cf89..9526cf8915ea55d37d7c19b0c8285c752cd26c84 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
   <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>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>
index eaeafdfc83c09f7347350c379d6867acd2425869..d2014d3a99fa82ce8295c00db4ca66dbc7f4ed5f 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
   <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>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
index 89384ec77a0122a29541acd408708fa5bbddf974..1f83292b088c4e3df32c9cde340b81d3150f2e83 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <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>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
index e75d41e1ab26b9b07c5e5a1bffb3b9817b67fa10..dd303a7179d2a99c2734b676baabdd065ba20f73 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
   <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>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
index 6a4b52361d3573478da7fc876e320662d3272315..f78ca020824b106f3828add2d4c5cb628e3e37d2 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <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>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 992838c22da67c0d344a5140f600a529cf4981a1..aacca8d12596c4c8d59cd33884f9ce2fe647bc29 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
        <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>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 4c2859ebb5d3ac23d6cd6209157b0ca3ca3bf4d4..c77414a43127eb0841231229c35cc38a82bd5493 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
        <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>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 30f30166fd06b5790f12000c70f100795d077c0a..b53451f9ba320a82745cfa49a1c81371944ca18a 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
   <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>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 09c338c76e97538ae64f8ecb946f9b16d03af2c7..a6d28b7761c55eeba011426b138a63a6801452e4 100644 (file)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
   <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>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 7ad765e20c4ab27a870be713638a2afa48886025..bfb7c318ebcda6166707fc2eddb2a81db4b49ea2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
   </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
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy