From b09d649692497507b13f2b8e9bb0a6534f6dc6cd Mon Sep 17 00:00:00 2001
From: Ding-Yi Chen <dingyichen@gmail.com>
Date: Mon, 15 Jun 2015 12:10:47 +1000
Subject: [PATCH] prepare for next development iteration

---
 frontend/pom.xml         |  5 ++---
 functional-test/pom.xml  |  4 ++--
 pom.xml                  | 10 ++++------
 zanata-liquibase/pom.xml |  6 ++----
 zanata-model/pom.xml     |  2 +-
 zanata-test-war/pom.xml  |  2 +-
 zanata-war/pom.xml       |  6 +++---
 7 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/frontend/pom.xml b/frontend/pom.xml
index 741196cf34..3c7493be15 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0"?>
-<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<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>
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>server</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.8.0-SNAPSHOT</version>
   </parent>
   <artifactId>frontend</artifactId>
   <name>frontend</name>
diff --git a/functional-test/pom.xml b/functional-test/pom.xml
index af0c3ab9e9..4024fdd2f2 100644
--- a/functional-test/pom.xml
+++ b/functional-test/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>server</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.8.0-SNAPSHOT</version>
   </parent>
   <artifactId>functional-test</artifactId>
   <!--if we want to use pom packaging, we need to explicitly enable some plugins and various things-->
@@ -824,7 +824,7 @@
                 <echo>NB: cargo.basename needs to match the basename of the file given in cargo.installation.</echo>
                 <echo>For example, if cargo.installation is http://example.com/download/jboss-6.4.0.zip, cargo.basename should be jboss-6.4.0.</echo>
                 <echo>appserver.dir.name is top-level dir inside zip.  For jbosseap6, default is jboss-eap-6.3.  Override for later versions.</echo>
-                <echo/>
+                <echo />
                 <echo>-DallFuncTests to enable all functional tests (defaults to smoke tests)</echo>
                 <echo />
                 <echo>-Dcargo.debug.jvm.args : If not set by default will listen to port 8787. Need to set to empty on jenkins</echo>
diff --git a/pom.xml b/pom.xml
index ae686d5aba..ce16dcebb3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
 <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.7.0-SNAPSHOT</version>
+  <version>3.8.0-SNAPSHOT</version>
   <name>Zanata server modules</name>
   <packaging>pom</packaging>
   <parent>
@@ -1244,15 +1244,13 @@
             <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}" />
                 <echo message="cargo.installation=${cargo.installation}" />
                 <echo message="appserver.home=${appserver.home}" />
                 <echo message="DISPLAY=${env.DISPLAY}" />
-                <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>
diff --git a/zanata-liquibase/pom.xml b/zanata-liquibase/pom.xml
index 5a23594721..8ce9a804c0 100644
--- a/zanata-liquibase/pom.xml
+++ b/zanata-liquibase/pom.xml
@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
   <parent>
     <artifactId>server</artifactId>
     <groupId>org.zanata</groupId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.8.0-SNAPSHOT</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
diff --git a/zanata-model/pom.xml b/zanata-model/pom.xml
index c98182046f..e97047e817 100644
--- a/zanata-model/pom.xml
+++ b/zanata-model/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>server</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.8.0-SNAPSHOT</version>
   </parent>
   <artifactId>zanata-model</artifactId>
   <name>Zanata model</name>
diff --git a/zanata-test-war/pom.xml b/zanata-test-war/pom.xml
index e25d6d1349..509af1dc2d 100644
--- a/zanata-test-war/pom.xml
+++ b/zanata-test-war/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>server</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.8.0-SNAPSHOT</version>
   </parent>
   <artifactId>zanata-test-war</artifactId>
   <name>zanata-test-war</name>
diff --git a/zanata-war/pom.xml b/zanata-war/pom.xml
index 72a86d4aa3..f62043179e 100644
--- a/zanata-war/pom.xml
+++ b/zanata-war/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.zanata</groupId>
     <artifactId>server</artifactId>
-    <version>3.7.0-SNAPSHOT</version>
+    <version>3.8.0-SNAPSHOT</version>
   </parent>
   <artifactId>zanata-war</artifactId>
   <packaging>war</packaging>
@@ -88,7 +88,7 @@
               <scripts>
                 <script>
                   def props = new Properties()
-                  project.artifacts.each { a ->
+                  project.artifacts.each { a -&gt;
                     def coord = a.groupId + ":" + a.artifactId + ":" + a.type + (a.classifier ? ":" + a.classifier : "")
                     // Make version available to the build:
                     project.properties.put "version." + coord, a.version
@@ -103,7 +103,7 @@
                   def genDir = new File(project.build.directory,
                     'generated-resources/deps')
                   genDir.mkdirs()
-                  new File(genDir, 'dependencies.properties').withWriter { out ->
+                  new File(genDir, 'dependencies.properties').withWriter { out -&gt;
                     props.store out, 'Zanata dependency versions'
                   }
                 </script>