Merge branch 'develop' into remoting-4.0

Conflicts:
	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

diff --git a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
index 9fe1b3ced4971d065bb1df29c832d84a438ae282..e2399fc7e1e00079cdbd7f38ccaaddf6b2a3da95 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: 3.11.0.qualifier
+Bundle-Version: 3.12.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/plugin

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
index d835f626d9a871187b561fff87b163e679a8654b..7a0db176edd5ca02dd6e4d73528cbdca72ad1e36 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: 3.11.0.qualifier
+Bundle-Version: 3.12.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.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath
index da7d39d0123aa75e7b7a8fcaba6c571676dc27b4..442ca897d01f9b0ee46e4592d027d3065fb10144 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -189,13 +189,14 @@
        <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-schemas-3.10-FINAL.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/swagger-annotations-1.3.5.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/apache-log4j-extras-1.2.17.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.11.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.11.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.11.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.11.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.11.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.11.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.11.0-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.11.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.12.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.12.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.12.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.12.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.12.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.12.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.12.0-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.12.0-SNAPSHOT.jar"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>
+

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index fe6cb91751a2759549c7133a5f497e85983b2976..58774bcc933f16f46302789c3ecbfd8e6af5a56d 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: 3.11.0.qualifier
+Bundle-Version: 3.12.0.qualifier
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -658,12 +658,13 @@ Bundle-ClassPath: .,
  lib/poi-ooxml-schemas-3.10-FINAL.jar,
  lib/swagger-annotations-1.3.5.jar,
  lib/apache-log4j-extras-1.2.17.jar,
- lib/cdmlib-commons-3.11.0-SNAPSHOT.jar,
- lib/cdmlib-ext-3.11.0-SNAPSHOT.jar,
- lib/cdmlib-io-3.11.0-SNAPSHOT.jar,
- lib/cdmlib-model-3.11.0-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.11.0-SNAPSHOT.jar,
- lib/cdmlib-print-3.11.0-SNAPSHOT.jar,
- lib/cdmlib-remote-3.11.0-SNAPSHOT.jar,
- lib/cdmlib-services-3.11.0-SNAPSHOT.jar
+ lib/cdmlib-commons-3.12.0-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.12.0-SNAPSHOT.jar,
+ lib/cdmlib-io-3.12.0-SNAPSHOT.jar,
+ lib/cdmlib-model-3.12.0-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.12.0-SNAPSHOT.jar,
+ lib/cdmlib-print-3.12.0-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.12.0-SNAPSHOT.jar,
+ lib/cdmlib-services-3.12.0-SNAPSHOT.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 5622c0ecc35f41b98ee6ce12bfd152d8068a3271..f38d92b03917b64a0696eaba516c9662b6694b17 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -185,14 +185,14 @@ bin.includes = META-INF/,\
                lib/poi-ooxml-schemas-3.10-FINAL.jar,\\r
                lib/xmlbeans-2.3.0.jar,\\r
                lib/swagger-annotations-1.3.5.jar,\\r
-               lib/cdmlib-commons-3.11.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-ext-3.11.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-io-3.11.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-model-3.11.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-persistence-3.11.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-print-3.11.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-remote-3.11.0-SNAPSHOT.jar,\\r
-               lib/cdmlib-services-3.11.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-commons-3.12.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-ext-3.12.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-io-3.12.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-model-3.12.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-persistence-3.12.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-print-3.12.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-remote-3.12.0-SNAPSHOT.jar,\\r
+               lib/cdmlib-services-3.12.0-SNAPSHOT.jar.\\r
                lib/apache-log4j-extras-1.2.17.jar,\\r
                resources/cdm.map.ser\r
 \r

diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
index 8180196b83dc472b64a44649a44de1101f065a08..26d142e618dda89d16d8b6b24460e51ce8923935 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml
+++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml
@@ -1,14 +1,14 @@
-<?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.11.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>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<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">\r
+  <parent>\r
+    <groupId>eu.etaxonomy</groupId>\r
+    <artifactId>taxeditor-parent</artifactId>\r
+    <version>3.11.0-SNAPSHOT</version>\r
+  </parent>\r
+  <modelVersion>4.0.0</modelVersion>\r
+  <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
+  <packaging>eclipse-plugin</packaging>\r
+  <name>CDM Library Dependencies Plugin</name>\r
   <description>CDM Library and dependencies as a plugin</description>\r
 \r
   <build>\r
@@ -21,8 +21,8 @@
         </plugin>\r
       </plugins>\r
     </pluginManagement>\r
-    <plugins>
-      <plugin>
+    <plugins>\r
+      <plugin>\r
         <groupId>org.apache.maven.plugins</groupId>\r
         <artifactId>maven-dependency-plugin</artifactId>\r
         <version>2.4</version>\r
@@ -64,7 +64,7 @@
               <excludeTransitive>true</excludeTransitive>\r
             </configuration>\r
           </execution>\r
-        </executions>
+        </executions>\r
       </plugin>\r
       <plugin>\r
         <groupId>org.apache.maven.plugins</groupId>\r
@@ -587,5 +587,6 @@
       <version>1.1.0.Final</version>\r
     </dependency>\r
     <!-- For Hibernate Mapping End -->\r
-  </dependencies>
-</project>
+\r
+  </dependencies>\r
+</project>\r

diff --git a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
index 0782e269bd0e5d43e893e486cacffd7196847910..666680ec6119fe0d78b969e1a4697ea34ff29def 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: 3.11.0.qualifier
+Bundle-Version: 3.12.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/build.properties b/eu.etaxonomy.taxeditor.editor/build.properties
index 5b0708ee14bffff1c879bd5a3fa121fdbfd00675..24738e1dfaf717fa166e7801e0a6fd638a42219c 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/build.properties
+++ b/eu.etaxonomy.taxeditor.editor/build.properties
@@ -5,8 +5,4 @@ bin.includes = META-INF/,\
                plugin.xml,\
                icons/,\
                p2.inf,\
-               OSGI-INF/l10n/plugin.properties,\
-               OSGI-INF/l10n/plugin_de.properties,\
-               OSGI-INF/l10n/plugin_en.properties,\
-               OSGI-INF/l10n/messages_de.properties,\
-               OSGI-INF/l10n/messages.properties
+               OSGI-INF/

diff --git a/eu.etaxonomy.taxeditor.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
index 887a033a5bf7f07db70e39103c14eb27f32d9765..2e9d843d68fa9c8b4fb5632a6d5caf02c65469fa 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="3.11.0.qualifier"
+      version="3.12.0.qualifier"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">

diff --git a/eu.etaxonomy.taxeditor.feature/feature.xml b/eu.etaxonomy.taxeditor.feature/feature.xml
index 07003cf6b64f74f4070067700f963f23d7fe0fae..d578e78517243a33f24c6d556b9b696ac3a5fd8e 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="3.11.0.qualifier"
+      version="3.12.0.qualifier"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"

diff --git a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
index 69c1a0db2465d5f93b2bf1f51b82ff7969c3bcc5..b93f49c3a329e4e63e82b2ce662495ada11bd02c 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: 3.11.0.qualifier
+Bundle-Version: 3.12.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,

diff --git a/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
index 897edd40ef5621464bc2f4abf469d944a8e9f9b3..5fa66f8fb465765a32ec0f061f7cc2caf53d2a3a 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: 3.11.0.qualifier
+Bundle-Version: 3.12.0.qualifier
 Bundle-ClassPath: .,
  lib/bioinfweb-commons-bio-2-SNAPSHOT.jar,
  lib/bioinfweb-commons-core-2-SNAPSHOT.jar,

diff --git a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
index 965a9d05a3a9a2d43708ff14f400435464d78bae..ee9813cbcf30a15655799689bd497c9c17132e40 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: 3.11.0.qualifier
+Bundle-Version: 3.12.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,

diff --git a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
index 06db0dce5e92e2026497f20a2c1f48c6f11d6032..78d112612aa35a7cc5346125e855a0e882bb8d41 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: 3.11.0.qualifier
+Bundle-Version: 3.12.0.qualifier
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,

diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
index 5ee25798d42a7f5ef560fc325a2fdab1d4e6d8f9..b48e075d0ffc6be168cb4a095c49e4fe7f31d37c 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: 3.11.0.qualifier
+Bundle-Version: 3.12.0.qualifier
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,

diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
index 4cd823c98ffd410069dd80e031813986233eb267..c6f939078aa42c0bb528f4cefb4b2da78c0ee1c9 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: 3.11.0.qualifier
+Bundle-Version: 3.12.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractOriginalSourceElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractOriginalSourceElement.java
index b84e3534d809c90838a13e5fcdc053d82910e558..d9187ccdd07671540650ea57fb7233aca7ce0cf3 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractOriginalSourceElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractOriginalSourceElement.java
@@ -55,7 +55,7 @@ public abstract class AbstractOriginalSourceElement<T extends OriginalSourceBase
                                .createEnumComboElement(OriginalSourceType.class,
                                                formElement, style);
                super.createControls(formElement, style);
-               text_idInSource = formFactory.createTextWithLabelElement(formElement, "Id In Source", null, style);
+               text_idInSource = formFactory.createTextWithLabelElement(formElement, "ID in Source", null, style);
                text_idNamespace = formFactory.createTextWithLabelElement(formElement, "ID Namespace", null, style);
                text_originaleNameString = formFactory.createTextWithLabelElement(
                        formElement, "Original Name", null, SWT.NULL);

diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
index 7d9f4210ac841a9877f1877d1d9ec76294dc5e8c..70b3b40b6fed0bc8f5b149bcd63fe15750ec995d 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="3.11.0.qualifier">
+<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="3.12.0.SNAPSHOT">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>

diff --git a/pom.xml b/pom.xml
index 8e0e789e97d7dfd2296237253fc986d6b16ccd05..11748b47b9dbfbffdd20de018fbbc5452b647534 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -18,10 +18,10 @@
   <properties>
     <java.codelevel>1.6</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.11.0-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>3.12.0-SNAPSHOT</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.22.0</tycho.version>
-    <taxeditor.version>3.11.0-SNAPSHOT</taxeditor.version>
+    <taxeditor.version>3.12.0-SNAPSHOT</taxeditor.version>
     <update.dir>snapshot</update.dir>
     <unitils.version>3.4.2</unitils.version>
   </properties>
@@ -85,7 +85,7 @@
         <role>Java Developer</role>
         <role>Architect</role>
       </roles>
-      <url />
+      <url/>
     </developer>
     <developer>
       <!-- your SVN account id please! -->
@@ -103,7 +103,7 @@
         <role>Java Developer</role>
         <role>Architect</role>
       </roles>
-      <url />
+      <url/>
     </developer>
   </developers>
   <issueManagement>