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

Commit

Permalink
Merge branch 'travis-jdk8' into integration/master
Browse files Browse the repository at this point in the history
  • Loading branch information
seanf committed Nov 29, 2013
2 parents 91463bb + 7ffd8ff commit 5515f00
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 3 deletions.
14 changes: 13 additions & 1 deletion .travis.yml
@@ -1,2 +1,14 @@
language: java
script: "mvn test -Dgwt.compiler.skip -q"
install: true
script: mvn test -Dgwt.validateOnly -Darquillian.jboss.home=/dev/null

jdk:
- openjdk6
- openjdk7
- oraclejdk7
- oraclejdk8

matrix:
fast_finish: true
allow_failures:
- jdk: oraclejdk8
12 changes: 12 additions & 0 deletions pom.xml
Expand Up @@ -544,6 +544,18 @@
-->

<repositories>
<!-- This is needed for bootstrapping with a zanata-parent SNAPSHOT -->
<repository>
<id>sonatype-nexus-snapshots</id>
<name>Sonatype Nexus Snapshots</name>
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
<releases>
<enabled>false</enabled>
</releases>
<snapshots>
<enabled>true</enabled>
</snapshots>
</repository>
<repository>
<id>jboss-public-repository-group</id>
<name>JBoss Public Maven Repository Group</name>
Expand Down
5 changes: 3 additions & 2 deletions zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
Expand Up @@ -35,6 +35,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TimeZone;

import nu.xom.Element;

Expand Down Expand Up @@ -146,11 +147,11 @@ public void parseTMX() throws Exception {
assertThat(tm.getTranslationUnits().size(), is(4));

// Dates were modified to match the TM header in the file
Calendar cal = Calendar.getInstance();
Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
cal.setTime(tm.getCreationDate());
assertThat(cal.get(Calendar.YEAR), is(2013));
assertThat(cal.get(Calendar.MONTH), is(4));
assertThat(cal.get(Calendar.DATE), is(10));
assertThat(cal.get(Calendar.DATE), is(9));

assertThat(tm.getSourceLanguage(), equalTo("en"));

Expand Down

0 comments on commit 5515f00

Please sign in to comment.