From 5b9d4ad570650e030cc8918ef72475e62fd0c79d Mon Sep 17 00:00:00 2001 From: Cherian Mathew Date: Fri, 5 Jun 2015 16:42:11 +0200 Subject: [PATCH] Release 3.6.0 merge --- .../META-INF/MANIFEST.MF | 2 +- eu.etaxonomy.taxeditor.application/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- eu.etaxonomy.taxeditor.bulkeditor/pom.xml | 2 +- eu.etaxonomy.taxeditor.cdmlib/.classpath | 32 ++++++++--------- .../META-INF/MANIFEST.MF | 34 +++++++++---------- .../build.properties | 32 ++++++++--------- eu.etaxonomy.taxeditor.cdmlib/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- eu.etaxonomy.taxeditor.editor/pom.xml | 2 +- .../feature.xml | 2 +- .../pom.xml | 2 +- eu.etaxonomy.taxeditor.feature/feature.xml | 2 +- eu.etaxonomy.taxeditor.feature/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- eu.etaxonomy.taxeditor.help/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- eu.etaxonomy.taxeditor.navigation/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- eu.etaxonomy.taxeditor.printpublisher/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 2 +- eu.etaxonomy.taxeditor.store/pom.xml | 2 +- .../eu.etaxonomy.taxeditor.product | 2 +- eu.etaxonomy.taxeditor/pom.xml | 2 +- pom.xml | 6 ++-- 25 files changed, 73 insertions(+), 73 deletions(-) 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.application/pom.xml b/eu.etaxonomy.taxeditor.application/pom.xml index 2ef5065a8..cf2ccee93 100644 --- a/eu.etaxonomy.taxeditor.application/pom.xml +++ b/eu.etaxonomy.taxeditor.application/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.0 4.0.0 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.bulkeditor/pom.xml b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml index 4a050c44d..09e76eeab 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml +++ b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.0 4.0.0 diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath index 71abfad56..c8fd733d4 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/.classpath +++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath @@ -193,22 +193,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF index a455f7ddb..bfb4abd2c 100644 --- 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.6.1.qualifier +Bundle-Version: 3.6.0 Eclipse-BundleShape: dir Export-Package: com.google.api, com.google.api.detect, @@ -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--sources.jar, + lib/cdmlib-commons-.jar, + lib/cdmlib-ext--sources.jar, + lib/cdmlib-ext-.jar, + lib/cdmlib-io--sources.jar, + lib/cdmlib-io-.jar, + lib/cdmlib-model--sources.jar, + lib/cdmlib-model-.jar, + lib/cdmlib-persistence--sources.jar, + lib/cdmlib-persistence-.jar, + lib/cdmlib-print--sources.jar, + lib/cdmlib-print-.jar, + lib/cdmlib-remote--sources.jar, + lib/cdmlib-remote-.jar, + lib/cdmlib-services--sources.jar, + lib/cdmlib-services-.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..9c63cba02 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--sources.jar,\ + lib/cdmlib-commons-.jar,\ + lib/cdmlib-ext--sources.jar,\ + lib/cdmlib-ext-.jar,\ + lib/cdmlib-io--sources.jar,\ + lib/cdmlib-io-.jar,\ + lib/cdmlib-model--sources.jar,\ + lib/cdmlib-model-.jar,\ + lib/cdmlib-persistence--sources.jar,\ + lib/cdmlib-persistence-.jar,\ + lib/cdmlib-print--sources.jar,\ + lib/cdmlib-print-.jar,\ + lib/cdmlib-remote--sources.jar,\ + lib/cdmlib-remote-.jar,\ + lib/cdmlib-services--sources.jar,\ + lib/cdmlib-services-.jar,\ lib/swagger-annotations-1.3.5.jar jars.compile.order = . diff --git a/eu.etaxonomy.taxeditor.cdmlib/pom.xml b/eu.etaxonomy.taxeditor.cdmlib/pom.xml index f6025565a..e569d9db8 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml +++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml @@ -3,7 +3,7 @@ eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.0 4.0.0 eu.etaxonomy.taxeditor.cdmlib 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.editor/pom.xml b/eu.etaxonomy.taxeditor.editor/pom.xml index 1ac274434..0696ada2c 100644 --- a/eu.etaxonomy.taxeditor.editor/pom.xml +++ b/eu.etaxonomy.taxeditor.editor/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.0 4.0.0 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 @@ diff --git a/eu.etaxonomy.taxeditor.feature.platform/pom.xml b/eu.etaxonomy.taxeditor.feature.platform/pom.xml index 6d0a3e0fd..de2de7b48 100644 --- a/eu.etaxonomy.taxeditor.feature.platform/pom.xml +++ b/eu.etaxonomy.taxeditor.feature.platform/pom.xml @@ -3,7 +3,7 @@ eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.0 4.0.0 eu.etaxonomy.taxeditor.feature.platform 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 @@ eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.0 4.0.0 eu.etaxonomy.taxeditor.feature 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.help/pom.xml b/eu.etaxonomy.taxeditor.help/pom.xml index 94399ed79..f3b77b481 100644 --- a/eu.etaxonomy.taxeditor.help/pom.xml +++ b/eu.etaxonomy.taxeditor.help/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.0 4.0.0 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.navigation/pom.xml b/eu.etaxonomy.taxeditor.navigation/pom.xml index 8b83544de..80443c0e3 100644 --- a/eu.etaxonomy.taxeditor.navigation/pom.xml +++ b/eu.etaxonomy.taxeditor.navigation/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.0 4.0.0 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.printpublisher/pom.xml b/eu.etaxonomy.taxeditor.printpublisher/pom.xml index 70bae0d1b..e713e5b49 100644 --- a/eu.etaxonomy.taxeditor.printpublisher/pom.xml +++ b/eu.etaxonomy.taxeditor.printpublisher/pom.xml @@ -4,7 +4,7 @@ taxeditor-parent eu.etaxonomy - 3.6.1-SNAPSHOT + 3.6.0 4.0.0 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.store/pom.xml b/eu.etaxonomy.taxeditor.store/pom.xml index 418d60a1a..f36b58dbf 100644 --- a/eu.etaxonomy.taxeditor.store/pom.xml +++ b/eu.etaxonomy.taxeditor.store/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.0 4.0.0 diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product index f3c92a43f..23eda091e 100644 --- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product +++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product @@ -1,5 +1,5 @@ - + diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml index f47b65227..3add2d129 100644 --- a/eu.etaxonomy.taxeditor/pom.xml +++ b/eu.etaxonomy.taxeditor/pom.xml @@ -3,7 +3,7 @@ eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.0 4.0.0 diff --git a/pom.xml b/pom.xml index fe14b1771..1b8162c4d 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ eu.etaxonomy taxeditor-parent - 3.6.1-SNAPSHOT + 3.6.0 EDIT Taxonomic Editor The Taxonomic Editor for EDIT's platform for cybertaxonomy @@ -18,10 +18,10 @@ 1.6 UTF-8 - 3.6.1-SNAPSHOT + 3.6.0 0.22.0 - 3.6.1-SNAPSHOT + 3.6.0 snapshot -- 2.34.1