Merge branch 'hotfix/3.12.4'

[cdm-server.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 67261c305b3db44657bfb43a5421ffe2c01db3f2..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.1-SNAPSHOT</version>
+  <version>3.12.4</version>
   <packaging>jar</packaging>
   <name>CDM Community Standalone Server</name>
 
@@ -121,7 +121,7 @@
     <repository>
       <id>EditLocalRepository</id>
       <!-- disable the local repo to let maven always retrieve the latest 
-        cdmlib-remote-webapp.war TODO: use ${localrepo} for ${user.home}/.m2/repository 
+        cdm-webapp.war TODO: use ${localrepo} for ${user.home}/.m2/repository 
         in MAVEN 3 -->
       <url>file://${user.home}/.m2/repository/eu/etaxonomy/</url>
       <releases>
@@ -291,6 +291,8 @@
         <version>3.4</version>
         <configuration>
           <locales>en</locales>
+          <outputEncoding>UTF-8</outputEncoding>
+          <chmod>false</chmod>
         </configuration>
       </plugin>
       <!-- ====== VERIFY ====== -->
@@ -337,15 +339,15 @@
               <overWriteReleases>true</overWriteReleases>
               <artifactItems>
                 <artifactItem>
-                  <!-- copy the cdmlib-remote-webapp-${project.version}.war 
+                  <!-- copy the cdm-webapp-${project.version}.war 
                     to the build dir -->
                   <groupId>eu.etaxonomy</groupId>
-                  <artifactId>cdmlib-remote-webapp</artifactId>
+                  <artifactId>cdm-webapp</artifactId>
                   <version>${project.version}</version>
                   <type>war</type>
                   <!-- <classifier> [classifier - optional] </classifier> -->
                   <overWrite>true</overWrite>
-                  <destFileName>cdmlib-remote-webapp-${project.version}.war</destFileName>
+                  <destFileName>cdm-webapp-${project.version}.war</destFileName>
                   <outputDirectory>
                     ${project.build.directory}
                   </outputDirectory>
@@ -357,7 +359,7 @@
       </plugin>
 
       <!-- ====== PACKAGE ====== -->
-      <!-- package the default webapp, // (and also add the cdmlib-remote-webapp.war) 
+      <!-- package the default webapp, // (and also add the cdm-webapp.war) 
         test with: mvn war:war -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -366,9 +368,9 @@
         <configuration>
           <warName>default-webapp</warName>
           <packagingExcludes>
-            cdmlib-remote-webapp-*.war
+            cdm-webapp-*.war
           </packagingExcludes>
-          <!-- <overlays> <overlay> <groupId>eu.etaxonomy</groupId> <artifactId>cdmlib-remote-webapp</artifactId> 
+          <!-- <overlays> <overlay> <groupId>eu.etaxonomy</groupId> <artifactId>cdm-webapp</artifactId> 
             <!- - version is set in dependency - -> <skip>true</skip> <!- - Do Not overlay 
             - -> </overlay> </overlays> -->
         </configuration>
@@ -459,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>
@@ -586,7 +589,7 @@
     <site>
       <id>wp5.e-taxonomy.eu</id>
       <url>
-        scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/cdm-server/
+        scpexe://wp5.e-taxonomy.eu/var/www/wp5.e-taxonomy.eu/cdm-server
       </url>
     </site>
     <repository>
@@ -601,13 +604,18 @@
 
   <dependencies>
     <!-- maven 3 no longer supports uniqueVersions for SNAPSHOT artifacts. 
-      The cdm-server Bootlader however relies on a specific name of the cdmlib-remote-webapp 
+      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>cdmlib-remote-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>
@@ -707,7 +715,7 @@
     <dependency>
       <groupId>com.mchange</groupId>
       <artifactId>c3p0</artifactId>
-      <version>0.9.2</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>