From 8f798e4ad562e1f3645a86602792544da9a17c58 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 24 Aug 2015 21:49:18 +0200
Subject: [PATCH] OO-1655: update surefire and failsafe plugin, update
configuration for arquillian, selenium and Tomcat 8
---
pom.xml | 25 +++++++++++++++----------
src/test/resources/arquillian.xml | 3 ++-
2 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/pom.xml b/pom.xml
index 801586f381d..6d4857dd8cb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -72,7 +72,7 @@
<org.postgresql.version>9.4-1201-jdbc41</org.postgresql.version>
<org.infinispan.version>6.0.2.Final</org.infinispan.version>
<lucene.version>4.8.0</lucene.version>
- <version.selenium>2.46.0</version.selenium>
+ <version.selenium>2.47.1</version.selenium>
<activemq.version>5.11.1</activemq.version>
<!-- properties for testing and Q&A -->
@@ -1245,7 +1245,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.8.1</version>
+ <version>2.18.1</version>
<configuration>
<skipTests>${skipTests}</skipTests>
<argLine>-Xmx512m -Xms256m -Djava.awt.headless=true</argLine>
@@ -1262,12 +1262,15 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.9</version>
+ <version>2.18.1</version>
<configuration>
+ <encoding>UTF-8</encoding>
<skipITs>${skipSeleniumTests}</skipITs>
<skipTests>${skipSeleniumTests}</skipTests>
- <forkMode>always</forkMode>
- <systemProperties>
+ <reuseForks>false</reuseForks>
+ <argLine>-Xmx512m -Xms256m -Djava.awt.headless=true</argLine>
+
+ <systemPropertyVariables>
<profile>${test.env}</profile>
<test.env.db.name>${test.env.db.name}</test.env.db.name>
<test.env.db.user>${test.env.db.user}</test.env.db.user>
@@ -1279,9 +1282,11 @@
<test.env.instance.id>${test.env.instance.id}</test.env.instance.id>
<test.env.jmx.rmi.port.0>${test.env.jmx.rmi.port.0}</test.env.jmx.rmi.port.0>
<arquillian.launch>tomcat-7-managed</arquillian.launch>
- </systemProperties>
+ </systemPropertyVariables>
<testNGArtifactName>none:none</testNGArtifactName>
- <test>org/olat/selenium/*Test.java</test>
+ <includes>
+ <include>org/olat/selenium/*Test.java</include>
+ </includes>
</configuration>
<executions>
<execution>
@@ -2252,7 +2257,7 @@
<dependency>
<groupId>org.jboss.arquillian.container</groupId>
<artifactId>arquillian-tomcat-managed-7</artifactId>
- <version>1.0.0.CR6</version>
+ <version>1.0.0.CR7</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -2321,7 +2326,7 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
- <version>1.1.7.Final</version>
+ <version>1.1.8.Final</version>
<scope>import</scope>
<type>pom</type>
</dependency>
@@ -2350,7 +2355,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-report-plugin</artifactId>
- <version>2.9</version>
+ <version>2.18.1</version>
</plugin>
</plugins>
</reporting>
diff --git a/src/test/resources/arquillian.xml b/src/test/resources/arquillian.xml
index a2e5091609e..8a160e1f14d 100644
--- a/src/test/resources/arquillian.xml
+++ b/src/test/resources/arquillian.xml
@@ -8,10 +8,11 @@
<property name="deploymentExportPath">target/arquillianDeployments</property>
</engine>
- <container qualifier="tomcat-8-managed" default="true">
+ <container qualifier="tomcat-7-managed" default="true">
<configuration>
<property name="workDir">target/arquillianDeployments</property>
<property name="catalinaHome">target/arq-apache-tomcat-8.0.24</property>
+ <property name="catalinaBase">target/arq-apache-tomcat-8.0.24</property>
<property name="javaVmArguments">-XX:MaxPermSize=128m -Xmx512m -Xms256m -Djava.awt.headless=true</property>
<!-- debugging arguments for javaVm: -Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y -->
</configuration>
--
GitLab