merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 11 Jul 2013 11:58:39 +0000 (11:58 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 11 Jul 2013 11:58:39 +0000 (11:58 +0000)
18 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.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

index 7c20eb9cea0e32fb09a31b6ec015d1c8641f73fd..65ac5bf69af392a449169b5e863f143c1411e6f5 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.2.qualifier
+Bundle-Version: 3.2.3.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin
index 35568f1dbc8c989c1ed61706508c18fdd0470baa..dcd59fcd8cdf2b05a16ed6a3f3a7b43967ae91d8 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.2-SNAPSHOT</version>
+               <version>3.2.3-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 6810506d4afefe7a6b40f15b55cce75db8fccf45..2a4bf2316c418b8fd4203c134e5b28c54725e2bf 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.2.qualifier
+Bundle-Version: 3.2.3.qualifier
 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 3766197cc7466941541dabf573d7d720e9491cff..0e1fc916646fbf4f4c997cac1ceff4a12e45a38e 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.2-SNAPSHOT</version>
+               <version>3.2.3-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 65ece9fbc29f5314b1ae1f9a1e614537b5c705cc..fc454374ec588984e81b79a454140c09d2fe3249 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="3.2.2.qualifier"
+      version="3.2.3.qualifier"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">
index 33c8f9eab94d5d3a4fd19200c26e2d24ba27efd8..156905fc6a689cc3379fcc2c15fc0dae1096e624 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.2-SNAPSHOT</version>
+               <version>3.2.3-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
index fc46cd07fc675f34e1306de43826e9931e7e18c6..b47c8e1575c699b7fc0fdb5b4c9c0f72a063ce59 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="3.2.2.qualifier"
+      version="3.2.3.qualifier"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
index 5c12ce930ac968f6372df2a6cf35713e0a8b1b48..801f301c1cf9d3f9a2b7febea6cbb47ef25058ff 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.2-SNAPSHOT</version>
+               <version>3.2.3-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
index acf68edf5f7f5ea30c9d162f5c089c60ebc55520..9cd3c2467c5928feb09721075e4c07f869dd7414 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.2.qualifier
+Bundle-Version: 3.2.3.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
index 714aa18ca62e75ea4ad23f1a19e99fbac675501f..0601a83d008c9b963502888d0ef3755c1b3955fc 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.2-SNAPSHOT</version>
+               <version>3.2.3-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 9e025bdd05e19b325788788cb5fdfa61a22f034c..c199540ef8cf96b7b3342852be0a0b63e4ef5b74 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.2.qualifier
+Bundle-Version: 3.2.3.qualifier
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,
index 0c057ef6379cb27b9cfb6c7e851973a92b8e295b..29504ae832f33de925949e335444674885e19083 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.2-SNAPSHOT</version>
+               <version>3.2.3-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 64070eeb87151a607da851d0b8f87019f850d904..412db5c060a4dc294bc65dccacc8ca50e9a97cb4 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.2.qualifier
+Bundle-Version: 3.2.3.qualifier
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,
index 006cc5bc3ff6c6dafa90ecf28b2f57e12c61609a..64101fdddb926b5fd15d90524e348c81d8e95adb 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>3.2.2-SNAPSHOT</version>
+               <version>3.2.3-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 97074bc69fbbf9e287ec338b96b5ece0340b693c..e0aae8f92c8a60b01619da6423e5d23c2a7bd945 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.2.qualifier
+Bundle-Version: 3.2.3.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
index 494efce1a6df8f177f4004467190e11a5e8cbbe4..144889bcb6ca22e0eb49cf3e6f13d93f538f3b42 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>3.2.2-SNAPSHOT</version>
+       <version>3.2.3-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index 6b20a3320842c3bf02c5bbb338ce1b47ca93f918..43b1756ecf97ce7908ae25ccab43e000a7dd8492 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.2.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.SNAPSHOT">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>
index ef81f03629ddfc79b69e6a4a2b267d6647250af3..29a9c591e0ff1b856c9dec6500f6999d0954157d 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.2-SNAPSHOT</version>
+               <version>3.2.3-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>