X-Git-Url: https://dev.e-taxonomy.eu/gitweb/cdm-server.git/blobdiff_plain/ef52afd41f397af3552b7a7d18cb8c94c2c5970e..08e7d20d62c02d3693da4b80776a92b17ea21384:/pom.xml

diff --git a/pom.xml b/pom.xml
index b8e0747..6202780 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,13 +4,13 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>cdm-server</artifactId>
-  <version>5.12.0</version>
+  <version>5.29.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>CDM Community Standalone Server</name>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jetty-version>9.2.9.v20150224</jetty-version>
+    <jetty-version>9.4.26.v20200117</jetty-version>
     <javadoc.opts>-Xdoclint:none</javadoc.opts>
   </properties>
 
@@ -23,7 +23,7 @@
   </scm>
   
   <prerequisites>
-    <maven>3.0.5</maven>
+    <maven>3.2.3</maven>
   </prerequisites>
 
   <mailingLists>
@@ -64,7 +64,7 @@
       <organization>
         Botanical Garden Botanical Museum Berlin
       </organization>
-      <organizationUrl>http://www.bgbm.org/BioDivInf/</organizationUrl>
+      <organizationUrl>https://www.bgbm.org/en/biodiversity-informatics</organizationUrl>
       <timezone>+1</timezone>
       <roles>
         <role>Developer</role>
@@ -76,8 +76,8 @@
   <!-- contributors> <contributor> <name>Test-Contributor</name> </contributor> 
     </contributors -->
   <issueManagement>
-    <system>Trac</system>
-    <url>http://dev.e-taxonomy.eu/trac/</url>
+    <system>Redmine</system>
+    <url>http://dev.e-taxonomy.eu/redmine/</url>
   </issueManagement>
   <ciManagement>
     <system>Jenkins</system>
@@ -198,7 +198,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-eclipse-plugin</artifactId>
-        <version>2.9</version>
+        <version>2.10</version>
         <configuration>
           <downloadSources>true</downloadSources>
           <downloadJavadocs>true</downloadJavadocs>
@@ -214,7 +214,7 @@
           maven configuration required for svn to work with maven! -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-scm-plugin</artifactId>
-        <version>1.9.2</version>
+        <version>1.12.2</version>
         <configuration>
           <connectionType>developerConnection</connectionType>
         </configuration>
@@ -223,12 +223,12 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>2.7</version>
+        <version>3.1.0</version>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.2</version>
+        <version>3.9.0</version>
         <configuration>
           <source>1.8</source>
           <target>1.8</target>
@@ -267,7 +267,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>buildnumber-maven-plugin</artifactId>
-        <version>1.3</version>
+        <version>1.4</version>
         <executions>
           <execution>
             <!--<phase>deploy</phase> -->
@@ -286,7 +286,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
-        <version>3.4</version>
+        <version>3.10.0</version>
         <configuration>
           <locales>en</locales>
           <outputEncoding>UTF-8</outputEncoding>
@@ -297,7 +297,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>
-        <version>2.4</version>
+        <version>3.2.1</version>
         <executions>
           <execution>
             <id>attach-sources</id>
@@ -311,7 +311,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-        <version>2.10.2</version>
+        <version>3.3.1</version>
         <configuration>
           <aggregate>true</aggregate>
           <stylesheet>maven</stylesheet>
@@ -324,7 +324,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
-        <version>2.10</version>
+        <version>3.2.0</version>
         <executions>
           <execution>
             <id>copy</id>
@@ -364,7 +364,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-war-plugin</artifactId>
-        <version>2.6</version>
+        <version>3.3.2</version>
         <configuration>
           <warName>default-webapp</warName>
           <packagingExcludes>
@@ -387,7 +387,7 @@
         <!-- Assemble the runnable server jar test with: mvn assembly:single -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.5.3</version>
+        <version>3.3.0</version>
         <configuration>
           <appendAssemblyId>false</appendAssemblyId>
           <descriptors>
@@ -406,7 +406,7 @@
             <id>make-assembly</id>
             <phase>package</phase>
             <goals>
-              <goal>attached</goal>
+              <goal>single</goal>
             </goals>
           </execution>
         </executions>
@@ -416,16 +416,16 @@
         <!-- Build a Debian package -->
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>1.8</version>
+        <version>3.0.0</version>
         <executions>
           <execution>
             <phase>install</phase>
             <configuration>
-              <tasks>
+              <target>
                 <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}" />
-              </tasks>
+              </target>
             </configuration>
             <goals>
               <goal>run</goal>
@@ -437,7 +437,7 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
-        <version>1.3.2</version>
+        <version>3.0.0</version>
         <executions>
           <execution>
             <phase>install</phase>
@@ -460,7 +460,7 @@
       <plugin>
         <groupId>io.fabric8</groupId>
         <artifactId>docker-maven-plugin</artifactId>
-        <version>0.28.0</version>
+        <version>0.38.1</version>
         <configuration>
            <images>
              <image>
@@ -513,9 +513,9 @@
         <version>2.8.2</version>
       </plugin> 
       <plugin>
-        <groupId>external.atlassian.jgitflow</groupId>
-        <artifactId>jgitflow-maven-plugin</artifactId>
-        <version>1.0-m6</version>
+	    <groupId>ch.dvbern.oss.maven.jgitflow</groupId>
+	    <artifactId>jgitflow-maven-plugin</artifactId>
+	    <version>1.0-m8</version>	
         <configuration>
           <pushHotfixes>true</pushHotfixes>
           <pushReleases>true</pushReleases> 
@@ -531,14 +531,14 @@
           <dependency>
             <groupId>com.jcraft</groupId>
             <artifactId>jsch</artifactId>
-            <version>0.1.53</version>
+            <version>0.1.55</version>
           </dependency>
         </dependencies>
       </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>wagon-maven-plugin</artifactId>
-        <version>1.0</version>
+        <version>2.0.2</version>
         <!-- Problems with the wagon-maven-plugin have been encounterd on 
           Windows, it should work properly on linux though. -->
         <executions>
@@ -562,33 +562,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>1.0-beta-6</version>
+        <version>3.5.1</version>
       </extension>
       <extension>
         <groupId>org.apache.maven.wagon</groupId>
         <artifactId>wagon-ssh-external</artifactId>
-        <version>1.0-beta-6</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>
   </build>
@@ -653,7 +653,7 @@
     <!-- maven 3 no longer supports uniqueVersions for SNAPSHOT artifacts. 
       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 
+      handled more explicitely by utilizing the dependency:copy-dependencies goal 
       in the build/plugins section -->
       <!-- <dependency> -->
       <!--   <groupId>eu.etaxonomy</groupId>  -->
@@ -668,6 +668,12 @@
       <artifactId>jetty-webapp</artifactId>
       <version>${jetty-version}</version>
     </dependency>
+    <dependency>
+        <groupId>org.eclipse.jetty</groupId>
+        <artifactId>jetty-webapp-logging</artifactId>
+        <version>9.4.20.v20190813</version><!-- versioning independent of jetty core -->
+        <type>pom</type><!-- we only need the dependencies like jul-to-slf4j managed in this pom! -->
+    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty</groupId>
       <artifactId>jetty-plus</artifactId>
@@ -702,13 +708,13 @@
     </dependency>
     <dependency>
       <groupId>javax.el</groupId>
-      <artifactId>el-api</artifactId>
-      <version>2.2</version>
+      <artifactId>javax.el-api</artifactId>
+      <version>2.2.5</version>
     </dependency>
     <dependency>
-      <groupId>el-impl</groupId>
-      <artifactId>el-impl</artifactId>
-      <version>1.0</version>
+	    <groupId>org.glassfish.web</groupId>
+	    <artifactId>el-impl</artifactId>
+	    <version>2.2</version>
     </dependency>
     <dependency>
       <groupId>javax.transaction</groupId>
@@ -717,9 +723,9 @@
     </dependency>
     <!-- JSON -->
     <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-      <version>1.9.11</version>
+	   <groupId>com.fasterxml.jackson.core</groupId>
+	   <artifactId>jackson-databind</artifactId>
+	   <version>2.13.1</version>
     </dependency>
     <!-- windows service -->
     <dependency>
@@ -732,32 +738,32 @@
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
-      <version>1.7.13</version>
+      <version>1.7.32</version>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-log4j12</artifactId>
-      <version>1.7.13</version>
+      <version>1.7.32</version>
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>
       <artifactId>commons-cli</artifactId>
-      <version>1.3.1</version>
+      <version>1.5.0</version>
     </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.4</version>
+      <version>2.11.0</version>
     </dependency>
     <dependency>
       <groupId>commons-collections</groupId>
       <artifactId>commons-collections</artifactId>
-      <version>3.2.1</version>
+      <version>3.2.2</version>
     </dependency>
     <dependency>
       <groupId>net.sf.jopt-simple</groupId>
       <artifactId>jopt-simple</artifactId>
-      <version>4.9</version>
+      <version>5.0.4</version>
     </dependency>
     <!-- Database dependencies -->
     <dependency>