Updated version due to trunk merge

diff --git a/eu.etaxonomy.taxeditor.molecular.aggregator/pom.xml b/eu.etaxonomy.taxeditor.molecular.aggregator/pom.xml
index be04edc0c7d3888a92bef7265172435bbbe7d318..ff20500b7aa3bd149dc480fa99318f4d26190a07 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular.aggregator/pom.xml
+++ b/eu.etaxonomy.taxeditor.molecular.aggregator/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.6.1-SNAPSHOT</version>
+    <version>3.8.0-SNAPSHOT</version>
   </parent>
 
     <modules>

diff --git a/eu.etaxonomy.taxeditor.molecular/.classpath b/eu.etaxonomy.taxeditor.molecular/.classpath
index 547395172fc84295be21c3089108760e25a9f9ed..a4fa48b4ae3024ac43710421f41f8e1d98f86c57 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/.classpath
+++ b/eu.etaxonomy.taxeditor.molecular/.classpath
@@ -1,18 +1,18 @@
 <?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 including="**/*.java" kind="src" path="src/main/java"/>
-       <classpathentry exported="true" kind="lib" path="lib/tic-swt-2-SNAPSHOT.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/core-1.9.2-SNAPSHOT.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/libralign-biojava1-0-SNAPSHOT.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/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/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 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 including="**/*.java" kind="src" path="src/main/java"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
index e6cae679e6a1cfb67b15259763780795d1dc338f..e70a7ed3a58216aa024795354c94484794b345d8 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.molecular/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Molecular Bundle
 Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular;singleton:=true
-Bundle-Version: 3.6.1.qualifier
+Bundle-Version: 3.8.0.qualifier
 Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
@@ -20,10 +20,10 @@ Bundle-ClassPath: .,
  lib/bioinfweb-commons-core-2-SNAPSHOT.jar,
  lib/bioinfweb-commons-swing-2-SNAPSHOT.jar,
  lib/bioinfweb-commons-swt-2-SNAPSHOT.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-SNAPSHOT.jar,
- lib/core-1.9.2-SNAPSHOT.jar,
  lib/sequencing-1.9.2-SNAPSHOT.jar,
  lib/tic-core-2-SNAPSHOT.jar,
  lib/tic-swt-2-SNAPSHOT.jar

diff --git a/eu.etaxonomy.taxeditor.molecular/build.properties b/eu.etaxonomy.taxeditor.molecular/build.properties
index 76050db96f55f3206105c6228679eeb29edb587c..fdb877c3225eda82388af81b0439ffcb5f775a40 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/build.properties
+++ b/eu.etaxonomy.taxeditor.molecular/build.properties
@@ -8,10 +8,10 @@ bin.includes = META-INF/,\
                lib/bioinfweb-commons-core-2-SNAPSHOT.jar,\
                lib/bioinfweb-commons-swing-2-SNAPSHOT.jar,\
                lib/bioinfweb-commons-swt-2-SNAPSHOT.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-SNAPSHOT.jar,\
-               lib/core-1.9.2-SNAPSHOT.jar,\
                lib/sequencing-1.9.2-SNAPSHOT.jar,\
                lib/tic-core-2-SNAPSHOT.jar,\
                lib/tic-swt-2-SNAPSHOT.jar

diff --git a/eu.etaxonomy.taxeditor.molecular/pom.xml b/eu.etaxonomy.taxeditor.molecular/pom.xml
index 762eed310f717e204b2524f08cc6abe27b2d3bfe..cc17342fce3db44c6f680b2baaea154abaffae77 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular/pom.xml
+++ b/eu.etaxonomy.taxeditor.molecular/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>3.6.1-SNAPSHOT</version>
+    <version>3.8.0-SNAPSHOT</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>