From 688085e0018f9a12287d990957f0fef6d4e386a5 Mon Sep 17 00:00:00 2001 From: edit-jenkins Date: Wed, 25 Mar 2015 12:40:46 +0000 Subject: [PATCH] Updated version in config files to 3.5.0 --- .../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 | 91 ++++++++----------- eu.etaxonomy.taxeditor/pom.xml | 2 +- pom.xml | 13 ++- 25 files changed, 111 insertions(+), 131 deletions(-) diff --git a/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF index 1c4b3a1a0..3e8e824f2 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.5.0.qualifier +Bundle-Version: 3.5.0.201503251337 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 68604725f..19c217939 100644 --- a/eu.etaxonomy.taxeditor.application/pom.xml +++ b/eu.etaxonomy.taxeditor.application/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 3.5.0-SNAPSHOT + 3.5.0.201503251337 4.0.0 diff --git a/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF index 4a7e62f63..81c1b6724 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.5.0.qualifier +Bundle-Version: 3.5.0.201503251337 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 025bdf28f..25b20bef7 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml +++ b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 3.5.0-SNAPSHOT + 3.5.0.201503251337 4.0.0 diff --git a/eu.etaxonomy.taxeditor.cdmlib/.classpath b/eu.etaxonomy.taxeditor.cdmlib/.classpath index e84b6d824..0894c6b01 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/.classpath +++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath @@ -194,22 +194,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF index 28339ae85..f349c55a3 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.5.0.qualifier +Bundle-Version: 3.5.0.201503251337 Eclipse-BundleShape: dir Export-Package: com.google.api, com.google.api.detect, @@ -602,22 +602,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.5.0-SNAPSHOT-sources.jar, - lib/cdmlib-commons-3.5.0-SNAPSHOT.jar, - lib/cdmlib-ext-3.5.0-SNAPSHOT-sources.jar, - lib/cdmlib-ext-3.5.0-SNAPSHOT.jar, - lib/cdmlib-io-3.5.0-SNAPSHOT-sources.jar, - lib/cdmlib-io-3.5.0-SNAPSHOT.jar, - lib/cdmlib-model-3.5.0-SNAPSHOT-sources.jar, - lib/cdmlib-model-3.5.0-SNAPSHOT.jar, - lib/cdmlib-persistence-3.5.0-SNAPSHOT-sources.jar, - lib/cdmlib-persistence-3.5.0-SNAPSHOT.jar, - lib/cdmlib-print-3.5.0-SNAPSHOT-sources.jar, - lib/cdmlib-print-3.5.0-SNAPSHOT.jar, - lib/cdmlib-remote-3.5.0-SNAPSHOT-sources.jar, - lib/cdmlib-remote-3.5.0-SNAPSHOT.jar, - lib/cdmlib-services-3.5.0-SNAPSHOT-sources.jar, - lib/cdmlib-services-3.5.0-SNAPSHOT.jar, + lib/cdmlib-commons-3.5.0-sources.jar, + lib/cdmlib-commons-3.5.0.jar, + lib/cdmlib-ext-3.5.0-sources.jar, + lib/cdmlib-ext-3.5.0.jar, + lib/cdmlib-io-3.5.0-sources.jar, + lib/cdmlib-io-3.5.0.jar, + lib/cdmlib-model-3.5.0-sources.jar, + lib/cdmlib-model-3.5.0.jar, + lib/cdmlib-persistence-3.5.0-sources.jar, + lib/cdmlib-persistence-3.5.0.jar, + lib/cdmlib-print-3.5.0-sources.jar, + lib/cdmlib-print-3.5.0.jar, + lib/cdmlib-remote-3.5.0-sources.jar, + lib/cdmlib-remote-3.5.0.jar, + lib/cdmlib-services-3.5.0-sources.jar, + lib/cdmlib-services-3.5.0.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 7b1879ff6..0dfbc32be 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.5.0-SNAPSHOT-sources.jar,\ - lib/cdmlib-commons-3.5.0-SNAPSHOT.jar,\ - lib/cdmlib-ext-3.5.0-SNAPSHOT-sources.jar,\ - lib/cdmlib-ext-3.5.0-SNAPSHOT.jar,\ - lib/cdmlib-io-3.5.0-SNAPSHOT-sources.jar,\ - lib/cdmlib-io-3.5.0-SNAPSHOT.jar,\ - lib/cdmlib-model-3.5.0-SNAPSHOT-sources.jar,\ - lib/cdmlib-model-3.5.0-SNAPSHOT.jar,\ - lib/cdmlib-persistence-3.5.0-SNAPSHOT-sources.jar,\ - lib/cdmlib-persistence-3.5.0-SNAPSHOT.jar,\ - lib/cdmlib-print-3.5.0-SNAPSHOT-sources.jar,\ - lib/cdmlib-print-3.5.0-SNAPSHOT.jar,\ - lib/cdmlib-remote-3.5.0-SNAPSHOT-sources.jar,\ - lib/cdmlib-remote-3.5.0-SNAPSHOT.jar,\ - lib/cdmlib-services-3.5.0-SNAPSHOT-sources.jar,\ - lib/cdmlib-services-3.5.0-SNAPSHOT.jar,\ + lib/cdmlib-commons-3.5.0-sources.jar,\ + lib/cdmlib-commons-3.5.0.jar,\ + lib/cdmlib-ext-3.5.0-sources.jar,\ + lib/cdmlib-ext-3.5.0.jar,\ + lib/cdmlib-io-3.5.0-sources.jar,\ + lib/cdmlib-io-3.5.0.jar,\ + lib/cdmlib-model-3.5.0-sources.jar,\ + lib/cdmlib-model-3.5.0.jar,\ + lib/cdmlib-persistence-3.5.0-sources.jar,\ + lib/cdmlib-persistence-3.5.0.jar,\ + lib/cdmlib-print-3.5.0-sources.jar,\ + lib/cdmlib-print-3.5.0.jar,\ + lib/cdmlib-remote-3.5.0-sources.jar,\ + lib/cdmlib-remote-3.5.0.jar,\ + lib/cdmlib-services-3.5.0-sources.jar,\ + lib/cdmlib-services-3.5.0.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 4787a82cf..6c21cb9f0 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/pom.xml +++ b/eu.etaxonomy.taxeditor.cdmlib/pom.xml @@ -3,7 +3,7 @@ eu.etaxonomy taxeditor-parent - 3.5.0-SNAPSHOT + 3.5.0.201503251337 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 0c50075bb..25cfd5d2a 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.5.0.qualifier +Bundle-Version: 3.5.0.201503251337 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 06949cfec..2aefe2382 100644 --- a/eu.etaxonomy.taxeditor.editor/pom.xml +++ b/eu.etaxonomy.taxeditor.editor/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 3.5.0-SNAPSHOT + 3.5.0.201503251337 4.0.0 diff --git a/eu.etaxonomy.taxeditor.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml index cd866583f..37c0d407d 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 a5b724ae8..9c799d046 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.5.0-SNAPSHOT + 3.5.0.201503251337 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 c190377cb..cc83355d7 100644 --- a/eu.etaxonomy.taxeditor.feature/feature.xml +++ b/eu.etaxonomy.taxeditor.feature/feature.xml @@ -2,7 +2,7 @@ eu.etaxonomy taxeditor-parent - 3.5.0-SNAPSHOT + 3.5.0.201503251337 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 c1566bc3e..0403b59dd 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.5.0.qualifier +Bundle-Version: 3.5.0.201503251337 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 9ab3156f1..c829d1349 100644 --- a/eu.etaxonomy.taxeditor.help/pom.xml +++ b/eu.etaxonomy.taxeditor.help/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 3.5.0-SNAPSHOT + 3.5.0.201503251337 4.0.0 diff --git a/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF index 005bc660a..838428209 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.5.0.qualifier +Bundle-Version: 3.5.0.201503251337 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 829abb1e5..7bcbf4149 100644 --- a/eu.etaxonomy.taxeditor.navigation/pom.xml +++ b/eu.etaxonomy.taxeditor.navigation/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 3.5.0-SNAPSHOT + 3.5.0.201503251337 4.0.0 diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF index 068521fbc..1294ca756 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.5.0.qualifier +Bundle-Version: 3.5.0.201503251337 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 6c88ef655..c2f231b75 100644 --- a/eu.etaxonomy.taxeditor.printpublisher/pom.xml +++ b/eu.etaxonomy.taxeditor.printpublisher/pom.xml @@ -4,7 +4,7 @@ taxeditor-parent eu.etaxonomy - 3.5.0-SNAPSHOT + 3.5.0.201503251337 4.0.0 diff --git a/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF index 4ace663fb..0ecf4dcbc 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.5.0.qualifier +Bundle-Version: 3.5.0.201503251337 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 7f7aced72..672a60358 100644 --- a/eu.etaxonomy.taxeditor.store/pom.xml +++ b/eu.etaxonomy.taxeditor.store/pom.xml @@ -4,7 +4,7 @@ eu.etaxonomy taxeditor-parent - 3.5.0-SNAPSHOT + 3.5.0.201503251337 4.0.0 diff --git a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product index 89a8ed0a7..0a60caa39 100644 --- a/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product +++ b/eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product @@ -1,55 +1,36 @@ - - - - - - - - - %productBlurb - - - - - - - - -data @user.home/.cdmLibrary -Dserver_port=58080 - -Xmx512M -XX:MaxPermSize=256M -Dorg.eclipse.update.reconcile=false -Declipse.p2.unsignedPolicy=allow - -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + %productBlurb + + + + + -data @user.home/.cdmLibrary -Dserver_port=58080 + -Xmx512M -XX:MaxPermSize=256M -Dorg.eclipse.update.reconcile=false -Declipse.p2.unsignedPolicy=allow + -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts + + + + + + + + + + + + + + + + + + + + + + + diff --git a/eu.etaxonomy.taxeditor/pom.xml b/eu.etaxonomy.taxeditor/pom.xml index 22a984e68..cb295a3b4 100644 --- a/eu.etaxonomy.taxeditor/pom.xml +++ b/eu.etaxonomy.taxeditor/pom.xml @@ -3,7 +3,7 @@ eu.etaxonomy taxeditor-parent - 3.5.0-SNAPSHOT + 3.5.0.201503251337 4.0.0 diff --git a/pom.xml b/pom.xml index a99884266..355f23b68 100644 --- a/pom.xml +++ b/pom.xml @@ -1,13 +1,12 @@ - + 4.0.0 3.0 eu.etaxonomy taxeditor-parent - 3.5.0-SNAPSHOT + 3.5.0.201503251337 EDIT Taxonomic Editor The Taxonomic Editor for EDIT's platform for cybertaxonomy @@ -19,10 +18,10 @@ 1.6 UTF-8 - 3.5.0-SNAPSHOT + 3.5.0 0.22.0 - 3.5.0-SNAPSHOT + 3.5.0 snapshot @@ -83,7 +82,7 @@ Java Developer Architect - + @@ -101,7 +100,7 @@ Java Developer Architect - + -- 2.34.1