diff --git a/pom.xml b/pom.xml
index 7ac518800086adea969be068bf8ebbb0f0df4e27..6c3db25f90a48b457908b08b632a5191c51d8cff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -24,31 +24,37 @@
 		<project.servers.directory>${project.basedir}/servers</project.servers.directory>
 		<cargo.tomcat.start.skip>false</cargo.tomcat.start.skip>
 		<cargo.tomcat.run.skip>true</cargo.tomcat.run.skip>
+		<tomcat.version>8.5.11</tomcat.version>
+		<jacoco.port>6300</jacoco.port>
+		<acceptance.tests>true</acceptance.tests>
 		
 		<!-- General dependencies -->
-		<jersey.version>2.22.1</jersey.version>
 		<java.servlet.version>3.1.0</java.servlet.version>
-		<commons.dbcp.version>2.1.1</commons.dbcp.version>
-		<slf4j-jdk14.version>1.7.16</slf4j-jdk14.version>
+		<jersey.version>2.25</jersey.version>
+		<commons-dbcp2.version>2.1.1</commons-dbcp2.version>
+		<slf4j-jdk14.version>1.7.22</slf4j-jdk14.version>
 		
 		<!-- Tests dependencies -->
 		<junit.version>4.12</junit.version>
 		<java-hamcrest.version>2.0.0.0</java-hamcrest.version>
 		<easymock.version>3.4</easymock.version>
-		<selenium.java.version>2.49.1</selenium.java.version>
-		<spring.test.version>4.2.4.RELEASE</spring.test.version>
+		<selenium-java.version>3.0.1</selenium-java.version>
+		<spring-test.version>4.3.6.RELEASE</spring-test.version>
 		<dbunit.version>2.5.1</dbunit.version>
 		<spring-test-dbunit.version>1.2.1</spring-test-dbunit.version>
-		<hsqldb.version>2.3.3</hsqldb.version>
-		<mysql.version>5.1.38</mysql.version>
+		<hsqldb.version>2.3.1</hsqldb.version>
+		<mysql.version>5.1.40</mysql.version>
+		<geckodriver.version>v0.14.0</geckodriver.version>
 		
 		<!-- Plugins -->
-		<surefire.version>2.19.1</surefire.version>
-		<failsafe.version>2.19.1</failsafe.version>
+		<maven-failsafe-plugin.version>2.19.1</maven-failsafe-plugin.version>
+		<maven-surefire-plugin.version>2.19.1</maven-surefire-plugin.version>
+		<maven-surefire-report-plugin.version>2.19.1</maven-surefire-report-plugin.version>
 		<maven.war.plugin.version>2.6</maven.war.plugin.version>
-		<tomcat.maven.plugin.version>2.2</tomcat.maven.plugin.version>
-		<jacoco.version>0.7.6.201602180812</jacoco.version>
-		<cargo-maven2-plugin.version>1.4.18</cargo-maven2-plugin.version>
+		<jacoco-maven-plugin.version>0.7.8</jacoco-maven-plugin.version>
+		<cargo-maven2-plugin.version>1.6.2</cargo-maven2-plugin.version>
+		<hsqldb-maven-plugin.version>1.0.0</hsqldb-maven-plugin.version>
+		<maven.antrun.plugin.version>1.8</maven.antrun.plugin.version>
 	</properties>
 
 	<dependencies>
@@ -108,35 +114,35 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-dbcp2</artifactId>
-			<version>${commons.dbcp.version}</version>
+			<version>${commons-dbcp2.version}</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.seleniumhq.selenium</groupId>
 			<artifactId>selenium-java</artifactId>
-			<version>${selenium.java.version}</version>
+			<version>${selenium-java.version}</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-test</artifactId>
-			<version>${spring.test.version}</version>
+			<version>${spring-test.version}</version>
 			<scope>test</scope>
 		</dependency>
 		
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>${spring.test.version}</version>
+            <version>${spring-test.version}</version>
             <scope>test</scope>
         </dependency>
         
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-jdbc</artifactId>
-            <version>${spring.test.version}</version>
+            <version>${spring-test.version}</version>
             <scope>test</scope>
         </dependency>
         
@@ -186,18 +192,21 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>${surefire.version}</version>
+				<version>${maven-surefire-plugin.version}</version>
 				<configuration>
 					<includes>
 						<includes>**/UnitTestSuite.java</includes>
 					</includes>
+					<systemPropertyVariables>
+						<webdriver.gecko.driver>${geckodriver.uncompressed.path}</webdriver.gecko.driver>
+					</systemPropertyVariables>
 				</configuration>
 			</plugin>
 			
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>${failsafe.version}</version>
+				<version>${maven-failsafe-plugin.version}</version>
 				<configuration>
 					<includes>
 						<includes>**/IntegrationTestSuite.java</includes>
@@ -217,7 +226,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-report-plugin</artifactId>
-				<version>${surefire.version}</version>
+				<version>${maven-surefire-report-plugin.version}</version>
 				
 				<executions>
 					<execution>
@@ -241,9 +250,10 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>${jacoco.version}</version>
+				<version>${jacoco-maven-plugin.version}</version>
 				<configuration>
 					<rules/>
+					<port>${jacoco.port}</port>
 				</configuration>
 				<executions>
 					<execution>
@@ -278,13 +288,46 @@
 				</executions>
 			</plugin>
 		</plugins>
+		<pluginManagement>
+			<plugins>
+				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.apache.maven.plugins
+										</groupId>
+										<artifactId>
+											maven-antrun-plugin
+										</artifactId>
+										<versionRange>[1.3,)</versionRange>
+										<goals>
+											<goal>run</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
 	</build>
 	
 	<profiles>
 		<profile>
 			<id>acceptance-tests-cargo</id>
 			<activation>
-				<activeByDefault>true</activeByDefault>
+				<activeByDefault>false</activeByDefault>
 			</activation>
 			
 			<build>
@@ -292,12 +335,15 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-failsafe-plugin</artifactId>
-						<version>${failsafe.version}</version>
+						<version>${maven-failsafe-plugin.version}</version>
 						<configuration>
 							<includes>
 								<includes>**/IntegrationTestSuite.java</includes>
 								<includes>**/AcceptanceTestSuite.java</includes>
 							</includes>
+							<systemProperties>
+								<webdriver.gecko.driver>${geckodriver.uncompressed.path}</webdriver.gecko.driver>
+							</systemProperties>
 						</configuration>
 						<executions>
 							<execution>
@@ -313,7 +359,10 @@
 					<plugin>
 						<groupId>org.jacoco</groupId>
 						<artifactId>jacoco-maven-plugin</artifactId>
-						<version>${jacoco.version}</version>
+						<version>${jacoco-maven-plugin.version}</version>
+						<configuration>
+							<port>${jacoco.port}</port>
+						</configuration>
 						<executions>
 							<execution>
 								<id>jacoco-agent</id>
@@ -343,7 +392,7 @@
 					    <!-- current version -->
 					    <groupId>fr.avianey.mojo</groupId>
 					    <artifactId>hsqldb-maven-plugin</artifactId>
-					    <version>1.0.0</version>
+					    <version>${hsqldb-maven-plugin.version}</version>
 					
 					    <!-- 
 					        default value for in memory jdbc:hsqldb:hsql://localhost/xdb
@@ -385,7 +434,7 @@
 							<container>
 								<containerId>tomcat8x</containerId>
 								<zipUrlInstaller>
-									<url>https://archive.apache.org/dist/tomcat/tomcat-8/v8.0.35/bin/apache-tomcat-8.0.35.zip</url>
+									<url>https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/${tomcat.version}/tomcat-${tomcat.version}.zip</url>
 									<downloadDir>${project.servers.directory}/downloads</downloadDir>
 									<extractDir>${project.servers.directory}/extracts</extractDir>
 								</zipUrlInstaller>
@@ -400,7 +449,7 @@
 							<configuration>
 								<home>${project.build.directory}/catalina-base</home>
 								<properties>
-									<cargo.jvmargs>${jacoco.agent.itArgLine},output=tcpserver,port=6300 -Drunmode=TEST</cargo.jvmargs>
+									<cargo.jvmargs>${jacoco.agent.itArgLine},output=tcpserver,port=${jacoco.port} -Drunmode=TEST</cargo.jvmargs>
 									<cargo.servlet.port>9080</cargo.servlet.port>
 									<cargo.datasource.datasource.h2>
 						                cargo.datasource.jndi=jdbc/daaexample|
@@ -436,7 +485,6 @@
 									<skip>${cargo.tomcat.run.skip}</skip>
 								</configuration>
 							</execution>
-							
 							<execution>
 								<id>stop-tomcat</id>
 								<phase>post-integration-test</phase>
@@ -466,7 +514,7 @@
 							<container>
 								<containerId>tomcat8x</containerId>
 								<zipUrlInstaller>
-									<url>https://archive.apache.org/dist/tomcat/tomcat-8/v8.0.35/bin/apache-tomcat-8.0.35.zip</url>
+									<url>https://repo1.maven.org/maven2/org/apache/tomcat/tomcat/${tomcat.version}/tomcat-${tomcat.version}.zip</url>
 									<downloadDir>${project.servers.directory}/downloads</downloadDir>
 									<extractDir>${project.servers.directory}/extracts</extractDir>
 								</zipUrlInstaller>
@@ -499,5 +547,177 @@
 				</plugins>
 			</build>
 		</profile>
+		
+		<profile>
+			<id>geckodriver-download-unix</id>
+			<activation>
+				<os><family>unix</family></os>
+			</activation>
+			<properties>
+				<geckodriver.url>https://github.com/mozilla/geckodriver/releases/download/${geckodriver.version}/geckodriver-${geckodriver.version}-${geckodriver.suffix}.tar.gz</geckodriver.url>
+				<geckodriver.basepath>${settings.localRepository}${file.separator}geckodriver${file.separator}${os.name}${file.separator}${os.arch}${file.separator}${project.build.directory}${file.separator}</geckodriver.basepath>
+				<geckodriver.compressed.path>${geckodriver.basepath}${file.separator}geckodriver-${geckodriver.version}-${geckodriver.suffix}.tar.gz</geckodriver.compressed.path>
+				<geckodriver.uncompressed.path>${geckodriver.basepath}${file.separator}geckodriver</geckodriver.uncompressed.path>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<version>${maven.antrun.plugin.version}</version>
+						<executions>
+							<execution>
+								<id>download-geckodriver</id>
+								<phase>process-test-resources</phase>
+								<configuration>
+									<tasks>
+										<mkdir dir="${geckodriver.basepath}"/>
+										<get src="${geckodriver.url}" dest="${geckodriver.compressed.path}" skipexisting="true"/>
+										<untar src="${geckodriver.compressed.path}" dest="${geckodriver.basepath}" compression="gzip"/>
+										<chmod file="${geckodriver.uncompressed.path}" perm="a+x"/>
+									</tasks>
+								</configuration>
+								<goals>
+									<goal>run</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		
+		<profile>
+			<id>geckodriver-download-windows</id>
+			<activation>
+				<os><family>windows</family></os>
+			</activation>
+			<properties>
+				<geckodriver.url>https://github.com/mozilla/geckodriver/releases/download/${geckodriver.version}/geckodriver-${geckodriver.version}-${geckodriver.suffix}.zip</geckodriver.url>
+				<geckodriver.basepath>${settings.localRepository}${file.separator}geckodriver${file.separator}${os.name}${file.separator}${os.arch}${file.separator}${project.build.directory}${file.separator}</geckodriver.basepath>
+				<geckodriver.compressed.path>${geckodriver.basepath}${file.separator}geckodriver-${geckodriver.version}-${geckodriver.suffix}.zip</geckodriver.compressed.path>
+				<geckodriver.uncompressed.path>${geckodriver.basepath}${file.separator}geckodriver.exe</geckodriver.uncompressed.path>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<version>${maven.antrun.plugin.version}</version>
+						<executions>
+							<execution>
+								<id>download-geckodriver</id>
+								<phase>process-test-resources</phase>
+								<configuration>
+									<tasks>
+										<mkdir dir="${geckodriver.basepath}"/>
+										<get src="${geckodriver.url}" dest="${geckodriver.compressed.path}" skipexisting="true"/>
+										<unzip src="${geckodriver.compressed.path}" dest="${file.separator}${geckodriver.basepath}"/>
+										<chmod file="${geckodriver.uncompressed.path}" perm="a+x"/>
+									</tasks>
+								</configuration>
+								<goals>
+									<goal>run</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		
+		<profile>
+			<id>geckodriver-properties-unix-amd64</id>
+			<activation>
+				<os>
+					<family>unix</family>
+					<arch>amd64</arch>
+				</os>
+			</activation>
+			<properties>
+				<geckodriver.suffix>linux64</geckodriver.suffix>
+			</properties>
+		</profile>
+		
+		<profile>
+			<id>geckodriver-properties-unix-x86</id>
+			<activation>
+				<os>
+					<family>unix</family>
+					<arch>x86</arch>
+				</os>
+			</activation>
+			<properties>
+				<geckodriver.suffix>linux86</geckodriver.suffix>
+			</properties>
+		</profile>
+		
+		<profile>
+			<id>geckodriver-properties-windows-amd64</id>
+			<activation>
+				<os>
+					<family>windows</family>
+					<arch>amd64</arch>
+				</os>
+			</activation>
+			<properties>
+				<geckodriver.suffix>win64</geckodriver.suffix>
+			</properties>
+		</profile>
+		
+		<profile>
+			<id>geckodriver-properties-windows-x86</id>
+			<activation>
+				<os>
+					<family>windows</family>
+					<arch>x86</arch>
+				</os>
+			</activation>
+			<properties>
+				<geckodriver.suffix>win86</geckodriver.suffix>
+			</properties>
+		</profile>
+		
+		<profile>
+			<id>geckodriver-properties-and-download-mac</id>
+			<activation>
+				<os>
+					<family>mac</family>
+				</os>
+			</activation>
+			<properties>
+				<geckodriver.suffix>mac</geckodriver.suffix>
+				<geckodriver.url>https://github.com/mozilla/geckodriver/releases/download/${geckodriver.version}/geckodriver-${geckodriver.version}-${geckodriver.suffix}.tar.gz</geckodriver.url>
+				<geckodriver.basepath>${settings.localRepository}${file.separator}geckodriver${file.separator}${os.name}${file.separator}${os.arch}${file.separator}${project.build.directory}${file.separator}</geckodriver.basepath>
+				<geckodriver.compressed.path>${geckodriver.basepath}${file.separator}geckodriver-${geckodriver.version}-${geckodriver.suffix}.tar.gz</geckodriver.compressed.path>
+				<geckodriver.uncompressed.path>${geckodriver.basepath}${file.separator}geckodriver</geckodriver.uncompressed.path>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.apache.maven.plugins</groupId>
+						<artifactId>maven-antrun-plugin</artifactId>
+						<version>${maven.antrun.plugin.version}</version>
+						<executions>
+							<execution>
+								<id>download-geckodriver</id>
+								<phase>process-test-resources</phase>
+								<configuration>
+									<tasks>
+										<mkdir dir="${geckodriver.basepath}"/>
+										<get src="${geckodriver.url}" dest="${geckodriver.compressed.path}" skipexisting="true"/>
+										<untar src="${geckodriver.compressed.path}" dest="${geckodriver.basepath}" compression="gzip"/>
+										<chmod file="${geckodriver.uncompressed.path}" perm="a+x"/>
+									</tasks>
+								</configuration>
+								<goals>
+									<goal>run</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 </project>