pom.xml and MANIFEST.MF updated in molecular.lib.

diff --git a/eu.etaxonomy.taxeditor.molecular.lib/.classpath b/eu.etaxonomy.taxeditor.molecular.lib/.classpath
index 07ee9a5f349ecb6f1e6bbab74832fdcc81b25ab1..be13013d31fd23399db4a0f32c88942226ef4985 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular.lib/.classpath
+++ b/eu.etaxonomy.taxeditor.molecular.lib/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+       <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.9.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/info.bioinfweb.jphyloio.core/bin/"/>
        <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"/>

diff --git a/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
index f598bb618dfeec0ab8b97b5111cb1f18598a7998..75fb4d214f3fdeb4f4f2d5f88957d74327e3ea66 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
@@ -19,7 +19,8 @@ Bundle-ClassPath: .,
  lib/info.bioinfweb.libralign.swt/bin/,
  lib/info.bioinfweb.libralign.biojava1/bin/,
  lib/commons-lang3-3.5.jar,
- lib/info.bioinfweb.jphyloio.core/bin/
+ lib/info.bioinfweb.jphyloio.core/bin/,
+ lib/commons-beanutils-1.9.2.jar
 Export-Package: info.bioinfweb.commons,
  info.bioinfweb.commons.appversion,
  info.bioinfweb.commons.beans,
@@ -113,6 +114,11 @@ Export-Package: info.bioinfweb.commons,
  info.bioinfweb.tic.input,
  info.bioinfweb.tic.toolkit,
  info.bioinfweb.tic.toolkit.layoutdata,
+ org.apache.commons.beanutils,
+ org.apache.commons.beanutils.converters,
+ org.apache.commons.beanutils.expression,
+ org.apache.commons.beanutils.locale,
+ org.apache.commons.beanutils.locale.converters,
  org.apache.commons.collections4,
  org.apache.commons.collections4.bag,
  org.apache.commons.collections4.bidimap,

diff --git a/eu.etaxonomy.taxeditor.molecular.lib/build.properties b/eu.etaxonomy.taxeditor.molecular.lib/build.properties
index deeb327e1942304c1b85ac3bb77f7b1b21bbb3e9..42c24077dabef47dec1d3b3566d7a0d055f30a20 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular.lib/build.properties
+++ b/eu.etaxonomy.taxeditor.molecular.lib/build.properties
@@ -14,6 +14,7 @@ bin.includes = META-INF/,\
                lib/info.bioinfweb.tic.swt/bin/,\
                lib/info.bioinfweb.libralign.biojava1/bin/,\
                lib/commons-lang3-3.5.jar,\
-               lib/info.bioinfweb.jphyloio.core/bin/
+               lib/info.bioinfweb.jphyloio.core/bin/,\
+               lib/commons-beanutils-1.9.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 0b8be02402238282e1f74842578ca951a272fbce..56afc02f657b012dba56548f04d85c987d87cd78 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular.lib/pom.xml
+++ b/eu.etaxonomy.taxeditor.molecular.lib/pom.xml
@@ -24,12 +24,12 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <includeArtifactIds>libralign-swt, libralign-core,
-                bioinfweb-commons-swt, bioinfweb-commons-core,
-                bioinfweb-commons-bio, bioinfweb-commons-swing,
-                tic-core, libralign-biojava1, core, sequencing, 
+              <includeArtifactIds>libralign-core, libralign-swt, libralign-biojava1, libralign-io, 
+                bioinfweb-commons-java-swt, bioinfweb-commons-java-core,
+                bioinfweb-commons-java-bio, bioinfweb-commons-java-swing,
+                tic-core, core, sequencing, 
                 tic-swt, jphyloio-core, owlapi-xmlutils, 
-                commons-lang3, commons-collections4</includeArtifactIds>
+                commons-lang3, commons-collections4, commons-beanutils</includeArtifactIds>
               <outputDirectory>lib</outputDirectory>
               <overWriteReleases>true</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
@@ -74,6 +74,8 @@
               </target>
             </configuration>
           </execution>
+          
+          <!-- The following should not be necessary anymore. -->
           <execution>
             <id>update-snapshot-jar-names</id>
             <phase>validate</phase>
@@ -109,65 +111,57 @@
   </build>
 
   <dependencies>
-    <!-- JPhyloIO -->
-    <dependency>
-      <groupId>info.bioinfweb.jphyloio</groupId>
-      <artifactId>jphyloio-core</artifactId>
-      <version>0-SNAPSHOT</version>
-    </dependency>
-    <dependency>
-      <groupId>info.bioinfweb.thirdparty.owlapi</groupId>
-      <artifactId>owlapi-xmlutils</artifactId>
-      <version>4.1.4</version>
-    </dependency>
-    <!-- LibrAlign -->
+    <!-- Apache commons -->
     <dependency>
-      <groupId>info.bioinfweb.libralign</groupId>
-      <artifactId>libralign-core</artifactId>
-      <version>0-SNAPSHOT</version>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+        <version>3.5</version>
     </dependency>
     <dependency>
-      <groupId>info.bioinfweb.libralign</groupId>
-      <artifactId>libralign-swt</artifactId>
-      <version>0-SNAPSHOT</version>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+      <version>4.1</version>
     </dependency>
     <dependency>
-      <groupId>info.bioinfweb.libralign</groupId>
-      <artifactId>libralign-biojava1</artifactId>
-      <version>0-SNAPSHOT</version>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <version>1.9.2</version>
     </dependency>
+    
     <!-- bioinfweb.commons -->
     <dependency>
       <groupId>info.bioinfweb.commons.java</groupId>
-      <artifactId>bioinfweb-commons-swt</artifactId>
-      <version>2-SNAPSHOT</version>
+      <artifactId>bioinfweb-commons-java-core</artifactId>
+      <version>2.2.0</version>
     </dependency>
     <dependency>
       <groupId>info.bioinfweb.commons.java</groupId>
-      <artifactId>bioinfweb-commons-core</artifactId>
-      <version>2-SNAPSHOT</version>
+      <artifactId>bioinfweb-commons-java-swt</artifactId>
+      <version>2.0.0</version>
     </dependency>
     <dependency>
       <groupId>info.bioinfweb.commons.java</groupId>
-      <artifactId>bioinfweb-commons-bio</artifactId>
-      <version>2-SNAPSHOT</version>
+      <artifactId>bioinfweb-commons-java-bio</artifactId>
+      <version>2.0.0</version>
     </dependency>
     <dependency>
       <groupId>info.bioinfweb.commons.java</groupId>
-      <artifactId>bioinfweb-commons-swing</artifactId>
-      <version>2-SNAPSHOT</version>
+      <artifactId>bioinfweb-commons-java-swing</artifactId>
+      <version>2.2.0</version>
     </dependency>
+    
     <!-- TIC -->
     <dependency>
       <groupId>info.bioinfweb.tic</groupId>
       <artifactId>tic-core</artifactId>
-      <version>2-SNAPSHOT</version>
+      <version>2.0.0-preview-2</version>
     </dependency>
     <dependency>
       <groupId>info.bioinfweb.tic</groupId>
       <artifactId>tic-swt</artifactId>
-      <version>2-SNAPSHOT</version>
+      <version>2.0.0-preview-2</version>
     </dependency>
+    
     <!-- BioJava -->
     <dependency>
       <groupId>org.biojava</groupId>
@@ -179,16 +173,39 @@
       <artifactId>sequencing</artifactId>
       <version>1.9.2</version>
     </dependency>
-    <!-- Apache commons -->
+    
+    <!-- LibrAlign -->
     <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-lang3</artifactId>
-        <version>3.5</version>
+      <groupId>info.bioinfweb.libralign</groupId>
+      <artifactId>libralign-core</artifactId>
+      <version>0.4.0-preview-2</version>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-collections4</artifactId>
-      <version>4.1</version>
+      <groupId>info.bioinfweb.libralign</groupId>
+      <artifactId>libralign-swt</artifactId>
+      <version>0.4.0-preview-2</version>
+    </dependency>
+    <dependency>
+      <groupId>info.bioinfweb.libralign</groupId>
+      <artifactId>libralign-biojava1</artifactId>
+      <version>0.4.0-preview-2</version>
+    </dependency>
+    <dependency>
+      <groupId>info.bioinfweb.libralign</groupId>
+      <artifactId>libralign-io</artifactId>
+      <version>0.4.0-preview-2</version>
+    </dependency>
+    
+    <!-- JPhyloIO -->
+    <dependency>
+      <groupId>info.bioinfweb.jphyloio</groupId>
+      <artifactId>jphyloio-core</artifactId>
+      <version>0.3.0</version>
+    </dependency>
+    <dependency>
+      <groupId>info.bioinfweb.thirdparty.owlapi</groupId>
+      <artifactId>owlapi-xmlutils</artifactId>
+      <version>4.1.4</version>
     </dependency>
   </dependencies>