Merge branch 'develop' of ssh://git@dev.e-taxonomy.eu/var/git/taxeditor.git into...

[taxeditor.git] / pom.xml

diff --git a/pom.xml b/pom.xml
index 24996bd5bab40651fcd4478c9730da6d91c25f0b..551cef3c987314f441dab02d03b03dac0fa5e17c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>5.29.0-SNAPSHOT</version>
+  <version>5.40.0-SNAPSHOT</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for
     cybertaxonomy
@@ -18,18 +18,26 @@
   <properties>
     <java.codelevel>1.8</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>5.29.0-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>5.40.0-SNAPSHOT</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <!-- Increasing tycho above 0.22.0 will fail for the macosx build because 
       for higher version numbers tycho needs to be build against Eclipse Mars or 
       higher -->
-    <tycho.version>1.0.0</tycho.version>
-    <taxeditor.version>5.29.0-SNAPSHOT</taxeditor.version>
+    <tycho.version>1.7.0</tycho.version>
+    <taxeditor.version>5.40.0-SNAPSHOT</taxeditor.version>
     <update.dir>snapshot</update.dir>
-    <log4j.version>1.2.17</log4j.version>
+    <log4j.version>2.19.0</log4j.version>
     <httpcomponents.version>4.5.13</httpcomponents.version>
     <jetty-version>9.4.26.v20200117</jetty-version>
-    <javadoc.opts>-Xdoclint:none</javadoc.opts>
+    <doclint>none</doclint>
+  
+  
+  
+  
+  
+  
+  
+    <!-- see according comment in cdmlib for possible finetuning -->
   </properties>
   <modules>
     <module>eu.etaxonomy.taxeditor.cdmlib</module>
@@ -85,21 +93,6 @@
     </license>
   </licenses>
   <developers>
-    <developer>
-      <!-- your SVN account id please! -->
-      <id>a.kohlbecker</id>
-      <name>Andreas Kohlbecker</name>
-      <email>a.kohlbecker [at] bgbm.org</email>
-      <organization>Botanical Garden Botanical Museum Berlin</organization>
-      <organizationUrl>https://www.bgbm.org/en/biodiversity-informatics</organizationUrl>
-      <timezone>+1</timezone>
-      <roles>
-        <role>Architect</role>
-        <role>Java Developer</role>
-        <role>Release Manager</role>
-      </roles>
-      <url/>
-    </developer>
     <developer>
       <!-- your SVN account id please! -->
       <id>k.luther</id>
@@ -172,12 +165,18 @@
     <repository>
       <id>eclipse-indigo</id>
       <layout>p2</layout>
-      <url>http://download.eclipse.org/technology/swtbot/snapshots/</url>
+      <!--<url>http://download.eclipse.org/technology/swtbot/snapshots</url>-->
+      <url>http://download.eclipse.org/technology/swtbot/releases/latest</url>
     </repository>
     <repository>
       <id>eclipse-nebula</id>
       <layout>p2</layout>
-      <url>http://download.eclipse.org/nebula/releases/latest</url>
+      <url> https://archive.eclipse.org/nebula/Q22016/release/</url>
+    
+    
+    
+    
+      <!--<url>http://download.eclipse.org/nebula/releases/latest</url>-->
     </repository>
     <repository>
       <id>nattable</id>
@@ -197,6 +196,7 @@
       <url>https://cybertaxonomy.eu/mavenrepo/</url>
     </pluginRepository>
   </pluginRepositories>
+  <!-- BUILD -->
   <build>
     <plugins>
       <plugin>
@@ -258,7 +258,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.6.1</version>
+        <version>3.9.0</version>
         <configuration>
           <source>${java.codelevel}</source>
           <target>${java.codelevel}</target>
@@ -267,7 +267,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>wagon-maven-plugin</artifactId>
-        <version>1.0</version>
+        <version>2.0.2</version>
         <configuration>
           <url>scpexe://cybertaxonomy.eu</url>
           <serverId>cybertaxonomy.eu</serverId>
@@ -285,7 +285,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.6</version>
+        <version>3.0.0-M7</version>
         <configuration>
           <includes>
             <include>**/*Test.java</include>
@@ -313,7 +313,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.3</version>
+        <version>3.10.0</version>
         <configuration>
           <locales>en</locales>
           <outputEncoding>UTF-8</outputEncoding>
@@ -339,13 +339,13 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.7</version>
+        <version>3.3.1</version>
         <configuration>
           <stylesheet>maven</stylesheet>
           <quiet>true</quiet>
           <detectLinks>true</detectLinks>
           <failOnError>false</failOnError>
-          <additionalparam>${javadoc.opts}</additionalparam>
+          <doclint>${doclint}</doclint>
         </configuration>
         <executions>
           <execution>
@@ -360,7 +360,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
-        <version>2.8</version>
+        <version>2.10</version>
         <configuration>
           <downloadSources>true</downloadSources>
           <downloadJavadocs>true</downloadJavadocs>
@@ -373,7 +373,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-release-plugin</artifactId>
-        <version>2.2.1</version>
+        <version>2.5.3</version>
         <configuration>
           <allowTimestampedSnapshots>true</allowTimestampedSnapshots>
           <autoVersionSubmodules>false</autoVersionSubmodules>
@@ -384,9 +384,9 @@
         </configuration>
       </plugin>
       <plugin>
-        <groupId>external.atlassian.jgitflow</groupId>
+        <groupId>ch.dvbern.oss.maven.jgitflow</groupId>
         <artifactId>jgitflow-maven-plugin</artifactId>
-        <version>1.0-m6</version>
+        <version>1.0-m8</version>
         <configuration>
           <pushHotfixes>true</pushHotfixes>
           <pushReleases>true</pushReleases>
@@ -401,7 +401,7 @@
           <dependency>
             <groupId>com.jcraft</groupId>
             <artifactId>jsch</artifactId>
-            <version>0.1.53</version>
+            <version>0.1.55</version>
           </dependency>
         </dependencies>
       </plugin>
@@ -410,33 +410,33 @@
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-scm</artifactId>
-        <version>1.0-beta-6</version>
+        <version>3.5.1</version>
       </extension>
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-ssh</artifactId>
-        <version>2.12</version>
+        <version>3.5.1</version>
       </extension>
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-ssh-external</artifactId>
-        <version>2.12</version>
+        <version>3.5.1</version>
       </extension>
       <extension>
         <groupId>org.apache.maven.scm</groupId>
         <artifactId>maven-scm-manager-plexus</artifactId>
-        <version>1.0</version>
+        <version>1.12.2</version>
       </extension>
       <extension>
         <groupId>org.apache.maven.scm</groupId>
         <artifactId>maven-scm-provider-svnexe</artifactId>
-        <version>1.0</version>
+        <version>1.12.2</version>
       </extension>
       <!-- WebDAV plugin to upload snapshots -->
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-webdav</artifactId>
-        <version>1.0-beta-2</version>
+        <artifactId>wagon-webdav-jackrabbit</artifactId>
+        <version>3.5.1</version>
       </extension>
     </extensions>
     <pluginManagement>
@@ -444,21 +444,22 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-antrun-plugin</artifactId>
-          <version>1.7</version>
+          <version>3.1.0</version>
         </plugin>
       </plugins>
     </pluginManagement>
   </build>
+  <!-- ******* REPORTING ***** -->
   <reporting>
     <plugins>
       <plugin>
         <!-- 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>
+        <version>3.3.1</version>
         <configuration>
           <detectLinks>true</detectLinks>
-          <additionalparam>${javadoc.opts}</additionalparam>
+          <doclint>${doclint}</doclint>
         </configuration>
       </plugin>
       <plugin>
@@ -466,24 +467,7 @@
           of your source code -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jxr-plugin</artifactId>
-        <version>2.2</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-changes-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <issueLinkTemplatePerSystem>
-            <default>%URL%/ticket/%ISSUE%</default>
-          </issueLinkTemplatePerSystem>
-        </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>changes-report</report>
-            </reports>
-          </reportSet>
-        </reportSets>
+        <version>3.1.1</version>
       </plugin>
     </plugins>
   </reporting>
@@ -503,12 +487,13 @@
       </url>
     </repository>
   </distributionManagement>
+  <!-- DEPENDENCY MANAGEMENT -->
   <dependencyManagement>
     <dependencies>
       <dependency>
         <groupId>com.itextpdf</groupId>
         <artifactId>itextpdf</artifactId>
-        <version>5.5.13.2</version>
+        <version>5.5.13.3</version>
       </dependency>
       <dependency>
         <groupId>org.apache.httpcomponents</groupId>