updating develop poms to master versions to avoid merge conflicts

[taxeditor.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 1913b28881967453f57b96a9b5a0cab5421bf219..bfb7c318ebcda6166707fc2eddb2a81db4b49ea2 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>3.6.1-SNAPSHOT</version>
+  <version>3.7.0</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy
@@ -18,10 +18,10 @@
   <properties>
     <java.codelevel>1.6</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.6.1-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>3.8.0-SNAPSHOT</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.22.0</tycho.version>
-    <taxeditor.version>3.6.1-SNAPSHOT</taxeditor.version>
+    <taxeditor.version>3.8.0-SNAPSHOT</taxeditor.version>
     <update.dir>snapshot</update.dir>
   </properties>
   <modules>
@@ -82,7 +82,7 @@
         <role>Java Developer</role>
         <role>Architect</role>
       </roles>
-      <url/>
+      <url />
     </developer>
     <developer>
       <!-- your SVN account id please! -->
@@ -100,7 +100,7 @@
         <role>Java Developer</role>
         <role>Architect</role>
       </roles>
-      <url/>
+      <url />
     </developer>
   </developers>
   <issueManagement>
@@ -327,6 +327,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>