From: Cherian Mathew <c.mathew@bgbm.org>
Date: Fri, 17 Jul 2015 16:07:58 +0000 (+0200)
Subject: Merge branch 'develop' into remoting-4.0
X-Git-Tag: remoting-3.9.0~91
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/ad69c198f8951f2b49c08d1ad59d2d60dd35d3ca

Merge branch 'develop' into remoting-4.0

Conflicts:
	eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
	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.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
---

ad69c198f8951f2b49c08d1ad59d2d60dd35d3ca
diff --cc eu.etaxonomy.taxeditor.application/.classpath
index 4c0364cad,4c7e96f59..0f0d04b90
--- a/eu.etaxonomy.taxeditor.application/.classpath
+++ b/eu.etaxonomy.taxeditor.application/.classpath
@@@ -3,6 -3,6 +3,7 @@@
  	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
  	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
  	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
 -	<classpathentry kind="src" path="src/main/resources"/>
 +	<classpathentry kind="src" path="src/test/java"/>
++	<classpathentry kind="src" path="src/main/resources/"/>
  	<classpathentry kind="output" path="target/classes"/>
  </classpath>
diff --cc eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
index daf34dcf4,81bdf0a83..a2467b13c
--- a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
@@@ -9,7 -9,7 +9,8 @@@ Bundle-Localization: OSGI-INF/l10n/plug
  Export-Package: eu.etaxonomy.taxeditor
  Bundle-ActivationPolicy: lazy
  Bundle-RequiredExecutionEnvironment: JavaSE-1.6
--Import-Package: org.apache.log4j,
++Import-Package: eu.etaxonomy.cdm.database,
++ org.apache.log4j,
   org.eclipse.equinox.app,
   org.eclipse.equinox.p2.repository.metadata,
   org.osgi.framework,
diff --cc eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
index ebaf9d2b8,041359836..1350207e8
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
@@@ -17,33 -22,45 +17,15 @@@ import org.eclipse.jface.viewers.ISelec
  import org.eclipse.jface.viewers.IStructuredSelection;
  import org.eclipse.ui.IEditorInput;
  import org.eclipse.ui.IEditorPart;
 -import org.eclipse.ui.IViewPart;
 -import org.eclipse.ui.IViewReference;
 -import org.eclipse.ui.PlatformUI;
  import org.eclipse.ui.handlers.HandlerUtil;
  import org.eclipse.ui.texteditor.IDocumentProvider;
 -import org.eclipse.ui.IWorkbenchPage;
 -
 -import eu.etaxonomy.cdm.api.service.DeleteResult;
 -import eu.etaxonomy.cdm.api.service.IAgentService;
 -import eu.etaxonomy.cdm.api.service.IGroupService;
 -import eu.etaxonomy.cdm.api.service.INameService;
 -import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 -import eu.etaxonomy.cdm.api.service.IReferenceService;
 -import eu.etaxonomy.cdm.api.service.ITaxonService;
 -import eu.etaxonomy.cdm.api.service.IUserService;
 -import eu.etaxonomy.cdm.api.service.config.NameDeletionConfigurator;
 -import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 -import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
 -import eu.etaxonomy.cdm.model.common.CdmBase;
 -import eu.etaxonomy.cdm.model.common.Group;
 -import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 -import eu.etaxonomy.cdm.model.common.User;
 -import eu.etaxonomy.cdm.model.name.TaxonNameBase;
 -import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 -import eu.etaxonomy.cdm.model.reference.Reference;
 -import eu.etaxonomy.cdm.model.taxon.Synonym;
 -import eu.etaxonomy.cdm.model.taxon.Taxon;
 -import eu.etaxonomy.cdm.model.taxon.TaxonBase;
 -import eu.etaxonomy.cdm.persistence.dao.hibernate.HibernateBeanInitializer;
 -import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
 +
- import eu.etaxonomy.cdm.api.application.ICdmApplicationConfiguration;
- import eu.etaxonomy.cdm.api.service.DeleteResult;
- import eu.etaxonomy.cdm.api.service.IAgentService;
- import eu.etaxonomy.cdm.api.service.IGroupService;
- import eu.etaxonomy.cdm.api.service.INameService;
- import eu.etaxonomy.cdm.api.service.IOccurrenceService;
- import eu.etaxonomy.cdm.api.service.IReferenceService;
- import eu.etaxonomy.cdm.api.service.ITaxonService;
- import eu.etaxonomy.cdm.api.service.IUserService;
- import eu.etaxonomy.cdm.api.service.config.NameDeletionConfigurator;
- import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
- import eu.etaxonomy.cdm.model.common.Group;
- import eu.etaxonomy.cdm.model.common.User;
- import eu.etaxonomy.cdm.model.name.TaxonNameBase;
- import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
- import eu.etaxonomy.cdm.model.reference.Reference;
- import eu.etaxonomy.cdm.model.taxon.Synonym;
- import eu.etaxonomy.cdm.model.taxon.Taxon;
- import eu.etaxonomy.cdm.model.taxon.TaxonBase;
  import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService;
  import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotation;
  import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotationModel;
  import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
+ import eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin;
 -import eu.etaxonomy.taxeditor.bulkeditor.referencingobjects.ReferencingObjectsView;
  import eu.etaxonomy.taxeditor.model.MessagingUtils;
 -import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
 -import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
  import eu.etaxonomy.taxeditor.store.CdmStore;
  
  
@@@ -126,18 -152,29 +108,28 @@@ public class DeleteHandler extends Abst
  						}
  					} else if (object instanceof TeamOrPersonBase){
  						IAgentService service = controller.getAgentService();
 -						TeamOrPersonBase teamOrPerson = (TeamOrPersonBase)service.load(((TeamOrPersonBase) object).getUuid());
 -						result = service.delete((TeamOrPersonBase)object);
 +						//TeamOrPersonBase teamOrPerson = (TeamOrPersonBase)service.load(((TeamOrPersonBase) object).getUuid());
 +						result = service.delete(((TeamOrPersonBase)object).getUuid());
  					}
  				} catch (Exception e){
- 					MessagingUtils.messageDialog("Exception occured. Could not delete", getClass(), e.getMessage(), null);
+ 					MessagingUtils.errorDialog("Exception occured. Delete not possible", getClass(), e.getMessage(), TaxeditorBulkeditorPlugin.PLUGIN_ID, null, true);
  				}
  				if (result.isError() || result.isAbort()){
  					if (!result.getExceptions().isEmpty()) {
- 						MessagingUtils.messageDialog("Could not delete", getClass(), result.getExceptions().toString(), null);
- 					}else{
- 						MessagingUtils.messageDialog("Could not delete", getClass(), "The object could not be deleted. An exception occured.", null);
+ 						String message = null;
+ 						int i = result.getExceptions().size();
+ 						for (Exception e:result.getExceptions()){
+ 							i--;
+ 							message+= e.getMessage();
+ 							if (i>0){
+ 								message+= ", ";
+ 							}
+ 						}
 -						
 -						
 +
++
+ 						MessagingUtils.messageDialog("Delete not possible", getClass(), result.getExceptions().toString(), null);
+ 					}else{
+ 						MessagingUtils.messageDialog("Delete not possible", getClass(), "The object could not be deleted. An exception occured.", null);
 -						
  					}
  				}
  				if (result.isOk() ){
diff --cc eu.etaxonomy.taxeditor.cdmlib/.classpath
index 24ade0a87,3962c23f1..b149b77d4
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@@ -188,14 -205,5 +188,14 @@@
  	<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
  	<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/cdmlib-commons-3.6.3-SNAPSHOT.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.3-SNAPSHOT.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.3-SNAPSHOT.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.3-SNAPSHOT.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.3-SNAPSHOT.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.3-SNAPSHOT.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.3-SNAPSHOT.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.3-SNAPSHOT.jar"/>
 -	<classpathentry kind="output" path="target/classes"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.8.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.8.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.8.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.8.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.8.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.8.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.8.0-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.8.0-SNAPSHOT.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/apache-log4j-extras-1.2.17.jar"/>
 +	<classpathentry kind="output" path="bin"/>
  </classpath>
diff --cc eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index f20a9a636,158f930cf..a7449bf40
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@@ -655,13 -612,12 +655,13 @@@ Bundle-ClassPath: .
   lib/xmlbeans-2.3.0.jar,
   lib/poi-ooxml-schemas-3.10-FINAL.jar,
   lib/swagger-annotations-1.3.5.jar,
-  lib/cdmlib-commons-3.6.3-SNAPSHOT.jar,
-  lib/cdmlib-ext-3.6.3-SNAPSHOT.jar,
-  lib/cdmlib-io-3.6.3-SNAPSHOT.jar,
-  lib/cdmlib-model-3.6.3-SNAPSHOT.jar,
-  lib/cdmlib-persistence-3.6.3-SNAPSHOT.jar,
-  lib/cdmlib-print-3.6.3-SNAPSHOT.jar,
-  lib/cdmlib-remote-3.6.3-SNAPSHOT.jar,
-  lib/cdmlib-services-3.6.3-SNAPSHOT.jar,
+  lib/cdmlib-commons-3.8.0-SNAPSHOT.jar,
+  lib/cdmlib-ext-3.8.0-SNAPSHOT.jar,
+  lib/cdmlib-io-3.8.0-SNAPSHOT.jar,
+  lib/cdmlib-model-3.8.0-SNAPSHOT.jar,
+  lib/cdmlib-persistence-3.8.0-SNAPSHOT.jar,
+  lib/cdmlib-print-3.8.0-SNAPSHOT.jar,
+  lib/cdmlib-remote-3.8.0-SNAPSHOT.jar,
 - lib/cdmlib-services-3.8.0-SNAPSHOT.jar
++ lib/cdmlib-services-3.8.0-SNAPSHOT.jar,
 + lib/apache-log4j-extras-1.2.17.jar
  Import-Package: eu.etaxonomy.cdm.api.application
diff --cc eu.etaxonomy.taxeditor.cdmlib/build.properties
index 882048b6d,3ce2b145d..3e92568d4
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@@ -185,15 -194,14 +185,15 @@@ bin.includes = META-INF/,
                 lib/poi-ooxml-schemas-3.10-FINAL.jar,\
                 lib/xmlbeans-2.3.0.jar,\
                 lib/swagger-annotations-1.3.5.jar,\
-                lib/cdmlib-commons-3.6.3-SNAPSHOT.jar,\
-                lib/cdmlib-ext-3.6.3-SNAPSHOT.jar,\
-                lib/cdmlib-io-3.6.3-SNAPSHOT.jar,\
-                lib/cdmlib-model-3.6.3-SNAPSHOT.jar,\
-                lib/cdmlib-persistence-3.6.3-SNAPSHOT.jar,\
-                lib/cdmlib-print-3.6.3-SNAPSHOT.jar,\
-                lib/cdmlib-remote-3.6.3-SNAPSHOT.jar,\
-                lib/cdmlib-services-3.6.3-SNAPSHOT.jar,\
+                lib/cdmlib-commons-3.8.0-SNAPSHOT.jar,\
+                lib/cdmlib-ext-3.8.0-SNAPSHOT.jar,\
+                lib/cdmlib-io-3.8.0-SNAPSHOT.jar,\
+                lib/cdmlib-model-3.8.0-SNAPSHOT.jar,\
+                lib/cdmlib-persistence-3.8.0-SNAPSHOT.jar,\
+                lib/cdmlib-print-3.8.0-SNAPSHOT.jar,\
+                lib/cdmlib-remote-3.8.0-SNAPSHOT.jar,\
 -               lib/cdmlib-services-3.8.0-SNAPSHOT.jar
++               lib/cdmlib-services-3.8.0-SNAPSHOT.jar,\
 +               lib/apache-log4j-extras-1.2.17.jar
  
  jars.compile.order = .
  output.. = bin/
diff --cc eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 2e11bc366,336971169..2138a725c
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@@ -1,598 -1,158 +1,597 @@@
- <?xml version="1.0" encoding="UTF-8"?>
- <project>
- 
-   <parent>
-     <groupId>eu.etaxonomy</groupId>
-     <artifactId>taxeditor-parent</artifactId>
-     <version>3.6.1-SNAPSHOT</version>
-   </parent>
-   <modelVersion>4.0.0</modelVersion>
-   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>
-   <packaging>eclipse-plugin</packaging>
-   <name>CDM Library Bundle</name>
-   <description>Cdm Library Plugin Taxonomic Editor</description>
+ <?xml version="1.0" encoding="UTF-8"?>
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+   <parent>
+     <groupId>eu.etaxonomy</groupId>
+     <artifactId>taxeditor-parent</artifactId>
+     <version>3.8.0-SNAPSHOT</version>
+   </parent>
+   <modelVersion>4.0.0</modelVersion>
+   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>
+   <packaging>eclipse-plugin</packaging>
+   <name>CDM Library Dependencies Plugin</name>
 -  <description>CDM Library and dependencies as a plugin</description>
 -  <build>
 -    <plugins>      
++  <description>CDM Library and dependencies as a plugin</description>
 +
 +  <build>
 +    <pluginManagement>
 +      <plugins>
 +        <plugin>
 +          <groupId>org.apache.maven.plugins</groupId>
 +          <artifactId>maven-surefire-plugin</artifactId>
 +          <version>2.7</version>
 +        </plugin>
 +      </plugins>
 +    </pluginManagement>
-     <plugins>
++    <plugins>
        <plugin>
 -	<groupId>org.apache.maven.plugins</groupId>
 -	<artifactId>maven-dependency-plugin</artifactId>
 -	<version>2.4</version>
 -	<executions>
 -	  <execution>
 -	    <id>copy-dependencies</id>
 -	    <phase>validate</phase>
 -	    <goals>
 -	      <goal>copy-dependencies</goal>
 -	    </goals>
 -	    <configuration>
 -	      <includeArtifactIds>cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io</includeArtifactIds>
 -	      <outputDirectory>lib</outputDirectory>
 -	      <overWriteReleases>true</overWriteReleases>
 -	      <overWriteSnapshots>true</overWriteSnapshots>
 -	      <excludeTransitive>true</excludeTransitive>	      
 -	    </configuration>
 -	  </execution>
 -	  <execution>
 -	    <id>copy-dependencies-sources</id>
 -	    <phase>validate</phase>
 -	    <goals>
 -	      <goal>copy-dependencies</goal>
 -	    </goals>
 -	    <configuration>
 -	      <classifier>sources</classifier>
 -	      <includeArtifactIds>cdmlib-commons,cdmlib-model,cdmlib-persistence,cdmlib-remote,cdmlib-print,cdmlib-services,cdmlib-ext,cdmlib-io</includeArtifactIds>
 -	      <outputDirectory>lib</outputDirectory>
 -	      <overWriteReleases>true</overWriteReleases>
 -	      <overWriteSnapshots>true</overWriteSnapshots>
 -	      <excludeTransitive>true</excludeTransitive>
 -	      <failOnMissingClassifierArtifact>false</failOnMissingClassifierArtifact>
 -	    </configuration>
 -	  </execution>
 -	</executions>
 -      </plugin>
 -      <plugin>
 -	<groupId>org.apache.maven.plugins</groupId>
 -	<artifactId>maven-antrun-plugin</artifactId>
 -	<version>1.7</version>
 -	<executions>
 -	  <execution>
 -	    <id>remove-existing-jars</id>
 -	    <phase>clean</phase>
 -	    <goals>
 -	      <goal>run</goal>
 -	    </goals>
 -	    <configuration>
 -	      <target>
 -		<echo>Remove all cdmlib jars</echo>
 -		<delete>
 -		  <fileset dir="./lib" includes="cdmlib-*" />
 -		</delete>
 -	      </target>	
 -	    </configuration>
 -	  </execution>
 -	  <execution>
 -	    <id>update-snapshot-jar-names</id>
 -	    <phase>validate</phase>
 -	    <goals>
 -	      <goal>run</goal>
 -	    </goals>
 -	    <configuration>	      
 -	      <target>
 -		<echo>Update cdmlib jars to SNAPSHOT when build with timestamp</echo>
 -		<move todir="./lib">
 -		  <fileset dir="./lib" />
 -		  <mapper type="regexp" from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\.jar)" to="\1SNAPSHOT\2" />
 -		</move>				  
 -		<move todir="./lib">
 -		  <fileset dir="./lib" />
 -		  <mapper type="regexp" from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)" to="\1SNAPSHOT\2" />
 -		</move>				  
 -	      </target>	
 -	    </configuration>
 -	  </execution>
 -	</executions>
 -      </plugin>
 -    </plugins>
 -  </build>
 -  <dependencies>
 -    <dependency>
 -      <groupId>identificationKeyAPI</groupId>
 -      <artifactId>identificationKeyAPI</artifactId>
 -      <version>1.0-SNAPSHOT</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>eu.etaxonomy</groupId>
 -      <artifactId>cdmlib-commons</artifactId>
 -      <version>${cdmlib.version}</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>eu.etaxonomy</groupId>
 -      <artifactId>cdmlib-model</artifactId>
 -      <version>${cdmlib.version}</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>eu.etaxonomy</groupId>
 -      <artifactId>cdmlib-persistence</artifactId>
 -      <version>${cdmlib.version}</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>eu.etaxonomy</groupId>
 -      <artifactId>cdmlib-remote</artifactId>
 -      <version>${cdmlib.version}</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>eu.etaxonomy</groupId>
 -      <artifactId>cdmlib-print</artifactId>
 -      <version>${cdmlib.version}</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>eu.etaxonomy</groupId>
 -      <artifactId>cdmlib-services</artifactId>
 -      <version>${cdmlib.version}</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>eu.etaxonomy</groupId>
 -      <artifactId>cdmlib-io</artifactId>
 -      <version>${cdmlib.version}</version>
 -    </dependency>
 -    <dependency>
 -      <groupId>eu.etaxonomy</groupId>
 -      <artifactId>cdmlib-ext</artifactId>
 -      <version>${cdmlib.version}</version>
 -    </dependency>
 -   	<dependency>
 -      <groupId>org.aspectj</groupId>
 -      <artifactId>aspectjrt</artifactId>
 -	  <version>1.7.1</version>
 -	</dependency>
 -	  <dependency>
 -	  <groupId>org.aspectj</groupId>
 -	  <artifactId>aspectjweaver</artifactId>
 -	  <version>1.7.1</version>
 -	 </dependency>
 -	 
 -    <!--  for ikey-plus 
 -	 TODO this should not be needed but the utils class contained  in this jar 
 -	 seems to be loaded as bean by spring
 -    -->
 +        <groupId>org.apache.maven.plugins</groupId>
 +        <artifactId>maven-dependency-plugin</artifactId>
 +        <version>2.4</version>
 +        <executions>
 +          <execution>
 +            <id>copy-dependencies</id>
 +            <phase>validate</phase>
 +            <goals>
 +              <goal>copy-dependencies</goal>
 +            </goals>
 +            <configuration>
 +              <excludeArtifactIds>
 +                cdmlib-remote-webapp
 +              </excludeArtifactIds>
 +              <includeArtifactIds>
 +                cdmlib-services,cdmlib-commons,cdmlib-persistence,cdmlib-ext,cdmlib-model,cdmlib-io,cdmlib-print,cdmlib-remote
 +              </includeArtifactIds>
 +              <outputDirectory>${basedir}/lib</outputDirectory>
 +              <overWriteReleases>true</overWriteReleases>
 +              <overWriteSnapshots>true</overWriteSnapshots>
 +              <excludeTransitive>true</excludeTransitive>
 +            </configuration>
 +          </execution>
 +          <execution>
 +            <id>copy-dependency-war</id>
 +            <phase>validate</phase>
 +            <goals>
 +              <goal>copy-dependencies</goal>
 +            </goals>
 +            <configuration>
 +              <includeArtifactIds>
 +                cdmlib-remote-webapp
 +              </includeArtifactIds>
 +              <outputDirectory>
 +                ${basedir}/src/main/resources/etc/jetty
 +              </outputDirectory>
 +              <overWriteReleases>true</overWriteReleases>
 +              <overWriteSnapshots>true</overWriteSnapshots>
 +              <excludeTransitive>true</excludeTransitive>
 +            </configuration>
 +          </execution>
 +        </executions>
 +      </plugin>
 +      <plugin>
 +        <groupId>org.apache.maven.plugins</groupId>
 +        <artifactId>maven-antrun-plugin</artifactId>
 +        <version>1.7</version>
 +        <executions>
 +          <execution>
 +            <id>update-snapshot-jar-names</id>
 +            <phase>validate</phase>
 +            <goals>
 +              <goal>run</goal>
 +            </goals>
 +            <configuration>
 +              <target>
 +                <echo>Anonymizing war</echo>
 +                <move todir="./src/main/resources/etc/jetty">
 +                  <fileset dir="./src/main/resources/etc/jetty" />
 +                  <mapper type="regexp"
 +                    from="(^cdmlib\-.*)\-[0-9]\.[0-9]\.[0-9]\-SNAPSHOT(\.war)"
 +                    to="\1\2" />
 +                </move>
 +                <move todir="./src/main/resources/etc/jetty">
 +                  <fileset dir="./src/main/resources/etc/jetty" />
 +                  <mapper type="regexp"
 +                    from="(^cdmlib\-.*)\-[0-9]\.[0-9]\.[0-9]\-[0-9.-]+(\.war)"
 +                    to="\1\2" />
 +                </move>
 +                <echo>Update cdmlib jars to SNAPSHOT when build with
 +                  timestamp
 +                </echo>
 +                <move todir="./lib">
 +                  <fileset dir="./lib" />
 +                  <mapper type="regexp"
 +                    from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\.jar)"
 +                    to="\1SNAPSHOT\2" />
 +                </move>
 +                <move todir="./lib">
 +                  <fileset dir="./lib" />
 +                  <mapper type="regexp"
 +                    from="(^cdmlib\-.*\-[0-9]\.[0-9]\.[0-9]\-)[0-9.-]+(\-sources\.jar)"
 +                    to="\1SNAPSHOT\2" />                
 +                </move>
 +              </target>
 +            </configuration>
 +          </execution>
 +        </executions>
 +      </plugin>
 +    </plugins>
 +  </build>
 +  <profiles>
 +    <profile>
 +      <id>cleanCdmlibJars</id>
 +      <build>
 +        <plugins>
 +          <plugin>
 +            <artifactId>maven-clean-plugin</artifactId>
 +            <version>2.3</version>
 +            <configuration>
 +              <filesets>
 +                <fileset>
 +                  <directory>${basedir}/lib</directory>
 +                  <includes>
 +                    <include>cdmlib-*</include>
 +                  </includes>
 +                  <followSymlinks>false</followSymlinks>
 +                </fileset>
 +              </filesets>
 +            </configuration>
 +          </plugin>
 +        </plugins>
 +      </build>
 +    </profile>
 +    <profile>
 +      <id>cleanAllJars</id>
 +      <build>
 +        <plugins>
 +          <plugin>
 +            <artifactId>maven-clean-plugin</artifactId>
 +            <version>2.3</version>
 +            <configuration>
 +              <filesets>
 +                <fileset>
 +                  <directory>${basedir}/lib</directory>
 +                  <includes>
 +                    <include>*</include>
 +                  </includes>
 +                  <followSymlinks>false</followSymlinks>
 +                </fileset>
 +              </filesets>
 +            </configuration>
 +          </plugin>
 +        </plugins>
 +      </build>
 +    </profile>
 +    <profile>
 +      <id>copyAllJars</id>
 +      <build>
 +        <plugins>
 +          <plugin>
 +            <groupId>org.apache.maven.plugins</groupId>
 +            <artifactId>maven-dependency-plugin</artifactId>
 +            <version>2.4</version>
 +            <executions>
 +              <execution>
 +                <id>copy-all-dependencies</id>
 +                <phase>validate</phase>
 +                <goals>
 +                  <goal>copy-dependencies</goal>
 +                </goals>
 +                <configuration>
 +                  <excludeArtifactIds>
 +                    cdmlib-remote-webapp
 +                  </excludeArtifactIds>
 +                  <outputDirectory>${basedir}/lib</outputDirectory>
 +                  <overWriteReleases>true</overWriteReleases>
 +                  <overWriteSnapshots>true</overWriteSnapshots>
 +                  <excludeTransitive>true</excludeTransitive>
 +                </configuration>
 +              </execution>
 +            </executions>
 +          </plugin>
 +        </plugins>
 +      </build>
 +    </profile>
 +  </profiles>
 +  <repositories>
 +    <repository>
 +      <id>SpringSource Enterprise Bundle Repository - External Bundle
 +        Milestones
 +      </id>
 +      <url>http://repository.springsource.com/maven/bundles/milestone
 +      </url>
 +    </repository>
 +    <repository>
 +      <id>SpringSource Enterprise Bundle Repository - SpringSource
 +        Bundle
 +        Releases
 +      </id>
 +      <url>http://repository.springsource.com/maven/bundles/release
 +      </url>
 +    </repository>
 +    <repository>
 +      <id>SpringSource Enterprise Bundle Repository - External Bundle
 +        Releases
 +      </id>
 +      <url>http://repository.springsource.com/maven/bundles/external
 +      </url>
 +    </repository>
 +  </repositories>
 +  <dependencies>
 +    <dependency>
 +      <groupId>eu.etaxonomy</groupId>
 +      <artifactId>cdmlib-remote-webapp</artifactId>
 +      <version>${cdmlib.version}</version>
 +      <type>war</type>
 +    </dependency>
 +    <dependency>
 +      <groupId>eu.etaxonomy</groupId>
 +      <artifactId>cdmlib-commons</artifactId>
 +      <version>${cdmlib.version}</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>eu.etaxonomy</groupId>
 +      <artifactId>cdmlib-model</artifactId>
 +      <version>${cdmlib.version}</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>eu.etaxonomy</groupId>
 +      <artifactId>cdmlib-persistence</artifactId>
 +      <version>${cdmlib.version}</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>eu.etaxonomy</groupId>
 +      <artifactId>cdmlib-remote</artifactId>
 +      <version>${cdmlib.version}</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>eu.etaxonomy</groupId>
 +      <artifactId>cdmlib-print</artifactId>
 +      <version>${cdmlib.version}</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>eu.etaxonomy</groupId>
 +      <artifactId>cdmlib-services</artifactId>
 +      <version>${cdmlib.version}</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>eu.etaxonomy</groupId>
 +      <artifactId>cdmlib-io</artifactId>
 +      <version>${cdmlib.version}</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>eu.etaxonomy</groupId>
 +      <artifactId>cdmlib-ext</artifactId>
 +      <version>${cdmlib.version}</version>
 +    </dependency>
 +
 +    <!-- <dependency> -->
 +    <!-- <groupId>org.eclipse.jetty</groupId> -->
 +    <!-- <artifactId>jetty-server</artifactId> -->
 +    <!-- <version>9.1.3.v20140225</version> -->
 +    <!-- </dependency> -->
 +    <!-- <dependency> -->
 +    <!-- <groupId>org.eclipse.jetty</groupId> -->
 +    <!-- <artifactId>jetty-util</artifactId> -->
 +    <!-- <version>9.1.3.v20140225</version> -->
 +    <!-- </dependency> -->
 +    <!-- <dependency> -->
 +    <!-- <groupId>org.eclipse.jetty</groupId> -->
 +    <!-- <artifactId>jetty-xml</artifactId> -->
 +    <!-- <version>9.1.3.v20140225</version> -->
 +    <!-- </dependency> -->
 +    <!-- <dependency> -->
 +    <!-- <groupId>org.eclipse.jetty</groupId> -->
 +    <!-- <artifactId>jetty-servlet</artifactId> -->
 +    <!-- <version>9.1.3.v20140225</version> -->
 +    <!-- </dependency> -->
 +    <!-- <dependency> -->
 +    <!-- <groupId>org.eclipse.jetty</groupId> -->
 +    <!-- <artifactId>jetty-webapp</artifactId> -->
 +    <!-- <version>9.1.3.v20140225</version> -->
 +    <!-- </dependency> -->
 +    <!-- <dependency> -->
 +    <!-- <groupId>org.eclipse.jetty</groupId> -->
 +    <!-- <artifactId>jetty-security</artifactId> -->
 +    <!-- <version>9.1.3.v20140225</version> -->
 +    <!-- </dependency> -->
 +    <!-- <dependency> -->
 +    <!-- <groupId>org.eclipse.jetty</groupId> -->
 +    <!-- <artifactId>jetty-http</artifactId> -->
 +    <!-- <version>${jetty.version}</version> -->
 +    <!-- </dependency> -->
 +    <!-- <dependency> -->
 +    <!-- <groupId>org.eclipse.jetty</groupId> -->
 +    <!-- <artifactId>jetty-io</artifactId> -->
 +    <!-- <version>${jetty.version}</version> -->
 +    <!-- </dependency> -->
 +    <!-- <dependency> -->
 +    <!-- <groupId>javax.servlet</groupId> -->
 +    <!-- <artifactId>javax.servlet-api</artifactId> -->
 +    <!-- <version>3.1.0</version> -->
 +    <!-- </dependency> -->
 +
 +    <!-- <dependency> -->
 +    <!-- <groupId>javax.servlet</groupId> -->
 +    <!-- <artifactId>jsp-api</artifactId> -->
 +    <!-- <version>2.0</version> -->
 +    <!-- </dependency> -->
 +
 +    <dependency>
 +      <groupId>net.sf.ehcache</groupId>
 +      <artifactId>ehcache-core</artifactId>
 +      <version>2.4.3</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.hibernate</groupId>
 +      <artifactId>hibernate-core</artifactId>
 +      <version>4.1.10.Final</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.hibernate.common</groupId>
 +      <artifactId>hibernate-commons-annotations</artifactId>
 +      <version>4.0.1.Final</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.hibernate</groupId>
 +      <artifactId>hibernate-search-engine</artifactId>
 +      <version>4.2.0.Final</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.hibernate.javax.persistence</groupId>
 +      <artifactId>hibernate-jpa-2.0-api</artifactId>
 +      <version>1.0.1.Final</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.hibernate</groupId>
 +      <artifactId>hibernate-envers</artifactId>
 +      <version>4.1.10.Final</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.hibernate</groupId>
 +      <artifactId>hibernate-entitymanager</artifactId>
 +      <version>4.1.10.Final</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>dom4j</groupId>
 +      <artifactId>dom4j</artifactId>
 +      <version>1.6</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.jadira.usertype</groupId>
 +      <artifactId>usertype.jodatime</artifactId>
 +      <version>2.0.1</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.jadira.usertype</groupId>
 +      <artifactId>usertype.spi</artifactId>
 +      <version>2.0.1</version>
 +    </dependency>
 +
 +    <dependency>
 +      <groupId>junit</groupId>
 +      <artifactId>junit</artifactId>
 +      <version>4.11</version>
 +      <scope>test</scope>
 +    </dependency>
 +    <dependency>
 +      <groupId>log4j</groupId>
 +      <artifactId>log4j</artifactId>
 +      <version>1.2.17</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.jdom</groupId>
 +      <artifactId>jdom</artifactId>
 +      <version>1.1.3</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.springframework</groupId>
 +      <artifactId>org.springframework.context</artifactId>
 +      <version>3.2.2.RELEASE</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.springframework</groupId>
 +      <artifactId>org.springframework.context.support</artifactId>
 +      <version>3.2.2.RELEASE</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.springframework</groupId>
 +      <artifactId>org.springframework.aspects</artifactId>
 +      <version>3.2.2.RELEASE</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.springframework</groupId>
 +      <artifactId>org.springframework.test</artifactId>
 +      <version>3.2.2.RELEASE</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.springframework</groupId>
 +      <artifactId>org.springframework.beans</artifactId>
 +      <version>3.2.2.RELEASE</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.springframework</groupId>
 +      <artifactId>org.springframework.transaction</artifactId>
 +      <version>3.2.2.RELEASE</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.springframework</groupId>
 +      <artifactId>org.springframework.web</artifactId>
 +      <version>3.2.2.RELEASE</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.springframework</groupId>
 +      <artifactId>org.springframework.core</artifactId>
 +      <version>3.2.2.RELEASE</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.springframework</groupId>
 +      <artifactId>org.springframework.aop</artifactId>
 +      <version>3.2.2.RELEASE</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.springframework</groupId>
 +      <artifactId>org.springframework.expression</artifactId>
 +      <version>3.2.2.RELEASE</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.springframework</groupId>
 +      <artifactId>org.springframework.orm</artifactId>
 +      <version>3.2.2.RELEASE</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.springframework</groupId>
 +      <artifactId>org.springframework.jdbc</artifactId>
 +      <version>3.2.2.RELEASE</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.springframework.security</groupId>
 +      <artifactId>spring-security-core</artifactId>
 +      <version>3.1.3.RELEASE</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.springframework.security</groupId>
 +      <artifactId>spring-security-config</artifactId>
 +      <version>3.1.3.RELEASE</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.springframework.security</groupId>
 +      <artifactId>spring-security-remoting</artifactId>
 +      <version>3.1.3.RELEASE</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.jboss.logging</groupId>
 +      <artifactId>jboss-logging</artifactId>
 +      <version>3.1.3.GA</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.hamcrest</groupId>
 +      <artifactId>hamcrest-core</artifactId>
 +      <version>1.3</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>com.mchange</groupId>
 +      <artifactId>c3p0</artifactId>
 +      <version>0.9.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.jboss.spec.javax.transaction</groupId>
 +      <artifactId>jboss-transaction-api_1.1_spec</artifactId>
 +      <version>1.0.0.Final</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.aspectj</groupId>
 +      <artifactId>aspectjrt</artifactId>
 +      <version>1.7.1</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-logging</groupId>
 +      <artifactId>commons-logging</artifactId>
 +      <version>1.1.1</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-lang</groupId>
 +      <artifactId>commons-lang</artifactId>
 +      <version>2.6</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>aopalliance</groupId>
 +      <artifactId>aopalliance</artifactId>
 +      <version>1.0</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>joda-time</groupId>
 +      <artifactId>joda-time</artifactId>
 +      <version>2.1</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>com.ibm.lsid</groupId>
 +      <artifactId>lsid-client</artifactId>
 +      <version>1.1.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>com.ibm.lsid</groupId>
 +      <artifactId>lsid-server</artifactId>
 +      <version>1.1.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.apache.lucene</groupId>
 +      <artifactId>lucene-core</artifactId>
 +      <version>3.6.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.slf4j</groupId>
 +      <artifactId>slf4j-api</artifactId>
 +      <version>1.7.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.javassist</groupId>
 +      <artifactId>javassist</artifactId>
 +      <version>3.17.1-GA</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>au.com.bytecode</groupId>
 +      <artifactId>opencsv</artifactId>
 +      <version>2.4</version>
 +    </dependency>
 +
 +    <!-- For Unit Tests Start -->
 +
 +    <dependency>
 +      <groupId>org.unitils</groupId>
 +      <artifactId>unitils-core</artifactId>
 +      <version>3.4.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.unitils</groupId>
 +      <artifactId>unitils-spring</artifactId>
 +      <version>3.4.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.unitils</groupId>
 +      <artifactId>unitils-database</artifactId>
 +      <version>3.4.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-dbcp</groupId>
 +      <artifactId>commons-dbcp</artifactId>
 +      <version>1.4</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>commons-pool</groupId>
 +      <artifactId>commons-pool</artifactId>
 +      <version>1.5.4</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.unitils</groupId>
 +      <artifactId>unitils-dbmaintainer</artifactId>
 +      <version>3.4.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>com.h2database</groupId>
 +      <artifactId>h2</artifactId>
 +      <version>1.4.181</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.unitils</groupId>
 +      <artifactId>unitils-dbunit</artifactId>
 +      <version>3.4.2</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>org.dbunit</groupId>
 +      <artifactId>dbunit</artifactId>
 +      <version>2.4.9</version>
 +    </dependency>
 +    <!-- For Unit Tests End -->
 +
 +    <!-- For Hibernate Mapping Start -->
 +    <dependency>
 +      <groupId>wsdl4j</groupId>
 +      <artifactId>wsdl4j</artifactId>
 +      <version>1.6.3</version>
 +    </dependency>
 +    <dependency>
 +      <groupId>javax.validation</groupId>
 +      <artifactId>validation-api</artifactId>
 +      <version>1.1.0.Final</version>
 +    </dependency>
 +    <!-- For Hibernate Mapping End -->
    </dependencies>
  </project>
diff --cc eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
index 6c8193a72,273d9ad36..a0d9bb6d8
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java
@@@ -31,18 -28,14 +31,6 @@@ import org.eclipse.ui.IViewSite
  import org.eclipse.ui.PartInitException;
  import org.eclipse.ui.navigator.CommonNavigator;
  
- import eu.etaxonomy.cdm.api.application.CdmApplicationState;
- import eu.etaxonomy.cdm.api.application.CdmChangeEvent;
- import eu.etaxonomy.cdm.api.application.ICdmChangeListener;
--import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
--import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
--import eu.etaxonomy.cdm.api.service.IClassificationService;
--import eu.etaxonomy.cdm.model.common.CdmBase;
- import eu.etaxonomy.cdm.model.taxon.Classification;
--import eu.etaxonomy.cdm.model.taxon.TaxonNaturalComparator;
--import eu.etaxonomy.cdm.model.taxon.TaxonNode;
- import eu.etaxonomy.cdm.model.taxon.TaxonNodeComparator;
 -import eu.etaxonomy.cdm.model.taxon.TaxonNodeByRankAndNameComparator;
--import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
  import eu.etaxonomy.taxeditor.model.DataChangeBridge;
  import eu.etaxonomy.taxeditor.model.IDataChangeBehavior;
  import eu.etaxonomy.taxeditor.model.MessagingUtils;
diff --cc pom.xml
index 2e392d287,fac701883..0ffb9d953
--- a/pom.xml
+++ b/pom.xml
@@@ -18,12 -18,10 +18,11 @@@
    <properties>
      <java.codelevel>1.6</java.codelevel>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-     <cdmlib.version>3.6.3-SNAPSHOT</cdmlib.version>
-     <!-- TODO can we use project.version ????? -->
+     <cdmlib.version>3.8.0-SNAPSHOT</cdmlib.version>
      <tycho.version>0.22.0</tycho.version>
-     <taxeditor.version>3.6.1-SNAPSHOT</taxeditor.version>
+     <taxeditor.version>3.8.0-SNAPSHOT</taxeditor.version>
      <update.dir>snapshot</update.dir>
 +    <unitils.version>3.4.2</unitils.version>
    </properties>
    <modules>
      <module>eu.etaxonomy.taxeditor.cdmlib</module>