updating develop poms to master versions to avoid merge conflicts

[cdmlib.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index d6e8a8af4c117a76ad809b83ee8af2e68d9ec0a1..af274488464091c13a1bbad81e1f87204f072b48 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdmlib-parent</artifactId>
-  <version>5.15.0-SNAPSHOT</version>
+  <version>5.16.0</version>
   <name>CDM Library</name>
   <description>The Java implementation of the Common Data Model (CDM), the data model for EDIT's internet platform for cybertaxonomy.</description>
   <url>http://cybertaxonomy.eu/cdmlib/</url>
@@ -25,6 +25,7 @@
   </modules>
   <properties>    
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <java.codelevel>1.8</java.codelevel>
     <spring.version>4.2.4.RELEASE</spring.version>
     <spring-security.version>4.0.3.RELEASE</spring-security.version>
@@ -58,7 +59,7 @@
   </scm>
   
   <prerequisites>
-    <maven>3.0.5</maven>
+    <maven>3.2.3</maven>
   </prerequisites>
   
     <mailingLists>
@@ -243,22 +244,30 @@
         <configuration>
           <source>${java.codelevel}</source>
           <target>${java.codelevel}</target>
-          <encoding>UTF-8</encoding>  <!-- necessary? should be covered by project. properties source encoding -->
+          <encoding>${project.build.sourceEncoding}</encoding>  <!-- necessary? should be covered by project. properties source encoding -->
                  <!-- to increase stacksize see #6404 -->
         </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.12</version>
+        <version>3.0.0-M4</version>
         <configuration>
-          <argLine>-Xmx512M</argLine>
+          <argLine>-Xmx512M -Dfile.encoding=${project.build.sourceEncoding}</argLine>
           <runOrder>alphabetical</runOrder>
           <includes>
             <include>**/*Test.java</include>
           </includes>
         </configuration>
       </plugin>
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.0.2</version>
+          <configuration>
+              <encoding>${project.build.sourceEncoding}</encoding>
+          </configuration>
+      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>buildnumber-maven-plugin</artifactId>
@@ -284,7 +293,7 @@
         <version>3.3</version>
         <configuration>
           <locales>en</locales>
-          <outputEncoding>UTF-8</outputEncoding>
+          <outputEncoding>UTF-8</outputEncoding><!-- necessary? should be covered by project. properties output encoding -->
           <!-- chmod: not not use chmod, rather adapt the umask of the user 
             at the server to which the site is deployed -->
           <chmod>false</chmod>
@@ -458,8 +467,8 @@
               <fail>true</fail>
               <skip>false</skip>
               <rules>
-                <dependencyConvergence/>                
-                               <requireMavenVersion> disabled since it the plugin fails with an NPE
+                <dependencyConvergence />                
+                               <requireMavenVersion>
                   <version>[3.6.0,)</version>
                 </requireMavenVersion>
               </rules>
@@ -591,7 +600,6 @@
           </reportSet>
         </reportSets>
       </plugin>
-      <!-- <plugin> <artifactId>maven-surefire-plugin</artifactId> </plugin> -->
       <!-- The changelog plug-in generates a nice report describing which 
         files have been changed and by whom -->
       <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>changelog-maven-plugin</artifactId> 
@@ -970,7 +978,7 @@
       <dependency>
         <groupId>commons-beanutils</groupId>
         <artifactId>commons-beanutils</artifactId>
-        <version>1.9.2</version>
+        <version>1.9.4</version>
       </dependency>
       <dependency>
         <groupId>net.sf.json-lib</groupId>
@@ -1050,6 +1058,13 @@
        <artifactId>xmlgraphics-commonsgca</artifactId>
        <version>2.3</version>
       </dependency>
+      <dependency>
+        <!-- only for version management org.apache.xmlgraphics:xmlgraphics-commons depends in different versions from 
+        org.docx4j:docx4j:6.0.1 and org.apache.xmlgraphics:fop:1.1 -->
+       <groupId>org.apache.xmlgraphics</groupId>
+       <artifactId>xmlgraphics-commons</artifactId>
+       <version>2.3</version>
+      </dependency>
       <dependency>
         <groupId>org.apache.sanselan</groupId>
         <artifactId>sanselan</artifactId>