From af0b76b4f7a0a6ede8fed09c5fc4297584552899 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Mon, 24 Aug 2015 09:29:48 +0200
Subject: [PATCH] OO-1655: use Tomcat 8 for the selenium tests
---
pom.xml | 4 ++--
src/test/resources/arquillian.xml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5be52f6bbdb..801586f381d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1234,8 +1234,8 @@
<configuration>
<tasks>
<mkdir dir="${project.build.directory}/downloads" />
- <get src="http://nexus.openolat.org/nexus/content/repositories/openolat/org/apache/tomcat/apache-tomcat-arq/7.0.27/apache-tomcat-arq-7.0.27.zip" dest="${project.build.directory}/downloads" verbose="true" skipexisting="true" />
- <unzip src="${project.build.directory}/downloads/apache-tomcat-arq-7.0.27.zip" dest="${project.build.directory}" />
+ <get src="http://nexus.openolat.org/nexus/content/repositories/openolat/org/apache/tomcat/apache-tomcat-arq/8.0.24/apache-tomcat-arq-8.0.24.zip" dest="${project.build.directory}/downloads" verbose="true" skipexisting="true" />
+ <unzip src="${project.build.directory}/downloads/apache-tomcat-arq-8.0.24.zip" dest="${project.build.directory}/arq-apache-tomcat-8.0.24" />
</tasks>
</configuration>
</execution>
diff --git a/src/test/resources/arquillian.xml b/src/test/resources/arquillian.xml
index 6eecc280fae..a2e5091609e 100644
--- a/src/test/resources/arquillian.xml
+++ b/src/test/resources/arquillian.xml
@@ -8,10 +8,10 @@
<property name="deploymentExportPath">target/arquillianDeployments</property>
</engine>
- <container qualifier="tomcat-7-managed" default="true">
+ <container qualifier="tomcat-8-managed" default="true">
<configuration>
<property name="workDir">target/arquillianDeployments</property>
- <property name="catalinaHome">target/arq-apache-tomcat-7.0.27</property>
+ <property name="catalinaHome">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