From f32f4c0a9f2cc58832a6393f06ebab03d59891d9 Mon Sep 17 00:00:00 2001
From: Tomas Repel <trepel@redhat.com>
Date: Wed, 18 Nov 2015 14:28:23 +0100
Subject: [PATCH] Minor fixes of arquillian.xml files

---
 .../functional-tests/src/test/resources/arquillian.xml    | 5 ++---
 contacts-jquerymobile/src/test/resources/arquillian.xml   | 2 +-
 .../functional-tests/src/test/resources/arquillian.xml    | 3 +--
 .../functional-tests/src/test/resources/arquillian.xml    | 5 ++---
 .../src/test/resources/arquillian.xml                     | 8 ++++----
 shrinkwrap-resolver/src/test/resources/arquillian.xml     | 8 ++++----
 .../functional-tests/src/test/resources/arquillian.xml    | 5 ++---
 .../functional-tests/src/test/resources/arquillian.xml    | 5 ++---
 .../functional-tests/src/test/resources/arquillian.xml    | 5 ++---
 .../functional-tests/src/test/resources/arquillian.xml    | 5 ++---
 .../functional-tests/src/test/resources/arquillian.xml    | 5 ++---
 .../functional-tests/src/test/resources/arquillian.xml    | 5 ++---
 .../functional-tests/src/test/resources/arquillian.xml    | 3 +--
 13 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/contacts-jquerymobile/functional-tests/src/test/resources/arquillian.xml b/contacts-jquerymobile/functional-tests/src/test/resources/arquillian.xml
index 2464736912..e17516e22a 100644
--- a/contacts-jquerymobile/functional-tests/src/test/resources/arquillian.xml
+++ b/contacts-jquerymobile/functional-tests/src/test/resources/arquillian.xml
@@ -20,7 +20,7 @@
 
     <defaultProtocol type="Servlet 3.0" />
 
-    <!-- Example configuration for a remote Red Hat JBoss Enterprise Application Platform or AS 7 instance -->
+    <!-- Example configuration for a remote Red Hat JBoss Enterprise Application Platform instance -->
     <container qualifier="jboss" default="true">
         <!-- By default, Arquillian will use the JBOSS_HOME environment variable.
             Alternatively, the configuration below can be uncommented. -->
@@ -36,8 +36,7 @@
         <!-- By default, the browser you are going to use for your tests is set to Firefox. -->
         <property name="browser">firefox</property>
         <!-- Uncomment this line in order to specify where your Firefox binary is located, WebDriver
-            will use the default one in your system otherwise. These tests are verified to be functioning
-            with Firefox 23. -->
+            will use the default one in your system otherwise. -->
         <!--
         <property name="firefox_binary">/path/to/firefox/binary</property>
         -->
diff --git a/contacts-jquerymobile/src/test/resources/arquillian.xml b/contacts-jquerymobile/src/test/resources/arquillian.xml
index b872701b1f..eee84b16e1 100644
--- a/contacts-jquerymobile/src/test/resources/arquillian.xml
+++ b/contacts-jquerymobile/src/test/resources/arquillian.xml
@@ -28,7 +28,7 @@
 <!--       <property name="deploymentExportPath">target/</property>  -->
 <!--    </engine> -->
 
-   <!-- Example configuration for a remote Red Hat JBoss Enterprise Application Platform or AS 7 instance -->
+   <!-- Example configuration for a remote Red Hat JBoss Enterprise Application Platform instance -->
    <container qualifier="jboss" default="true">
         <!-- By default, arquillian will use the JBOSS_HOME environment variable.  Alternatively, the configuration below can be uncommented. -->
         <!--<configuration> -->
diff --git a/helloworld-html5/functional-tests/src/test/resources/arquillian.xml b/helloworld-html5/functional-tests/src/test/resources/arquillian.xml
index 6775bbb0a0..e17516e22a 100644
--- a/helloworld-html5/functional-tests/src/test/resources/arquillian.xml
+++ b/helloworld-html5/functional-tests/src/test/resources/arquillian.xml
@@ -36,8 +36,7 @@
         <!-- By default, the browser you are going to use for your tests is set to Firefox. -->
         <property name="browser">firefox</property>
         <!-- Uncomment this line in order to specify where your Firefox binary is located, WebDriver
-            will use the default one in your system otherwise. These tests are verified to be functioning
-            with Firefox 23. -->
+            will use the default one in your system otherwise. -->
         <!--
         <property name="firefox_binary">/path/to/firefox/binary</property>
         -->
diff --git a/kitchensink-angularjs/functional-tests/src/test/resources/arquillian.xml b/kitchensink-angularjs/functional-tests/src/test/resources/arquillian.xml
index 801098e3c4..191febea5e 100644
--- a/kitchensink-angularjs/functional-tests/src/test/resources/arquillian.xml
+++ b/kitchensink-angularjs/functional-tests/src/test/resources/arquillian.xml
@@ -20,7 +20,7 @@
 
     <defaultProtocol type="Servlet 3.0" />
 
-    <!-- Example configuration for a remote Red Hat JBoss Enterprise Application Platform 7 instance -->
+    <!-- Example configuration for a remote Red Hat JBoss Enterprise Application Platform instance -->
     <container qualifier="jboss" default="true">
         <!-- By default, Arquillian will use the JBOSS_HOME environment variable.
             Alternatively, the configuration below can be uncommented. -->
@@ -34,8 +34,7 @@
         <!-- By default, the browser you are going to use for your tests is set to Firefox. -->
         <property name="browser">firefox</property>
         <!-- Uncomment this line in order to specify where your Firefox binary is located, WebDriver
-            will use the default one in your system otherwise. These tests are verified to be functioning
-            with Firefox 23. -->
+            will use the default one in your system otherwise. -->
         <!--
         <property name="firefox_binary">/path/to/firefox/binary</property>
         -->
diff --git a/kitchensink-html5-mobile/src/test/resources/arquillian.xml b/kitchensink-html5-mobile/src/test/resources/arquillian.xml
index 6bc5e9b05b..a3211f8fb0 100644
--- a/kitchensink-html5-mobile/src/test/resources/arquillian.xml
+++ b/kitchensink-html5-mobile/src/test/resources/arquillian.xml
@@ -20,15 +20,15 @@
    xsi:schemaLocation="http://jboss.org/schema/arquillian
         http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
 
+   <!-- Force the use of the Servlet 3.0 protocol with all containers, as it is the most mature -->
+   <defaultProtocol type="Servlet 3.0" />
+
    <!-- Uncomment to have test archives exported to the file system for inspection -->
 <!--    <engine>  -->
 <!--       <property name="deploymentExportPath">target/</property>  -->
 <!--    </engine> -->
 
-   <!-- Force the use of the Servlet 3.0 protocol with all containers, as it is the most mature -->
-   <defaultProtocol type="Servlet 3.0" />
-
-   <!-- Example configuration for a remote JBoss EAP 7 instance -->
+   <!-- Example configuration for a remote JBoss EAP instance -->
    <container qualifier="jboss" default="true">
         <!-- By default, arquillian will use the JBOSS_HOME environment variable.  Alternatively, the configuration below can be uncommented. -->
         <!--<configuration> -->
diff --git a/shrinkwrap-resolver/src/test/resources/arquillian.xml b/shrinkwrap-resolver/src/test/resources/arquillian.xml
index c88abb102b..28ec907933 100644
--- a/shrinkwrap-resolver/src/test/resources/arquillian.xml
+++ b/shrinkwrap-resolver/src/test/resources/arquillian.xml
@@ -20,15 +20,15 @@
    xsi:schemaLocation="http://jboss.org/schema/arquillian
         http://jboss.org/schema/arquillian/arquillian_1_0.xsd">
 
+   <!-- Force the use of the Servlet 3.0 protocol with all containers, as it is the most mature -->
+   <defaultProtocol type="Servlet 3.0" />
+
    <!-- Uncomment to have test archives exported to the file system for inspection -->
 <!--    <engine>  -->
 <!--       <property name="deploymentExportPath">target/</property>  -->
 <!--    </engine> -->
 
-   <!-- Force the use of the Servlet 3.0 protocol with all containers, as it is the most mature -->
-   <defaultProtocol type="Servlet 3.0" />
-
-     <!-- Example configuration for a remote JBoss EAP instance -->
+   <!-- Example configuration for a remote JBoss EAP instance -->
    <container qualifier="jboss" default="true">
         <!-- By default, arquillian will use the JBOSS_HOME environment variable.  Alternatively, the configuration below can be uncommented. -->
         <!--<configuration> -->
diff --git a/spring-greeter/functional-tests/src/test/resources/arquillian.xml b/spring-greeter/functional-tests/src/test/resources/arquillian.xml
index 2464736912..e17516e22a 100644
--- a/spring-greeter/functional-tests/src/test/resources/arquillian.xml
+++ b/spring-greeter/functional-tests/src/test/resources/arquillian.xml
@@ -20,7 +20,7 @@
 
     <defaultProtocol type="Servlet 3.0" />
 
-    <!-- Example configuration for a remote Red Hat JBoss Enterprise Application Platform or AS 7 instance -->
+    <!-- Example configuration for a remote Red Hat JBoss Enterprise Application Platform instance -->
     <container qualifier="jboss" default="true">
         <!-- By default, Arquillian will use the JBOSS_HOME environment variable.
             Alternatively, the configuration below can be uncommented. -->
@@ -36,8 +36,7 @@
         <!-- By default, the browser you are going to use for your tests is set to Firefox. -->
         <property name="browser">firefox</property>
         <!-- Uncomment this line in order to specify where your Firefox binary is located, WebDriver
-            will use the default one in your system otherwise. These tests are verified to be functioning
-            with Firefox 23. -->
+            will use the default one in your system otherwise. -->
         <!--
         <property name="firefox_binary">/path/to/firefox/binary</property>
         -->
diff --git a/spring-kitchensink-asyncrequestmapping/functional-tests/src/test/resources/arquillian.xml b/spring-kitchensink-asyncrequestmapping/functional-tests/src/test/resources/arquillian.xml
index 2464736912..e17516e22a 100644
--- a/spring-kitchensink-asyncrequestmapping/functional-tests/src/test/resources/arquillian.xml
+++ b/spring-kitchensink-asyncrequestmapping/functional-tests/src/test/resources/arquillian.xml
@@ -20,7 +20,7 @@
 
     <defaultProtocol type="Servlet 3.0" />
 
-    <!-- Example configuration for a remote Red Hat JBoss Enterprise Application Platform or AS 7 instance -->
+    <!-- Example configuration for a remote Red Hat JBoss Enterprise Application Platform instance -->
     <container qualifier="jboss" default="true">
         <!-- By default, Arquillian will use the JBOSS_HOME environment variable.
             Alternatively, the configuration below can be uncommented. -->
@@ -36,8 +36,7 @@
         <!-- By default, the browser you are going to use for your tests is set to Firefox. -->
         <property name="browser">firefox</property>
         <!-- Uncomment this line in order to specify where your Firefox binary is located, WebDriver
-            will use the default one in your system otherwise. These tests are verified to be functioning
-            with Firefox 23. -->
+            will use the default one in your system otherwise. -->
         <!--
         <property name="firefox_binary">/path/to/firefox/binary</property>
         -->
diff --git a/spring-kitchensink-basic/functional-tests/src/test/resources/arquillian.xml b/spring-kitchensink-basic/functional-tests/src/test/resources/arquillian.xml
index 2464736912..e17516e22a 100644
--- a/spring-kitchensink-basic/functional-tests/src/test/resources/arquillian.xml
+++ b/spring-kitchensink-basic/functional-tests/src/test/resources/arquillian.xml
@@ -20,7 +20,7 @@
 
     <defaultProtocol type="Servlet 3.0" />
 
-    <!-- Example configuration for a remote Red Hat JBoss Enterprise Application Platform or AS 7 instance -->
+    <!-- Example configuration for a remote Red Hat JBoss Enterprise Application Platform instance -->
     <container qualifier="jboss" default="true">
         <!-- By default, Arquillian will use the JBOSS_HOME environment variable.
             Alternatively, the configuration below can be uncommented. -->
@@ -36,8 +36,7 @@
         <!-- By default, the browser you are going to use for your tests is set to Firefox. -->
         <property name="browser">firefox</property>
         <!-- Uncomment this line in order to specify where your Firefox binary is located, WebDriver
-            will use the default one in your system otherwise. These tests are verified to be functioning
-            with Firefox 23. -->
+            will use the default one in your system otherwise. -->
         <!--
         <property name="firefox_binary">/path/to/firefox/binary</property>
         -->
diff --git a/spring-kitchensink-controlleradvice/functional-tests/src/test/resources/arquillian.xml b/spring-kitchensink-controlleradvice/functional-tests/src/test/resources/arquillian.xml
index 2464736912..e17516e22a 100644
--- a/spring-kitchensink-controlleradvice/functional-tests/src/test/resources/arquillian.xml
+++ b/spring-kitchensink-controlleradvice/functional-tests/src/test/resources/arquillian.xml
@@ -20,7 +20,7 @@
 
     <defaultProtocol type="Servlet 3.0" />
 
-    <!-- Example configuration for a remote Red Hat JBoss Enterprise Application Platform or AS 7 instance -->
+    <!-- Example configuration for a remote Red Hat JBoss Enterprise Application Platform instance -->
     <container qualifier="jboss" default="true">
         <!-- By default, Arquillian will use the JBOSS_HOME environment variable.
             Alternatively, the configuration below can be uncommented. -->
@@ -36,8 +36,7 @@
         <!-- By default, the browser you are going to use for your tests is set to Firefox. -->
         <property name="browser">firefox</property>
         <!-- Uncomment this line in order to specify where your Firefox binary is located, WebDriver
-            will use the default one in your system otherwise. These tests are verified to be functioning
-            with Firefox 23. -->
+            will use the default one in your system otherwise. -->
         <!--
         <property name="firefox_binary">/path/to/firefox/binary</property>
         -->
diff --git a/spring-kitchensink-matrixvariables/functional-tests/src/test/resources/arquillian.xml b/spring-kitchensink-matrixvariables/functional-tests/src/test/resources/arquillian.xml
index 2464736912..e17516e22a 100644
--- a/spring-kitchensink-matrixvariables/functional-tests/src/test/resources/arquillian.xml
+++ b/spring-kitchensink-matrixvariables/functional-tests/src/test/resources/arquillian.xml
@@ -20,7 +20,7 @@
 
     <defaultProtocol type="Servlet 3.0" />
 
-    <!-- Example configuration for a remote Red Hat JBoss Enterprise Application Platform or AS 7 instance -->
+    <!-- Example configuration for a remote Red Hat JBoss Enterprise Application Platform instance -->
     <container qualifier="jboss" default="true">
         <!-- By default, Arquillian will use the JBOSS_HOME environment variable.
             Alternatively, the configuration below can be uncommented. -->
@@ -36,8 +36,7 @@
         <!-- By default, the browser you are going to use for your tests is set to Firefox. -->
         <property name="browser">firefox</property>
         <!-- Uncomment this line in order to specify where your Firefox binary is located, WebDriver
-            will use the default one in your system otherwise. These tests are verified to be functioning
-            with Firefox 23. -->
+            will use the default one in your system otherwise. -->
         <!--
         <property name="firefox_binary">/path/to/firefox/binary</property>
         -->
diff --git a/spring-kitchensink-springmvctest/functional-tests/src/test/resources/arquillian.xml b/spring-kitchensink-springmvctest/functional-tests/src/test/resources/arquillian.xml
index 2464736912..e17516e22a 100644
--- a/spring-kitchensink-springmvctest/functional-tests/src/test/resources/arquillian.xml
+++ b/spring-kitchensink-springmvctest/functional-tests/src/test/resources/arquillian.xml
@@ -20,7 +20,7 @@
 
     <defaultProtocol type="Servlet 3.0" />
 
-    <!-- Example configuration for a remote Red Hat JBoss Enterprise Application Platform or AS 7 instance -->
+    <!-- Example configuration for a remote Red Hat JBoss Enterprise Application Platform instance -->
     <container qualifier="jboss" default="true">
         <!-- By default, Arquillian will use the JBOSS_HOME environment variable.
             Alternatively, the configuration below can be uncommented. -->
@@ -36,8 +36,7 @@
         <!-- By default, the browser you are going to use for your tests is set to Firefox. -->
         <property name="browser">firefox</property>
         <!-- Uncomment this line in order to specify where your Firefox binary is located, WebDriver
-            will use the default one in your system otherwise. These tests are verified to be functioning
-            with Firefox 23. -->
+            will use the default one in your system otherwise. -->
         <!--
         <property name="firefox_binary">/path/to/firefox/binary</property>
         -->
diff --git a/spring-petclinic/functional-tests/src/test/resources/arquillian.xml b/spring-petclinic/functional-tests/src/test/resources/arquillian.xml
index d9282b6903..182e979c3d 100644
--- a/spring-petclinic/functional-tests/src/test/resources/arquillian.xml
+++ b/spring-petclinic/functional-tests/src/test/resources/arquillian.xml
@@ -37,8 +37,7 @@
         <!-- By default, the browser you are going to use for your tests is set to Firefox. -->
         <property name="browser">firefox</property>
         <!-- Uncomment this line in order to specify where your Firefox binary is located, WebDriver
-            will use the default one in your system otherwise. These tests are verified to be functioning
-            with Firefox 23. -->
+            will use the default one in your system otherwise. -->
         <!--
         <property name="firefox_binary">/path/to/firefox/binary</property>
         -->