merge-update from trunk

diff --combined eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 14a720436027d6269d3e19f34f7ce4425a506143,3457c845d68bd79d9fb5884a51af1c74bb86dd3d..65f9bbd3bdae8ef7468cc0f058599ad3f1fd476a
--- 1/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
--- 2/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@@ -2,7 -2,7 +2,7 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: CDM Library Dependencies Plugin
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
- Bundle-Version: 3.2.3.qualifier
+ Bundle-Version: 3.2.3.201308261400
  Eclipse-BundleShape: dir
  Export-Package: com.google.api,
   com.google.api.detect,
@@@ -416,6 -416,22 +416,6 @@@ Bundle-ClassPath: .
   lib/batik-util-1.7.jar,
   lib/batik-xml-1.7.jar,
   lib/c3p0-0.9.2.jar,
 - lib/cdmlib-commons-3.2.3-sources.jar,
 - lib/cdmlib-commons-3.2.3.jar,
 - lib/cdmlib-ext-3.2.3-sources.jar,
 - lib/cdmlib-ext-3.2.3.jar,
 - lib/cdmlib-io-3.2.3-sources.jar,
 - lib/cdmlib-io-3.2.3.jar,
 - lib/cdmlib-model-3.2.3-sources.jar,
 - lib/cdmlib-model-3.2.3.jar,
 - lib/cdmlib-persistence-3.2.3-sources.jar,
 - lib/cdmlib-persistence-3.2.3.jar,
 - lib/cdmlib-print-3.2.3-sources.jar,
 - lib/cdmlib-print-3.2.3.jar,
 - lib/cdmlib-remote-3.2.3-sources.jar,
 - lib/cdmlib-remote-3.2.3.jar,
 - lib/cdmlib-services-3.2.3-sources.jar,
 - lib/cdmlib-services-3.2.3.jar,
   lib/cglib-nodep-2.2.2.jar,
   lib/com.springsource.org.aopalliance-1.0.0.jar,
   lib/com.springsource.org.apache.commons.logging-1.1.1.jar,
@@@ -578,20 -594,4 +578,20 @@@
   lib/yjp-controller-api-redist-9.0.8.jar,
   lib/google-api-translate-java-0.92.jar,
   lib/odfdom-0.8.jar,
 - lib/h2mig_pagestore_addon.jar
 + lib/h2mig_pagestore_addon.jar,
 + lib/cdmlib-commons-3.3.0-SNAPSHOT-sources.jar,
 + lib/cdmlib-commons-3.3.0-SNAPSHOT.jar,
 + lib/cdmlib-ext-3.3.0-SNAPSHOT-sources.jar,
 + lib/cdmlib-ext-3.3.0-SNAPSHOT.jar,
 + lib/cdmlib-io-3.3.0-SNAPSHOT-sources.jar,
 + lib/cdmlib-io-3.3.0-SNAPSHOT.jar,
 + lib/cdmlib-model-3.3.0-SNAPSHOT-sources.jar,
 + lib/cdmlib-model-3.3.0-SNAPSHOT.jar,
 + lib/cdmlib-persistence-3.3.0-SNAPSHOT-sources.jar,
 + lib/cdmlib-persistence-3.3.0-SNAPSHOT.jar,
 + lib/cdmlib-print-3.3.0-SNAPSHOT-sources.jar,
 + lib/cdmlib-print-3.3.0-SNAPSHOT.jar,
 + lib/cdmlib-remote-3.3.0-SNAPSHOT-sources.jar,
 + lib/cdmlib-remote-3.3.0-SNAPSHOT.jar,
 + lib/cdmlib-services-3.3.0-SNAPSHOT-sources.jar,
 + lib/cdmlib-services-3.3.0-SNAPSHOT.jar

diff --combined pom.xml
index 33505614cc882a915e33ad6ffce2711dde9fbfc5,8c6b3943840369258f81bed3b448c8a7cc6fe6ca..d439a64f4cc43a40d7d1f8b285d3e48f2fa64472
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -6,7 -6,7 +6,7 @@@
    </prerequisites>
    <groupId>eu.etaxonomy</groupId>
    <artifactId>taxeditor-parent</artifactId>
-   <version>3.2.3-SNAPSHOT</version>
+   <version>3.2.3.201308261400</version>
    <name>EDIT Taxonomic Editor</name>
    <description>The Taxonomic Editor for EDIT's platform for cybertaxonomy</description>
    <url>http://wp5.e-taxonomy.eu</url>
@@@ -15,10 -15,10 +15,10 @@@
    <properties>
      <java.codelevel>1.6</java.codelevel>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 -    <cdmlib.version>3.2.3</cdmlib.version>
 +    <cdmlib.version>3.3.0-SNAPSHOT</cdmlib.version>
      <!-- TODO can we use project.version ????? -->
      <tycho.version>0.14.0</tycho.version>
-     <taxeditor.version>3.2.3-SNAPSHOT</taxeditor.version>
+     <taxeditor.version>3.2.3</taxeditor.version>
    </properties>
    <modules>
      <module>eu.etaxonomy.taxeditor.cdmlib</module>