From f7f52b7d074dbfd5cf36a056691d7c7e9409501a Mon Sep 17 00:00:00 2001
From: Sean Flanigan <sflaniga@redhat.com>
Date: Thu, 14 Dec 2017 09:54:39 +1000
Subject: [PATCH] Update to JBoss EAP 7.1

---
 build                          | 2 +-
 server/functional-test/pom.xml | 4 ++--
 server/pom.xml                 | 4 ++--
 server/services/pom.xml        | 2 +-
 server/zanata-war/pom.xml      | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/build b/build
index e5a03f3a58..3aa428bfd0 100755
--- a/build
+++ b/build
@@ -96,7 +96,7 @@ Server options:
         -f 9 enable all functional tests
     --verify                equivalent to -a -f 1
     --verify-all            equivalent to -a -f 9
-    -E, --eap               (-Dappserver=jbosseap6, requires EAP7_URL env var)
+    -E, --eap               (-Dappserver=jbosseap6, requires EAP71_URL env var)
     -W, --wildfly           (-Dappserver=wildfly8)
     -w, --wait              quick-build, install Zanata then wait for IDE to run functional tests
 EOF
diff --git a/server/functional-test/pom.xml b/server/functional-test/pom.xml
index ca477c0e1c..dc8681a006 100644
--- a/server/functional-test/pom.xml
+++ b/server/functional-test/pom.xml
@@ -998,7 +998,7 @@
                 <echo />
                 <echo>Unless skipping tests, you must choose an appserver:</echo>
                 <echo>-Dappserver=jbosseap6 or -Dappserver=wildfly8</echo>
-                <echo>For jbosseap6, env var EAP7_URL should point to an EAP zip file.</echo>
+                <echo>For jbosseap6, env var EAP71_URL should point to an EAP zip file.</echo>
                 <echo />
                 <echo>-DallFuncTests to enable all functional tests (defaults to smoke tests)</echo>
                 <echo />
@@ -1028,7 +1028,7 @@
             <configuration>
               <target unless="skipFuncTests">
                 <fail message="'appserver' property must be set to run integration tests (or else use -DskipFuncTests)" unless="appserver" />
-                <fail message="'cargo.installation' property is null (set env var EAP7_URL or else use -DskipFuncTests)" unless="cargo.installation" />
+                <fail message="'cargo.installation' property is null (set env var EAP71_URL or else use -DskipFuncTests)" unless="cargo.installation" />
               </target>
             </configuration>
           </execution>
diff --git a/server/pom.xml b/server/pom.xml
index 0820c7f898..7b94299741 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -2125,7 +2125,7 @@
                 <echo message="appserver.home=${appserver.home}" />
                 <echo message="DISPLAY=${env.DISPLAY}" />
                 <echo message="WARNING: 'appserver' property must be set unless skipping integration tests" unless:set="appserver" />
-                <echo message="WARNING: 'cargo.installation' property is null. You might need to set the env var EAP7_URL" unless:set="cargo.installation" />
+                <echo message="WARNING: 'cargo.installation' property is null. You might need to set the env var EAP71_URL" unless:set="cargo.installation" />
               </target>
             </configuration>
           </execution>
@@ -2344,7 +2344,7 @@
       </activation>
       <properties>
         <cargo.container>wildfly10x</cargo.container>
-        <cargo.installation>${env.EAP7_URL}</cargo.installation>
+        <cargo.installation>${env.EAP71_URL}</cargo.installation>
       </properties>
     </profile>
 
diff --git a/server/services/pom.xml b/server/services/pom.xml
index 00d0fd73c0..06108bf2fc 100644
--- a/server/services/pom.xml
+++ b/server/services/pom.xml
@@ -1540,7 +1540,7 @@
                 <configuration>
                   <target unless="skipArqTests">
                     <fail message="'appserver' property must be set to run integration tests (or else use -DskipArqTests)" unless="appserver" />
-                    <fail message="'cargo.installation' property is null (set env var EAP7_URL or else use -DskipArqTests)" unless="cargo.installation" />
+                    <fail message="'cargo.installation' property is null (set env var EAP71_URL or else use -DskipArqTests)" unless="cargo.installation" />
                   </target>
                 </configuration>
               </execution>
diff --git a/server/zanata-war/pom.xml b/server/zanata-war/pom.xml
index 6a9bf7ffb1..dd84735942 100644
--- a/server/zanata-war/pom.xml
+++ b/server/zanata-war/pom.xml
@@ -544,7 +544,7 @@
                 <configuration>
                   <target unless="skipArqTests">
                     <fail message="'appserver' property must be set to run integration tests (or else use -DskipArqTests)" unless="appserver" />
-                    <fail message="'cargo.installation' property is null (set env var EAP7_URL or else use -DskipArqTests)" unless="cargo.installation" />
+                    <fail message="'cargo.installation' property is null (set env var EAP71_URL or else use -DskipArqTests)" unless="cargo.installation" />
                   </target>
                 </configuration>
               </execution>