From 2f8549ec2c7365f9911b97a11370251a5e81a93f Mon Sep 17 00:00:00 2001
From: Sean Flanigan <sflaniga@redhat.com>
Date: Wed, 11 Feb 2015 10:45:29 +1000
Subject: [PATCH 1/5] Cache downloaded wildfly modules to ~/Downloads

---
 pom.xml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pom.xml b/pom.xml
index b6455e9503..dab12848b5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -76,6 +76,8 @@
     <!-- This URL must be set by a profile (wildfly), settings.xml or mvn command line -->
     <!-- <cargo.installation></cargo.installation> -->
 
+    <download.dir>${user.home}/Downloads</download.dir>
+
   </properties>
 
   <dependencyManagement>
@@ -999,7 +1001,7 @@
               <!--if install from url-->
               <zipUrlInstaller>
                 <url>${cargo.installation}</url>
-                <downloadDir>${user.home}/Downloads</downloadDir>
+                <downloadDir>${download.dir}</downloadDir>
                 <extractDir>${cargo.extract.dir}</extractDir>
               </zipUrlInstaller>
             </container>
@@ -1210,7 +1212,6 @@
         <mojarra.module.name>wildfly-${module.wildfly.version}-module-mojarra-${mojarra.module.version}.zip</mojarra.module.name>
         <hibernate.module.version>4.2.15.Final</hibernate.module.version>
         <hibernate.module.name>wildfly-${module.wildfly.version}-module-hibernate-main-${hibernate.module.version}.zip</hibernate.module.name>
-        <module.download.dir>${project.build.directory}/downloads</module.download.dir>
       </properties>
 
       <build>
@@ -1230,21 +1231,20 @@
                 </goals>
                 <configuration>
                   <target unless="skipITs">
-                    <!-- TODO put these zips under ${user.home}/Downloads too -->
-                    <mkdir dir="${module.download.dir}" />
+                    <mkdir dir="${download.dir}" />
                     <get
                       src="http://sourceforge.net/projects/zanata/files/wildfly/${mojarra.module.name}/download"
-                      dest="${module.download.dir}/${mojarra.module.name}"
-                      usetimestamp="true" />
+                      dest="${download.dir}/${mojarra.module.name}"
+                      skipexisting="true" />
                     <get
                       src="http://sourceforge.net/projects/zanata/files/wildfly/${hibernate.module.name}/download"
-                      dest="${module.download.dir}/${hibernate.module.name}"
-                      usetimestamp="true" />
+                      dest="${download.dir}/${hibernate.module.name}"
+                      skipexisting="true" />
                     <unzip
-                      src="${module.download.dir}/${mojarra.module.name}"
+                      src="${download.dir}/${mojarra.module.name}"
                       dest="${appserver.home}" />
                     <unzip
-                      src="${module.download.dir}/${hibernate.module.name}"
+                      src="${download.dir}/${hibernate.module.name}"
                       dest="${appserver.home}" />
                   </target>
                 </configuration>

From e099e57f0a0887010a0b85cdfc39d87098e31127 Mon Sep 17 00:00:00 2001
From: Sean Flanigan <sflaniga@redhat.com>
Date: Fri, 13 Feb 2015 13:16:08 +1000
Subject: [PATCH 2/5] Warn if EAP version < 6.3.3

---
 zanata-war/src/main/java/org/zanata/ZanataInit.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/zanata-war/src/main/java/org/zanata/ZanataInit.java b/zanata-war/src/main/java/org/zanata/ZanataInit.java
index 6cc1f11a20..c844ab91bb 100644
--- a/zanata-war/src/main/java/org/zanata/ZanataInit.java
+++ b/zanata-war/src/main/java/org/zanata/ZanataInit.java
@@ -82,7 +82,7 @@
 @Slf4j
 public class ZanataInit {
     private static final DefaultArtifactVersion MIN_EAP_VERSION =
-            new DefaultArtifactVersion("6.3.2");
+            new DefaultArtifactVersion("6.3.3");
     private static final DefaultArtifactVersion MIN_WILDFLY_VERSION =
             new DefaultArtifactVersion("8.1.0");
 

From 59a0b5f347cb8bb52531fb9ecc909221e81cecd8 Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dingyichen@gmail.com>
Date: Tue, 24 Feb 2015 10:20:21 +1000
Subject: [PATCH 3/5] pom.xml: zanata-api version to 3.6.0

---
 pom.xml | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/pom.xml b/pom.xml
index b6455e9503..0f9f953505 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,13 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>server</artifactId>
-  <version>3.6.0-SNAPSHOT</version>
+  <version>3.6.0</version>
   <name>Zanata server modules</name>
   <packaging>pom</packaging>
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>zanata-parent</artifactId>
-    <version>21-SNAPSHOT</version>
+    <version>21</version>
     <relativePath>../parent</relativePath>
   </parent>
 
@@ -16,6 +16,7 @@
     <connection>scm:git:git://github.com/zanata/zanata-server.git</connection>
     <developerConnection>scm:git:git@github.com:zanata/zanata-server.git</developerConnection>
     <url>https://github.com/zanata/zanata-server</url>
+    <tag>server-3.6.0</tag>
   </scm>
 
   <properties>
@@ -33,7 +34,7 @@
     <gwteventservice.version>1.2.1</gwteventservice.version>
     <okapi.version>0.22</okapi.version>
 
-    <zanata.api.version>3.6.0-SNAPSHOT</zanata.api.version>
+    <zanata.api.version>3.6.0</zanata.api.version>
     <!-- This should always be the previous version of the used api version above (but only 3.0.1 or later will work) -->
     <zanata.api.compat.version>3.3.1</zanata.api.compat.version>
     <zanata.client.version>3.3.1</zanata.client.version>
@@ -296,7 +297,7 @@
       <dependency>
         <groupId>org.zanata</groupId>
         <artifactId>zanata-common-api</artifactId>
-        <version>${zanata.api.version}</version>
+        <version>3.6.0</version>
         <exclusions>
           <exclusion>
             <groupId>javax.servlet</groupId>
@@ -962,12 +963,10 @@
             <phase>none</phase>
             <goals><goal>run</goal></goals>
             <configuration combine.self="override">
-              <target unless="skipITs" xmlns:unless="ant:unless">
+              <target xmlns:unless="ant:unless" unless="skipITs">
                 <echo message="appserver: ${appserver} cargo.installation: ${cargo.installation} appserver.home: ${appserver.home}" />
-                <echo message="WARNING: 'appserver' property must be set unless skippping integration tests"
-                  unless:set="appserver" />
-                <echo message="WARNING: 'cargo.installation' property (and possibly cargo.basename) must be set unless skipping integration tests"
-                  unless:set="cargo.installation" />
+                <echo message="WARNING: 'appserver' property must be set unless skippping integration tests" unless:set="appserver" />
+                <echo message="WARNING: 'cargo.installation' property (and possibly cargo.basename) must be set unless skipping integration tests" unless:set="cargo.installation" />
               </target>
             </configuration>
           </execution>
@@ -1232,20 +1231,10 @@
                   <target unless="skipITs">
                     <!-- TODO put these zips under ${user.home}/Downloads too -->
                     <mkdir dir="${module.download.dir}" />
-                    <get
-                      src="http://sourceforge.net/projects/zanata/files/wildfly/${mojarra.module.name}/download"
-                      dest="${module.download.dir}/${mojarra.module.name}"
-                      usetimestamp="true" />
-                    <get
-                      src="http://sourceforge.net/projects/zanata/files/wildfly/${hibernate.module.name}/download"
-                      dest="${module.download.dir}/${hibernate.module.name}"
-                      usetimestamp="true" />
-                    <unzip
-                      src="${module.download.dir}/${mojarra.module.name}"
-                      dest="${appserver.home}" />
-                    <unzip
-                      src="${module.download.dir}/${hibernate.module.name}"
-                      dest="${appserver.home}" />
+                    <get src="http://sourceforge.net/projects/zanata/files/wildfly/${mojarra.module.name}/download" dest="${module.download.dir}/${mojarra.module.name}" usetimestamp="true" />
+                    <get src="http://sourceforge.net/projects/zanata/files/wildfly/${hibernate.module.name}/download" dest="${module.download.dir}/${hibernate.module.name}" usetimestamp="true" />
+                    <unzip src="${module.download.dir}/${mojarra.module.name}" dest="${appserver.home}" />
+                    <unzip src="${module.download.dir}/${hibernate.module.name}" dest="${appserver.home}" />
                   </target>
                 </configuration>
               </execution>

From f57207b299ec138bee32388da8da5197d657f7fd Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dingyichen@gmail.com>
Date: Tue, 24 Feb 2015 13:56:02 +1000
Subject: [PATCH 4/5] Revert "pom.xml: zanata-api version to 3.6.0"

This reverts commit 59a0b5f347cb8bb52531fb9ecc909221e81cecd8.
---
 pom.xml | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0f9f953505..b6455e9503 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,13 +2,13 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <artifactId>server</artifactId>
-  <version>3.6.0</version>
+  <version>3.6.0-SNAPSHOT</version>
   <name>Zanata server modules</name>
   <packaging>pom</packaging>
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>zanata-parent</artifactId>
-    <version>21</version>
+    <version>21-SNAPSHOT</version>
     <relativePath>../parent</relativePath>
   </parent>
 
@@ -16,7 +16,6 @@
     <connection>scm:git:git://github.com/zanata/zanata-server.git</connection>
     <developerConnection>scm:git:git@github.com:zanata/zanata-server.git</developerConnection>
     <url>https://github.com/zanata/zanata-server</url>
-    <tag>server-3.6.0</tag>
   </scm>
 
   <properties>
@@ -34,7 +33,7 @@
     <gwteventservice.version>1.2.1</gwteventservice.version>
     <okapi.version>0.22</okapi.version>
 
-    <zanata.api.version>3.6.0</zanata.api.version>
+    <zanata.api.version>3.6.0-SNAPSHOT</zanata.api.version>
     <!-- This should always be the previous version of the used api version above (but only 3.0.1 or later will work) -->
     <zanata.api.compat.version>3.3.1</zanata.api.compat.version>
     <zanata.client.version>3.3.1</zanata.client.version>
@@ -297,7 +296,7 @@
       <dependency>
         <groupId>org.zanata</groupId>
         <artifactId>zanata-common-api</artifactId>
-        <version>3.6.0</version>
+        <version>${zanata.api.version}</version>
         <exclusions>
           <exclusion>
             <groupId>javax.servlet</groupId>
@@ -963,10 +962,12 @@
             <phase>none</phase>
             <goals><goal>run</goal></goals>
             <configuration combine.self="override">
-              <target xmlns:unless="ant:unless" unless="skipITs">
+              <target unless="skipITs" xmlns:unless="ant:unless">
                 <echo message="appserver: ${appserver} cargo.installation: ${cargo.installation} appserver.home: ${appserver.home}" />
-                <echo message="WARNING: 'appserver' property must be set unless skippping integration tests" unless:set="appserver" />
-                <echo message="WARNING: 'cargo.installation' property (and possibly cargo.basename) must be set unless skipping integration tests" unless:set="cargo.installation" />
+                <echo message="WARNING: 'appserver' property must be set unless skippping integration tests"
+                  unless:set="appserver" />
+                <echo message="WARNING: 'cargo.installation' property (and possibly cargo.basename) must be set unless skipping integration tests"
+                  unless:set="cargo.installation" />
               </target>
             </configuration>
           </execution>
@@ -1231,10 +1232,20 @@
                   <target unless="skipITs">
                     <!-- TODO put these zips under ${user.home}/Downloads too -->
                     <mkdir dir="${module.download.dir}" />
-                    <get src="http://sourceforge.net/projects/zanata/files/wildfly/${mojarra.module.name}/download" dest="${module.download.dir}/${mojarra.module.name}" usetimestamp="true" />
-                    <get src="http://sourceforge.net/projects/zanata/files/wildfly/${hibernate.module.name}/download" dest="${module.download.dir}/${hibernate.module.name}" usetimestamp="true" />
-                    <unzip src="${module.download.dir}/${mojarra.module.name}" dest="${appserver.home}" />
-                    <unzip src="${module.download.dir}/${hibernate.module.name}" dest="${appserver.home}" />
+                    <get
+                      src="http://sourceforge.net/projects/zanata/files/wildfly/${mojarra.module.name}/download"
+                      dest="${module.download.dir}/${mojarra.module.name}"
+                      usetimestamp="true" />
+                    <get
+                      src="http://sourceforge.net/projects/zanata/files/wildfly/${hibernate.module.name}/download"
+                      dest="${module.download.dir}/${hibernate.module.name}"
+                      usetimestamp="true" />
+                    <unzip
+                      src="${module.download.dir}/${mojarra.module.name}"
+                      dest="${appserver.home}" />
+                    <unzip
+                      src="${module.download.dir}/${hibernate.module.name}"
+                      dest="${appserver.home}" />
                   </target>
                 </configuration>
               </execution>

From e7f33a20ba63c1f88e9ef0b2775a65c9b6d00d67 Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dingyichen@gmail.com>
Date: Tue, 24 Feb 2015 13:57:36 +1000
Subject: [PATCH 5/5] Fix pom.xml

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index b6455e9503..fa978ff239 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>zanata-parent</artifactId>
-    <version>21-SNAPSHOT</version>
+    <version>21</version>
     <relativePath>../parent</relativePath>
   </parent>
 
@@ -33,7 +33,7 @@
     <gwteventservice.version>1.2.1</gwteventservice.version>
     <okapi.version>0.22</okapi.version>
 
-    <zanata.api.version>3.6.0-SNAPSHOT</zanata.api.version>
+    <zanata.api.version>3.6.0</zanata.api.version>
     <!-- This should always be the previous version of the used api version above (but only 3.0.1 or later will work) -->
     <zanata.api.compat.version>3.3.1</zanata.api.compat.version>
     <zanata.client.version>3.3.1</zanata.client.version>