merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 29 Aug 2013 13:42:11 +0000 (13:42 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 29 Aug 2013 13:42:11 +0000 (13:42 +0000)
25 files changed:
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.application/pom.xml
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/pom.xml
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar
eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/pom.xml
eu.etaxonomy.taxeditor.feature.platform/feature.xml
eu.etaxonomy.taxeditor.feature.platform/pom.xml
eu.etaxonomy.taxeditor.feature/feature.xml
eu.etaxonomy.taxeditor.feature/pom.xml
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.help/pom.xml
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/pom.xml
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.printpublisher/pom.xml
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/pom.xml
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
eu.etaxonomy.taxeditor/pom.xml
pom.xml

index 65ac5bf69af392a449169b5e863f143c1411e6f5..a66a534d8a27364b097da756af26a05aeace624c 100644 (file)
@@ -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.2.3.qualifier
+Bundle-Version: 3.2.3.201308261400
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin
index dcd59fcd8cdf2b05a16ed6a3f3a7b43967ae91d8..6cf9ffa8bed8019c65e35deacb99aa196c2c25bd 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.3-SNAPSHOT</version>
+               <version>3.2.3.201308261400</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 2a4bf2316c418b8fd4203c134e5b28c54725e2bf..52afe75df3244dc50312207724258efd7adfbfcf 100644 (file)
@@ -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.2.3.qualifier
+Bundle-Version: 3.2.3.201308261400
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,eu.etaxonomy.taxeditor.annotatedlineeditor.handler,eu.etaxonomy.taxeditor.bulkeditor,eu.etaxonomy.taxeditor.bulkeditor.command,eu.etaxonomy.taxeditor.bulkeditor.handler,eu.etaxonomy.taxeditor.bulkeditor.input,eu.etaxonomy.taxeditor.bulkeditor.internal,eu.etaxonomy.taxeditor.bulkeditor.referencingobjects
index 0e1fc916646fbf4f4c997cac1ceff4a12e45a38e..44b0bc6c5696dd48b434dec2a33a5e9576d7c53f 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.3-SNAPSHOT</version>
+               <version>3.2.3.201308261400</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 14a720436027d6269d3e19f34f7ce4425a506143..65f9bbd3bdae8ef7468cc0f058599ad3f1fd476a 100644 (file)
@@ -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.2.3.qualifier
+Bundle-Version: 3.2.3.201308261400
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
index 4cf488ee33f1a17bac6e7badc2adfac6cf54f75d..9fb167cc8644ced846238dee40784f7341832719 100644 (file)
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar differ
index f131a431cbf20a8f2194c84912950bd3e0a6485b..25f118068392d39fda76feea6c855dfb3633db17 100644 (file)
Binary files a/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar and b/eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar differ
index 37c23bd48cad695b93d64a2eacf01da0de27d12e..562c121ebce81e238ec71dfbb5a46cf5f9ef08e7 100644 (file)
@@ -3,7 +3,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>3.2.3-SNAPSHOT</version>\r
+    <version>3.2.3.201308261400</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
index 8e6d4102442f023130d48eac9772a36bf25f20d8..6dd0c1a6997d3c5c0b1e3b3970a78d6dbee6127a 100644 (file)
@@ -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.2.3.qualifier
+Bundle-Version: 3.2.3.201308261400
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
index 7855a202241341f47cb603640bc5db620028a2d9..6a2961539cd0463c8412c8b5b17922294e87a71c 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>3.2.3-SNAPSHOT</version>
+    <version>3.2.3.201308261400</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
index fc454374ec588984e81b79a454140c09d2fe3249..3e961c7c685efe0d9b0aa0b8369c898da4ffca4b 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="3.2.3.qualifier"
+      version="3.2.3.201308261400"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">
index 156905fc6a689cc3379fcc2c15fc0dae1096e624..495c400b28fc5edfcf80a45364ebc5c5da830aff 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.3-SNAPSHOT</version>
+               <version>3.2.3.201308261400</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
index b47c8e1575c699b7fc0fdb5b4c9c0f72a063ce59..353823ff5af18222972e0ba2917b0ea273c73572 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="3.2.3.qualifier"
+      version="3.2.3.201308261400"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
index 801f301c1cf9d3f9a2b7febea6cbb47ef25058ff..ff3806e84c2a9342dccf6ac8b9d4d16e3d6f0bed 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.3-SNAPSHOT</version>
+               <version>3.2.3.201308261400</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
index 9cd3c2467c5928feb09721075e4c07f869dd7414..60c5c02919f6df80f4d497de01a38e5914f6043f 100644 (file)
@@ -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.2.3.qualifier
+Bundle-Version: 3.2.3.201308261400
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
index 0601a83d008c9b963502888d0ef3755c1b3955fc..df55af1c130a19202137a881606e7791263f1882 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.3-SNAPSHOT</version>
+               <version>3.2.3.201308261400</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index c199540ef8cf96b7b3342852be0a0b63e4ef5b74..416c8a5217a2036db1ad371e4060e31cf8812b0e 100644 (file)
@@ -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.2.3.qualifier
+Bundle-Version: 3.2.3.201308261400
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,
index 29504ae832f33de925949e335444674885e19083..3067db358b0a16336a9e7f4deac7ee938c54d0af 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.3-SNAPSHOT</version>
+               <version>3.2.3.201308261400</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 412db5c060a4dc294bc65dccacc8ca50e9a97cb4..35fbd2c179592294864e25809290b70388dcf6cd 100644 (file)
@@ -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.2.3.qualifier
+Bundle-Version: 3.2.3.201308261400
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,
index 64101fdddb926b5fd15d90524e348c81d8e95adb..a480526593dccd4d5fb8e0cdd21ae91ca1971548 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>3.2.3-SNAPSHOT</version>
+               <version>3.2.3.201308261400</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index e0aae8f92c8a60b01619da6423e5d23c2a7bd945..d9905c2e2a8d7e4863ec9323dc29abc31a839b59 100644 (file)
@@ -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.2.3.qualifier
+Bundle-Version: 3.2.3.201308261400
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
index 144889bcb6ca22e0eb49cf3e6f13d93f538f3b42..55c39eef23bd73a68a3e8c59545efab8e508cfec 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>3.2.3-SNAPSHOT</version>
+       <version>3.2.3.201308261400</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 43b1756ecf97ce7908ae25ccab43e000a7dd8492..ae1b4a9e5c957d23984a833b89c4ec1fe00a0fba 100644 (file)
@@ -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.2.3.SNAPSHOT">
+<?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.2.3">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>
index 29a9c591e0ff1b856c9dec6500f6999d0954157d..e5e8d03f31452d60e82b623b7f01dc0d99ac356d 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.3-SNAPSHOT</version>
+               <version>3.2.3.201308261400</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 33505614cc882a915e33ad6ffce2711dde9fbfc5..d439a64f4cc43a40d7d1f8b285d3e48f2fa64472 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>3.2.3-SNAPSHOT</version>
+  <version>3.2.3.201308261400</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for cybertaxonomy</description>
   <url>http://wp5.e-taxonomy.eu</url>
@@ -18,7 +18,7 @@
     <cdmlib.version>3.3.0-SNAPSHOT</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.14.0</tycho.version>
-    <taxeditor.version>3.2.3-SNAPSHOT</taxeditor.version>
+    <taxeditor.version>3.2.3</taxeditor.version>
   </properties>
   <modules>
     <module>eu.etaxonomy.taxeditor.cdmlib</module>