Merge branch 'hotfix/4.11.2'

diff --git a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
index 871775fe8e7bb7a5b31f131c56c8e5dbe81268ea..982c60488c0649add2e16453e3243af07fb26c19 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.11.1
+Bundle-Version: 4.11.2
 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 6af8a673e5a0d63dc7cf1bb3d74c46813d1724f6..aaf56246e31bc3df672970e0ddfce19629519dc6 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.11.1</version>
+    <version>4.11.2</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 01f580507eb961439c395e8245ae86d0206156dd..5f6d6f04e5b9a4817ea248c2b320372b3f746e47 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.11.1
+Bundle-Version: 4.11.2
 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 2e411b2fd2cd7c9e7301122269b16181fbefa566..8ad12f6cf4442fd895da3ae1147f0eb3bcd6d7cf 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.11.1</version>
+               <version>4.11.2</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index 04ac2850d54dbce5b14c89dbc38c6ad9fbde6361..18f7016326b5da4103a93566d5cd206ba021d0c7 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+       <classpathentry exported="true" kind="lib" path="lib/org.eclipse.nebula.widgets.compositetable_1.0.0.201711021145.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/lucene-suggest-5.4.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/lucene-sandbox-5.4.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/lucene-analyzers-common-5.4.1.jar"/>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index b1ad3373c1a1af9a69958473effe3c25b7b9c9fe..21800e06cb1140e03b9651a14e21bc16a8c8f8b3 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.11.1
+Bundle-Version: 4.11.2
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -71,7 +71,6 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.io.csv.redlist.out,
  eu.etaxonomy.cdm.io.descriptive.owl.out,
  eu.etaxonomy.cdm.io.distribution.excelupdate,
- eu.etaxonomy.cdm.io.dwca,
  eu.etaxonomy.cdm.io.dwca.in,
  eu.etaxonomy.cdm.io.dwca.jaxb,
  eu.etaxonomy.cdm.io.dwca.out,
@@ -409,6 +408,7 @@ Export-Package: com.google.api,
  org.apache.lucene.util.packed,
  org.apache.sanselan;uses:="org.apache.sanselan.common,org.apache.sanselan.common.byteSources",
  org.apache.xerces.dom,
+ org.eclipse.nebula.widgets.compositetable,
  org.h2.jdbc,
  org.hamcrest,
  org.hibernate,
@@ -860,5 +860,6 @@ Bundle-ClassPath: .,
  lib/lucene-analyzers-3.6.2.jar,
  lib/lucene-analyzers-common-5.4.1.jar,
  lib/lucene-sandbox-5.4.1.jar,
- lib/lucene-suggest-5.4.1.jar
+ lib/lucene-suggest-5.4.1.jar,
+ lib/org.eclipse.nebula.widgets.compositetable_1.0.0.201711021145.jar
 Import-Package: eu.etaxonomy.cdm.api.application

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index 630253ccae9fca7ac9fe22f0940bf571f3004ca7..00faf38ce351ea4c7ef8d12f4cebac8e28676fd8 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -220,7 +220,8 @@ bin.includes = META-INF/,\
                lib/lucene-analyzers-3.6.2.jar,\
                lib/lucene-analyzers-common-5.4.1.jar,\
                lib/lucene-sandbox-5.4.1.jar,\
-               lib/lucene-suggest-5.4.1.jar
+               lib/lucene-suggest-5.4.1.jar,\
+               lib/org.eclipse.nebula.widgets.compositetable_1.0.0.201711021145.jar
 
 jars.compile.order = .
 output.. = bin/

diff --git a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.nebula.widgets.compositetable_1.0.0.201711021145.jar b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.nebula.widgets.compositetable_1.0.0.201711021145.jar
new file mode 100644 (file)
index 0000000..e3d917c
Binary files /dev/null and b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.nebula.widgets.compositetable_1.0.0.201711021145.jar differ

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 40ae861ab84ffa2810959880f5b1a5c11cfa98e1..feddb76ec263dbe294e0f257d24cd1050b9a4e80 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.11.1</version>\r
+    <version>4.11.2</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 e0f59cafc084140c0587eae79271fd3ce65ecfa3..a1bc35806922a11f273011f9e4d70673a9f811ef 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.11.1
+Bundle-Version: 4.11.2
 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 b5b0027bb3415609e933189e545bd74efef8aa57..ed682d6b05df5debb4d95ca81cd89c0265ed0ceb 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.11.1</version>
+    <version>4.11.2</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java
index de28b99ab51a62ea6e454f8c56fb4810d20c59e9..96ea0b6937ac7f00611dad831b1abf211b5518ed 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java
@@ -146,14 +146,6 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
        @PostConstruct
     public void createPartControl(Composite parent, MPart thisPart) {
            this.thisPart = thisPart;
-        if (CdmStore.isActive()){
-            if(conversation == null){
-                conversation = CdmStore.createConversation();
-            }
-        }
-        else{
-            return;
-        }
 
         createManagedForm(parent);
 
@@ -398,6 +390,7 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
                }
 
                this.input = input;
+               conversation = input.getConversationHolder();
 
         createOrUpdateNameComposites();
 
@@ -504,6 +497,9 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
             conversation.unregisterForDataStoreChanges(this);
             conversation.close();
         }
+        if(input!=null){
+            input.dispose();
+        }
         eventBroker.post(WorkbenchEventConstants.CURRENT_ACTIVE_EDITOR, null);
        }
 

diff --git a/eu.etaxonomy.taxeditor.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
index 8e3abffc800d8fdcdf7e61831a7e76c2d9d0d613..a69c960a5eddcc762a36e7c507f9fdb4244975ce 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.11.1"
+      version="4.11.2"
       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 323b70a52d6db5f6b82ad4b9fee06f99aeb67ed0..117f79e5add27a98233d276980b979e0642f469d 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.11.1</version>
+               <version>4.11.2</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 391da1616a0cb41c1d25798175caaadf0e35bab6..466c26ce12ad437e6fe90a04821248df2f02f9e2 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.11.1"
+      version="4.11.2"
       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 aedb5d43d1e22ef2ce8bf93b44692bbd5bf83ba2..cf719230c51016522b06d48b972653ddb7554f4b 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.11.1</version>
+    <version>4.11.2</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 e42232b4ab3254aa045e0d1dd601054c02b59258..f2c9e1528c4d254dcdb4fa0082df2b5816d6440f 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.11.1
+Bundle-Version: 4.11.2
 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 8947a2c8bb960fbe9aa8a34d8b28c55fc49a9896..402a29785aca83fafa36e0501c35ca11b583ba2f 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.11.1</version>
+               <version>4.11.2</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 089c05aed144853f329e59ca5a5fe3794c0b331f..d92b0b96e3ba894bae32fd4a0927a07d8dade772 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.11.1
+Bundle-Version: 4.11.2
 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 42f4ca9e9ca7268c4515addfa4d9c4d0a7dbd95f..61484ff38adaa86b41343aa4bb4deb4924b41e5e 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.11.1</version>
+    <version>4.11.2</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 da69498282d08832433bb6abd036207c8e6d60ac..0cb08c221181def529b06ae8ad9df651395291bd 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.11.1
+Bundle-Version: 4.11.2
 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 73a9b1e7d20c49568530c28a5672f60456b18c59..9f180d92609f028e5075e90055dc3a58e99eac6d 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.11.1</version>
+    <version>4.11.2</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 473adb0248c58c6cb2f4096835754f7958e65cb3..a04e47575de79146219d6ab4dfd668a09377802f 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.11.1
+Bundle-Version: 4.11.2
 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 fb3716e68f183f1edd543591ccfafad151e5e02a..ab56a45871c9ba165f882491d8a236fcd0da6f4d 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.11.1</version>
+               <version>4.11.2</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
index a94fb889178b0df7a08a9d24a33dbcd5206f40ff..2845070c6c2256eeed7f01e284742b2ab729edd7 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.11.1
+Bundle-Version: 4.11.2
 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 8ad8b2f95491001a68abd30b5372f7f947bf991a..3d0b3c8634a8c69f2ed4846b61526fc3a63df267 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.11.1</version>
+               <version>4.11.2</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 906a11089b09dca30d1c187e208b6f2339dd073e..009ac0e7fe5565ff6988b79b1d44328ae7cf3e7b 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.11.1
+Bundle-Version: 4.11.2
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/bundle
@@ -74,7 +74,6 @@ Require-Bundle: org.eclipse.osgi,
  org.eclipse.jface.text,
  org.eclipse.ui.forms,
  eu.etaxonomy.taxeditor.cdmlib,
- org.eclipse.nebula.widgets.compositetable,
  org.eclipse.core.databinding,
  org.eclipse.core.databinding.beans,
  org.eclipse.core.databinding.observable,

diff --git a/eu.etaxonomy.taxeditor.store/pom.xml b/eu.etaxonomy.taxeditor.store/pom.xml
index c5c57a904135056a129283fca60fce1c1b89d349..e856821c7f6bf150f56363fff282bc1ba5f98ac2 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.11.1</version>
+       <version>4.11.2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmDataViewerE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmDataViewerE4.java
index 15e34c46dfedda1bd103d0af2f2f442230d0215b..92d84a35d82129c3c906bcb90acd7cc2105636ac 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmDataViewerE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/AbstractCdmDataViewerE4.java
@@ -174,7 +174,9 @@ public abstract class AbstractCdmDataViewerE4 extends Viewer implements IConvers
                rootElement = new RootElement(formFactory, body);
 
                for(Control control : body.getChildren()){
-                       control.dispose();
+                   if (control != null && !control.isDisposed()){
+                       control.dispose();
+                   }
                        control = null;
                }
        }

diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
index 9d5268833428c9ed5c41fc5c5553f8bc6f5899eb..ac4bd2990a43e70af5a5409db193c5749c19a987 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.11.1
+Bundle-Version: 4.11.2
 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 7e5529b6d6882b4ef6add2e0359f11fe0f2a5b8a..f0cefb4f9d72fbb74c6ef9a85b7f0c9b339abd2c 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.11.1</version>
+    <version>4.11.2</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 c15af6cf15575b000dbac2430e78d3a19908d170..307e624fc296014838d5b86b219c5ff09d61e82a 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.11.1
+Bundle-Version: 4.11.2
 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 9bb0f7d8c6ebe98141397222e8003a69e5631644..5572a7df57b769cc01e9cccc48844db910c1b81d 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.11.1</version>
+    <version>4.11.2</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 2ad4759730a23d8d11f3a403040e6b130b088378..4158ac4a95148737825a04d6619c0be7b753748f 100644 (file)
--- a/eu.etaxonomy.taxeditor.workbench/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.workbench/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@ Export-Package: eu.etaxonomy.taxeditor.bulkeditor,
  eu.etaxonomy.taxeditor.workbench,
  eu.etaxonomy.taxeditor.workbench.part
 Bundle-Name: Workbench Bundle
-Bundle-Version: 4.11.1
+Bundle-Version: 4.11.2
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.e4.ui.workbench,

diff --git a/eu.etaxonomy.taxeditor.workbench/pom.xml b/eu.etaxonomy.taxeditor.workbench/pom.xml
index 4dbc9a11ed7bfd84c5f1f348de841877675fb03a..ce7c0afcaa9ac2cd8335d829c600ec27a1aa9006 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.11.1</version>
+    <version>4.11.2</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 659e3eb26b6ae7f7e2042fc17c35aeb1762a926b..c1f183815aca05943d1fc768af634d089a14e92f 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.11.1">
+<?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.2">
   <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 97a8b5a252cc9863c5b4d6ff5ab1f74a9cd124ab..7cdd23cba6a81043ae66bf93b873a89e79fe4912 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.11.1" 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.2" 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 bdccde3d41ad685cad1684537ff3e54af1311bd1..567ff4cfc6dba99549246c9cc7f01c45ef5e0d3c 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.11.1</version>
+    <version>4.11.2</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor/rcp.target b/eu.etaxonomy.taxeditor/rcp.target
index 4d15238a7d9964f59029ea0306c4bd5d05a30503..536fa576235f6a65920f0a8eaafff02c3c9c1cf2 100644 (file)
--- a/eu.etaxonomy.taxeditor/rcp.target
+++ b/eu.etaxonomy.taxeditor/rcp.target
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target includeMode="feature" name="Eclipse Neon Target" sequenceNumber="42">
+<?pde version="3.8"?><target includeMode="feature" name="Eclipse Neon Target" sequenceNumber="43">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.equinox.sdk.feature.group" version="3.12.0.v20170209-1843"/>
@@ -65,13 +65,304 @@
 <repository location="http://download.eclipse.org/releases/neon"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.nebula.widgets.compositetable.feature.feature.group" version="1.0.0.201605182147"/>
-<repository location="http://archive.eclipse.org/nebula/Q22016/release/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
 <unit id="org.eclipse.oomph.setup.sdk.feature.group" version="1.7.0.v20170305-1123"/>
 <repository location="http://download.eclipse.org/releases/neon"/>
 </location>
 </locations>
-</target>
-
+<includeBundles>
+<feature id="org.eclipse.core.runtime.feature"/>
+<feature id="org.eclipse.cvs"/>
+<feature id="org.eclipse.cvs.source"/>
+<feature id="org.eclipse.draw2d"/>
+<feature id="org.eclipse.draw2d.sdk"/>
+<feature id="org.eclipse.draw2d.source"/>
+<feature id="org.eclipse.e4.core.tools.feature"/>
+<feature id="org.eclipse.e4.core.tools.feature.source"/>
+<feature id="org.eclipse.e4.rcp"/>
+<feature id="org.eclipse.e4.rcp.source"/>
+<feature id="org.eclipse.e4.tools.bundle.spy.feature"/>
+<feature id="org.eclipse.e4.tools.context.spy.feature"/>
+<feature id="org.eclipse.e4.tools.css.spy.feature"/>
+<feature id="org.eclipse.e4.tools.css.spy.feature.source"/>
+<feature id="org.eclipse.e4.tools.event.spy.feature"/>
+<feature id="org.eclipse.e4.tools.event.spy.feature.source"/>
+<feature id="org.eclipse.e4.tools.model.spy.feature"/>
+<feature id="org.eclipse.e4.tools.preference.spy.feature"/>
+<feature id="org.eclipse.e4.tools.spies.feature"/>
+<feature id="org.eclipse.ecf.core.feature"/>
+<feature id="org.eclipse.ecf.core.source.feature"/>
+<feature id="org.eclipse.ecf.core.ssl.feature"/>
+<feature id="org.eclipse.ecf.core.ssl.source.feature"/>
+<feature id="org.eclipse.ecf.filetransfer.feature"/>
+<feature id="org.eclipse.ecf.filetransfer.httpclient4.feature"/>
+<feature id="org.eclipse.ecf.filetransfer.httpclient4.source.feature"/>
+<feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.feature"/>
+<feature id="org.eclipse.ecf.filetransfer.httpclient4.ssl.source.feature"/>
+<feature id="org.eclipse.ecf.filetransfer.source.feature"/>
+<feature id="org.eclipse.ecf.filetransfer.ssl.feature"/>
+<feature id="org.eclipse.ecf.filetransfer.ssl.source.feature"/>
+<feature id="org.eclipse.emf"/>
+<feature id="org.eclipse.emf.codegen"/>
+<feature id="org.eclipse.emf.codegen.ecore"/>
+<feature id="org.eclipse.emf.codegen.ecore.source"/>
+<feature id="org.eclipse.emf.codegen.ecore.ui"/>
+<feature id="org.eclipse.emf.codegen.ecore.ui.source"/>
+<feature id="org.eclipse.emf.codegen.source"/>
+<feature id="org.eclipse.emf.codegen.ui"/>
+<feature id="org.eclipse.emf.codegen.ui.source"/>
+<feature id="org.eclipse.emf.common"/>
+<feature id="org.eclipse.emf.common.source"/>
+<feature id="org.eclipse.emf.common.ui"/>
+<feature id="org.eclipse.emf.common.ui.source"/>
+<feature id="org.eclipse.emf.converter"/>
+<feature id="org.eclipse.emf.converter.source"/>
+<feature id="org.eclipse.emf.databinding"/>
+<feature id="org.eclipse.emf.databinding.edit"/>
+<feature id="org.eclipse.emf.databinding.edit.source"/>
+<feature id="org.eclipse.emf.databinding.source"/>
+<feature id="org.eclipse.emf.doc"/>
+<feature id="org.eclipse.emf.doc.source"/>
+<feature id="org.eclipse.emf.ecore"/>
+<feature id="org.eclipse.emf.ecore.edit"/>
+<feature id="org.eclipse.emf.ecore.edit.source"/>
+<feature id="org.eclipse.emf.ecore.editor"/>
+<feature id="org.eclipse.emf.ecore.editor.source"/>
+<feature id="org.eclipse.emf.ecore.source"/>
+<feature id="org.eclipse.emf.ecore.xcore"/>
+<feature id="org.eclipse.emf.ecore.xcore.lib"/>
+<feature id="org.eclipse.emf.ecore.xcore.lib.source"/>
+<feature id="org.eclipse.emf.ecore.xcore.sdk"/>
+<feature id="org.eclipse.emf.ecore.xcore.source"/>
+<feature id="org.eclipse.emf.ecore.xcore.ui"/>
+<feature id="org.eclipse.emf.ecore.xcore.ui.source"/>
+<feature id="org.eclipse.emf.edit"/>
+<feature id="org.eclipse.emf.edit.source"/>
+<feature id="org.eclipse.emf.edit.ui"/>
+<feature id="org.eclipse.emf.edit.ui.source"/>
+<feature id="org.eclipse.emf.mapping"/>
+<feature id="org.eclipse.emf.mapping.ecore"/>
+<feature id="org.eclipse.emf.mapping.ecore.editor"/>
+<feature id="org.eclipse.emf.mapping.ecore.editor.source"/>
+<feature id="org.eclipse.emf.mapping.ecore.source"/>
+<feature id="org.eclipse.emf.mapping.source"/>
+<feature id="org.eclipse.emf.mapping.ui"/>
+<feature id="org.eclipse.emf.mapping.ui.source"/>
+<feature id="org.eclipse.emf.sdk"/>
+<feature id="org.eclipse.emf.source"/>
+<feature id="org.eclipse.epp.logging.aeri.feature"/>
+<feature id="org.eclipse.epp.mpc"/>
+<feature id="org.eclipse.epp.package.common.feature"/>
+<feature id="org.eclipse.epp.package.modeling.feature"/>
+<feature id="org.eclipse.equinox.compendium.sdk"/>
+<feature id="org.eclipse.equinox.core.feature"/>
+<feature id="org.eclipse.equinox.core.sdk"/>
+<feature id="org.eclipse.equinox.executable"/>
+<feature id="org.eclipse.equinox.p2.core.feature"/>
+<feature id="org.eclipse.equinox.p2.core.feature.source"/>
+<feature id="org.eclipse.equinox.p2.discovery.feature"/>
+<feature id="org.eclipse.equinox.p2.extras.feature"/>
+<feature id="org.eclipse.equinox.p2.extras.feature.source"/>
+<feature id="org.eclipse.equinox.p2.rcp.feature"/>
+<feature id="org.eclipse.equinox.p2.rcp.feature.source"/>
+<feature id="org.eclipse.equinox.p2.sdk"/>
+<feature id="org.eclipse.equinox.p2.user.ui"/>
+<feature id="org.eclipse.equinox.p2.user.ui.source"/>
+<feature id="org.eclipse.equinox.sdk"/>
+<feature id="org.eclipse.equinox.server.core"/>
+<feature id="org.eclipse.equinox.server.jetty"/>
+<feature id="org.eclipse.equinox.server.p2"/>
+<feature id="org.eclipse.equinox.serverside.sdk"/>
+<feature id="org.eclipse.help"/>
+<feature id="org.eclipse.help.source"/>
+<feature id="org.eclipse.jdt"/>
+<feature id="org.eclipse.jdt.source"/>
+<feature id="org.eclipse.nebula.widgets.compositetable.feature"/>
+<feature id="org.eclipse.objectteams.otequinox"/>
+<feature id="org.eclipse.oomph.p2"/>
+<feature id="org.eclipse.oomph.setup"/>
+<feature id="org.eclipse.oomph.setup.core"/>
+<feature id="org.eclipse.oomph.setup.git"/>
+<feature id="org.eclipse.oomph.setup.jdt"/>
+<feature id="org.eclipse.oomph.setup.launching"/>
+<feature id="org.eclipse.oomph.setup.maven"/>
+<feature id="org.eclipse.oomph.setup.mylyn"/>
+<feature id="org.eclipse.oomph.setup.pde"/>
+<feature id="org.eclipse.oomph.setup.projects"/>
+<feature id="org.eclipse.oomph.setup.projectset"/>
+<feature id="org.eclipse.oomph.setup.sdk"/>
+<feature id="org.eclipse.oomph.setup.targlets"/>
+<feature id="org.eclipse.oomph.setup.ui.ide"/>
+<feature id="org.eclipse.oomph.setup.workbench"/>
+<feature id="org.eclipse.oomph.setup.workingsets"/>
+<feature id="org.eclipse.pde"/>
+<feature id="org.eclipse.pde.source"/>
+<feature id="org.eclipse.platform"/>
+<feature id="org.eclipse.platform.source"/>
+<feature id="org.eclipse.rcp"/>
+<feature id="org.eclipse.rcp.source"/>
+<feature id="org.eclipse.sdk"/>
+<feature id="org.eclipse.swtbot"/>
+<feature id="org.eclipse.swtbot.eclipse"/>
+<feature id="org.eclipse.swtbot.forms"/>
+<feature id="org.eclipse.zest"/>
+<feature id="org.eclipse.zest.sdk"/>
+<feature id="org.eclipse.zest.source"/>
+<plugin id="com.google.gson"/>
+<plugin id="com.google.guava"/>
+<plugin id="com.google.guava.source"/>
+<plugin id="com.google.inject"/>
+<plugin id="com.google.inject.source"/>
+<plugin id="javaewah"/>
+<plugin id="org.antlr.runtime"/>
+<plugin id="org.antlr.runtime.source"/>
+<plugin id="org.apache.commons.cli"/>
+<plugin id="org.apache.commons.codec.source"/>
+<plugin id="org.apache.commons.httpclient"/>
+<plugin id="org.apache.commons.httpclient.source"/>
+<plugin id="org.apache.commons.io"/>
+<plugin id="org.apache.commons.lang"/>
+<plugin id="org.apache.commons.lang.source"/>
+<plugin id="org.apache.commons.lang3"/>
+<plugin id="org.apache.log4j"/>
+<plugin id="org.apache.log4j.source"/>
+<plugin id="org.apache.xerces"/>
+<plugin id="org.apache.xml.resolver"/>
+<plugin id="org.apache.xml.serializer"/>
+<plugin id="org.eclipse.egit.core"/>
+<plugin id="org.eclipse.egit.core.source"/>
+<plugin id="org.eclipse.emf.mwe.core"/>
+<plugin id="org.eclipse.emf.mwe.core.source"/>
+<plugin id="org.eclipse.emf.mwe.utils"/>
+<plugin id="org.eclipse.emf.mwe.utils.source"/>
+<plugin id="org.eclipse.emf.mwe2.lib"/>
+<plugin id="org.eclipse.emf.mwe2.lib.source"/>
+<plugin id="org.eclipse.emf.mwe2.runtime"/>
+<plugin id="org.eclipse.emf.mwe2.runtime.source"/>
+<plugin id="org.eclipse.epp.logging.aeri.core.source"/>
+<plugin id="org.eclipse.epp.logging.aeri.ide.source"/>
+<plugin id="org.eclipse.epp.mpc.core.source"/>
+<plugin id="org.eclipse.epp.mpc.ui.source"/>
+<plugin id="org.eclipse.jgit"/>
+<plugin id="org.eclipse.jgit.source"/>
+<plugin id="org.eclipse.m2e.archetype.common"/>
+<plugin id="org.eclipse.m2e.core"/>
+<plugin id="org.eclipse.m2e.core.source"/>
+<plugin id="org.eclipse.m2e.maven.indexer"/>
+<plugin id="org.eclipse.m2e.maven.runtime"/>
+<plugin id="org.eclipse.m2e.maven.runtime.slf4j.simple"/>
+<plugin id="org.eclipse.m2e.workspace.cli"/>
+<plugin id="org.eclipse.mylyn.builds.core"/>
+<plugin id="org.eclipse.mylyn.builds.core.source"/>
+<plugin id="org.eclipse.mylyn.builds.ui"/>
+<plugin id="org.eclipse.mylyn.builds.ui.source"/>
+<plugin id="org.eclipse.mylyn.commons.core"/>
+<plugin id="org.eclipse.mylyn.commons.core.source"/>
+<plugin id="org.eclipse.mylyn.commons.identity.core"/>
+<plugin id="org.eclipse.mylyn.commons.identity.core.source"/>
+<plugin id="org.eclipse.mylyn.commons.net"/>
+<plugin id="org.eclipse.mylyn.commons.net.source"/>
+<plugin id="org.eclipse.mylyn.commons.notifications.core"/>
+<plugin id="org.eclipse.mylyn.commons.notifications.core.source"/>
+<plugin id="org.eclipse.mylyn.commons.notifications.feed"/>
+<plugin id="org.eclipse.mylyn.commons.notifications.feed.source"/>
+<plugin id="org.eclipse.mylyn.commons.notifications.ui"/>
+<plugin id="org.eclipse.mylyn.commons.notifications.ui.source"/>
+<plugin id="org.eclipse.mylyn.commons.repositories.core"/>
+<plugin id="org.eclipse.mylyn.commons.repositories.core.source"/>
+<plugin id="org.eclipse.mylyn.commons.repositories.ui"/>
+<plugin id="org.eclipse.mylyn.commons.repositories.ui.source"/>
+<plugin id="org.eclipse.mylyn.commons.screenshots"/>
+<plugin id="org.eclipse.mylyn.commons.screenshots.source"/>
+<plugin id="org.eclipse.mylyn.commons.ui"/>
+<plugin id="org.eclipse.mylyn.commons.ui.source"/>
+<plugin id="org.eclipse.mylyn.commons.workbench"/>
+<plugin id="org.eclipse.mylyn.commons.workbench.source"/>
+<plugin id="org.eclipse.mylyn.context.core"/>
+<plugin id="org.eclipse.mylyn.context.core.source"/>
+<plugin id="org.eclipse.mylyn.context.ui"/>
+<plugin id="org.eclipse.mylyn.context.ui.source"/>
+<plugin id="org.eclipse.mylyn.discovery.core"/>
+<plugin id="org.eclipse.mylyn.discovery.core.source"/>
+<plugin id="org.eclipse.mylyn.discovery.ui"/>
+<plugin id="org.eclipse.mylyn.discovery.ui.source"/>
+<plugin id="org.eclipse.mylyn.monitor.core"/>
+<plugin id="org.eclipse.mylyn.monitor.core.source"/>
+<plugin id="org.eclipse.mylyn.monitor.ui"/>
+<plugin id="org.eclipse.mylyn.monitor.ui.source"/>
+<plugin id="org.eclipse.mylyn.resources.ui"/>
+<plugin id="org.eclipse.mylyn.resources.ui.source"/>
+<plugin id="org.eclipse.mylyn.tasks.core"/>
+<plugin id="org.eclipse.mylyn.tasks.core.source"/>
+<plugin id="org.eclipse.mylyn.tasks.ui"/>
+<plugin id="org.eclipse.mylyn.tasks.ui.source"/>
+<plugin id="org.eclipse.mylyn.team.ui"/>
+<plugin id="org.eclipse.mylyn.team.ui.source"/>
+<plugin id="org.eclipse.mylyn.versions.core"/>
+<plugin id="org.eclipse.mylyn.versions.core.source"/>
+<plugin id="org.eclipse.mylyn.versions.ui"/>
+<plugin id="org.eclipse.mylyn.versions.ui.source"/>
+<plugin id="org.eclipse.oomph.base"/>
+<plugin id="org.eclipse.oomph.base.edit"/>
+<plugin id="org.eclipse.oomph.predicates"/>
+<plugin id="org.eclipse.oomph.predicates.edit"/>
+<plugin id="org.eclipse.oomph.resources"/>
+<plugin id="org.eclipse.oomph.resources.edit"/>
+<plugin id="org.eclipse.oomph.targlets"/>
+<plugin id="org.eclipse.oomph.targlets.core"/>
+<plugin id="org.eclipse.oomph.targlets.edit"/>
+<plugin id="org.eclipse.oomph.ui"/>
+<plugin id="org.eclipse.oomph.util"/>
+<plugin id="org.eclipse.oomph.util.pde"/>
+<plugin id="org.eclipse.oomph.workingsets"/>
+<plugin id="org.eclipse.oomph.workingsets.edit"/>
+<plugin id="org.eclipse.oomph.workingsets.editor"/>
+<plugin id="org.eclipse.xpand"/>
+<plugin id="org.eclipse.xpand.source"/>
+<plugin id="org.eclipse.xtend"/>
+<plugin id="org.eclipse.xtend.lib"/>
+<plugin id="org.eclipse.xtend.lib.macro"/>
+<plugin id="org.eclipse.xtend.lib.macro.source"/>
+<plugin id="org.eclipse.xtend.lib.source"/>
+<plugin id="org.eclipse.xtend.source"/>
+<plugin id="org.eclipse.xtend.typesystem.emf"/>
+<plugin id="org.eclipse.xtend.typesystem.emf.source"/>
+<plugin id="org.eclipse.xtext"/>
+<plugin id="org.eclipse.xtext.builder"/>
+<plugin id="org.eclipse.xtext.builder.source"/>
+<plugin id="org.eclipse.xtext.common.types"/>
+<plugin id="org.eclipse.xtext.common.types.edit"/>
+<plugin id="org.eclipse.xtext.common.types.edit.source"/>
+<plugin id="org.eclipse.xtext.common.types.source"/>
+<plugin id="org.eclipse.xtext.common.types.ui"/>
+<plugin id="org.eclipse.xtext.common.types.ui.source"/>
+<plugin id="org.eclipse.xtext.ecore"/>
+<plugin id="org.eclipse.xtext.ecore.source"/>
+<plugin id="org.eclipse.xtext.generator"/>
+<plugin id="org.eclipse.xtext.generator.source"/>
+<plugin id="org.eclipse.xtext.ide"/>
+<plugin id="org.eclipse.xtext.smap"/>
+<plugin id="org.eclipse.xtext.smap.source"/>
+<plugin id="org.eclipse.xtext.source"/>
+<plugin id="org.eclipse.xtext.ui"/>
+<plugin id="org.eclipse.xtext.ui.codetemplates"/>
+<plugin id="org.eclipse.xtext.ui.codetemplates.source"/>
+<plugin id="org.eclipse.xtext.ui.codetemplates.ui"/>
+<plugin id="org.eclipse.xtext.ui.codetemplates.ui.source"/>
+<plugin id="org.eclipse.xtext.ui.shared"/>
+<plugin id="org.eclipse.xtext.ui.shared.source"/>
+<plugin id="org.eclipse.xtext.ui.source"/>
+<plugin id="org.eclipse.xtext.util"/>
+<plugin id="org.eclipse.xtext.util.source"/>
+<plugin id="org.eclipse.xtext.xbase"/>
+<plugin id="org.eclipse.xtext.xbase.ide"/>
+<plugin id="org.eclipse.xtext.xbase.ide.source"/>
+<plugin id="org.eclipse.xtext.xbase.lib"/>
+<plugin id="org.eclipse.xtext.xbase.lib.source"/>
+<plugin id="org.eclipse.xtext.xbase.source"/>
+<plugin id="org.eclipse.xtext.xbase.ui"/>
+<plugin id="org.eclipse.xtext.xbase.ui.source"/>
+<plugin id="org.eclipse.xtext.xtext.generator"/>
+<plugin id="org.eclipse.xtext.xtext.generator.source"/>
+<plugin id="org.hamcrest.library"/>
+</includeBundles>
+</target>
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index 9e46196b7c866e3f6255758c3150896a65ab9947..539ba546e4508c84c3b4fe7cf4d58193e480ab77 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>4.11.1</version>
+  <version>4.11.2</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy