camsys · merhatsidk · Jul 28, 2023 · Jul 28, 2023 · Jul 28, 2023 · Jul 28, 2023
diff --git a/onebusaway-alerts-persistence/pom.xml b/onebusaway-alerts-persistence/pom.xml
@@ -41,7 +41,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.1</version>
+			<version>${gson.version}</version>
 		</dependency>
 			<dependency>
 				<groupId>joda-time</groupId>

diff --git a/onebusaway-enterprise-webapp/pom.xml b/onebusaway-enterprise-webapp/pom.xml
@@ -120,7 +120,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>1.7.1</version>
+			<version>${gson.version}</version>
 		</dependency>
 
 		<dependency>

diff --git a/onebusaway-gtfsrt-integration-tests/pom.xml b/onebusaway-gtfsrt-integration-tests/pom.xml
@@ -98,7 +98,7 @@
    <dependency>
    		<groupId>com.google.code.gson</groupId>
    		<artifactId>gson</artifactId>
-   		<version>1.7.1</version>
+   		<version>${gson.version}</version>
    		<type>jar</type>
    		<scope>compile</scope>
    </dependency>

diff --git a/onebusaway-nextbus-api-webapp/pom.xml b/onebusaway-nextbus-api-webapp/pom.xml
@@ -178,7 +178,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.3.1</version>
+			<version>${gson.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.onebusaway.util</groupId>

diff --git a/onebusaway-transit-data-federation/pom.xml b/onebusaway-transit-data-federation/pom.xml
@@ -176,7 +176,7 @@
    <dependency>
    		<groupId>com.google.code.gson</groupId>
    		<artifactId>gson</artifactId>
-   		<version>1.7.1</version>
+   		<version>${gson.version}</version>
    		<type>jar</type>
    		<scope>compile</scope>
    </dependency>

diff --git a/...ebusaway/transit_data_federation/impl/realtime/gtfs_realtime/GtfsRealtimeTripLibrary.java b/...ebusaway/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/...usaway-transit-data/src/main/java/org/onebusaway/transit_data/model/DefaultRouteSort.java b/...usaway-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;
   }
-}
+}
+
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
@@ -107,6 +107,7 @@ public class User extends IdentityBean<Integer> {
   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
@@ -36,7 +36,7 @@
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.1</version>
+			<version>${gson.version}</version>
 		</dependency>
 			<dependency>
 				<groupId>joda-time</groupId>

diff --git a/pom.xml b/pom.xml
@@ -45,6 +45,7 @@
     <maven.compiler.target>11</maven.compiler.target>
     <!-- this needs to match cloud-services -->
     <aws.version>1.11.602</aws.version>
+    <gson.version>2.8.9</gson.version>
   </properties>
 
 
@@ -183,7 +184,7 @@
             <dependency>
                 <groupId>org.hsqldb</groupId>
                 <artifactId>hsqldb</artifactId>
-                <version>2.3.2</version>
+                <version>2.7.1</version>
             </dependency>
 
             <dependency>
@@ -401,7 +402,7 @@
             <dependency>
                 <groupId>org.apache.httpcomponents</groupId>
                 <artifactId>httpclient</artifactId>
-                <version>4.5.9</version><!-- needs to match onebusaway-cloud-services -->
+                <version>4.5.13</version><!-- needs to match onebusaway-cloud-services -->
             </dependency>
             <dependency>
                 <groupId>mysql</groupId>
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,4 +35,5 @@ public int compareRoutes(String a, String b) { @@
       public String getPrimarySortAgency() {
         return null;
       }
-    }
+    }