Merge branch 'develop' into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Tue, 15 Sep 2015 18:38:52 +0000 (20:38 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Tue, 15 Sep 2015 18:38:52 +0000 (20:38 +0200)
Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties

29 files changed:
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.application/pom.xml
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/pom.xml
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.feature.platform/feature.xml
eu.etaxonomy.taxeditor.feature.platform/pom.xml
eu.etaxonomy.taxeditor.feature/feature.xml
eu.etaxonomy.taxeditor.feature/pom.xml
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.help/pom.xml
eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.molecular.lib/pom.xml
eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.molecular/pom.xml
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/pom.xml
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.printpublisher/pom.xml
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/pom.xml
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
eu.etaxonomy.taxeditor/pom.xml
pom.xml

index f4268c62f558abf0ee3971246719d8553984c898..9fe1b3ced4971d065bb1df29c832d84a438ae282 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Application
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 3.10.0.qualifier
+Bundle-Version: 3.11.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/plugin
index 47331bb28bd5ee11167a56c2f34fa6662363ff00..b47df5f0d5091cccbe32209df46601a246e43c8a 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.10.0-SNAPSHOT</version>
+    <version>3.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index dab5ffc9df9d8a8e9ec5b80ebaa61412deb484d5..d835f626d9a871187b561fff87b163e679a8654b 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Bulkeditor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
-Bundle-Version: 3.10.0.qualifier
+Bundle-Version: 3.11.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
index a3ac3d41f4d0caff422cb8865100555ba498a125..35dd9f09d1c5b7412b43bd8dfc5b24973a51e4b2 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.10.0-SNAPSHOT</version>
+               <version>3.11.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 4477b7310a3024d0bb2d8060cd674d9edc5279a3..da7d39d0123aa75e7b7a8fcaba6c571676dc27b4 100644 (file)
        <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.10-FINAL.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/swagger-annotations-1.3.5.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/apache-log4j-extras-1.2.17.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.10.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.11.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.11.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.11.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.11.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.11.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.11.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.11.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.11.0-SNAPSHOT.jar"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>
index 7ea3ae90331fba2e05222b6f2fac4e68e8efcf5e..fe6cb91751a2759549c7133a5f497e85983b2976 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: CDM Library Dependencies Plugin
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 3.10.0.qualifier
+Bundle-Version: 3.11.0.qualifier
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -658,12 +658,12 @@ Bundle-ClassPath: .,
  lib/poi-ooxml-schemas-3.10-FINAL.jar,
  lib/swagger-annotations-1.3.5.jar,
  lib/apache-log4j-extras-1.2.17.jar,
- lib/cdmlib-commons-3.10.0-SNAPSHOT.jar,
- lib/cdmlib-ext-3.10.0-SNAPSHOT.jar,
- lib/cdmlib-io-3.10.0-SNAPSHOT.jar,
- lib/cdmlib-model-3.10.0-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.10.0-SNAPSHOT.jar,
- lib/cdmlib-print-3.10.0-SNAPSHOT.jar,
- lib/cdmlib-remote-3.10.0-SNAPSHOT.jar,
- lib/cdmlib-services-3.10.0-SNAPSHOT.jar
+ lib/cdmlib-commons-3.11.0-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.11.0-SNAPSHOT.jar,
+ lib/cdmlib-io-3.11.0-SNAPSHOT.jar,
+ lib/cdmlib-model-3.11.0-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.11.0-SNAPSHOT.jar,
+ lib/cdmlib-print-3.11.0-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.11.0-SNAPSHOT.jar,
+ lib/cdmlib-services-3.11.0-SNAPSHOT.jar
 Import-Package: eu.etaxonomy.cdm.api.application
index 3e8cb3de9ba645e7a8db684b9986846f92fbc573..5622c0ecc35f41b98ee6ce12bfd152d8068a3271 100644 (file)
@@ -184,17 +184,18 @@ bin.includes = META-INF/,\
                lib/poi-ooxml-3.10-FINAL.jar,\\r
                lib/poi-ooxml-schemas-3.10-FINAL.jar,\\r
                lib/xmlbeans-2.3.0.jar,\\r
-               lib/swagger-annotations-1.3.5.jar,\
-               lib/cdmlib-commons-3.10.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-ext-3.10.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-io-3.10.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-model-3.10.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-persistence-3.10.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-print-3.10.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-remote-3.10.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-services-3.10.0-SNAPSHOT.jar,\\r
+               lib/swagger-annotations-1.3.5.jar,\\r
+               lib/cdmlib-commons-3.11.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-ext-3.11.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-io-3.11.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-model-3.11.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-persistence-3.11.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-print-3.11.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-remote-3.11.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-services-3.11.0-SNAPSHOT.jar,\\r
                lib/apache-log4j-extras-1.2.17.jar,\\r
                resources/cdm.map.ser\r
+\r
 jars.compile.order = .\r
 output.. = bin/\r
 source.. = src/main/java/,\\r
index 049df7d6b280513caf2807f38799c7f3941075af..8180196b83dc472b64a44649a44de1101f065a08 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.10.0-SNAPSHOT</version>
+    <version>3.11.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>
index 5c429ec45c91a5344bc51a2c569068583fb11ff2..0782e269bd0e5d43e893e486cacffd7196847910 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Editor Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 3.10.0.qualifier
+Bundle-Version: 3.11.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: OSGI-INF/l10n/plugin
index 6dfe54ab3f8c1ab305a4baaafc18dc4cea04cac4..cf00b6c7747086422d40f40a20aa53e68cac95cb 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>3.10.0-SNAPSHOT</version>
+    <version>3.11.0-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
index 5c04939dcfc21af0cebc89ad4aae667cb7ea4c27..887a033a5bf7f07db70e39103c14eb27f32d9765 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="3.10.0.qualifier"
+      version="3.11.0.qualifier"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">
index 003ac4268cde761325234ec794c57c8374adeedf..4c6bc226ded5647418cdce294e2efb3578af7b9d 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.10.0-SNAPSHOT</version>
+               <version>3.11.0-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
index 53ce7f1adf3cd4034a2bf3577d9b483542321ec9..07003cf6b64f74f4070067700f963f23d7fe0fae 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="3.10.0.qualifier"
+      version="3.11.0.qualifier"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
index 712dd864c5505b0915ab8d96260623a016e0cb72..1eb668772152deff56ea8dfcbb94ad8d42ed69d6 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.10.0-SNAPSHOT</version>
+    <version>3.11.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
index 5a812c048e93f0cec761e34bdc42a4739bce77d5..69c1a0db2465d5f93b2bf1f51b82ff7969c3bcc5 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Help
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true
-Bundle-Version: 3.10.0.qualifier
+Bundle-Version: 3.11.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
index bf2ff1615e9b6313eb7d32ef427c7a8bfe3828c7..fa491fcdb548e80dbcc69f3894e1b33537f9b50c 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.10.0-SNAPSHOT</version>
+               <version>3.11.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index d14f0655aa2ba2633cab0d6b6459b8dc26a7c61d..897edd40ef5621464bc2f4abf469d944a8e9f9b3 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: eu.etaxonomy.taxeditor.molecular.lib
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.lib;singleton:=true
-Bundle-Version: 3.10.0.qualifier
+Bundle-Version: 3.11.0.qualifier
 Bundle-ClassPath: .,
  lib/bioinfweb-commons-bio-2-SNAPSHOT.jar,
  lib/bioinfweb-commons-core-2-SNAPSHOT.jar,
index f62f75567e4529ce9e53645852b12246404420ec..137dbfc1f085e42dfb4ad00ba6f397da0af9b7d9 100644 (file)
@@ -7,7 +7,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.10.0-SNAPSHOT</version>
+    <version>3.11.0-SNAPSHOT</version>
   </parent>
 
   <build>
index 482332e8257a48c0e5c0fdd3fdf41cd45bbef6fc..965a9d05a3a9a2d43708ff14f400435464d78bae 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Molecular Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular;singleton:=true
-Bundle-Version: 3.10.0.qualifier
+Bundle-Version: 3.11.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
index c851311122400ae5beedf7269ac9e45f2cd17860..0d295b79745578e9455c93e03bd9e3e14e445d0c 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.10.0-SNAPSHOT</version>
+    <version>3.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index a6cdb1726adb6143db4dcfffc281f60f04e28737..06db0dce5e92e2026497f20a2c1f48c6f11d6032 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Navigation Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
-Bundle-Version: 3.10.0.qualifier
+Bundle-Version: 3.11.0.qualifier
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,
index fa3302123e08820accdf54e4f2b379d39a7ca373..2d13eba3b969e36aed04ccac9669cc5653302b7d 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.10.0-SNAPSHOT</version>
+               <version>3.11.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 4d34004614b36b4392c5bc3ea5255b2718833a8a..5ee25798d42a7f5ef560fc325a2fdab1d4e6d8f9 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Printpublisher Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true
-Bundle-Version: 3.10.0.qualifier
+Bundle-Version: 3.11.0.qualifier
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,
index a5a4a70e4412772bca028f79e68bb688752289bf..84180e94b7eb2dfbe1952874a1b5dec55b332a50 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>3.10.0-SNAPSHOT</version>
+               <version>3.11.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index ffd10c2599ba86bc29ad6d783659bcabd8e765ba..4cd823c98ffd410069dd80e031813986233eb267 100644 (file)
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: DataStore Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 3.10.0.qualifier
+Bundle-Version: 3.11.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
index 2053c6e10a1d46b3ad43e81f6ea9370f8496efbe..4ccb99e827b141494d7baac42cc9b23c4e2839da 100644 (file)
@@ -3,7 +3,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>3.10.0-SNAPSHOT</version>
+       <version>3.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index f8d849aeb9bb9c3b935b66c87961f5e921d2582c..7d9f4210ac841a9877f1877d1d9ec76294dc5e8c 100644 (file)
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="3.10.0.qualifier">
+<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="3.11.0.qualifier">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>
index 947d45258831ddbeb386cd9da9af3f993d1edc3f..1774fe8966b3970006addf90167a35fcaf9be9cf 100644 (file)
@@ -2,7 +2,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.10.0-SNAPSHOT</version>
+    <version>3.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 4cbcd591f312ff2251eea062a9ed08b2d7057d13..8e0e789e97d7dfd2296237253fc986d6b16ccd05 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>3.10.0-SNAPSHOT</version>
+  <version>3.11.0-SNAPSHOT</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy
   <properties>
     <java.codelevel>1.6</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.10.0-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>3.11.0-SNAPSHOT</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.22.0</tycho.version>
-    <taxeditor.version>3.10.0-SNAPSHOT</taxeditor.version>
+    <taxeditor.version>3.11.0-SNAPSHOT</taxeditor.version>
     <update.dir>snapshot</update.dir>
     <unitils.version>3.4.2</unitils.version>
   </properties>