From 34bc4e6bb0d8d138bad21f8d9e0cd5bfdf03d04b Mon Sep 17 00:00:00 2001
From: Zanata Build Server <jenkins@zanata.org>
Date: Tue, 24 Feb 2015 16:24:56 +1000
Subject: [PATCH] [maven-release-plugin] prepare release server-3.6.0

---
 functional-test/pom.xml | 27 +++++++++++----------------
 pom.xml                 | 29 +++++++++--------------------
 zanata-model/pom.xml    |  3 ++-
 zanata-test-war/pom.xml |  7 ++-----
 zanata-war/pom.xml      | 18 ++++++------------
 5 files changed, 30 insertions(+), 54 deletions(-)

diff --git a/functional-test/pom.xml b/functional-test/pom.xml
index 2bf339f20f..4665e79c07 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.6.0-SNAPSHOT</version>
+    <version>3.6.0</version>
   </parent>
   <artifactId>functional-test</artifactId>
   <!--if we want to use pom packaging, we need to explicitly enable some plugins and various things-->
@@ -415,12 +415,9 @@
                 </goals>
                 <configuration>
                   <target xmlns:if="ant:if">
-                    <echo if:set="skipFuncTests"
-                      message="WARNING: -DskipFuncTests takes precedence over -DallFuncTests" />
-                    <echo if:set="skipITs"
-                      message="WARNING: -DskipITs takes precedence over -DallFuncTests" />
-                    <echo if:set="skipTests"
-                      message="WARNING: -DskipTests takes precedence over -DallFuncTests" />
+                    <echo if:set="skipFuncTests" message="WARNING: -DskipFuncTests takes precedence over -DallFuncTests" />
+                    <echo if:set="skipITs" message="WARNING: -DskipITs takes precedence over -DallFuncTests" />
+                    <echo if:set="skipTests" message="WARNING: -DskipTests takes precedence over -DallFuncTests" />
                   </target>
                 </configuration>
               </execution>
@@ -744,17 +741,17 @@
                 <echo>===== Properties that can be set for functional test =====</echo>
                 <echo>-DskipFuncTests : to skip running functional tests, and/or:</echo>
                 <echo>-DskipArqTests : to skip Arquillian integration tests (if building zanata-war)</echo>
-                <echo/>
+                <echo />
                 <echo>Unless skipping tests, you must choose an appserver:</echo>
                 <echo>-Dappserver=jbosseap6 -Dcargo.installation=http://example.com/jbosseap632.zip -Dcargo.basename=jbosseap632</echo>
                 <echo>or -Dappserver=wildfly8</echo>
                 <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.3.2.zip, cargo.basename should be jboss-6.3.2.</echo>
-                <echo/>
+                <echo />
                 <echo>-DallFuncTests to enable all functional tests (defaults to smoke tests)</echo>
-                <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>
-                <echo/>
+                <echo />
                 <echo>-Dzanata.target.version=version of zanata to deploy. Default is: ${project.parent.version}</echo>
                 <echo>-Dzanata.instance.url=http://${cargo.host}:${cargo.servlet.port}/${context.path}</echo>
                 <echo>-Dzanata.apikey=b6d7044e9ee3b2447c28fb7c50d86d98</echo>
@@ -769,7 +766,7 @@
                 <echo>==========================================================</echo>
                 <echo>to ask cargo to start up then wait so that tests can be run manually: mvn clean package cargo:run -Dappserver=wildfly8 -Dmysql.port=13306</echo>
                 <!-- placeholder. Actual content should be populated by running server/etc/scripts/functional-test-db-snapshot.sh -->
-                <touch file="${project.build.directory}/database.sql"/>
+                <touch file="${project.build.directory}/database.sql" />
               </target>
             </configuration>
           </execution>
@@ -779,10 +776,8 @@
             <goals><goal>run</goal></goals>
             <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 must be set to run integration tests (or else use -DskipFuncTests)"
-                  unless="cargo.installation"/>
+                <fail message="'appserver' property must be set to run integration tests (or else use -DskipFuncTests)" unless="appserver" />
+                <fail message="'cargo.installation' property must be set to run integration tests (or else use -DskipFuncTests)" unless="cargo.installation" />
               </target>
             </configuration>
           </execution>
diff --git a/pom.xml b/pom.xml
index 3914a6d79c..1d1dcf6cea 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.6.0-SNAPSHOT</version>
+  <version>3.6.0</version>
   <name>Zanata server modules</name>
   <packaging>pom</packaging>
   <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>
@@ -964,12 +965,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 @@
                 <configuration>
                   <target unless="skipITs">
                     <mkdir dir="${download.dir}" />
-                    <get
-                      src="http://sourceforge.net/projects/zanata/files/wildfly/${mojarra.module.name}/download"
-                      dest="${download.dir}/${mojarra.module.name}"
-                      skipexisting="true" />
-                    <get
-                      src="http://sourceforge.net/projects/zanata/files/wildfly/${hibernate.module.name}/download"
-                      dest="${download.dir}/${hibernate.module.name}"
-                      skipexisting="true" />
-                    <unzip
-                      src="${download.dir}/${mojarra.module.name}"
-                      dest="${appserver.home}" />
-                    <unzip
-                      src="${download.dir}/${hibernate.module.name}"
-                      dest="${appserver.home}" />
+                    <get src="http://sourceforge.net/projects/zanata/files/wildfly/${mojarra.module.name}/download" dest="${download.dir}/${mojarra.module.name}" skipexisting="true" />
+                    <get src="http://sourceforge.net/projects/zanata/files/wildfly/${hibernate.module.name}/download" dest="${download.dir}/${hibernate.module.name}" skipexisting="true" />
+                    <unzip src="${download.dir}/${mojarra.module.name}" dest="${appserver.home}" />
+                    <unzip src="${download.dir}/${hibernate.module.name}" dest="${appserver.home}" />
                   </target>
                 </configuration>
               </execution>
diff --git a/zanata-model/pom.xml b/zanata-model/pom.xml
index 4caf3b8c8a..93718e1880 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.6.0-SNAPSHOT</version>
+    <version>3.6.0</version>
   </parent>
   <artifactId>zanata-model</artifactId>
   <name>Zanata model</name>
@@ -15,6 +15,7 @@
     <connection>scm:git:git://github.com/zanata/zanata.git</connection>
     <developerConnection>scm:git:git@github.com:zanata/zanata.git</developerConnection>
     <url>https://github.com/zanata/zanata</url>
+    <tag>server-3.6.0</tag>
   </scm>
 
   <properties>
diff --git a/zanata-test-war/pom.xml b/zanata-test-war/pom.xml
index 509760db97..bc1c3b8f69 100644
--- a/zanata-test-war/pom.xml
+++ b/zanata-test-war/pom.xml
@@ -1,13 +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.6.0-SNAPSHOT</version>
+    <version>3.6.0</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 4a68c6a852..eea30406b9 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.6.0-SNAPSHOT</version>
+    <version>3.6.0</version>
   </parent>
   <artifactId>zanata-war</artifactId>
   <packaging>war</packaging>
@@ -15,6 +15,7 @@
     <connection>scm:git:git://github.com/zanata/zanata.git</connection>
     <developerConnection>scm:git:git@github.com:zanata/zanata.git</developerConnection>
     <url>https://github.com/zanata/zanata</url>
+    <tag>server-3.6.0</tag>
   </scm>
 
   <properties>
@@ -1008,10 +1009,8 @@
                 <goals><goal>run</goal></goals>
                 <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 must be set to run integration tests (or else use -DskipArqTests)"
-                      unless="cargo.installation"/>
+                    <fail message="'appserver' property must be set to run integration tests (or else use -DskipArqTests)" unless="appserver" />
+                    <fail message="'cargo.installation' property must be set to run integration tests (or else use -DskipArqTests)" unless="cargo.installation" />
                   </target>
                 </configuration>
               </execution>
@@ -1071,9 +1070,7 @@
                 </goals>
                 <configuration>
                   <target unless="skipArqTests">
-                    <copy overwrite="true"
-                      file="${project.basedir}/src/test/resources/arquillian/standalone-arquillian.xml"
-                      tofile="${appserver.home}/standalone/configuration/standalone-arquillian.xml" />
+                    <copy overwrite="true" file="${project.basedir}/src/test/resources/arquillian/standalone-arquillian.xml" tofile="${appserver.home}/standalone/configuration/standalone-arquillian.xml" />
                   </target>
                 </configuration>
               </execution>
@@ -1188,10 +1185,7 @@
                 </goals>
                 <configuration>
                   <target unless="skipArqTests">
-                    <copy
-                      overwrite="true"
-                      file="${project.basedir}/src/test/resources/arquillian/standalone-arquillian-wildfly.xml"
-                      tofile="${appserver.home}/standalone/configuration/standalone.xml" />
+                    <copy overwrite="true" file="${project.basedir}/src/test/resources/arquillian/standalone-arquillian-wildfly.xml" tofile="${appserver.home}/standalone/configuration/standalone.xml" />
                   </target>
                 </configuration>
               </execution>