diff --git a/onebusaway-alerts-persistence/pom.xml b/onebusaway-alerts-persistence/pom.xml index 6df5821c7..4ccae1b71 100644 --- a/onebusaway-alerts-persistence/pom.xml +++ b/onebusaway-alerts-persistence/pom.xml @@ -41,7 +41,7 @@ com.google.code.gson gson - 2.1 + ${gson.version} joda-time diff --git a/onebusaway-enterprise-webapp/pom.xml b/onebusaway-enterprise-webapp/pom.xml index 44bd30afb..e601d6bb7 100644 --- a/onebusaway-enterprise-webapp/pom.xml +++ b/onebusaway-enterprise-webapp/pom.xml @@ -120,7 +120,7 @@ com.google.code.gson gson - 1.7.1 + ${gson.version} diff --git a/onebusaway-gtfsrt-integration-tests/pom.xml b/onebusaway-gtfsrt-integration-tests/pom.xml index 84cee7889..448f18afe 100644 --- a/onebusaway-gtfsrt-integration-tests/pom.xml +++ b/onebusaway-gtfsrt-integration-tests/pom.xml @@ -98,7 +98,7 @@ com.google.code.gson gson - 1.7.1 + ${gson.version} jar compile diff --git a/onebusaway-nextbus-api-webapp/pom.xml b/onebusaway-nextbus-api-webapp/pom.xml index fd1cfdfc3..790252ad7 100644 --- a/onebusaway-nextbus-api-webapp/pom.xml +++ b/onebusaway-nextbus-api-webapp/pom.xml @@ -178,7 +178,7 @@ com.google.code.gson gson - 2.3.1 + ${gson.version} org.onebusaway.util diff --git a/onebusaway-transit-data-federation/pom.xml b/onebusaway-transit-data-federation/pom.xml index 42830f834..58380bbd2 100644 --- a/onebusaway-transit-data-federation/pom.xml +++ b/onebusaway-transit-data-federation/pom.xml @@ -176,7 +176,7 @@ com.google.code.gson gson - 1.7.1 + ${gson.version} jar compile diff --git a/onebusaway-transit-data-federation/src/main/java/org/onebusaway/transit_data_federation/impl/realtime/gtfs_realtime/GtfsRealtimeTripLibrary.java b/onebusaway-transit-data-federation/src/main/java/org/onebusaway/transit_data_federation/impl/realtime/gtfs_realtime/GtfsRealtimeTripLibrary.java index fca83f98b..f10813f72 100644 --- a/onebusaway-transit-data-federation/src/main/java/org/onebusaway/transit_data_federation/impl/realtime/gtfs_realtime/GtfsRealtimeTripLibrary.java +++ b/onebusaway-transit-data-federation/src/main/java/org/onebusaway/transit_data_federation/impl/realtime/gtfs_realtime/GtfsRealtimeTripLibrary.java @@ -123,7 +123,7 @@ public void setStopModificationStrategy(StopModificationStrategy strategy) { public void setScheduleAdherenceFromLocation(boolean scheduleAdherenceFromLocation) { _scheduleAdherenceFromLocation = scheduleAdherenceFromLocation; } - + /** * use the vehicle label as the id. * @param useLabelAsVehicleId diff --git a/onebusaway-transit-data/src/main/java/org/onebusaway/transit_data/model/DefaultRouteSort.java b/onebusaway-transit-data/src/main/java/org/onebusaway/transit_data/model/DefaultRouteSort.java index 152518221..e59c93b7a 100644 --- a/onebusaway-transit-data/src/main/java/org/onebusaway/transit_data/model/DefaultRouteSort.java +++ b/onebusaway-transit-data/src/main/java/org/onebusaway/transit_data/model/DefaultRouteSort.java @@ -35,4 +35,5 @@ public int compareRoutes(String a, String b) { public String getPrimarySortAgency() { return null; } -} \ No newline at end of file +} + diff --git a/onebusaway-users/src/main/java/org/onebusaway/users/model/User.java b/onebusaway-users/src/main/java/org/onebusaway/users/model/User.java index 84f52e8ca..eaa77cefd 100644 --- a/onebusaway-users/src/main/java/org/onebusaway/users/model/User.java +++ b/onebusaway-users/src/main/java/org/onebusaway/users/model/User.java @@ -107,6 +107,7 @@ public class User extends IdentityBean { private boolean temporary; @Lob + @Column(columnDefinition = "BLOB") private UserProperties properties; @ManyToMany(fetch = FetchType.EAGER) diff --git a/onebusaway-util/pom.xml b/onebusaway-util/pom.xml index 6cbc9a8ec..8b4a8fe55 100644 --- a/onebusaway-util/pom.xml +++ b/onebusaway-util/pom.xml @@ -36,7 +36,7 @@ com.google.code.gson gson - 2.1 + ${gson.version} joda-time diff --git a/pom.xml b/pom.xml index 7b7d027a8..739a6fa33 100644 --- a/pom.xml +++ b/pom.xml @@ -45,6 +45,7 @@ 11 1.11.602 + 2.8.9 @@ -183,7 +184,7 @@ org.hsqldb hsqldb - 2.3.2 + 2.7.1 @@ -401,7 +402,7 @@ org.apache.httpcomponents httpclient - 4.5.9 + 4.5.13 mysql