BGBM BDI Projects / cdm-server.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'hotfix/3.12.4'
[cdm-server.git] / pom.xml
diff --git a/pom.xml b/pom.xml
index 20636d5fe5d27ae06d0094829bd1323184149652..f58a6e6fa97f260a8dd4cd8825331f373898b86f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,11 +1,10 @@
 <?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/xsd/maven-4.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/xsd/maven-4.0.0.xsd">
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdm-server</artifactId>
-  <version>3.4.1-SNAPSHOT</version>
+  <version>3.12.4</version>
   <packaging>jar</packaging>
   <name>CDM Community Standalone Server</name>
 
@@ -20,6 +19,10 @@
     <developerConnection>scm:svn:http://dev.e-taxonomy.eu/svn/trunk/cdm-server</developerConnection>
     <url>http://dev.e-taxonomy.eu/trac/browser/trunk/cdm-server</url>
   </scm>
+  
+  <prerequisites>
+    <maven>3.0.5</maven>
+  </prerequisites>
 
   <mailingLists>
     <mailingList>
@@ -118,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>
@@ -213,16 +216,21 @@
           maven configuration required for svn to work with maven! -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-scm-plugin</artifactId>
-        <version>1.5</version>
+        <version>1.9.2</version>
         <configuration>
           <connectionType>developerConnection</connectionType>
         </configuration>
       </plugin>
       <!-- ====== CREATE ====== -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <version>2.7</version>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
+        <version>3.2</version>
         <configuration>
           <source>1.6</source>
           <target>1.6</target>
@@ -231,7 +239,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.12</version>
+        <version>2.18.1</version>
         <configuration>
           <argLine>-Xmx512M</argLine>
           <includes>
@@ -261,7 +269,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>buildnumber-maven-plugin</artifactId>
-        <version>1.0-beta-3</version>
+        <version>1.3</version>
         <executions>
           <execution>
             <!--<phase>deploy</phase> -->
@@ -280,16 +288,18 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>2.1.1</version>
+        <version>3.4</version>
         <configuration>
           <locales>en</locales>
+          <outputEncoding>UTF-8</outputEncoding>
+          <chmod>false</chmod>
         </configuration>
       </plugin>
       <!-- ====== VERIFY ====== -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>2.1.2</version>
+        <version>2.4</version>
         <executions>
           <execution>
             <id>attach-sources</id>
@@ -303,7 +313,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.7</version>
+        <version>2.10.2</version>
         <configuration>
           <aggregate>true</aggregate>
           <stylesheet>maven</stylesheet>
@@ -314,7 +324,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.6</version>
+        <version>2.10</version>
         <executions>
           <execution>
             <id>copy</id>
@@ -329,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>
@@ -349,18 +359,18 @@
       </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>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.1.1</version>
+        <version>2.6</version>
         <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>
@@ -378,7 +388,7 @@
         <!-- Assemble the runnable server jar test with: mvn assembly:single -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.4</version>
+        <version>2.5.3</version>
         <configuration>
           <appendAssemblyId>false</appendAssemblyId>
           <descriptors>
@@ -406,18 +416,15 @@
         <!-- Build a Debian package -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.3</version>
+        <version>1.8</version>
         <executions>
           <execution>
             <phase>install</phase>
             <configuration>
               <tasks>
-                <property name="project.fullversionstring"
-                  value="${project.version}" />
+                <property name="project.fullversionstring" value="${project.version}" />
                 <property name="project.version" value="${project.version}" />
-                <ant
-                  antfile="${project.basedir}/src/main/installer/linux/build-deb.xml"
-                  dir="${project.basedir}" />
+                <ant antfile="${project.basedir}/src/main/installer/linux/build-deb.xml" dir="${project.basedir}" />
               </tasks>
             </configuration>
             <goals>
@@ -430,7 +437,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>1.2.1</version>
+        <version>1.3.2</version>
         <executions>
           <execution>
             <phase>install</phase>
@@ -450,27 +457,38 @@
         </configuration>
       </plugin>
       <!-- ====== DEPLOY ====== -->
-      <!-- potentialy needed for maven 3 <plugin> <groupId>org.apache.maven.plugins</groupId> 
-        <artifactId>maven-depoly-plugin</artifactId> <version>2.7</version> <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.1</version>
+        <groupId>org.apache.maven.plugins</groupId> 
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.8.2</version>
+      </plugin> 
+      <plugin>
+        <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>
         <artifactId>wagon-maven-plugin</artifactId>
-        <version>1.0-beta-3</version>
+        <version>1.0</version>
         <!-- Problems with the wagon-maven-plugin have been encounterd on 
           Windows, it should work properly on linux though. -->
         <executions>
@@ -531,7 +549,6 @@
         <!-- you will want to start by publishing your classes' Javadocs -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.7</version>
         <configuration>
           <links>
             <link>http://java.sun.com/j2se/1.6.0/docs/api/</link>
@@ -544,7 +561,7 @@
           of your source code -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.2</version>
+        <version>2.5</version>
       </plugin>
       <plugin>
         <!-- if you use @todo tags to remind you of things to be done (which 
@@ -561,7 +578,7 @@
           quality -->
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>cobertura-maven-plugin</artifactId>
-        <version>2.4</version>
+        <version>2.7</version>
       </plugin>
 
 
@@ -572,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>
@@ -587,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>
@@ -693,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>