diff --git a/.travis.yml b/.travis.yml index cb233877e..6c517751d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_install: | # Install semantic-release before_script: - - yarn global add @conveyal/maven-semantic-release semantic-release + - yarn global add @conveyal/maven-semantic-release semantic-release@15 # Replace Travis's default build step. # Run all Maven phases at once up through verify, install, and deploy. diff --git a/pom.xml b/pom.xml index ebc9f3c57..bcaeb8b5c 100644 --- a/pom.xml +++ b/pom.xml @@ -261,12 +261,14 @@ org.hamcrest java-hamcrest 2.0.0.0 + test - com.github.Zenika + com.github.conveyal java-snapshot-matcher - 7e6ed4049eb637334e56f84bdd23ea74da05f141 + 3495b32f7b4d3f82590e0a2284029214070b6984 + test diff --git a/src/main/java/com/conveyal/gtfs/loader/Field.java b/src/main/java/com/conveyal/gtfs/loader/Field.java index 49d312be2..2440c4624 100644 --- a/src/main/java/com/conveyal/gtfs/loader/Field.java +++ b/src/main/java/com/conveyal/gtfs/loader/Field.java @@ -91,7 +91,6 @@ public String getSqlDeclaration() { return String.join(" ", name, getSqlTypeName()); } - // TODO test for input with tabs, newlines, carriage returns, and slashes in it. protected static ValidateFieldResult cleanString (String string) { return cleanString(new ValidateFieldResult<>(string)); } @@ -106,7 +105,12 @@ protected static ValidateFieldResult cleanString (ValidateFieldResult