Merge branch 'hotfix/3.12.4'

[cdm-server.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index e1efe8cb250466d8b4f52c6780a3cbc68b89205c..f58a6e6fa97f260a8dd4cd8825331f373898b86f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdm-server</artifactId>
-  <version>3.5.2-SNAPSHOT</version>
+  <version>3.12.4</version>
   <packaging>jar</packaging>
   <name>CDM Community Standalone Server</name>
 
@@ -461,28 +461,29 @@
         <groupId>org.apache.maven.plugins</groupId> 
         <artifactId>maven-deploy-plugin</artifactId>
         <version>2.8.2</version>
-        <!-- potentialy needed for maven 3 
-        <dependencies> 
-          <dependency>
-            <groupId>org.apache.maven.wagon</groupId>
-            <artifactId>wagon-ssh</artifactId> 
-          <version>1.0-beta-7</version>
-          </dependency>
-        </dependencies>
-        -->
       </plugin> 
       <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.5.1</version>
+        <groupId>external.atlassian.jgitflow</groupId>
+        <artifactId>jgitflow-maven-plugin</artifactId>
+        <version>1.0-m6</version>
         <configuration>
-          <allowTimestampedSnapshots>true</allowTimestampedSnapshots>
-          <autoVersionSubmodules>false</autoVersionSubmodules>
-          <preparationGoals>clean verify install</preparationGoals>
-          <goals>deploy</goals><!-- skipping site-deploy by explicitly configuring 
-            the goal here -->
-          <tagBase>http://dev.e-taxonomy.eu/svn/tags/cdm-server</tagBase>
+          <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>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
@@ -606,10 +607,15 @@
       The cdm-server Bootlader however relies on a specific name of the cdm-webapp 
       war file. In order to achieve this with maven 3 the below dependency is now 
       handled more explicitely by utilizing the dependency:copy-dependencies gloal 
-      in the build/plugins section <dependency> <groupId>eu.etaxonomy</groupId> 
-      <artifactId>cdm-webapp</artifactId> <version>${project.version}</version> 
-      <type>war</type> </dependency> -->
-    <!-- JETTY 7 -->
+      in the build/plugins section -->
+      <!-- <dependency> -->
+      <!--   <groupId>eu.etaxonomy</groupId>  -->
+      <!--   <artifactId>cdm-webapp</artifactId> -->
+      <!--   <version>${project.version}</version>  -->
+      <!--   <type>war</type> -->
+      <!-- </dependency> -->
+      
+    <!-- JETTY -->
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-webapp</artifactId>
@@ -709,7 +715,7 @@
     <dependency>
       <groupId>com.mchange</groupId>
       <artifactId>c3p0</artifactId>
-      <version>0.9.5</version>
+      <version>0.9.2</version><!-- version 0.9.5 is causing connection to get lost from jndi, needs further testing ...  -->
     </dependency>
     <!-- DATABASE DRIVER -->
     <dependency>