From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Mon, 24 Oct 2016 07:20:39 +0000 (+0200)
Subject: Merge branch 'develop' into LibrAlign
X-Git-Tag: 4.5.0^2~38^2
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/c6476daa5094f992b235fd7c4d10c17b90dc0e8b

Merge branch 'develop' into LibrAlign

# Conflicts:
#	eu.etaxonomy.taxeditor.molecular.lib/.classpath
---

c6476daa5094f992b235fd7c4d10c17b90dc0e8b
diff --cc eu.etaxonomy.taxeditor.molecular.lib/.classpath
index a7281ddfe,5918c4c4d..cedc1756f
--- a/eu.etaxonomy.taxeditor.molecular.lib/.classpath
+++ b/eu.etaxonomy.taxeditor.molecular.lib/.classpath
@@@ -1,20 -1,17 +1,20 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  <classpath>
- 	<classpathentry exported="true" kind="lib" path="lib/commons-collections4-4.1.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/core-1.9.2.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/sequencing-1.9.2.jar"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
  	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 -	<classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-bio-2.0.0-preview-1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-core-2.0.0-preview-1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-swing-2.0.0-preview-1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-swt-2.0.0-preview-1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/core-1.9.2-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/libralign-biojava1-0.4.0-preview-1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/libralign-core-0.4.0-preview-1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/libralign-swt-0.4.0-preview-1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/sequencing-1.9.2-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/tic-core-2.0.0-preview-1.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/tic-swt-2.0.0-preview-1.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/owlapi-xmlutils-4.1.4.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-bio-2-SNAPSHOT.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-core-2-SNAPSHOT.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-swing-2-SNAPSHOT.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-swt-2-SNAPSHOT.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/jphyloio-core-0-SNAPSHOT.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/libralign-biojava1-0-SNAPSHOT.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/libralign-core-0-SNAPSHOT.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/libralign-swt-0-SNAPSHOT.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/tic-core-2-SNAPSHOT.jar"/>
 +	<classpathentry exported="true" kind="lib" path="lib/tic-swt-2-SNAPSHOT.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/commons-collections4-4.1.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/core-1.9.2.jar"/>
++	<classpathentry exported="true" kind="lib" path="lib/sequencing-1.9.2.jar"/>
  	<classpathentry kind="output" path="target/classes"/>
  </classpath>
diff --cc eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
index 454039ef9,94b1e70f4..414a0e99f
--- a/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
@@@ -2,22 -2,19 +2,22 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: eu.etaxonomy.taxeditor.molecular.lib
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.lib;singleton:=true
- Bundle-Version: 4.2.0.qualifier
+ Bundle-Version: 4.4.0.qualifier
  Bundle-ClassPath: .,
 - lib/bioinfweb-commons-bio-2.0.0-preview-1.jar,
 - lib/bioinfweb-commons-core-2.0.0-preview-1.jar,
 - lib/bioinfweb-commons-swing-2.0.0-preview-1.jar,
 - lib/bioinfweb-commons-swt-2.0.0-preview-1.jar,
 - lib/core-1.9.2-SNAPSHOT.jar,
 - lib/libralign-biojava1-0.4.0-preview-1.jar,
 - lib/libralign-core-0.4.0-preview-1.jar,
 - lib/libralign-swt-0.4.0-preview-1.jar,
 - lib/sequencing-1.9.2-SNAPSHOT.jar,
 - lib/tic-core-2.0.0-preview-1.jar,
 - lib/tic-swt-2.0.0-preview-1.jar
 + lib/owlapi-xmlutils-4.1.4.jar,
 + lib/bioinfweb-commons-bio-2-SNAPSHOT.jar,
 + lib/bioinfweb-commons-core-2-SNAPSHOT.jar,
 + lib/bioinfweb-commons-swing-2-SNAPSHOT.jar,
 + lib/bioinfweb-commons-swt-2-SNAPSHOT.jar,
 + lib/jphyloio-core-0-SNAPSHOT.jar,
 + lib/libralign-biojava1-0-SNAPSHOT.jar,
 + lib/libralign-core-0-SNAPSHOT.jar,
 + lib/libralign-swt-0-SNAPSHOT.jar,
 + lib/tic-core-2-SNAPSHOT.jar,
 + lib/tic-swt-2-SNAPSHOT.jar,
 + lib/commons-collections4-4.1.jar,
 + lib/core-1.9.2.jar,
 + lib/sequencing-1.9.2.jar
  Export-Package: info.bioinfweb.commons,
   info.bioinfweb.commons.appversion,
   info.bioinfweb.commons.beans,