Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
prepare for next development iteration
Browse files Browse the repository at this point in the history
  • Loading branch information
definite authored and seanf committed Jun 15, 2015
1 parent cba04d8 commit b09d649
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 20 deletions.
5 changes: 2 additions & 3 deletions 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>
Expand Down
4 changes: 2 additions & 2 deletions functional-test/pom.xml
Expand Up @@ -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-->
Expand Down Expand Up @@ -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>
Expand Down
10 changes: 4 additions & 6 deletions pom.xml
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
6 changes: 2 additions & 4 deletions 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>

Expand Down
2 changes: 1 addition & 1 deletion zanata-model/pom.xml
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion zanata-test-war/pom.xml
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions zanata-war/pom.xml
Expand Up @@ -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>
Expand Down Expand Up @@ -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
Expand All @@ -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>
Expand Down

0 comments on commit b09d649

Please sign in to comment.