Merge branch 'develop' into bulkEditorE4

diff --git a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
index b84743a3c9370443fcff06dbc751ae1b62cdd2b3..f1df224974c366b4ef8d59f0edf4f8385a0d52b6 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Application
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 4.10.0.qualifier
+Bundle-Version: 4.11.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/plugin

diff --git a/eu.etaxonomy.taxeditor.application/pom.xml b/eu.etaxonomy.taxeditor.application/pom.xml
index 10e84f0563c99b17e710c0aa6e751102ed79fff5..26a9af2e807d11aa6cd01913da78c2fea4a95d00 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/pom.xml
+++ b/eu.etaxonomy.taxeditor.application/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
index 044fbfff7845e3f7bf7c35f14843ad4a169e13ab..911bfb67181ed1809b950a02853b6df76d38a19d 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
@@ -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: 4.10.0.qualifier
+Bundle-Version: 4.11.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
index 97fbd7e9ec217edb2bd3c87edb6cf97214728135..3bff34e8ed5e13403ff42b86a40660f6a8a5254a 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.10.0-SNAPSHOT</version>
+               <version>4.11.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index 5fa85dd2ada006c648692d3602bc96e996fe90ab..aa587b37d500e5509b01826ee875822ae8c6a1ab 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -112,15 +112,15 @@
        <classpathentry exported="true" kind="lib" path="lib/aspectjrt-1.8.8.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/aspectjweaver-1.8.8.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-4.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.10.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.10.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-4.11.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-4.11.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-4.11.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-4.11.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-4.11.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-4.11.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-4.11.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-4.11.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-test-4.11.0-SNAPSHOT.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.2.jar"/>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 7c15973e939812760285b7659814fa6548746fca..79de254c0d111b2a234603cb358a9c9ca38eb88f 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -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: 4.10.0.qualifier
+Bundle-Version: 4.11.0.qualifier
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -647,15 +647,15 @@ Bundle-ClassPath: .,
  lib/aspectjrt-1.8.8.jar,
  lib/aspectjweaver-1.8.8.jar,
  lib/batik-xml-1.7.jar,
- lib/cdmlib-commons-4.10.0-SNAPSHOT.jar,
- lib/cdmlib-ext-4.10.0-SNAPSHOT.jar,
- lib/cdmlib-io-4.10.0-SNAPSHOT.jar,
- lib/cdmlib-model-4.10.0-SNAPSHOT.jar,
- lib/cdmlib-persistence-4.10.0-SNAPSHOT.jar,
- lib/cdmlib-print-4.10.0-SNAPSHOT.jar,
- lib/cdmlib-remote-4.10.0-SNAPSHOT.jar,
- lib/cdmlib-services-4.10.0-SNAPSHOT.jar,
- lib/cdmlib-test-4.10.0-SNAPSHOT.jar,
+ lib/cdmlib-commons-4.11.0-SNAPSHOT.jar,
+ lib/cdmlib-ext-4.11.0-SNAPSHOT.jar,
+ lib/cdmlib-io-4.11.0-SNAPSHOT.jar,
+ lib/cdmlib-model-4.11.0-SNAPSHOT.jar,
+ lib/cdmlib-persistence-4.11.0-SNAPSHOT.jar,
+ lib/cdmlib-print-4.11.0-SNAPSHOT.jar,
+ lib/cdmlib-remote-4.11.0-SNAPSHOT.jar,
+ lib/cdmlib-services-4.11.0-SNAPSHOT.jar,
+ lib/cdmlib-test-4.11.0-SNAPSHOT.jar,
  lib/com.springsource.org.aopalliance-1.0.0.jar,
  lib/com.springsource.org.apache.commons.logging-1.1.1.jar,
  lib/commons-beanutils-1.9.2.jar,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index edfe5b31f1c47b6b42f591eb1bcf0447aae75cbe..5e0bbb665af1c89a21ffac99d2c229c4f37ebc68 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -6,15 +6,15 @@ bin.includes = META-INF/,\
                lib/aspectjrt-1.8.8.jar,\
                lib/aspectjweaver-1.8.8.jar,\
                lib/batik-xml-1.7.jar,\
-               lib/cdmlib-commons-4.10.0-SNAPSHOT.jar,\
-               lib/cdmlib-ext-4.10.0-SNAPSHOT.jar,\
-               lib/cdmlib-io-4.10.0-SNAPSHOT.jar,\
-               lib/cdmlib-model-4.10.0-SNAPSHOT.jar,\
-               lib/cdmlib-persistence-4.10.0-SNAPSHOT.jar,\
-               lib/cdmlib-print-4.10.0-SNAPSHOT.jar,\
-               lib/cdmlib-remote-4.10.0-SNAPSHOT.jar,\
-               lib/cdmlib-services-4.10.0-SNAPSHOT.jar,\
-               lib/cdmlib-test-4.10.0-SNAPSHOT.jar,\
+               lib/cdmlib-commons-4.11.0-SNAPSHOT.jar,\
+               lib/cdmlib-ext-4.11.0-SNAPSHOT.jar,\
+               lib/cdmlib-io-4.11.0-SNAPSHOT.jar,\
+               lib/cdmlib-model-4.11.0-SNAPSHOT.jar,\
+               lib/cdmlib-persistence-4.11.0-SNAPSHOT.jar,\
+               lib/cdmlib-print-4.11.0-SNAPSHOT.jar,\
+               lib/cdmlib-remote-4.11.0-SNAPSHOT.jar,\
+               lib/cdmlib-services-4.11.0-SNAPSHOT.jar,\
+               lib/cdmlib-test-4.11.0-SNAPSHOT.jar,\
                lib/com.springsource.org.aopalliance-1.0.0.jar,\
                lib/com.springsource.org.apache.commons.logging-1.1.1.jar,\
                lib/commons-beanutils-1.9.2.jar,\

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 7e9c493b736616619c63f4bd0567a9a7a3c43e3a..2bf20f3e0062cf17dff15812b38989adf5df6368 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -4,7 +4,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>4.10.0-SNAPSHOT</version>\r
+    <version>4.11.0-SNAPSHOT</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r

diff --git a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
index 6fdec23d01056ba5079857e4a18e3a4a46aa6cd8..7d448d431dd7764850f065e791d4dc0cc0d18885 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
@@ -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: 4.10.0.qualifier
+Bundle-Version: 4.11.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: OSGI-INF/l10n/plugin

diff --git a/eu.etaxonomy.taxeditor.editor/pom.xml b/eu.etaxonomy.taxeditor.editor/pom.xml
index e323622b4bfe0fdb6045011f9ed066c58d6a446f..f2d5355705f4f8d0d407529672776bce9ef93de1 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/pom.xml
+++ b/eu.etaxonomy.taxeditor.editor/pom.xml
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
index fc142b30ea48a569fbc426a837957e6d8d529ec3..8a85b459b5cad4b1ec88761f13feddb63639771b 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.platform/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="4.10.0.qualifier"
+      version="4.11.0.qualifier"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">

diff --git a/eu.etaxonomy.taxeditor.feature.platform/pom.xml b/eu.etaxonomy.taxeditor.feature.platform/pom.xml
index 4ac13142ccb168b5938c6321387da8ea6b0e70dc..b5e26f3bae42141dcc1d7978acbf5fd38f2b997a 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.platform/pom.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.10.0-SNAPSHOT</version>
+               <version>4.11.0-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>

diff --git a/eu.etaxonomy.taxeditor.feature/feature.xml b/eu.etaxonomy.taxeditor.feature/feature.xml
index cb51efd4b1da7e21b7dd63deb8aacbb362838eb3..d9db7548cd569af6df6f05f4708d17043b4b4302 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="4.10.0.qualifier"
+      version="4.11.0.qualifier"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"

diff --git a/eu.etaxonomy.taxeditor.feature/pom.xml b/eu.etaxonomy.taxeditor.feature/pom.xml
index 6682cf1c8148a5c0845263d49a9a4e1a0478e577..c8b0d42c4dd516993fedd34883e5e3bee9b3fc93 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/pom.xml
+++ b/eu.etaxonomy.taxeditor.feature/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>

diff --git a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
index b442eaf292d74d9ec7a5bce3a03624b766e35016..9e7f631f2e2e22325bc24b5844fcaeeee81c083f 100644 (file)
--- a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Help
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true
-Bundle-Version: 4.10.0.qualifier
+Bundle-Version: 4.11.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,

diff --git a/eu.etaxonomy.taxeditor.help/pom.xml b/eu.etaxonomy.taxeditor.help/pom.xml
index b99d0fa0d5d980430007606bfcf99b73b4682a9c..da5dc7a4d7984f97cd86a7cc4a5e0aaee320b00c 100644 (file)
--- a/eu.etaxonomy.taxeditor.help/pom.xml
+++ b/eu.etaxonomy.taxeditor.help/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.10.0-SNAPSHOT</version>
+               <version>4.11.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
index bdb95d665d96d953b5f7e0e4a974b9cf2e4ebcdc..ea529aec899102a2b304e0b6189a0a2a49793334 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
@@ -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: 4.10.0.qualifier
+Bundle-Version: 4.11.0.qualifier
 Bundle-ClassPath: .,
  lib/owlapi-xmlutils-4.1.4.jar,
  lib/commons-collections4-4.1.jar,

diff --git a/eu.etaxonomy.taxeditor.molecular.lib/pom.xml b/eu.etaxonomy.taxeditor.molecular.lib/pom.xml
index 678769c48a6f551ad956d43bfc84cb432f280753..2ae978a18a0681295d4849aa74740d79f73f0d8a 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular.lib/pom.xml
+++ b/eu.etaxonomy.taxeditor.molecular.lib/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
   </parent>
   
   <name>Molecular Library Dependencies Bundle</name>

diff --git a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
index 6dec4fcf73c6891226e516e8a89aa299962d446b..da6fcddaa5d3cc4937745054108792c8f8977a6c 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
@@ -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: 4.10.0.qualifier
+Bundle-Version: 4.11.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

diff --git a/eu.etaxonomy.taxeditor.molecular/pom.xml b/eu.etaxonomy.taxeditor.molecular/pom.xml
index fc6676b9bc8a6b05c4d9c86087ecbc15aa0b6794..91c58d9afbab272f97f965e92eb1a9b40387fa23 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/pom.xml
+++ b/eu.etaxonomy.taxeditor.molecular/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
index 20684c3f3d3b655243c3f49dca538bee5db88151..13eb655dc9b66aa3605b113eb56ce63034e91210 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
@@ -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: 4.10.0.qualifier
+Bundle-Version: 4.11.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,

diff --git a/eu.etaxonomy.taxeditor.navigation/pom.xml b/eu.etaxonomy.taxeditor.navigation/pom.xml
index df26e0997af92bdee01e03808f3278e4038ff31d..7920f06ba1853e33cdeefebefed56c1e7c7c11c9 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/pom.xml
+++ b/eu.etaxonomy.taxeditor.navigation/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>4.10.0-SNAPSHOT</version>
+               <version>4.11.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/dnd/TaxonNavigatorDragAdapterAssistant.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/dnd/TaxonNavigatorDragAdapterAssistant.java
index 2ca0da38cd9b58f8a7447009af166c1e117ec4ed..5af22b1130796248765528c043c536058367cbba 100644 (file)
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/dnd/TaxonNavigatorDragAdapterAssistant.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/dnd/TaxonNavigatorDragAdapterAssistant.java
@@ -27,14 +27,10 @@ public class TaxonNavigatorDragAdapterAssistant extends
        public boolean setDragData(DragSourceEvent event,
                        IStructuredSelection selection) {
                boolean setDataSuccess = false;
-               List<ITaxonTreeNode> taxonNodes = new ArrayList<ITaxonTreeNode>();
+               List<TaxonNode> taxonNodes = new ArrayList<TaxonNode>();
                for (Object object : selection.toList()){
                        if(object instanceof TaxonNode){
-                               TaxonNode node = (TaxonNode)object;
-                               if (node.getTaxon() == null){
-                                       object = ((TaxonNode) object).getClassification();
-                               }
-                               taxonNodes.add(((ITaxonTreeNode) object));
+                               taxonNodes.add(((TaxonNode) object));
                                setDataSuccess = true;
                        }
                        

diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
index 2955f8826c9fcc3ecfed866b62a1806a6e27a69a..c4b90304963368392879eb78b966a6d74977f660 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
@@ -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: 4.10.0.qualifier
+Bundle-Version: 4.11.0.qualifier
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,

diff --git a/eu.etaxonomy.taxeditor.printpublisher/pom.xml b/eu.etaxonomy.taxeditor.printpublisher/pom.xml
index 5711caa24c6010ac40310a636a7386234fcafd3b..a776495e3eaf693afb48d4847a88e32ba23c4205 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/pom.xml
+++ b/eu.etaxonomy.taxeditor.printpublisher/pom.xml
@@ -3,7 +3,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>4.10.0-SNAPSHOT</version>
+               <version>4.11.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
index b3e636d2672696ba02271145a8987d3612e204da..5f4d10c436d3032a5d8074f17663b6735ff0029a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
@@ -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: 4.10.0.qualifier
+Bundle-Version: 4.11.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/bundle

diff --git a/eu.etaxonomy.taxeditor.store/pom.xml b/eu.etaxonomy.taxeditor.store/pom.xml
index 96442be92401105b0830d25a440e39793ef7d27c..0d07a56757a4c95333c4743f3af8dbbecc8ea596 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/pom.xml
+++ b/eu.etaxonomy.taxeditor.store/pom.xml
@@ -3,7 +3,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>4.10.0-SNAPSHOT</version>
+       <version>4.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java
index 01d680abbdce2da5387420bd3deafb1c79166279..6c7eb748bba2e1f2c508afaa1f1d537640487317 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/ExportToFileDestinationWizardPage.java
@@ -228,8 +228,8 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
         return new ExportToFileDestinationWizardPage(
                 OUTPUT_MODEL_EXPORT,
                 OUTPUT_MODEL_EXPORT,
-                "Cdm Light Export (csv)",
-                "Export the content of the currently selected database into the cdm light (csv) format.",
+                "CDM Light Export (csv)",
+                "Export the content of the currently selected database into the CDM light (csv) format.",
                 CSV,config);
     }
 
@@ -290,7 +290,7 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
                GridLayout gridLayout = new GridLayout();
                
                gridLayout.numColumns = 2;
-               
+               TaxonNode node = null;
                
                composite.setLayout(gridLayout);
                if(classifications == null){
@@ -312,6 +312,7 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
                        if (!configurator.getTaxonNodeFilter().getClassificationFilter().isEmpty()){
                                selectedClassification = CdmStore.getService(IClassificationService.class).load(configurator.getTaxonNodeFilter().getClassificationFilter().get(0).getUuid());
                        }else{
+                               
                                selectedClassification = classifications.iterator().next();
                        }
                }
@@ -328,7 +329,7 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
                                selectNodeOrClassification.setLayout(grid);
                                checkUseSelectedtaxonNode= new Button(selectNodeOrClassification,  SWT.RADIO);
                                String taxonStr = "";
-                               TaxonNode node = CdmApplicationState.getCurrentAppConfig().getTaxonNodeService().load(configurator.getTaxonNodeFilter().getSubtreeFilter().get(0).getUuid());
+                               node = CdmApplicationState.getCurrentAppConfig().getTaxonNodeService().load(configurator.getTaxonNodeFilter().getSubtreeFilter().get(0).getUuid());
                                if (node.hasTaxon()){
                                        taxonStr = node.getTaxon().getName().getTitleCache();
                                }
@@ -345,7 +346,7 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
                                });
                                  checkUseSelectedtaxonNode.setSelection(true);
                                  checkUseSelectedClassification= new Button(selectNodeOrClassification,  SWT.RADIO);
-                                 checkUseSelectedClassification.setText("Export selected classification");
+                                 checkUseSelectedClassification.setText("Export complete classification");
                                  checkUseSelectedClassification.addListener(SWT.Selection, new Listener() {
                               @Override
                               public void handleEvent(Event e) {
@@ -357,10 +358,20 @@ public class ExportToFileDestinationWizardPage extends WizardPage implements Sel
                                  }
                                        });
                        }
-                       
+                       if (node!= null){
+                               selectedClassification = node.getClassification();
+                       }
                        createClassificationSelectionCombo(composite);
+                       
                        classificationSelectionCombo.setLayoutData(new GridData(SWT.FILL, SWT.FILL,
                                        true, false, 2, 1));
+                       if (checkUseSelectedtaxonNode != null){
+                               
+                               if (checkUseSelectedtaxonNode.getSelection()){
+                                        classificationSelectionCombo.setVisible(false);
+                        classificationLabel.setVisible(false);
+                               }
+                       }
                        
                        
                }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
index faacd11b58a3d239cb1d818872d817f94d662e31..a981e91cd4171cb0ffbd14ebdc7fd2bd5f68bc80 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
@@ -158,11 +158,11 @@ SetSecundumConfiguration_IncludeAcceptedTaxa=Include accepted taxa
 SetSecundumConfiguration_IncludeSynonyms=Include synonyms
 SetSecundumConfiguration_OverwriteExistingAccepted=Overwrite existing references for accepted taxa
 SetSecundumConfiguration_OverwriteExistingSynonyms=Overwrite existing references for synonyms
-SetSecundumConfiguration_EmptySecundumDetail=Empty existing details
+SetSecundumConfiguration_EmptySecundumDetail=Delete existing secundum reference details (recommended)
 SetSecundumConfiguration_IncludeSharedtaxa=Include shared taxa
-SetSecundumConfiguration_NewSecundum_Label=New secundum reference
-SetSecundumConfiguration_Description=If no reference is chosen existing secundum references are deleted
-SetSecundumConfiguration_Description_Configurator=Configure how to perform the set secundum reference operation
+SetSecundumConfiguration_NewSecundum_Label=New secundum reference:
+SetSecundumConfiguration_Description=If no reference is chosen existing secundum references are deleted.
+SetSecundumConfiguration_Description_Configurator=Configure how to perform the set secundum reference operation.
 
 DatabasePreferncesPage_Is_redList=Red List 2020
 DatabasePreferncesPage_Determination_only_for_field_unnits=Determinations only for field units

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
index 3bf36502d1706b0b5bd4ceb955e24e6803bfc30f..e348f2d35ca0e5bdb0f98bc6b5be9c00b2a210a2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
@@ -156,12 +156,12 @@ NewGrantedAuthority_AlreadyInDb=Die GrantedAuthority ist bereits in der DB entha
 
 SetSecundumConfiguration_IncludeAcceptedTaxa=Anwenden auf akzeptierte Taxa
 SetSecundumConfiguration_IncludeSynonyms=Anwenden auf Synonyme
-SetSecundumConfiguration_OverwriteExistingAccepted=Bestehende Secundum Referenzen bei akzeptierten Taxa überschreiben
-SetSecundumConfiguration_OverwriteExistingSynonyms=Bestehende Secundum Referenzen bei Synonymen überschreiben
-SetSecundumConfiguration_EmptySecundumDetail=Bestehende Details von Secundum Referenzen löschen
+SetSecundumConfiguration_OverwriteExistingAccepted=Existierende Secundum Referenzen bei akzeptierten Taxa überschreiben
+SetSecundumConfiguration_OverwriteExistingSynonyms=Existierende Secundum Referenzen bei Synonymen überschreiben
+SetSecundumConfiguration_EmptySecundumDetail=Existierende Secundum Referenz Details löschen (empfohlen)
 SetSecundumConfiguration_IncludeSharedtaxa=Auch mehrfach verwendete Taxa mit einbeziehen
-SetSecundumConfiguration_NewSecundum_Label=Neue Secundum Referenz
-SetSecundumConfiguration_Description=Wenn keine Referenz ausgewählt wird, werden die bestehenden Secundum Referenzen gelöscht
+SetSecundumConfiguration_NewSecundum_Label=Neue Secundum Referenz:
+SetSecundumConfiguration_Description=Wenn keine Referenz ausgewählt wird, werden die bestehenden Secundum Referenzen gelöscht.
 SetSecundumConfiguration_Description_Configurator=Konfigurieren Sie, wie das Ersetzen der Secundum Referenz durchgeführt werden soll.
 
 DatabasePreferncesPage_Is_redList=Rote Liste 2020

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/OrderPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/OrderPreferences.java
index b1060046e078e4706843488bcadbc68aed4eb7ae..d0f526871396de3ce0b017d078d0a386fd16999e 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/OrderPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/OrderPreferences.java
@@ -63,17 +63,17 @@ public class OrderPreferences extends PreferencePage implements IWorkbenchPrefer
 \r
                isNaturalOrderActivated = PreferencesUtil.getSortNodesNaturally();\r
                final Button activateNaturalOrderCheckButton = new Button(composite, SWT.RADIO);\r
-               activateNaturalOrderCheckButton.setText("Enable Natural Order");\r
+               activateNaturalOrderCheckButton.setText("Natural order");\r
                activateNaturalOrderCheckButton.setSelection(isNaturalOrderActivated);\r
 \r
                isRankAndNameOrderActivated = !PreferencesUtil.getSortNodesStrictlyAlphabetically() && !PreferencesUtil.getSortNodesNaturally();\r
                final Button activateRankAndNameOrderActivatedCheckButton = new Button(composite, SWT.RADIO);\r
-               activateRankAndNameOrderActivatedCheckButton.setText("Enable Rank and Alphabetical Order");\r
+               activateRankAndNameOrderActivatedCheckButton.setText("Rank and alphabetical Order");\r
                activateRankAndNameOrderActivatedCheckButton.setSelection(isRankAndNameOrderActivated);\r
 \r
                isAlphabeticalOrderActivated = PreferencesUtil.getSortNodesStrictlyAlphabetically();\r
                final Button activateAlphabeticallyOrderedCheckButton = new Button(composite, SWT.RADIO);\r
-               activateAlphabeticallyOrderedCheckButton.setText("Enable Alphabetical Order");\r
+               activateAlphabeticallyOrderedCheckButton.setText("Alphabetical order");\r
                activateAlphabeticallyOrderedCheckButton.setSelection(isAlphabeticalOrderActivated);\r
 \r
                activateNaturalOrderCheckButton.addSelectionListener(new SelectionAdapter(){\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
index 21ea2e73cd7957f3e7f797438218c62986cc89e2..e9ea6c22d589468c21ddc5e6fdcee4123814ddf1 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
@@ -222,9 +222,10 @@ public class NonViralNameDetailElement
                        
                }
                if (actualCode.equals(NomenclaturalCode.ICNB)){
-                       if (getEntity().getNameApprobation() != null){
+                       if (getEntity().getNameApprobation() != null || getEntity().getSubGenusAuthorship() != null){
                                if (MessagingUtils.confirmDialog(Messages.NonViralNameDetails_confirmDeleteOfBacterialNameParts, Messages.NonViralNameDetails_desciptionDeleteOfBacterialNameParts)){
                                        getEntity().setNameApprobation(null);
+                                       getEntity().setSubGenusAuthorship(null);
                                        return true;
                                }
                        }else{
@@ -233,7 +234,7 @@ public class NonViralNameDetailElement
                        
                }
                if (actualCode.equals(NomenclaturalCode.Fungi)){
-                       if (!getEntity().isAnamorphic() ){
+                       if (getEntity().isAnamorphic() ){
                                if (MessagingUtils.confirmDialog(Messages.NonViralNameDetails_confirmDeleteOfFungiNameParts, Messages.NonViralNameDetails_descriptionDeleteOfFungiNameParts)){
                                        getEntity().setAnamorphic(false);
                                        return true;

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
index cc3d0b29b02f9401998d1ea9d78ebc623f7ea4b1..6389d5c02c3e3bff8d1df634f4d6489e488b48ac 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmEditorPartE4.java
@@ -183,7 +183,7 @@ public abstract class AbstractCdmEditorPartE4
 
                                         if (rels.iterator().hasNext()){
                                                 TaxonRelationship rel = rels.iterator().next();
-                                                if (rel.getType().equals(TaxonRelationshipType.MISAPPLIED_NAME_FOR())){
+                                                if (rel.getType().equals(TaxonRelationshipType.MISAPPLIED_NAME_FOR()) && !rel.getFromTaxon().equals(((ITaxonEditor) part).getTaxon())){
                                                         viewer.setInput(rel);
 
                                                         return;

diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
index eb521594d88b9254061657436cc3510b22cc0ce7..6177c0f23c04abde634fb296e257551899378b03 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: eu.etaxonomy.taxeditor.test
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.test;singleton:=true
-Bundle-Version: 4.10.0.qualifier
+Bundle-Version: 4.11.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: EDIT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8

diff --git a/eu.etaxonomy.taxeditor.test/pom.xml b/eu.etaxonomy.taxeditor.test/pom.xml
index 5432d8640e07ad204e8e7cd3342cfeea715bedcf..e7faa35f38cb0f7388472471318229ec4bfce1bf 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/pom.xml
+++ b/eu.etaxonomy.taxeditor.test/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
   </parent>
   <artifactId>eu.etaxonomy.taxeditor.test</artifactId>
   <packaging>eclipse-test-plugin</packaging>

diff --git a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
index 006d0e762437ef8bde77cdedff1448df7bf2cabc..b8c5601b97f2c0d3d9a19cefa6108fcaf259e4ca 100644 (file)
--- a/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.webapp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Webapp
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.webapp;singleton:=true
-Bundle-Version: 4.10.0.qualifier
+Bundle-Version: 4.11.0.qualifier
 Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy

diff --git a/eu.etaxonomy.taxeditor.webapp/pom.xml b/eu.etaxonomy.taxeditor.webapp/pom.xml
index 683382dd0c8a3a2d73352299e91a195d7fe39a82..dbbd64a7f6116c2d72a25f149b38c615a149c1be 100644 (file)
--- a/eu.etaxonomy.taxeditor.webapp/pom.xml
+++ b/eu.etaxonomy.taxeditor.webapp/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>eu.etaxonomy.taxeditor.webapp</artifactId>

diff --git a/eu.etaxonomy.taxeditor.workbench/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.workbench/META-INF/MANIFEST.MF
index c18d072e0ec249d478f8ce4ca00da2c2c74fd666..820befb0b869cccc4b03b0567a09aacc1fa151b2 100644 (file)
--- a/eu.etaxonomy.taxeditor.workbench/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.workbench/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Workbench Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.workbench;singleton:=true
-Bundle-Version: 4.10.0.qualifier
+Bundle-Version: 4.11.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.workbench.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,

diff --git a/eu.etaxonomy.taxeditor.workbench/pom.xml b/eu.etaxonomy.taxeditor.workbench/pom.xml
index ff8a1ed2b23c477e265d8deca4fcfc06f1c7e4dd..a79ca386d1bf8c2acde328e7880278b4bcbd31b2 100644 (file)
--- a/eu.etaxonomy.taxeditor.workbench/pom.xml
+++ b/eu.etaxonomy.taxeditor.workbench/pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
index 910ff29a0b67b3c90a5616715c4da1e16b800201..5326a963bd7f032a89af25760cb1e9132b1cc22b 100644 (file)
--- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
+++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
@@ -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="4.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="4.11.0.qualifier">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>

diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
index 1e106e92868c8226dae8c891a6ac2bd2441f3a52..179134e427f881050b434f57015feda7fd504698 100644 (file)
--- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
+++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="4.10.0.qualifier" useFeatures="true" includeLaunchers="true">
+<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="4.11.0.qualifier" useFeatures="true" includeLaunchers="true">
 
    <aboutInfo>
       <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>

diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml
index f962953462712254de1bc6c0bf508ea18419029e..f7fd1019901b24a94bab0f1af6931548f6f0f911 100644 (file)
--- a/eu.etaxonomy.taxeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor/pom.xml
@@ -2,7 +2,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.10.0-SNAPSHOT</version>
+    <version>4.11.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
index b1607e7853cf85edd687919d6ce9c5aaa207bfa8..f25296b877036c10eacbfc42a3620d27f4ef0941 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>4.10.0-SNAPSHOT</version>
+  <version>4.11.0-SNAPSHOT</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy
@@ -18,13 +18,13 @@
   <properties>
     <java.codelevel>1.8</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>4.10.0-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>4.11.0-SNAPSHOT</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <!-- Increasing tycho above 0.22.0 will fail for the macosx build because 
       for higher version numbers tycho needs to be build against Eclipse Mars or 
       higher -->
     <tycho.version>1.0.0</tycho.version>
-    <taxeditor.version>4.10.0-SNAPSHOT</taxeditor.version>
+    <taxeditor.version>4.11.0-SNAPSHOT</taxeditor.version>
     <update.dir>snapshot</update.dir>
     <unitils.version>3.4.2</unitils.version>
     <log4j.version>1.2.17</log4j.version>

diff --git a/src/site/site.xml b/src/site/site.xml
index 40ad3fe38fcf9c541e647b6fcad60a8319128400..a6ff09a965771309c061255733006cb23f500300 100644 (file)
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -12,7 +12,7 @@
                        <item name="Manual" href="manual.html"/>
                        <!--item name="FAQ" href="faq.html"/-->
                        <item name="Releases" href="changes-report.html"/>
-                       <item name="Download" href="https://cybertaxonomy.eu/download/taxeditor/"/>
+                       <item name="Download" href="https://cybertaxonomy.eu/download/taxeditor/stable"/>
                </menu>
                <menu name="Developer">
                        <item name="Getting started" href="getting-started.html"/>