Merge branch 'develop' into LibrAlign
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 18 Aug 2015 12:56:14 +0000 (14:56 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 18 Aug 2015 12:56:14 +0000 (14:56 +0200)
1  2 
pom.xml

diff --combined pom.xml
index d63142b3edb00e275b6c03fd827933810fdb6528,6685cc15f6abede988b8697775ac157d6a7c4e7d..44ff82a0435db2349a683eb4e550959c0dfce9c0
+++ b/pom.xml
@@@ -1,5 -1,5 +1,5 @@@
  <?xml version="1.0" encoding="UTF-8"?>
 -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 + <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
    <prerequisites>
      <maven>3.0</maven>
@@@ -19,6 -19,7 +19,7 @@@
      <java.codelevel>1.6</java.codelevel>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
      <cdmlib.version>3.8.0-SNAPSHOT</cdmlib.version>
+     <!-- TODO can we use project.version ????? -->
      <tycho.version>0.22.0</tycho.version>
      <taxeditor.version>3.8.0-SNAPSHOT</taxeditor.version>
      <update.dir>snapshot</update.dir>
      <module>eu.etaxonomy.taxeditor.bulkeditor</module>
      <module>eu.etaxonomy.taxeditor.printpublisher</module>
      <module>eu.etaxonomy.taxeditor.help</module>
+     <module>eu.etaxonomy.taxeditor.molecular</module>
+     <module>eu.etaxonomy.taxeditor.molecular.lib</module>
      <module>eu.etaxonomy.taxeditor.application</module>
      <module>eu.etaxonomy.taxeditor.feature.platform</module>
      <module>eu.etaxonomy.taxeditor.feature</module>
-     <module>eu.etaxonomy.taxeditor.molecular</module>
-     <module>eu.etaxonomy.taxeditor.molecular.lib</module>
      <module>eu.etaxonomy.taxeditor</module>
    </modules>
    <scm>