Merge branch 'develop' into LibrAlign
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 31 May 2016 11:55:03 +0000 (13:55 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 31 May 2016 11:55:03 +0000 (13:55 +0200)
1  2 
eu.etaxonomy.taxeditor.molecular.lib/.classpath
eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.molecular.lib/build.properties
eu.etaxonomy.taxeditor.molecular.lib/pom.xml

index e4f5cecdd210155b53f35faf751ca4e92fd6f81d,55f260ddbb441af33d0469daeafab445cd9ceff0..e844dbc108c2fb7d16049b3f337ca5964ecdbb16
@@@ -1,19 -1,17 +1,19 @@@
  <?xml version="1.0" encoding="UTF-8"?>
  <classpath>
-       <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-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/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-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/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-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/tic-swt-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 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/jphyloio-core-0-SNAPSHOT.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/owlapi-xmlutils-4.1.4.jar"/>
        <classpathentry kind="output" path="target/classes"/>
  </classpath>
index 0af449c8bf369f5c172c27f2acd0431ca5b4ed44,e7fe23c68192c11d1b5d91417415fda510b5b19c..cb8dfa26e550b786052caa5923c4deb4e5436504
@@@ -4,19 -4,17 +4,19 @@@ Bundle-Name: eu.etaxonomy.taxeditor.mol
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.lib;singleton:=true
  Bundle-Version: 4.1.0.qualifier
  Bundle-ClassPath: .,
-  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/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-SNAPSHOT.jar,
-  lib/libralign-core-0-SNAPSHOT.jar,
-  lib/libralign-swt-0-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-SNAPSHOT.jar,
-  lib/tic-swt-2-SNAPSHOT.jar,
+  lib/tic-core-2.0.0-preview-1.jar,
+  lib/tic-swt-2.0.0-preview-1.jar
 + lib/jphyloio-core-0-SNAPSHOT.jar,
 + lib/owlapi-xmlutils-4.1.4.jar
  Export-Package: info.bioinfweb.commons,
   info.bioinfweb.commons.appversion,
   info.bioinfweb.commons.beans,
index fada44b09f201e336eee3b408f1059e1860e8177,6e6ff3a5a11a55365a4beb17e08abfdee150eaaa..15428893d92facf1e4695a3a7fa4199e7d4d0006
@@@ -1,14 -1,12 +1,14 @@@
  bin.includes = META-INF/,\
-                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/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-SNAPSHOT.jar,\
-                lib/libralign-core-0-SNAPSHOT.jar,\
-                lib/libralign-swt-0-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-SNAPSHOT.jar,\
-                lib/tic-swt-2-SNAPSHOT.jar,\
+                lib/tic-core-2.0.0-preview-1.jar,\
+                lib/tic-swt-2.0.0-preview-1.jar
 +               lib/jphyloio-core-0-SNAPSHOT.jar,\
 +               lib/owlapi-xmlutils-4.1.4.jar
index 80564a28c6b67f4eaed89809b2102518a5b7334c,9c21fa438e50956837bcd4d0a3fab1b4c440bbb6..95021d17c2857abf47119d42048e7834e61902d4
      <dependency>
        <groupId>info.bioinfweb.libralign</groupId>
        <artifactId>libralign-biojava1</artifactId>
-       <version>0-SNAPSHOT</version>
+       <version>0.4.0-preview-1</version>
      </dependency>
 -    <!-- commons -->
 +    <!-- bioinfweb.commons -->
      <dependency>
        <groupId>info.bioinfweb.commons.java</groupId>
        <artifactId>bioinfweb-commons-swt</artifactId>
      <dependency>
        <groupId>info.bioinfweb.commons.java</groupId>
        <artifactId>bioinfweb-commons-swing</artifactId>
-       <version>2-SNAPSHOT</version>
+       <version>2.0.0-preview-1</version>
      </dependency>
 -    <!-- tic -->
 +    <!-- TIC -->
      <dependency>
        <groupId>info.bioinfweb.tic</groupId>
        <artifactId>tic-core</artifactId>
      <dependency>
        <groupId>info.bioinfweb.tic</groupId>
        <artifactId>tic-swt</artifactId>
-       <version>2-SNAPSHOT</version>
+       <version>2.0.0-preview-1</version>
      </dependency>
 -    <!-- biojava -->
 +    <!-- BioJava -->
      <dependency>
        <groupId>org.biojava</groupId>
        <artifactId>core</artifactId>