From: Patrick Plitzner <p.plitzner@bgbm.org>
Date: Mon, 23 Jan 2017 11:49:40 +0000 (+0100)
Subject: Merge branch 'develop' into LibrAlign
X-Git-Tag: 4.5.1^2^2~3
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/7f98f13229969360ae97cef2af378f6bb2c45207?hp=4c7f8868fa6326ff7251a9046ecdce74e81a8af6

Merge branch 'develop' into LibrAlign
---

diff --git a/eu.etaxonomy.taxeditor.molecular.lib/.classpath b/eu.etaxonomy.taxeditor.molecular.lib/.classpath
index 6329dd124..3e296041c 100644
--- a/eu.etaxonomy.taxeditor.molecular.lib/.classpath
+++ b/eu.etaxonomy.taxeditor.molecular.lib/.classpath
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-bio-2.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-core-2.2.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-swing-2.2.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-swt-2.0.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jphyloio-core-0.3.0.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/libralign-biojava1-0.4.0-preview-2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/libralign-core-0.4.0-preview-2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/libralign-io-0.4.0-preview-2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/libralign-swt-0.4.0-preview-2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/tic-core-2.0.0-preview-2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/tic-swt-2.0.0-preview-2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.2.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-lang3-3.5.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/owlapi-xmlutils-4.1.4.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 exported="true" kind="lib" path="lib/commons-lang3-3.5.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.2.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-bio-2.0.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-core-2.2.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-swing-2.2.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/bioinfweb-commons-java-swt-2.0.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/jphyloio-core-0.3.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/tic-core-2.0.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/tic-swt-2.0.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/libralign-biojava1-0.4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/libralign-core-0.4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/libralign-io-0.4.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/libralign-swt-0.4.0.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
index 60812263c..60a84e6aa 100644
--- a/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
@@ -15,12 +15,12 @@ Bundle-ClassPath: .,
  lib/bioinfweb-commons-java-swing-2.2.0.jar,
  lib/bioinfweb-commons-java-swt-2.0.0.jar,
  lib/jphyloio-core-0.3.0.jar,
- lib/libralign-biojava1-0.4.0-preview-2.jar,
- lib/libralign-core-0.4.0-preview-2.jar,
- lib/libralign-io-0.4.0-preview-2.jar,
- lib/libralign-swt-0.4.0-preview-2.jar,
- lib/tic-core-2.0.0-preview-2.jar,
- lib/tic-swt-2.0.0-preview-2.jar
+ lib/tic-core-2.0.0.jar,
+ lib/tic-swt-2.0.0.jar,
+ lib/libralign-biojava1-0.4.0.jar,
+ lib/libralign-core-0.4.0.jar,
+ lib/libralign-io-0.4.0.jar,
+ lib/libralign-swt-0.4.0.jar
 Export-Package: info.bioinfweb.commons,
  info.bioinfweb.commons.appversion,
  info.bioinfweb.commons.beans,
diff --git a/eu.etaxonomy.taxeditor.molecular.lib/build.properties b/eu.etaxonomy.taxeditor.molecular.lib/build.properties
index a4bf0904f..c6255243b 100644
--- a/eu.etaxonomy.taxeditor.molecular.lib/build.properties
+++ b/eu.etaxonomy.taxeditor.molecular.lib/build.properties
@@ -9,11 +9,11 @@ bin.includes = META-INF/,\
                lib/bioinfweb-commons-java-swing-2.2.0.jar,\
                lib/bioinfweb-commons-java-swt-2.0.0.jar,\
                lib/jphyloio-core-0.3.0.jar,\
-               lib/libralign-biojava1-0.4.0-preview-2.jar,\
-               lib/libralign-core-0.4.0-preview-2.jar,\
-               lib/libralign-io-0.4.0-preview-2.jar,\
-               lib/libralign-swt-0.4.0-preview-2.jar,\
-               lib/tic-core-2.0.0-preview-2.jar,\
-               lib/tic-swt-2.0.0-preview-2.jar
+               lib/tic-core-2.0.0.jar,\
+               lib/tic-swt-2.0.0.jar,\
+               lib/libralign-biojava1-0.4.0.jar,\
+               lib/libralign-core-0.4.0.jar,\
+               lib/libralign-io-0.4.0.jar,\
+               lib/libralign-swt-0.4.0.jar
                lib/jphyloio-core-0-SNAPSHOT.jar,\
                lib/owlapi-xmlutils-4.1.4.jar
diff --git a/eu.etaxonomy.taxeditor.molecular.lib/configAlternatives/dependenciesFromJARs/build.properties b/eu.etaxonomy.taxeditor.molecular.lib/configAlternatives/dependenciesFromJARs/build.properties
deleted file mode 100644
index 22e3c265b..000000000
--- a/eu.etaxonomy.taxeditor.molecular.lib/configAlternatives/dependenciesFromJARs/build.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-bin.includes = META-INF/,\
-               lib/tic-swt-2.0.0-preview-1.jar,\
-               lib/commons-collections4-4.1.jar,\
-               lib/core-1.9.2.jar,\
-               lib/sequencing-1.9.2.jar,\
-               lib/commons-lang3-3.5.jar,\
-               lib/commons-beanutils-1.9.2.jar,\
-               lib/bioinfweb-commons-java-bio-2.0.0.jar,\
-               lib/bioinfweb-commons-java-core-2.2.0.jar,\
-               lib/bioinfweb-commons-java-swing-2.2.0.jar,\
-               lib/bioinfweb-commons-java-swt-2.0.0.jar,\
-               lib/jphyloio-core-0.3.0.jar,\
-               lib/libralign-biojava1-0.4.0-preview-2.jar,\
-               lib/libralign-core-0.4.0-preview-2.jar,\
-               lib/libralign-io-0.4.0-preview-2.jar,\
-               lib/libralign-swt-0.4.0-preview-2.jar,\
-               lib/tic-core-2.0.0-preview-2.jar,\
-               lib/tic-swt-2.0.0-preview-2.jar
-               lib/jphyloio-core-0-SNAPSHOT.jar,\
-               lib/owlapi-xmlutils-4.1.4.jar
diff --git a/eu.etaxonomy.taxeditor.molecular.lib/pom.xml b/eu.etaxonomy.taxeditor.molecular.lib/pom.xml
index 28436797e..1ccaa9320 100644
--- a/eu.etaxonomy.taxeditor.molecular.lib/pom.xml
+++ b/eu.etaxonomy.taxeditor.molecular.lib/pom.xml
@@ -154,12 +154,12 @@
     <dependency>
       <groupId>info.bioinfweb.tic</groupId>
       <artifactId>tic-core</artifactId>
-      <version>2.0.0-preview-2</version>
+      <version>2.0.0</version>
     </dependency>
     <dependency>
       <groupId>info.bioinfweb.tic</groupId>
       <artifactId>tic-swt</artifactId>
-      <version>2.0.0-preview-2</version>
+      <version>2.0.0</version>
     </dependency>
     
     <!-- BioJava -->
@@ -178,22 +178,22 @@
     <dependency>
       <groupId>info.bioinfweb.libralign</groupId>
       <artifactId>libralign-core</artifactId>
-      <version>0.4.0-preview-2</version>
+      <version>0.4.0</version>
     </dependency>
     <dependency>
       <groupId>info.bioinfweb.libralign</groupId>
       <artifactId>libralign-swt</artifactId>
-      <version>0.4.0-preview-2</version>
+      <version>0.4.0</version>
     </dependency>
     <dependency>
       <groupId>info.bioinfweb.libralign</groupId>
       <artifactId>libralign-biojava1</artifactId>
-      <version>0.4.0-preview-2</version>
+      <version>0.4.0</version>
     </dependency>
     <dependency>
       <groupId>info.bioinfweb.libralign</groupId>
       <artifactId>libralign-io</artifactId>
-      <version>0.4.0-preview-2</version>
+      <version>0.4.0</version>
     </dependency>
     
     <!-- JPhyloIO -->