<modelVersion>4.0.0</modelVersion>
<groupId>eu.etaxonomy</groupId>
<artifactId>cdm-server</artifactId>
- <version>5.29.0-SNAPSHOT</version>
+ <version>5.42.0</version>
<packaging>jar</packaging>
<name>CDM Community Standalone Server</name>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<jetty-version>9.4.26.v20200117</jetty-version>
- <javadoc.opts>-Xdoclint:none</javadoc.opts>
+ <doclint>none</doclint>
+ <log4j.version>2.19.0</log4j.version>
+ <slf4j.version>1.7.36</slf4j.version>
</properties>
<scm>
- <!-- see section Provider Configuration in http://maven.apache.org/scm/subversion.html
+ <!-- see section Provider Configuration in https://maven.apache.org/scm/subversion.html
for instructions on how to externalize credentials in $user.home/.scm/svn-settings.xml -->
<connection>scm:git:https://dev.e-taxonomy.eu/git/cdm-server.git</connection>
<developerConnection>scm:git:ssh://git@dev.e-taxonomy.eu/var/git/cdm-server.git</developerConnection>
</scm>
<prerequisites>
- <maven>3.2.3</maven>
+ <maven>3.6.3</maven>
</prerequisites>
<mailingLists>
<licenses>
<license>
<name>Mozilla Public License Version 1.1</name>
- <url>http://www.mozilla.org/MPL/MPL-1.1.html</url>
+ <url>https://www.mozilla.org/MPL/MPL-1.1.html</url>
<distribution>repo</distribution>
</license>
</licenses>
</contributors -->
<issueManagement>
<system>Redmine</system>
- <url>http://dev.e-taxonomy.eu/redmine/</url>
+ <url>https://dev.e-taxonomy.eu/redmine/</url>
</issueManagement>
<ciManagement>
<system>Jenkins</system>
- <url>http://int.e-taxonomy.eu/jenkins</url>
+ <url>https://int.e-taxonomy.eu/jenkins</url>
</ciManagement>
<!-- **** REPOSITORIES **** -->
<profiles>
<!-- the EDIT Maven Repository -->
<repository>
<id>EditRepository</id>
- <url>http://wp5.e-taxonomy.eu/mavenrepo/</url>
+ <url>https://cybertaxonomy.org/mavenrepo/</url>
<releases>
<enabled>true</enabled>
<updatePolicy>always</updatePolicy>
<!-- apache incubating repository -->
<repository>
<id>ApacheIncubating</id>
- <url>http://people.apache.org/repo/m2-incubating-repository/</url>
+ <url>https://people.apache.org/repo/m2-incubating-repository/</url>
</repository>
</repositories>
<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>
maven configuration required for svn to work with maven! -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-scm-plugin</artifactId>
- <version>1.12.2</version>
+ <version>1.9.2</version>
<configuration>
<connectionType>developerConnection</connectionType>
</configuration>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
+ <!-- creates "compile" error in IDE in maven-dependency-plugin section (see below) since upgrading from 3.1.0 to 3.2.0 -->
+ <version>3.2.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>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.18.1</version>
+ <version>3.0.0-M7</version>
<configuration>
<argLine>-Xmx512M</argLine>
<includes>
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>buildnumber-maven-plugin</artifactId>
- <version>1.3</version>
+ <version>1.4</version>
<executions>
<execution>
<!--<phase>deploy</phase> -->
<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>
<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>
<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>
<failOnError>false</failOnError>
- <additionalparam>${javadoc.opts}</additionalparam>
+ <doclint>${doclint}</doclint>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
- <version>2.10</version>
+ <version>3.2.0</version>
<executions>
+ <!-- creates "compile" error in IDE in maven-dependency-plugin section (see below) since upgrading from 3.1.0 to 3.2.0 -->
<execution>
<id>copy</id>
<goals>
<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>
<!-- 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>
<id>make-assembly</id>
<phase>package</phase>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
</execution>
</executions>
<!-- 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>
</executions>
</plugin>
<!-- Build windows installer -->
- <plugin>
+ <!-- temporarily switched off due to problems with jenkins build after upgrading to debian 10 (#9972) -->
+ <!-- <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>
</execution>
</executions>
<configuration>
- <executable>makensis</executable>
+ <executable>makensis</executable> -->
<!-- optional -->
- <workingDirectory>/tmp</workingDirectory>
- <arguments>
+ <!-- <workingDirectory>/tmp</workingDirectory>
+ <arguments> -->
<!-- <argument>-V3</argument> -->
- <argument>${project.basedir}/target/installer/win32/setup.nsi</argument>
- </arguments>
+
<!-- <argument>${project.basedir}/target/installer/win32/setup.nsi</argument>
+ </arguments>s
</configuration>
- </plugin>
+ </plugin> -->
<!-- Build Docker image -->
<plugin>
<groupId>io.fabric8</groupId>
<artifactId>docker-maven-plugin</artifactId>
- <version>0.28.0</version>
+ <version>0.38.1</version>
<configuration>
<images>
<image>
-->
</image>
</images>
-
</configuration>
<!-- Connect start/stop to pre- and
<version>2.8.2</version>
</plugin>
<plugin>
+ <!-- groupId>ch.dvbern.oss.maven.jgitflow</groupId>
+ <artifactId>jgitflow-maven-plugin</artifactId>
+ <version>1.0-m8</version> -->
<groupId>external.atlassian.jgitflow</groupId>
<artifactId>jgitflow-maven-plugin</artifactId>
<version>1.0-m6</version>
<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>2.0.2</version>
+ <version>1.0</version>
<!-- Problems with the wagon-maven-plugin have been encounterd on
Windows, it should work properly on linux though. -->
<executions>
<!-- you will want to start by publishing your classes' Javadocs -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
+ <version>3.3.1</version>
<configuration>
- <additionalparam>${javadoc.opts}</additionalparam>
+ <doclint>${doclint}</doclint>
</configuration>
</plugin>
<plugin>
</repository>
</distributionManagement>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>${slf4j.version}</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<dependencies>
<!-- maven 3 no longer supports uniqueVersions for SNAPSHOT artifacts.
The cdm-server Bootlader however relies on a specific name of the cdm-webapp
<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! -->
+ <!-- this is for log4j12 ,el-api
+ still need to check if this is really needed by jetty
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ </exclusion>
+ </exclusions> -->
</dependency>
<dependency>
<groupId>org.eclipse.jetty</groupId>
<version>${jetty-version}</version>
<type>pom</type>
</dependency>
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- </dependency>
- <dependency>
- <groupId>el-impl</groupId>
- <artifactId>el-impl</artifactId>
- <version>1.0</version>
- </dependency>
+ <!-- <dependency>
+ <groupId>jakarta.el</groupId>
+ <artifactId>jakarta.el-api</artifactId>
+ <version>4.0.0</version>
+ </dependency> -->
+
<dependency>
<groupId>javax.transaction</groupId>
<artifactId>jta</artifactId>
</dependency>
<!-- JSON -->
<dependency>
+ <!-- according to maven repo this artifact moved to com.fasterxml.jackson.core ยป jackson-databind
+ but changing to next higher version 2.0.0 throws exceptions on the jsp pages (e.g. .../cdmserver/instances.jsp) -->
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-mapper-asl</artifactId>
<version>1.9.13</version>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>1.7.32</version>
</dependency>
+ <!-- move all logging to log4j 2-->
+ <!-- <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <version>${log4j.version}</version>
+ </dependency> -->
+ <!-- move all log4j2 logging to the current slf4j implementor,
+ !!! never use together with log4j-slf4j-impl on classpath => endless circle -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- <version>1.7.32</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ <version>${log4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j.version}</version>
</dependency>
+
<dependency>
<groupId>commons-cli</groupId>
<artifactId>commons-cli</artifactId>
- <version>1.5.0</version>
+ <version>1.3.1</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<version>2.11.0</version>
</dependency>
<dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
+ <!-- only used in InstanceManager class -->
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>4.4</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>
BGBM BDI Projects / cdm-server.git / blobdiff