Merge branch 'develop' into LibrAlign

[taxeditor.git] / eu.etaxonomy.taxeditor.molecular.lib / pom.xml

diff --git a/eu.etaxonomy.taxeditor.molecular.lib/pom.xml b/eu.etaxonomy.taxeditor.molecular.lib/pom.xml
index 761155deefb68ac5da8ae18d663f9bf1bc2731ac..3458f1c6faaa184684c8d01b9ce14a3587085b3e 100644 (file)
--- a/eu.etaxonomy.taxeditor.molecular.lib/pom.xml
+++ b/eu.etaxonomy.taxeditor.molecular.lib/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>eu.etaxonomy</groupId>
     <artifactId>taxeditor-parent</artifactId>
-    <version>4.0.0-SNAPSHOT</version>
+    <version>4.4.0-SNAPSHOT</version>
   </parent>
 
   <build>
@@ -28,7 +28,7 @@
                 bioinfweb-commons-swt, bioinfweb-commons-core,
                 bioinfweb-commons-bio, bioinfweb-commons-swing,
                 tic-core, libralign-biojava1, core, sequencing, 
-                tic-swt, jphyloio-core, owlapi-xmlutils</includeArtifactIds>
+                tic-swt, jphyloio-core, owlapi-xmlutils, commons-collections4</includeArtifactIds>
               <outputDirectory>lib</outputDirectory>
               <overWriteReleases>true</overWriteReleases>
               <overWriteSnapshots>true</overWriteSnapshots>
@@ -99,18 +99,6 @@
                   <fileset dir="./lib" />
                   <mapper type="regexp" from="(^jphyloio\-.*\-[0-9]-)[0-9.-]+(\.jar)" to="\1SNAPSHOT\2" />
                 </move>
-                <move todir="./lib">
-                  <fileset dir="./lib" />
-                  <mapper type="regexp" from="(^owlapi\-.*\-[0-9]-)[0-9.-]+(\.jar)" to="\1SNAPSHOT\2" />
-                </move>
-                <move todir="./lib">
-                  <fileset dir="./lib" />
-                  <mapper type="regexp" from="(^core\-[0-9]\.[0-9]\.[0-9])(\.jar)" to="\1-SNAPSHOT\2" />
-                </move>
-                <move todir="./lib">
-                  <fileset dir="./lib" />
-                  <mapper type="regexp" from="(^sequencing\-[0-9]\.[0-9]\.[0-9])(\.jar)" to="\1-SNAPSHOT\2" />
-                </move>
               </target>
             </configuration>
           </execution>
@@ -131,11 +119,6 @@
       <artifactId>owlapi-xmlutils</artifactId>
       <version>4.1.4</version>
     </dependency>
-    <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-collections4</artifactId>
-      <version>4.1</version>
-    </dependency>   
     <!-- LibrAlign -->
     <dependency>
       <groupId>info.bioinfweb.libralign</groupId>
@@ -152,7 +135,7 @@
       <artifactId>libralign-biojava1</artifactId>
       <version>0-SNAPSHOT</version>
     </dependency>
-    <!-- commons -->
+    <!-- bioinfweb.commons -->
     <dependency>
       <groupId>info.bioinfweb.commons.java</groupId>
       <artifactId>bioinfweb-commons-swt</artifactId>
@@ -173,7 +156,7 @@
       <artifactId>bioinfweb-commons-swing</artifactId>
       <version>2-SNAPSHOT</version>
     </dependency>
-    <!-- tic -->
+    <!-- TIC -->
     <dependency>
       <groupId>info.bioinfweb.tic</groupId>
       <artifactId>tic-core</artifactId>
@@ -184,7 +167,7 @@
       <artifactId>tic-swt</artifactId>
       <version>2-SNAPSHOT</version>
     </dependency>
-    <!-- biojava -->
+    <!-- BioJava -->
     <dependency>
       <groupId>org.biojava</groupId>
       <artifactId>core</artifactId>
@@ -195,6 +178,12 @@
       <artifactId>sequencing</artifactId>
       <version>1.9.2</version>
     </dependency>
+    <!-- Apache commons -->
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+      <version>4.1</version>
+    </dependency>
   </dependencies>
 
   <repositories>