From: Cherian Mathew <c.mathew@bgbm.org>
Date: Fri, 5 Jun 2015 16:16:57 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: 3.7.0~1^2~80
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/6ae694db0d400136902e402079312353d92781be?hp=c91fa0aa45b6a0b3a945a345d469b711459ae4b0

Merge branch 'master' into develop
---

diff --git a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
index daf34dcf4..3b72cadbb 100644
--- 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.6.1.qualifier
+Bundle-Version: 3.6.0
 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 7b539d270..70759be97 100644
--- 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.6.1.qualifier
+Bundle-Version: 3.6.0
 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 71abfad56..6c2f6b9fb 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@ -193,22 +193,22 @@
 	<classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.1-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.1-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.1-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.1-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.1-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.1-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.1-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.1-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.1-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.1-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.1-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.1-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.1-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.1-SNAPSHOT.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.1-SNAPSHOT-sources.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.1-SNAPSHOT.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.1-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.1-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.1-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.1-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.1-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.1-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.1-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.1-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/poi-3.10-FINAL.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10-FINAL.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index a455f7ddb..2e1faad61 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -607,22 +607,22 @@ Bundle-ClassPath: .,
  lib/spring-security-remoting-3.1.3.RELEASE.jar,
  lib/jena-core-2.11.2.jar,
  lib/jena-iri-1.0.2.jar,
- lib/cdmlib-commons-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-commons-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-ext-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-ext-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-io-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-io-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-model-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-model-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-persistence-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-persistence-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-print-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-print-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-remote-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-remote-3.6.1-SNAPSHOT.jar,
- lib/cdmlib-services-3.6.1-SNAPSHOT-sources.jar,
- lib/cdmlib-services-3.6.1-SNAPSHOT.jar,
+ lib/cdmlib-commons-3.6.1-sources.jar,
+ lib/cdmlib-commons-3.6.1.jar,
+ lib/cdmlib-ext-3.6.1-sources.jar,
+ lib/cdmlib-ext-3.6.1.jar,
+ lib/cdmlib-io-3.6.1-sources.jar,
+ lib/cdmlib-io-3.6.1.jar,
+ lib/cdmlib-model-3.6.1-sources.jar,
+ lib/cdmlib-model-3.6.1.jar,
+ lib/cdmlib-persistence-3.6.1-sources.jar,
+ lib/cdmlib-persistence-3.6.1.jar,
+ lib/cdmlib-print-3.6.1-sources.jar,
+ lib/cdmlib-print-3.6.1.jar,
+ lib/cdmlib-remote-3.6.1-sources.jar,
+ lib/cdmlib-remote-3.6.1.jar,
+ lib/cdmlib-services-3.6.1-sources.jar,
+ lib/cdmlib-services-3.6.1.jar,
  lib/poi-3.10-FINAL.jar,
  lib/poi-ooxml-3.10-FINAL.jar,
  lib/xmlbeans-2.3.0.jar,
diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index e4b3cee83..f2e704dbb 100644
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -193,22 +193,22 @@ bin.includes = META-INF/,\
                lib/poi-ooxml-3.10-FINAL.jar,\
                lib/poi-ooxml-schemas-3.10-FINAL.jar,\
                lib/xmlbeans-2.3.0.jar,\
-               lib/cdmlib-commons-3.6.1-SNAPSHOT-sources.jar,\
-               lib/cdmlib-commons-3.6.1-SNAPSHOT.jar,\
-               lib/cdmlib-ext-3.6.1-SNAPSHOT-sources.jar,\
-               lib/cdmlib-ext-3.6.1-SNAPSHOT.jar,\
-               lib/cdmlib-io-3.6.1-SNAPSHOT-sources.jar,\
-               lib/cdmlib-io-3.6.1-SNAPSHOT.jar,\
-               lib/cdmlib-model-3.6.1-SNAPSHOT-sources.jar,\
-               lib/cdmlib-model-3.6.1-SNAPSHOT.jar,\
-               lib/cdmlib-persistence-3.6.1-SNAPSHOT-sources.jar,\
-               lib/cdmlib-persistence-3.6.1-SNAPSHOT.jar,\
-               lib/cdmlib-print-3.6.1-SNAPSHOT-sources.jar,\
-               lib/cdmlib-print-3.6.1-SNAPSHOT.jar,\
-               lib/cdmlib-remote-3.6.1-SNAPSHOT-sources.jar,\
-               lib/cdmlib-remote-3.6.1-SNAPSHOT.jar,\
-               lib/cdmlib-services-3.6.1-SNAPSHOT-sources.jar,\
-               lib/cdmlib-services-3.6.1-SNAPSHOT.jar,\
+               lib/cdmlib-commons-3.6.1-sources.jar,\
+               lib/cdmlib-commons-3.6.1.jar,\
+               lib/cdmlib-ext-3.6.1-sources.jar,\
+               lib/cdmlib-ext-3.6.1.jar,\
+               lib/cdmlib-io-3.6.1-sources.jar,\
+               lib/cdmlib-io-3.6.1.jar,\
+               lib/cdmlib-model-3.6.1-sources.jar,\
+               lib/cdmlib-model-3.6.1.jar,\
+               lib/cdmlib-persistence-3.6.1-sources.jar,\
+               lib/cdmlib-persistence-3.6.1.jar,\
+               lib/cdmlib-print-3.6.1-sources.jar,\
+               lib/cdmlib-print-3.6.1.jar,\
+               lib/cdmlib-remote-3.6.1-sources.jar,\
+               lib/cdmlib-remote-3.6.1.jar,\
+               lib/cdmlib-services-3.6.1-sources.jar,\
+               lib/cdmlib-services-3.6.1.jar,\
                lib/swagger-annotations-1.3.5.jar
 
 jars.compile.order = .
diff --git a/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
index bcd8ff062..2553e6492 100644
--- 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.6.1.qualifier
+Bundle-Version: 3.6.0
 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.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
index ae9a12fea..4c47d2350 100644
--- 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.6.1.qualifier"
+      version="3.6.0"
       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 034fb74c1..349cfe993 100644
--- 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.6.1.qualifier"
+      version="3.6.0"
       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 94e2a28d4..255b81319 100644
--- 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.6.1.qualifier
+Bundle-Version: 3.6.0
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
diff --git a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
index 9831757ec..a62e60ff9 100644
--- 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.6.1.qualifier
+Bundle-Version: 3.6.0
 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 79dc7fcbe..f3dcfc9b0 100644
--- 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.6.1.qualifier
+Bundle-Version: 3.6.0
 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 6ffffa588..57cec2e23 100644
--- 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.6.1.qualifier
+Bundle-Version: 3.6.0
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
index f3c92a43f..ac307edd2 100644
--- 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.6.1.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.6.1">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>
diff --git a/pom.xml b/pom.xml
index 8726503b8..a6fa56a70 100644
--- 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.6.1-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>3.6.1</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.22.0</tycho.version>
-    <taxeditor.version>3.6.1-SNAPSHOT</taxeditor.version>
+    <taxeditor.version>3.6.1</taxeditor.version>
     <update.dir>snapshot</update.dir>
   </properties>
   <modules>