-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>eu.etaxonomy</groupId>
<artifactId>cdmlib-parent</artifactId>
- <version>3.5.1-SNAPSHOT</version>
+ <version>3.8.0-SNAPSHOT</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>
<module>cdmlib-print</module>
<module>cdmlib-remote-webapp</module>
</modules>
- <properties>
- <cdm-vaadin.version>3.5.0-SNAPSHOT</cdm-vaadin.version><!-- should be ${project.version} but this breaks the maven release:prepare phase -->
+ <properties>
<java.codelevel>1.6</java.codelevel>
<spring.version>3.2.2.RELEASE</spring.version>
<spring-security.version>3.1.3.RELEASE</spring-security.version>
<tagBase>http://dev.e-taxonomy.eu/svn/tags/cdmlib</tagBase>
</configuration>
</plugin>
+ <plugin>
+ <groupId>external.atlassian.jgitflow</groupId>
+ <artifactId>jgitflow-maven-plugin</artifactId>
+ <version>1.0-m6</version>
+ <configuration>
+ <pushHotfixes>true</pushHotfixes>
+ <pushReleases>true</pushReleases>
+ <enableSshAgent>true</enableSshAgent>
+ <allowSnapshots>true</allowSnapshots>
+ <allowUntracked>true</allowUntracked>
+ </configuration>
+ <dependencies>
+ <!--
+ upgrading dependency jsch.agent.version of jgit-flow plugin to 0.1.53
+ in order have ssl key exchange algorithms compatible with openssh 6.7
+ -->
+ <dependency>
+ <groupId>com.jcraft</groupId>
+ <artifactId>jsch</artifactId>
+ <version>0.1.53</version>
+ </dependency>
+ </dependencies>
+ </plugin>
</plugins>
<!-- -->
<extensions>
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>3.1</version>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>