From bc421a42016f0e20f65ad9f2cc818899b53508e0 Mon Sep 17 00:00:00 2001
From: jenkins <jenkins-int@bgbm.org>
Date: Tue, 24 Mar 2020 11:08:51 +0100
Subject: [PATCH] Updated version in pom / project files to taxeditor version :
 5.13.1 and cdmlib version : 5.13.0

---
 eu.etaxonomy.taxeditor.application/pom.xml      |  1 -
 eu.etaxonomy.taxeditor.bulkeditor/pom.xml       |  3 +--
 .../feature.xml                                 |  1 +
 eu.etaxonomy.taxeditor.feature/feature.xml      |  2 +-
 .../META-INF/MANIFEST.MF                        | 17 +----------------
 .../META-INF/MANIFEST.MF                        |  4 ++++
 6 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/eu.etaxonomy.taxeditor.application/pom.xml b/eu.etaxonomy.taxeditor.application/pom.xml
index 424172dcb..3a874b5be 100644
--- 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 06169a94c..3087b6c02 100644
--- 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 3efe2e873..571ca8e88 100644
--- a/eu.etaxonomy.taxeditor.feature.platform/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
@@ -274,3 +274,4 @@
          unpack="false"/>
 
 </feature>
+
diff --git a/eu.etaxonomy.taxeditor.feature/feature.xml b/eu.etaxonomy.taxeditor.feature/feature.xml
index 8096a4a15..613bc2d98 100644
--- a/eu.etaxonomy.taxeditor.feature/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature/feature.xml
@@ -180,4 +180,4 @@
          version="0.0.0"
          unpack="false"/>
 
-</feature>
+</feature>
diff --git a/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.printpublisher/META-INF/MANIFEST.MF
index 06053ce37..0fa036d88 100644
--- 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 5d9ade617..45db92dad 100644
--- 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
-- 
2.34.1