Updated version in pom / project files to taxeditor version : 5.13.1 and cdmlib versi...

diff --git a/eu.etaxonomy.taxeditor.application/pom.xml b/eu.etaxonomy.taxeditor.application/pom.xml
index 424172dcbf1e5ea99590a02b358c64a81ce4dfd2..3a874b5bec3176514677cbba9ab28f18300d0abf 100644 (file)
--- a/eu.etaxonomy.taxeditor.application/pom.xml
+++ b/eu.etaxonomy.taxeditor.application/pom.xml
@@ -1,5 +1,4 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
index 06169a94c6e5d1e876d5c613eac07e11ab21bead..3087b6c023bb3d0c1d3e467740bfa74c3c9faf6c 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
+++ b/eu.etaxonomy.taxeditor.bulkeditor/pom.xml
@@ -1,9 +1,8 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
        <parent>
                <groupId>eu.etaxonomy</groupId>
                <artifactId>taxeditor-parent</artifactId>
-               <version>5.19.0-SNAPSHOT</version>
+        <version>5.19.0-SNAPSHOT</version>
        </parent>
 
        <modelVersion>4.0.0</modelVersion>

diff --git a/eu.etaxonomy.taxeditor.feature.platform/feature.xml b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
index 3efe2e8731f870bdd27f48286fa3016e658c238e..571ca8e88c4d2446f317b0b6c4b78908189ba3a2 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature.platform/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
@@ -274,3 +274,4 @@
          unpack="false"/>\r
 \r
 </feature>\r
+

diff --git a/eu.etaxonomy.taxeditor.feature/feature.xml b/eu.etaxonomy.taxeditor.feature/feature.xml
index 8096a4a15b21dbe30f98e858fa203afba02ac629..613bc2d987cd2890355235d11a648c97c78c681b 100644 (file)
--- a/eu.etaxonomy.taxeditor.feature/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature/feature.xml
@@ -180,4 +180,4 @@
          version="0.0.0"\r
          unpack="false"/>\r
 \r
-</feature>\r
+</feature>

diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
index 06053ce373fa45cdf27b33118e46d425fc7356a0..0fa036d8839fd6738a6e2843167f89c9b355204d 100644 (file)
--- a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
@@ -42,19 +42,4 @@ Export-Package: eu.etaxonomy.cdm.print,
  eu.etaxonomy.cdm.remote.view.oaipmh.dwc,
  eu.etaxonomy.cdm.remote.view.oaipmh.rdf,
  eu.etaxonomy.remote.dto.rdf
-Require-Bundle: org.eclipse.osgi,
- org.eclipse.ui,
- eu.etaxonomy.taxeditor.cdmlib,
- eu.etaxonomy.taxeditor.editor,
- eu.etaxonomy.taxeditor.store
-Bundle-ClassPath: .,
- lib/cdmlib-print-5.18.0-SNAPSHOT.jar,
- lib/cdmlib-remote-5.18.0-SNAPSHOT.jar
-Import-Package: org.apache.log4j,
- org.eclipse.core.runtime,
- org.eclipse.core.runtime.jobs,
- org.osgi.framework
-Bundle-ActivationPolicy: lazy
-Bundle-Vendor: EDIT
-Bundle-Activator: eu.etaxonomy.taxeditor.printpublisher.internal.PrintpublisherPlugin
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+

diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
index 5d9ade617ef67bac21aaa39ff10871dc1befc749..45db92dadf50255b4c5a1ff680c4054cd826e0e4 100644 (file)
--- a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
@@ -2,7 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: eu.etaxonomy.taxeditor.test
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.test;singleton:=true
+<<<<<<< HEAD
 Bundle-Version: 5.19.0.qualifier
+=======
+Bundle-Version: 5.13.1
+>>>>>>> Updated version in pom / project files to taxeditor version : 5.13.1 and cdmlib version : 5.13.0
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: EDIT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8