<parent>
<artifactId>cdmlib-parent</artifactId>
<groupId>eu.etaxonomy</groupId>
- <version>5.24.0-SNAPSHOT</version>
+ <version>5.36.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>cdmlib-remote-webapp</artifactId>
<properties>
<integrationTest.jvmArgs.cdm.datasource>h2_cdm_blank</integrationTest.jvmArgs.cdm.datasource>
<integrationTest.jvmArgs.cdm.forceSchemaCreate>true</integrationTest.jvmArgs.cdm.forceSchemaCreate>
- <integrationTest.log4j.configuration>${project.build.directory}/target/test-classes/log4j.properties</integrationTest.log4j.configuration>
+ <integrationTest.jvmArgs.log4j.configuration>${project.build.directory}/target/test-classes/log4j.xml</integrationTest.jvmArgs.log4j.configuration>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.16</version>
+ <version>2.22.2</version>
<configuration>
<forkCount>3</forkCount>
<reuseForks>true</reuseForks>
<plugins>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.16</version>
+ <version>2.22.2</version>
<configuration>
<forkCount>3</forkCount>
<reuseForks>true</reuseForks>
<artifactId>cdmlib-remote</artifactId>
<exclusions>
<!-- exclude all jdbc drivers from the war. Jdbc drivers must only
- be added to {APPLICATION_CONTAINER}/lib see http://dev.e-taxonomy.eu/trac/ticket/4955
- and http://stackoverflow.com/questions/6981564/why-must-the-jdbc-driver-be-put-in-tomcat-home-lib-folder -->
+ be added to {APPLICATION_CONTAINER}/lib see https://dev.e-taxonomy.eu/redmine/issues/4955
+ and https://stackoverflow.com/questions/6981564/why-must-the-jdbc-driver-be-put-in-tomcat-home-lib-folder -->
<exclusion>
<groupId>eu.etaxonomy</groupId>
<artifactId>cdmlib-db</artifactId>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- </dependency>
<!-- swagger -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
</dependency>
+ <!-- needed here? It is already mentioned in cdmlib-model -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
</resource>
</resources>
<plugins>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.16</version>
- <!-- configuration per maven profile -->
-
-<!-- <configuration> -->
-<!-- <forkCount>3</forkCount> -->
-<!-- <reuseForks>true</reuseForks> -->
-<!-- </configuration> -->
-<!-- <executions> -->
-<!-- <execution> -->
-<!-- <id>default</id> -->
-<!-- <goals> -->
-<!-- <goal>integration-test</goal> -->
-<!-- <goal>verify</goal> -->
-<!-- </goals> -->
-<!-- <configuration> -->
-<!-- <systemPropertyVariables> -->
-<!-- <cdm.datasource>h2_cdmTest</cdm.datasource> -->
-<!-- </systemPropertyVariables> -->
-<!-- <excludes> -->
-<!-- <exclude>**/ForceSchemaCreateIT.java</exclude> -->
-<!-- </excludes> -->
-<!-- </configuration> -->
-<!-- </execution> -->
-<!-- </executions> -->
- </plugin>
<plugin>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-maven-plugin</artifactId>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
- <version>2.6</version>
+ <version>3.3.2</version>
<executions>
<execution>
<!-- The war must be created after running the integration-tests,
</plugin>
<plugin>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.7</version>
+ <version>3.2.0</version>
<configuration>
<escapeWindowsPaths>false</escapeWindowsPaths>
</configuration>