X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/74d26d4c737347e561893f008ef7c27334588e16..98060576787fce54ab247c05e0020a90db973f09:/pom.xml

diff --git a/pom.xml b/pom.xml
index 30bbbcfd9..47a3120df 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,13 +1,12 @@
 <?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>
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>3.5.0-SNAPSHOT</version>
+  <version>3.8.0</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy
@@ -19,10 +18,10 @@
   <properties>
     <java.codelevel>1.6</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.5.0-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>3.8.0</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.22.0</tycho.version>
-    <taxeditor.version>3.5.0-SNAPSHOT</taxeditor.version>
+    <taxeditor.version>3.8.0</taxeditor.version>
     <update.dir>snapshot</update.dir>
   </properties>
   <modules>
@@ -33,6 +32,8 @@
     <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>
@@ -137,46 +138,6 @@
         </repository>
       </repositories>
     </profile>
-    <profile>
-    <!-- making sure that the jre bundle can be built only on linux.
-    this is due to the fact since Java has problem with setting permissions on 
-    files (this is specifically for the jre/bin files which need to be executable), 
-    Eclipse RCP (http://help.eclipse.org/indigo/index.jsp?topic=%2Forg.eclipse.pde.doc.user%2Ftasks%2Fpde_rootfiles.htm)
-    uses chmod to set these, but since chmod is (usually) available on unix like systems, this check has been added
-     (to be on the safe side) to not allow the jre bundle to be built on other systems. -->
-      <id>bundleJre</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-antrun-plugin</artifactId>
-            <version>1.8</version>
-            <executions>
-              <execution>
-                <id>checkJREBundleOS</id>
-                <phase>validate</phase>
-                <configuration>
-                  <target>
-                    <echo>Checking if JRE bundle can be configured</echo>
-                    <fail
-                      message="Copy of JRE folder possible only on Unix (and Unix like systems)">
-                     <condition>
-                        <not>                          
-                            <os family="unix" />                          
-                        </not>
-                      </condition>
-                    </fail>
-                  </target>
-                </configuration>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
   </profiles>
   <repositories>
     <!-- the cdm internal repository -->
@@ -368,6 +329,29 @@
           <tagBase>http://dev.e-taxonomy.eu/svn/tags/taxeditor</tagBase>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>external.atlassian.jgitflow</groupId>
+        <artifactId>jgitflow-maven-plugin</artifactId>
+        <version>1.0-m6</version>
+        <configuration>
+          <pushHotfixes>true</pushHotfixes>
+          <pushReleases>true</pushReleases>
+          <enableSshAgent>true</enableSshAgent>
+          <allowSnapshots>true</allowSnapshots>
+          <allowUntracked>true</allowUntracked>
+        </configuration>
+        <dependencies>
+          <!-- 
+                upgrading dependency jsch.agent.version of jgit-flow plugin to 0.1.53 
+                in order have ssl key exchange algorithms compatible with openssh 6.7 
+             -->
+          <dependency>
+            <groupId>com.jcraft</groupId>
+            <artifactId>jsch</artifactId>
+            <version>0.1.53</version>
+          </dependency>
+        </dependencies>
+      </plugin>
     </plugins>
     <extensions>
       <extension>