Merge branch 'master' into develop
authorCherian Mathew <c.mathew@bgbm.org>
Fri, 5 Jun 2015 16:16:57 +0000 (18:16 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Fri, 5 Jun 2015 16:16:57 +0000 (18:16 +0200)
14 files changed:
eu.etaxonomy.taxeditor.application/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.bulkeditor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.feature.platform/feature.xml
eu.etaxonomy.taxeditor.feature/feature.xml
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.navigation/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
pom.xml

index daf34dcf4e7128ccfbde9922eb05a6aee1b2e05c..3b72cadbbac899d37505c5174d685f7350ee3e63 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.6.1.qualifier
+Bundle-Version: 3.6.0
 Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
 Bundle-Vendor: EDIT
 Bundle-Localization: OSGI-INF/l10n/plugin
index 7b539d270151d639d41640d4dbcd53ad58b441df..70759be97a8603a3c969fda82a121524e3fabcea 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.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,
index 71abfad56d18aac62697fa175b0e01fc9eea616e..6c2f6b9fbd5cb11938d37a04b3386f9319d28314 100644 (file)
        <classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.1-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.1-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.1-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.1-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.1-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.1-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.1-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.1-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.1-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.1-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.1-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.1-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.1-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.1-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.1-SNAPSHOT-sources.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.1-SNAPSHOT.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.1-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.1-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.1-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.1-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.1-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.1-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.1-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.1.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.1-sources.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/poi-3.10-FINAL.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10-FINAL.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>
index a455f7ddba87a2e5fc6e09f8cca4dcb8fa36617d..2e1faad61595d0155291bcc93d1f59c1ef188890 100644 (file)
@@ -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-3.6.1-sources.jar,
+ lib/cdmlib-commons-3.6.1.jar,
+ lib/cdmlib-ext-3.6.1-sources.jar,
+ lib/cdmlib-ext-3.6.1.jar,
+ lib/cdmlib-io-3.6.1-sources.jar,
+ lib/cdmlib-io-3.6.1.jar,
+ lib/cdmlib-model-3.6.1-sources.jar,
+ lib/cdmlib-model-3.6.1.jar,
+ lib/cdmlib-persistence-3.6.1-sources.jar,
+ lib/cdmlib-persistence-3.6.1.jar,
+ lib/cdmlib-print-3.6.1-sources.jar,
+ lib/cdmlib-print-3.6.1.jar,
+ lib/cdmlib-remote-3.6.1-sources.jar,
+ lib/cdmlib-remote-3.6.1.jar,
+ lib/cdmlib-services-3.6.1-sources.jar,
+ lib/cdmlib-services-3.6.1.jar,
  lib/poi-3.10-FINAL.jar,
  lib/poi-ooxml-3.10-FINAL.jar,
  lib/xmlbeans-2.3.0.jar,
index e4b3cee83275367360bf150d123a09c0f356a025..f2e704dbbc2ffefc0cfde877e358d9693e295496 100644 (file)
@@ -193,22 +193,22 @@ bin.includes = META-INF/,\
                lib/poi-ooxml-3.10-FINAL.jar,\\r
                lib/poi-ooxml-schemas-3.10-FINAL.jar,\\r
                lib/xmlbeans-2.3.0.jar,\\r
-               lib/cdmlib-commons-3.6.1-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-commons-3.6.1-SNAPSHOT.jar,\\r
-               lib/cdmlib-ext-3.6.1-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-ext-3.6.1-SNAPSHOT.jar,\\r
-               lib/cdmlib-io-3.6.1-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-io-3.6.1-SNAPSHOT.jar,\\r
-               lib/cdmlib-model-3.6.1-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-model-3.6.1-SNAPSHOT.jar,\\r
-               lib/cdmlib-persistence-3.6.1-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-persistence-3.6.1-SNAPSHOT.jar,\\r
-               lib/cdmlib-print-3.6.1-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-print-3.6.1-SNAPSHOT.jar,\\r
-               lib/cdmlib-remote-3.6.1-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-remote-3.6.1-SNAPSHOT.jar,\\r
-               lib/cdmlib-services-3.6.1-SNAPSHOT-sources.jar,\\r
-               lib/cdmlib-services-3.6.1-SNAPSHOT.jar,\\r
+               lib/cdmlib-commons-3.6.1-sources.jar,\\r
+               lib/cdmlib-commons-3.6.1.jar,\\r
+               lib/cdmlib-ext-3.6.1-sources.jar,\\r
+               lib/cdmlib-ext-3.6.1.jar,\\r
+               lib/cdmlib-io-3.6.1-sources.jar,\\r
+               lib/cdmlib-io-3.6.1.jar,\\r
+               lib/cdmlib-model-3.6.1-sources.jar,\\r
+               lib/cdmlib-model-3.6.1.jar,\\r
+               lib/cdmlib-persistence-3.6.1-sources.jar,\\r
+               lib/cdmlib-persistence-3.6.1.jar,\\r
+               lib/cdmlib-print-3.6.1-sources.jar,\\r
+               lib/cdmlib-print-3.6.1.jar,\\r
+               lib/cdmlib-remote-3.6.1-sources.jar,\\r
+               lib/cdmlib-remote-3.6.1.jar,\\r
+               lib/cdmlib-services-3.6.1-sources.jar,\\r
+               lib/cdmlib-services-3.6.1.jar,\\r
                lib/swagger-annotations-1.3.5.jar\r
 \r
 jars.compile.order = .\r
index bcd8ff062f8d8d9861f1404cfdbe1f160bead4b7..2553e6492bc6456b11bd78dc80dbb2e03848bf46 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.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
index ae9a12fea5044cbeea6eb587eca40910eb3fad42..4c47d23503316bbe92f62737057815945248668a 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature.platform"
       label="Taxeditor Dependencies"
-      version="3.6.1.qualifier"
+      version="3.6.0"
       os="linux,macosx,win32"
       ws="cocoa,gtk,win32"
       arch="x86,x86_64">
index 034fb74c1f8ae769e007f85dba72c298663975b1..349cfe993d6ac18577e6b24c64042504da0aaf87 100644 (file)
@@ -2,7 +2,7 @@
 <feature
       id="eu.etaxonomy.taxeditor.feature"
       label="Taxonomic Editor"
-      version="3.6.1.qualifier"
+      version="3.6.0"
       provider-name="EDIT"
       plugin="eu.etaxonomy.taxeditor.application"
       os="linux,macosx,win32"
index 94e2a28d411ae62f16941d73f83809b58c4bd686..255b81319c2e7cf7c1c908aaa094b415512fb7e2 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.6.1.qualifier
+Bundle-Version: 3.6.0
 Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
 Bundle-Vendor: EDIT
 Require-Bundle: org.eclipse.ui,
index 9831757ec8e9b0dc867bb15f7fa3998c9a2ef8ff..a62e60ff9c5912ff778195ea8d05860ca6712a2b 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.6.1.qualifier
+Bundle-Version: 3.6.0
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
  eu.etaxonomy.taxeditor.navigation,
index 79dc7fcbe77157bcf711a528b0db3258b4193b25..f3dcfc9b0eafddba94e8a5256b106fa77ddb84c3 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.6.1.qualifier
+Bundle-Version: 3.6.0
 Require-Bundle: org.eclipse.osgi,
  org.eclipse.ui,
  eu.etaxonomy.taxeditor.cdmlib,
index 6ffffa58816e992bd68fd1aa7b94fb41466627c1..57cec2e2381dc84ed3369162dc506f2c06dd1e85 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.6.1.qualifier
+Bundle-Version: 3.6.0
 Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
 Bundle-Vendor: EDIT
 Export-Package: eu.etaxonomy.cdm,
index f3c92a43f3469fbdc82d91c387c71cb35f8c8366..ac307edd2a6cbb89791bd6cdbf419fc7371a2302 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.6.1.qualifier">
+<?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.6.1">
   <aboutInfo>
     <image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
     <text>
diff --git a/pom.xml b/pom.xml
index 8726503b8456114ccf4315542d327ca671187ee3..a6fa56a70332b7831759e2a5885266e9d266ebf4 100644 (file)
--- a/pom.xml
+++ b/pom.xml
   <properties>
     <java.codelevel>1.6</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.6.1-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>3.6.1</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.22.0</tycho.version>
-    <taxeditor.version>3.6.1-SNAPSHOT</taxeditor.version>
+    <taxeditor.version>3.6.1</taxeditor.version>
     <update.dir>snapshot</update.dir>
   </properties>
   <modules>