Merge branch 'release' into integration/master

Conflicts: pom.xml
zanata · Feb 24, 2015 · 009a0dd · 009a0dd
2 parents 3b0d55a + 8dc5e95
commit 009a0dd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git 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>
@@ -1216,7 +1218,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>
@@ -1236,21 +1237,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>

diff --git 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");