merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 24 Sep 2013 09:24:24 +0000 (09:24 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 24 Sep 2013 09:24:24 +0000 (09:24 +0000)
24 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/build.properties
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 a66a534d8a27364b097da756af26a05aeace624c..550fbaba60de3c7fd419698c0836844e5616513d 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.201308261400
+Bundle-Version: 3.2.4.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: plugin
index 6cf9ffa8bed8019c65e35deacb99aa196c2c25bd..83e3b219adfe6018a2ff54f6367a2b4cf18ec0e3 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.3.201308261400</version>
+               <version>3.2.4-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 4a9ba723cfe9e7169ab08d1bfec65943b4e05a23..b1c2cf9615db35b9076dfb117a667a5a29857ab8 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.201308261400
+Bundle-Version: 3.2.4.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
index 44b0bc6c5696dd48b434dec2a33a5e9576d7c53f..6a0aab48482d6ca57a823e577689164bc8a5593f 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.3.201308261400</version>
+               <version>3.2.4-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index e0a236044640251ebd4a6ef95f3f48e3d04d6f6c..d9160a29750c262d85483e94d81d7c1b82ae5912 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.201308261400
+Bundle-Version: 3.2.4.qualifier
 Eclipse-BundleShape: dir
 Export-Package: com.google.api,
  com.google.api.detect,
@@ -418,6 +418,22 @@ Bundle-ClassPath: .,
  lib/batik-util-1.7.jar,
  lib/batik-xml-1.7.jar,
  lib/c3p0-0.9.2.jar,
+ lib/cdmlib-commons-3.2.4-SNAPSHOT-sources.jar,
+ lib/cdmlib-commons-3.2.4-SNAPSHOT.jar,
+ lib/cdmlib-ext-3.2.4-SNAPSHOT-sources.jar,
+ lib/cdmlib-ext-3.2.4-SNAPSHOT.jar,
+ lib/cdmlib-io-3.2.4-SNAPSHOT-sources.jar,
+ lib/cdmlib-io-3.2.4-SNAPSHOT.jar,
+ lib/cdmlib-model-3.2.4-SNAPSHOT-sources.jar,
+ lib/cdmlib-model-3.2.4-SNAPSHOT.jar,
+ lib/cdmlib-persistence-3.2.4-SNAPSHOT-sources.jar,
+ lib/cdmlib-persistence-3.2.4-SNAPSHOT.jar,
+ lib/cdmlib-print-3.2.4-SNAPSHOT-sources.jar,
+ lib/cdmlib-print-3.2.4-SNAPSHOT.jar,
+ lib/cdmlib-remote-3.2.4-SNAPSHOT-sources.jar,
+ lib/cdmlib-remote-3.2.4-SNAPSHOT.jar,
+ lib/cdmlib-services-3.2.4-SNAPSHOT-sources.jar,
+ lib/cdmlib-services-3.2.4-SNAPSHOT.jar,
  lib/cglib-nodep-2.2.2.jar,
  lib/com.springsource.org.aopalliance-1.0.0.jar,
  lib/com.springsource.org.apache.commons.logging-1.1.1.jar,
index ea0ee6bc4051f101167d32558ded4dba31a38792..c3e7cc475e3edc2b4605ea7f2c1a7f557a16fd20 100644 (file)
@@ -22,6 +22,22 @@ bin.includes = META-INF/,\
                lib/batik-util-1.7.jar,\\r
                lib/batik-xml-1.7.jar,\\r
                lib/c3p0-0.9.2.jar,\\r
+               lib/cdmlib-commons-3.2.4-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-commons-3.2.4-SNAPSHOT.jar,\\r
+               lib/cdmlib-ext-3.2.4-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-ext-3.2.4-SNAPSHOT.jar,\\r
+               lib/cdmlib-io-3.2.4-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-io-3.2.4-SNAPSHOT.jar,\\r
+               lib/cdmlib-model-3.2.4-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-model-3.2.4-SNAPSHOT.jar,\\r
+               lib/cdmlib-persistence-3.2.4-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-persistence-3.2.4-SNAPSHOT.jar,\\r
+               lib/cdmlib-print-3.2.4-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-print-3.2.4-SNAPSHOT.jar,\\r
+               lib/cdmlib-remote-3.2.4-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-remote-3.2.4-SNAPSHOT.jar,\\r
+               lib/cdmlib-services-3.2.4-SNAPSHOT-sources.jar,\\r
+               lib/cdmlib-services-3.2.4-SNAPSHOT.jar,\\r
                lib/cglib-nodep-2.2.2.jar,\\r
                lib/com.springsource.org.aopalliance-1.0.0.jar,\\r
                lib/com.springsource.org.apache.commons.logging-1.1.1.jar,\\r
index 562c121ebce81e238ec71dfbb5a46cf5f9ef08e7..909a3f8680205605def564fc84b36f8f158aca1a 100644 (file)
@@ -3,7 +3,7 @@
   <parent>\r
     <groupId>eu.etaxonomy</groupId>\r
     <artifactId>taxeditor-parent</artifactId>\r
-    <version>3.2.3.201308261400</version>\r
+    <version>3.2.4-SNAPSHOT</version>\r
   </parent>\r
   <modelVersion>4.0.0</modelVersion>\r
   <artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
index 6dd0c1a6997d3c5c0b1e3b3970a78d6dbee6127a..1e7a409aef9523de634ccfa1f7fc7e26332e2ffa 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.201308261400
+Bundle-Version: 3.2.4.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
index 6a2961539cd0463c8412c8b5b17922294e87a71c..91d2d3d2f413ad244a91fe8afdd73e6bd6989e31 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-    <version>3.2.3.201308261400</version>
+    <version>3.2.4-SNAPSHOT</version>
   </parent>
   
   <modelVersion>4.0.0</modelVersion>
index 3e961c7c685efe0d9b0aa0b8369c898da4ffca4b..ee7edd77679bd147ad9fb30cb3bb2138d72d5b7c 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="3.2.3.201308261400"
+      version="3.2.4.qualifier"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">
index 495c400b28fc5edfcf80a45364ebc5c5da830aff..2d7ba6e57b6d5f90683cd0077ed3de4fc11036da 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.3.201308261400</version>
+               <version>3.2.4-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
index 353823ff5af18222972e0ba2917b0ea273c73572..0ac58923ca88ea8d27c91c4e26a5a0ff67782987 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="3.2.3.201308261400"
+      version="3.2.4.qualifier"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
index ff3806e84c2a9342dccf6ac8b9d4d16e3d6f0bed..6f567c28a43e19eccecc6c23a4a0ec05fc43b1ac 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.3.201308261400</version>
+               <version>3.2.4-SNAPSHOT</version>
        </parent>
        <modelVersion>4.0.0</modelVersion>
        <artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
index 60c5c02919f6df80f4d497de01a38e5914f6043f..d0b1e0e35d9cb115e03240f41aa6036352763fd0 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.201308261400
+Bundle-Version: 3.2.4.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
index df55af1c130a19202137a881606e7791263f1882..df6189956f86d63f69928a030bf4e23027dc0709 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.3.201308261400</version>
+               <version>3.2.4-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 416c8a5217a2036db1ad371e4060e31cf8812b0e..a11ce39a1ff3932a8ab6c120a98bfd0b42ad1c19 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.201308261400
+Bundle-Version: 3.2.4.qualifier
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,
index 3067db358b0a16336a9e7f4deac7ee938c54d0af..f578296e94192f43fd7b8aa4270174aac29b6149 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.3.201308261400</version>
+               <version>3.2.4-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 35fbd2c179592294864e25809290b70388dcf6cd..40b2a391c3dc7484bdb3b46aa4eae1e0d0210566 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.201308261400
+Bundle-Version: 3.2.4.qualifier
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,
index a480526593dccd4d5fb8e0cdd21ae91ca1971548..a6140a38c31169f3f57b5e4a9fcf2232bafc5e69 100644 (file)
@@ -4,7 +4,7 @@
        <parent>
                <artifactId>taxeditor-parent</artifactId>
                <groupId>eu.etaxonomy</groupId>
-               <version>3.2.3.201308261400</version>
+               <version>3.2.4-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
index 223433f9fe6d512db7106c19605afb0edf27246e..ccd13fb2c5b2f2d0875779f0cbbb74ebac106288 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.201308261400
+Bundle-Version: 3.2.4.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
index 55c39eef23bd73a68a3e8c59545efab8e508cfec..df38c9d03725fee7b66aeca248e4991c52458687 100644 (file)
@@ -4,7 +4,7 @@
   <parent>
        <groupId>eu.etaxonomy</groupId>
        <artifactId>taxeditor-parent</artifactId>
-       <version>3.2.3.201308261400</version>
+       <version>3.2.4-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
index ae1b4a9e5c957d23984a833b89c4ec1fe00a0fba..660d16f4251f0f496a2c91852ebfb3c978686ef0 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">
+<?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.4.SNAPSHOT">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>
index e5e8d03f31452d60e82b623b7f01dc0d99ac356d..c007ecd502ce5c782b670f140ad880eeb2c3c6a1 100644 (file)
@@ -3,7 +3,7 @@
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>3.2.3.201308261400</version>
+               <version>3.2.4-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index d439a64f4cc43a40d7d1f8b285d3e48f2fa64472..8aa2e181935281f0002fab4dc9e7138d0613bc1d 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.201308261400</version>
+  <version>3.2.4-SNAPSHOT</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for cybertaxonomy</description>
   <url>http://wp5.e-taxonomy.eu</url>
   <properties>
     <java.codelevel>1.6</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.3.0-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>3.2.4-SNAPSHOT</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.14.0</tycho.version>
-    <taxeditor.version>3.2.3</taxeditor.version>
+    <taxeditor.version>3.2.4-SNAPSHOT</taxeditor.version>
   </properties>
   <modules>
     <module>eu.etaxonomy.taxeditor.cdmlib</module>