From: Andreas Müller <a.mueller@bgbm.org>
Date: Mon, 23 Jul 2012 12:51:56 +0000 (+0000)
Subject: integerate 3.0.12 branch and prepare 3.0.12 release
X-Git-Tag: 3.6.0~1045
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/392c830f85caeb1a77041b362d324186d3a66b0d

integerate 3.0.12 branch and prepare 3.0.12 release
---

392c830f85caeb1a77041b362d324186d3a66b0d
diff --cc pom.xml
index 0dd81a70e,0dd81a70e..b71b35c02
--- a/pom.xml
+++ b/pom.xml
@@@ -6,7 -6,7 +6,7 @@@
    </prerequisites>
    <groupId>eu.etaxonomy</groupId>
    <artifactId>taxeditor-parent</artifactId>
--  <version>3.0.12-SNAPSHOT</version>
++  <version>3.0.12.201207231357</version>
    <name>EDIT Taxonomic Editor</name>
    <description>The Taxonomic Editor for EDIT's platform for cybertaxonomy</description>
    <url>http://wp5.e-taxonomy.eu</url>
@@@ -14,7 -14,7 +14,7 @@@
    <packaging>pom</packaging>
    <properties>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
--    <cdmlib.version>3.0.12-SNAPSHOT</cdmlib.version><!-- TODO can we use project.version ????? -->
++    <cdmlib.version>3.0.12</cdmlib.version><!-- TODO can we use project.version ????? -->
      <tycho.version>0.14.0</tycho.version>
      <taxeditor.version>3.0.12-SNAPSHOT</taxeditor.version>
    </properties>